From 85420f99b3d15b7402d6be2803ca6ca19c1905c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com>
Date: Mon, 30 Dec 2024 10:45:00 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99=20=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E9=80=80=E6=96=99=20=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E9=A2=86=E6=96=99=E5=92=8C=E9=80=80=E6=96=99=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=8F=98=E9=87=8F=E8=B5=8B=E5=80=BCservice?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E8=B0=83=E6=8D=A2=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E7=BB=8F=E7=90=86=E5=92=8C=E7=94=9F=E4=BA=A7=E4=B8=BB=E7=AE=A1?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90=EF=BC=9B=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=A2=86=E6=96=99=E8=AF=A6=E6=83=85=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8service=E6=96=B9=E6=B3=95=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E5=8F=B7=E7=A9=BA=E5=80=BC=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MakeReturnOrderServiceImpl.java   |  4 ++--
 .../impl/SysMakeorderPickDetailServiceImpl.java    | 14 ++++++++------
 .../service/impl/SysMakeorderPickServiceImpl.java  |  4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/MakeReturnOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/MakeReturnOrderServiceImpl.java
index 86688f67..43be8242 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/MakeReturnOrderServiceImpl.java
+++ b/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);
         }
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickDetailServiceImpl.java
index a3226e44..68c16303 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickDetailServiceImpl.java
+++ b/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;
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java
index be46a443..08ff5e06 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java
+++ b/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);
         }
     }