Merge branch 'uat-temp-nht-2503280000-cdpartsprint' into uat-temp-wj-chongqingdaqu-dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/ChengDuVolvoPartPrintStrategy.java

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.strategy;
 import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesCustomerPartService;
 import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesPartService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesPrintedSnLogService;
+import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProduceSnExtService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesWorkOrderService;
 import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.IPrintTemplateStrategyService;
 import cn.estsh.i3plus.ext.mes.pcn.apiservice.util.MesPcnException;
@@ -65,18 +66,22 @@ public class ChengDuVolvoPartPrintStrategy implements IPrintTemplateStrategyServ
     private MesCimVolvoJisRackIdDetailRepository rackIdDetailRDao;
     @Autowired
     private MesCimVolvoJisRackIdRepository volvoJisRackIdRDao;
+    @Autowired
+    private IMesProduceSnExtService produceSnExtService;
 
     @Override
     public MesProduceSnPrintModel execute(GenSerialNoModel genSerialNoModel, MesProduceSnPrintModel mesProduceSnPrintModel, MesNumberRule numberRule, StepResult stepResult, StationRequestBean reqBean, Boolean isStep) {
         String organizeCode = mesProduceSnPrintModel.getOrganizeCode();
-        //物料信息
-        MesPart mesPart = mesPartService.getMesPartByPartNo(mesProduceSnPrintModel.getPartNo(), organizeCode);
-        MesCustomerPart customerPart = (!Objects.isNull(genSerialNoModel) && !CollectionUtils.isEmpty(genSerialNoModel.getDataMap()) && genSerialNoModel.getDataMap().containsKey(MesCustomerPart.class.getSimpleName())) ? (MesCustomerPart) genSerialNoModel.getDataMap().get(MesCustomerPart.class.getSimpleName()) : mesCustomerPartService.getMesCustomerPart(organizeCode,mesProduceSnPrintModel.getPartNo());
         if (!isStep){
             MesPcnException.throwBusiException("成都volvo零件标签打印只支持工位端打印!");
         }
+        //物料信息
+        MesCustomerPart customerPart = (!Objects.isNull(genSerialNoModel) && !CollectionUtils.isEmpty(genSerialNoModel.getDataMap()) && genSerialNoModel.getDataMap().containsKey(MesCustomerPart.class.getSimpleName())) ? (MesCustomerPart) genSerialNoModel.getDataMap().get(MesCustomerPart.class.getSimpleName()) : mesCustomerPartService.getMesCustomerPart(organizeCode,mesProduceSnPrintModel.getPartNo());
+        Map<String, Object> modelMap = (Map<String, Object>) mesProduceSnPrintModel.getSourceData();
+        // 工单信息
+        MesWorkOrder workOrder = (MesWorkOrder) modelMap.get("mesWorkOrder");
 
-        MesProduceSn mesProduceSn = mesProduceSnPrintModel.getMesProduceSnList().get(0);
+        MesProduceSn mesProduceSn = produceSnExtService.getProduceSnByCustSn(organizeCode, workOrder.getCustSn());
         //封装打印信息
         MesProduceSnPrintDataModel printDataModel = getModel(mesProduceSn, customerPart);
         mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().clear();