打印

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

@@ -23,7 +23,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -128,17 +131,10 @@ public class MesProductSnPrintSortStepService extends BaseStepService {
             // 从物料信息中获取标签模板
             String labelTemplateCode = partDataContext.get(sn.getPartNo()).getCustLabelTemplate();
 
-            // 从物料信息中获取打印机
-            String productPrinterCode = partDataContext.get(sn.getPartNo()).getProductPrinterCode();
-
             if (labelTemplateCode == null) {
                 stepExpSendMsgAndThrowEx(reqBean, resultBean, String.format("工单号[%s]零件号[%s]未在ERP物料信息维护打印模板,请检查并修改!", sn.getWorkOrderNo(), sn.getPartNo()));
             }
 
-            if (StringUtils.isEmpty(productPrinterCode)) {
-                stepExpSendMsgAndThrowEx(reqBean, resultBean, String.format("工单号[%s]零件号[%s]未在ERP物料信息维护打印机,请检查并修改!", sn.getWorkOrderNo(), sn.getPartNo()));
-            }
-
             MesProduceSnPrintModel mesProduceSnPrintModel = new MesProduceSnPrintModel();
             // 查模板代码
             MesLabelTemplate labelTemplate = getLabelTemplate(labelTemplateCode, organizeCode);
@@ -148,7 +144,7 @@ public class MesProductSnPrintSortStepService extends BaseStepService {
             }
 
             mesProduceSnPrintModel.setMesLabelTemplate(labelTemplate);
-            mesProduceSnPrintModel.setPrinter(productPrinterCode);
+            mesProduceSnPrintModel.setPrinter(partDataContext.get(sn.getPartNo()).getProductPrinterCode());
             mesProduceSnPrintModel.setPartNo(sn.getPartNo());
             mesProduceSnPrintModel.setOrganizeCode(organizeCode);
             mesProduceSnPrintModel.setSourceData(workOrder);