Merge branch 'uat-temp-nht-2503130000-chengdu-shipping' into uat-temp-wj-chongqingdaqu-dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java

@@ -175,8 +175,11 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
     public MesSortShippingCheckModel saveRackNo(MesSortShippingCheckModel model, String organizeCode, String userInfo) {
         checkVolvoRack(model, organizeCode);
         MesShippingOrderManagement orderManagement = checkMesShippingOrderManagement(model);
+        //根据是否启动记忆判断 若启用记忆，则根据保存数据库
+        if (!StringUtils.isEmpty(orderManagement.getIsEnableMemory()) && Objects.equals(orderManagement.getIsEnableMemory(), MesCommonConstant.TRUE_INTEGER)) {
             orderManagement.setRackNo(model.getVolvoRackNo());
             shippingOrderManagementRepository.update(orderManagement);
+        }
         return model;
     }
 
@@ -311,7 +314,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
                 String tmpMidStr = tmpAfterBarCode.replace("[)>061B", "");
                 String[] splitStrArray = tmpMidStr.split("1Y");
                 if (splitStrArray.length > 0) {
-                    if (StringUtils.isEmpty(orderManagement.getRackNo()) || !orderManagement.getRackNo().contains(splitStrArray[0])) {
+                    if (StringUtils.isEmpty(model.getVolvoRackNo()) || !model.getVolvoRackNo().contains(splitStrArray[0])) {
                         throw new ImppBusiException(String.format("料箱类型与顺序不一致，请检查数据"));
                     }
                 }
@@ -332,7 +335,10 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
 //                detail.setBarcode(detail.getBarcode() + "," + model.getLocationCode());
                 detail.setPartPosition(model.getLocationCode());
 //                detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue());
+                //根据是否启动记忆判断 若启用记忆，则根据保存数据库
+                if (!StringUtils.isEmpty(orderManagement.getIsEnableMemory()) && Objects.equals(orderManagement.getIsEnableMemory(), MesCommonConstant.TRUE_INTEGER)) {
                     shippingOrderManagementDetailRepository.update(detail);
+                }
                 break;
             }
         }
@@ -600,7 +606,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
             throw new ImppBusiException(String.format("【%s】此产品条码不存在，请检查数据！", model.getSn()));
         }
         //校验状态
-        checkStatus(model, produceSn);
+//        checkStatus(model, produceSn);
         return produceSn;
     }
 
@@ -676,6 +682,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
         orderManagement.setSystemSyncStatus(CommonEnumUtil.FALSE);
         orderManagement.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue());
         orderManagement.setEndScanTime(TimeTool.getNowTime(true));
+        orderManagement.setRackNo(model.getVolvoRackNo());
 
         //发运单明细状态修改为校验完成
         DdlPackBean orderManagementDetailPackBean = DdlPackBean.getDdlPackBean(organizeCode, isUnpack? CommonEnumUtil.IS_VAILD.INVAILD.getValue() : CommonEnumUtil.IS_VAILD.VAILD.getValue());

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingCheckVolvoRackNoAndPartNoStrategyServiceImpl.java

@@ -241,23 +241,11 @@ public class MesShippingCheckVolvoRackNoAndPartNoStrategyServiceImpl implements
     }
 
     private void updateOrderManagementDetails(MesProduceSn produceSn, MesShippingOrderManagement orderManagement, MesShippingOrderManagementDetail detail, MesWorkOrder workOrder, String userInfo) {
-//        if (StringUtils.isEmpty(orderManagement.getCheckSeqCode())) {
         detail.setBarcode(produceSn.getCustSn());
         detail.setIsScanFlg(MesCommonConstant.TRUE_INTEGER);
         detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue());
         detail.setRemark("扫描完成");
-            updateDetail(detail);
         orderManagement.setCheckSeqCode("1");
-            update(orderManagement);
-
-//            MesCustSortInfo custSoftInfo = custSoftInfoRDao.getById(Long.parseLong(workOrder.getWorkOrderSource()));
-//            if (custSoftInfo != null) {
-//                MesCimVolvoJisRackIdDetail rackIdDetail = rackIdDetailRDao.getById(custSoftInfo.getSourceId());
-//                if (rackIdDetail != null) {
-//                    detail.setPartPosition(rackIdDetail.getPosition());
-//                }
-//            }
-
         //根据是否启动记忆判断 若启用记忆，则根据保存数据库
         if (!StringUtils.isEmpty(orderManagement.getIsEnableMemory()) && Objects.equals(orderManagement.getIsEnableMemory(), MesCommonConstant.TRUE_INTEGER)) {
 
@@ -288,7 +276,6 @@ public class MesShippingCheckVolvoRackNoAndPartNoStrategyServiceImpl implements
                 mesShippingSnUniqueService.insertMesShippingSnUnique(orderManagement.getOrganizeCode(),detail.getBarcode(),orderManagement.getShippingCode(),userInfo);
             }
         }
-//        }
     }
 
     @MonitorLog