Merge remote-tracking branch 'origin/dev-temp-xw-202502050000-44881' into test

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutCheckStepService.java

@@ -224,8 +224,6 @@ public class MesWorkOrderCutCheckStepService extends BaseStepService {
         // 裁片方案成品配置
         List<MesCutSchemeFg> mesCutSchemeFgList = workOrderCutService.queryCutSchemeFgList(cutScheme.getCutCode(), reqBean.getOrganizeCode());
 
-        // 裁片方案成品配置
-        List<MesWorkOrderCutDetail> mesWorkOrderCutDetails = workOrderCutService.queryMesWorkOrderCutDetailList(workOrderCut.getCutWorkOrderNo(), reqBean.getOrganizeCode());
 
 
         // 校验裁片方案成品配置
@@ -260,7 +258,7 @@ public class MesWorkOrderCutCheckStepService extends BaseStepService {
                 MesWorkOrderCutDetailModel workOrderCutDetailModel = new MesWorkOrderCutDetailModel();
                 BeanUtils.copyProperties(mesCutSchemeFg, workOrderCutDetailModel);
                 if (Objects.equal(cutScheme.getIsFree(), CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue())) {
-                    Map<String, List<MesWorkOrderCutDetail>> map = mesWorkOrderCutDetails.stream().collect(Collectors.groupingBy(MesWorkOrderCutDetail::getPartNo));
+                    Map<String, List<MesWorkOrderCutDetail>> map = mesWorkOrderCutDetailList.stream().collect(Collectors.groupingBy(MesWorkOrderCutDetail::getPartNo));
                     workOrderCutDetailModel.setQty(map.get(mesCutSchemeFg.getPartNo()).get(0).getQty());
                     workOrderCutDetailModel.setPackageQty(map.get(mesCutSchemeFg.getPartNo()).get(0).getPackageQty());
                 }