Merge branch 'uat-temp-nht-2504270000-46499' into yfai-20250418-dev

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

@@ -429,10 +429,10 @@ public class MesNingDeShippingCheckService implements IMesNingDeShippingCheckSer
         return  shippingOrderManagementRepository.getByProperty(recentlyOrderPackBean);
     }
 
-    private void updateOrderManagementDetails(String userInfo, MesShippingOrderManagement orderManagement, MesShippingOrderManagementDetail detail) {
+    private void updateOrderManagementDetails(String userInfo, MesShippingOrderManagement orderManagement, MesShippingOrderManagementDetail detail, MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS status) {
         detail.setIsScanFlg(MesCommonConstant.TRUE_INTEGER);
         detail.setSecondScanFlg(MesCommonConstant.TRUE_INTEGER);
-        detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.SKIP.getValue());
+        detail.setStatus(status.getValue());
         detail.setRemark(MesPcnExtConstWords.STRONGER_PASS);
         //根据是否启动记忆判断 若启用记忆，则根据保存数据库
         if (!StringUtils.isEmpty(orderManagement.getIsEnableMemory()) && Objects.equals(orderManagement.getIsEnableMemory(), MesCommonConstant.TRUE_INTEGER)) {
@@ -459,7 +459,7 @@ public class MesNingDeShippingCheckService implements IMesNingDeShippingCheckSer
             throw new ImppBusiException(String.format("【%s】明细已全部扫描完成，请检查数据！", orderManagement.getShippingCode()));
         }
         //更新明细
-        updateOrderManagementDetails(userInfo, orderManagement, shippingOrderManagementDetailOptional.get());
+        updateOrderManagementDetails(userInfo, orderManagement, shippingOrderManagementDetailOptional.get(), MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.SKIP);
         return model;
     }
 
@@ -477,7 +477,7 @@ public class MesNingDeShippingCheckService implements IMesNingDeShippingCheckSer
         //更新明细
         MesShippingOrderManagementDetail detail = shippingOrderManagementDetailOptional.get();
         detail.setBarcode(model.getSn());
-        updateOrderManagementDetails(userInfo, orderManagement, detail);
+        updateOrderManagementDetails(userInfo, orderManagement, detail, MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED);
         return model;
     }