Merge branch 'yfai-20250418-dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into yfai-20250418-dev

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

@@ -468,6 +468,11 @@ public class MesNingDeShippingCheckService implements IMesNingDeShippingCheckSer
         if(!shippingOrderManagementDetailOptional.isPresent()){
             throw new ImppBusiException(String.format("【%s】明细已全部扫描完成，请检查数据！", orderManagement.getShippingCode()));
         }
+        for (MesShippingOrderManagementDetail detail : model.getDetailList()) {
+            if (Objects.equals(detail.getSecondScanFlg(), MesCommonConstant.TRUE_INTEGER) && Objects.equals(detail.getBarcode(), model.getSn())) {
+                throw new ImppBusiException(String.format("【%s】条码已进行二次发运扫描，请检查数据！", model.getSn()));
+            }
+        }
         MesProduceSn produceSn = checkSecondSn(model);
         //更新明细
         MesShippingOrderManagementDetail detail = shippingOrderManagementDetailOptional.get();

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionAssemblyReplaceService.java

@@ -80,7 +80,6 @@ public class MesFunctionAssemblyReplaceService extends BaseSwsService implements
         requestModel.setOrganizeCode(organizeCode);
         requestModel.setCustSn(custSn);
         requestModel.setIsOrigSn(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
-        requestModel.setAssemblyPartStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue());
         List<MesProductionAssembly> mesProductionRecords = mesReworkTaskService.assemblyQuery(requestModel);
         paramMap.put(MesPcnExtConstWords.ORGANIZE_CODE, reqBean.getOrganizeCode());
         //根据配置查询生产队列工位推送信息