From 5fcef2d14f93ee7c4c8d5fbe2d184e5f679b6a0d Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Tue, 21 Jan 2025 22:35:28 +0800
Subject: [PATCH] =?UTF-8?q?44905=20=20MES-=E5=8F=91=E8=BF=90=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/MesShippingOrderManagementDetailService.java          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java
index ba6db7b..9ab930f 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java
@@ -168,10 +168,10 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
 
     @Override
     public ResultBean syncShip(Long[] ids) {
-        String organizeCode = AuthUtil.getOrganizeCode();
-        String userName = AuthUtil.getSessionUser().getUserName();
-        /*String organizeCode = "CR01";
-        String userName ="zxw";*/
+       /* String organizeCode = AuthUtil.getOrganizeCode();
+        String userName = AuthUtil.getSessionUser().getUserName();*/
+        String organizeCode = "CR01";
+        String userName ="zxw";
         List<MesShippingOrderManagementDetail> detailList = getManagementDetails(ids, organizeCode, userName);
         List<Long> idList = detailList.stream().map(MesShippingOrderManagementDetail::getPid).distinct().collect(Collectors.toList());
 
@@ -189,7 +189,7 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
                 log.info("发运单明细对应零件号为空");
                 return ResultBean.fail(String.format("发运单明细对应零件号为空"));
             }
-            if ((int) mesShippingOrderManagementDetail.getPlanQty() == mesShippingOrderManagementDetail.getActualQty()) {
+            if ((int) mesShippingOrderManagementDetail.getPlanQty() != mesShippingOrderManagementDetail.getActualQty()) {
                 log.info("计划数量和实际数量不相等");
                 return ResultBean.fail(String.format("计划数量和实际数量不相等"));
             }