[fix]

生产管理 生产领料 生产退料
修改生产领料和退料审批节点变量赋值service方法，调换生产经理和生产主管角色权限；
修改生产领料详情获取领料详情列表service方法，添加出库单号空值判断；

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/MakeReturnOrderServiceImpl.java

@@ -270,9 +270,9 @@ public class MakeReturnOrderServiceImpl implements IMakeReturnOrderService
         // 角色不同审核人不同
         if(roleKeys.contains("scyRole")){
             variables.put("authority",1);
-        }else if(roleKeys.contains("scjlRole")){
+        }else if(roleKeys.contains("sczgRole")){
             variables.put("authority",2);
-        }else if(roleKeys.contains("sczgRole")||roleKeys.contains("admin")){
+        }else if(roleKeys.contains("scjlRole")||roleKeys.contains("admin")){
             variables.put("authority",3);
         }
     }

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickDetailServiceImpl.java

@@ -199,12 +199,14 @@ public class SysMakeorderPickDetailServiceImpl implements ISysMakeorderPickDetai
                         .sum();
                 pickDetail.setHasReturnNum(returnNum);
             }
-            WarehouseOutOrderDetail tempDetail = new WarehouseOutOrderDetail();
-            tempDetail.setOutOrderCode(outOrderCode);
-            tempDetail.setMaterialNo(pickDetail.getMaterialNo());
-            WarehouseOutOrderDetail outOrderDetail = outOrderDetailMapper.selectOutOrderDetailListByThreeCode(tempDetail);
-            int outNum = Optional.ofNullable(outOrderDetail.getHasOutOrderSum()).orElse(0);
-            pickDetail.setHasPickNum(outNum);
+            if(outOrderCode!=null){
+                WarehouseOutOrderDetail tempDetail = new WarehouseOutOrderDetail();
+                tempDetail.setOutOrderCode(outOrderCode);
+                tempDetail.setMaterialNo(pickDetail.getMaterialNo());
+                WarehouseOutOrderDetail outOrderDetail = outOrderDetailMapper.selectOutOrderDetailListByThreeCode(tempDetail);
+                int outNum = Optional.ofNullable(outOrderDetail.getHasOutOrderSum()).orElse(0);
+                pickDetail.setHasPickNum(outNum);
+            }
         }
         return mergedDetails;
     }

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java

@@ -423,9 +423,9 @@ public class SysMakeorderPickServiceImpl implements ISysMakeorderPickService
         // 角色不同审核人不同
         if(roleKeys.contains("scyRole")){
             variables.put("authority",1);
-        }else if(roleKeys.contains("scjlRole")){
+        }else if(roleKeys.contains("sczgRole")){
             variables.put("authority",2);
-        }else if(roleKeys.contains("sczgRole")||roleKeys.contains("admin")){
+        }else if(roleKeys.contains("scjlRole")||roleKeys.contains("admin")){
             variables.put("authority",3);
         }
     }