Merge branch 'uat-temp-xw-202501200000-44905' into dev

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 organizeCode = AuthUtil.getOrganizeCode();
-        String userName = AuthUtil.getSessionUser().getUserName();
+        String userName = AuthUtil.getSessionUser().getUserName();*/
-        /*String organizeCode = "CR01";
+        String organizeCode = "CR01";
-        String userName ="zxw";*/
+        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("计划数量和实际数量不相等"));
             }