Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CLIENT

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysRoleController.java

@@ -138,6 +138,7 @@ public class SysRoleController extends BaseController
             if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
             {
                 loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
+                loginUser.getUser().setUserName(loginUser.getTenantId()+"¥¥¥"+loginUser.getUsername());
                 loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
                 tokenService.setLoginUser(loginUser);
             }

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/MaterialInventoryServiceImpl.java

@@ -185,6 +185,7 @@ public class MaterialInventoryServiceImpl implements IMaterialInventoryService
          //3、根据物料编码跟规则查询库存信息
           MaterialInventory materialInventory=new MaterialInventory();
           materialInventory.setMaterialId(materialInventoryVo.getMaterialId());
+          materialInventory.setLotNumber(materialInventoryVo.getLotNumber());
           List<MaterialInventory> materialInventories = materialInventoryMapper.selectMaterialInventoryList(materialInventory);
           if(materialInventories.size()>0){
               Double oldQuantity = materialInventories.get(0).getQuantity();

zkqy-system/src/main/java/com/zkqy/system/service/impl/SysUserServiceImpl.java

@@ -107,7 +107,7 @@ public class SysUserServiceImpl implements ISysUserService {
     /**
      * 通过用户名查询用户
      *
-     * @param userName 用户名
+     * @param userInfo 用户名
      * @return 用户对象信息
      */
     @Override

zkqy-ui/src/views/orderMange/index.vue

@@ -1343,20 +1343,23 @@ export default {
               btnIcon: "",
               btnShowCondition:
                 '[{"fieldName":"sale_order.status","mark":"6","refValue":"1"}]',
+              btnHasPermi: "huaxian:xsglddgl:INSERT",
               children: [],
             },
             {
               btnName: "打印出库单",
               btnType: "printOutBound",
               btnIcon: "",
-              btnShowCondition: "",
+              btnShowCondition:'[{"fieldName":"sale_order.status","mark":"6","refValue":"5"}]',
+              btnHasPermi: "huaxian:xsglddgl:INSERT",
               children: [],
             },
             {
               btnName: "出库发货",
               btnType: "deliver",
               btnIcon: "",
-              btnShowCondition: "",
+              btnShowCondition:'[{"fieldName":"sale_order.status","mark":"6","refValue":"5"}]',
+              btnHasPermi: "huaxian:xsglddgl:INSERT",
               children: [],
             },
             {
@@ -1364,6 +1367,7 @@ export default {
               btnType: "myDetail",
               btnIcon: "",
               btnShowCondition: "",
+              btnHasPermi: "huaxian:xsglddgl:INSERT",
               children: [],
             },
             {
@@ -1373,6 +1377,7 @@ export default {
               btnShowCondition:
                 '[{"fieldName":"sale_order.status","mark":"6","refValue":"1"}]',
               children: [],
+              btnHasPermi: "huaxian:xsglddgl:INSERT",
             }
           );
           // }
@@ -2874,8 +2879,8 @@ export default {
           let productName = productData ? productData.productName : "";
           let productType = productData ? productData.productType : "";
           printStr += `<tr align="center">
-                    <td>${productName}</td>    
-                    <td>${productType}</td>    
+                    <td>${productName}</td>
+                    <td>${productType}</td>
                     <td>${item.productNumber}</td>
                     <td>${item.productUnitPrice}</td>
                     <td>${item.productAmounts}</td>

zkqy-ui/src/views/orderMange/purchase/listInfoTwo.vue

@@ -920,7 +920,8 @@ export default {
             btnName: "采购修改",
             btnType: "caiGouUpdate",
             btnIcon: "el-icon-edit",
-            btnShowCondition: "",
+            btnShowCondition:
+              '[{"fieldName":"purchase.data_approval_status","mark":"6","refValue":"0"}]',
             children: [],
           });
           this.topBtnArr = res.data.resultMap.button?.filter(