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

@@ -19,6 +19,7 @@ import cn.estsh.i3plus.pojo.mes.model.StationResultBean;
 import cn.estsh.i3plus.pojo.mes.model.StepResult;
 import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.impp.framework.boot.util.SpringContextsUtil;
+import com.google.common.base.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -223,6 +224,10 @@ public class MesWorkOrderCutCheckStepService extends BaseStepService {
         // 裁片方案成品配置
         List<MesCutSchemeFg> mesCutSchemeFgList = workOrderCutService.queryCutSchemeFgList(cutScheme.getCutCode(), reqBean.getOrganizeCode());
 
+        // 裁片方案成品配置
+        List<MesWorkOrderCutDetail> mesWorkOrderCutDetails = workOrderCutService.queryMesWorkOrderCutDetailList(workOrderCut.getCutWorkOrderNo(), reqBean.getOrganizeCode());
+
+
         // 校验裁片方案成品配置
         if(!checkMesCutSchemeFgListValid(mesCutSchemeFgList, workOrderList, stepResult, cutWorkOrderNo, cutScheme.getCutCode()).isCompleted()) return stepResult;
 
@@ -233,6 +238,7 @@ public class MesWorkOrderCutCheckStepService extends BaseStepService {
 
             Map<String, MesPartContext> partDataExtContext = (Map<String, MesPartContext>) stepResult.getObj();
 
+
             for (MesCutSchemeFg mesCutSchemeFg : mesCutSchemeFgList) {
                 if (StringUtils.isEmpty(mesCutSchemeFg.getPackageSnRuleCode()))
                     return stepResult.isCompleted(false).msg(String.format("请检查裁片方案成品信息,零件号[%s]未在裁片方案[%s]成品配置信息中维护包装编码规则!", mesCutSchemeFg.getPartNo(), cutScheme.getCutCode()));
@@ -253,6 +259,12 @@ 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));
+                    workOrderCutDetailModel.setQty(map.get(mesCutSchemeFg.getPartNo()).get(0).getQty());
+                    workOrderCutDetailModel.setPackageQty(map.get(mesCutSchemeFg.getPartNo()).get(0).getPackageQty());
+                }
+
                 workOrderCutDetailModel.setCutWorkOrderNo(cutWorkOrderNo);
 
                 MesCustomerPart customerPart = customerPartService.getMesCustomerPartByPartNo(mesCutSchemeFg.getPartNo(), mesPackingDefine.getCustCode(), reqBean.getOrganizeCode());