Merge remote-tracking branch 'origin/test-temp-wj-2501060000-44729' into dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java

@@ -303,7 +303,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
             mesReworkTask.setReworkedQty(requestModel.getReworkedQty());
             mesReworkTask.setScrapQty(requestModel.getScrapQty());
             // 如果是批次还需要移库
-            DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+            DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesReworkTask.getOrganizeCode());
             DdlPreparedPack.getStringEqualPack(requestModel.getPartNo(), "partNo", ddlPackBean);
 
             MesProductVersion version = productVersionRepository.getByProperty(ddlPackBean);

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

@@ -658,7 +658,8 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
         }*/
 
         //是否需要判断条码质量状态
-        if (produceSn.getQcStatus() != MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue()) {
+        List<Integer> statusList = Stream.of(MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue(), MesExtEnumUtil.PRODUCE_QC_STATUS.SUSPICIOUS_TO_QUALIFIED.getValue()).collect(Collectors.toList());
+        if (!statusList.contains(produceSn.getQcStatus())){
             throw new ImppBusiException(String.format("【%s】此条码质量状态为【%s】,请选择【%s】状态的条码", serialNumber, MesExtEnumUtil.PRODUCE_QC_STATUS.valueOfDescription(produceSn.getQcStatus()),
                     MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getDescription()));
         }

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

@@ -35,6 +35,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @Description : 扫描条码
@@ -155,7 +156,8 @@ public class MesShippingScanSnStrategyServiceImpl implements IMesShippingScanStr
                     MesExtEnumUtil.PRODUCE_SN_STATUS.OFFLINE.getDescription(), MesExtEnumUtil.PRODUCE_SN_STATUS.CREATE.getDescription()));
         }
         //校验产品质量状态 必须是状态为合格条码
-        if (produceSn.getQcStatus() != MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue()) {
+        List<Integer> statusList = Stream.of(MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue(), MesExtEnumUtil.PRODUCE_QC_STATUS.SUSPICIOUS_TO_QUALIFIED.getValue()).collect(Collectors.toList());
+        if (!statusList.contains(produceSn.getQcStatus())){
             throw new ImppBusiException(String.format("【%s】此条码质量状态为【%s】,请选择【%s】状态的条码，请检查数据！", model.getSn(), MesExtEnumUtil.PRODUCE_QC_STATUS.valueOfDescription(produceSn.getQcStatus()),
                     MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getDescription()));
         }