From f21eb3380cb51aaef3a0f1a2da98dc4b3e76cdc1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 13 Feb 2025 18:01:48 +0800 Subject: [PATCH] =?UTF-8?q?=2044435=20PCN=EF=BC=9A=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0=E9=85=8D?= =?UTF-8?q?=E7=BD=AEfollow=20Pisces?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../step/MesProductSnPrintSortStepService.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnPrintSortStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnPrintSortStepService.java index 0c08b8e..d1820ad 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnPrintSortStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnPrintSortStepService.java @@ -140,16 +140,15 @@ public class MesProductSnPrintSortStepService extends BaseStepService { MesNumberRule numberRule = numberRuleRepository.getByProperty(packBean); if (null == numberRule) stepExpSendMsgAndThrowEx(reqBean, resultBean, String.format("工单号[%s]零件号[%s]客户条码编码规则[%s]无效!", productionPartContext.getWorkOrderNo(), productionPartContext.getPartNo(), custMatchRule)); - //过滤打印配置信息 - MesProdRuleContext prodRuleContext = prodRuleContextMap.get(productionPartContext.getForeignKey()); - MesProductionAssemblySortContext productionAssemblySortContext = filterPrintInfo(prodRuleContext); - - //获取打印模版和打印机 - String labelTemplateCode = null != productionAssemblySortContext ? productionAssemblySortContext.getPrintTemplate() : null; - String printer = null != productionAssemblySortContext ? productionAssemblySortContext.getPrinter() : null; + //获取零件表的打印模版和打印机 + String labelTemplateCode = mesPart.getCustLabelTemplate();; + String printer = mesPart.getProductPrinterCode(); if (StringUtils.isEmpty(labelTemplateCode)) { - labelTemplateCode = mesPart.getCustLabelTemplate(); - printer = mesPart.getProductPrinterCode(); + //获取工单装配件的打印模版和打印机 + MesProdRuleContext prodRuleContext = prodRuleContextMap.get(productionPartContext.getForeignKey()); + MesProductionAssemblySortContext productionAssemblySortContext = filterPrintInfo(prodRuleContext); + labelTemplateCode = null != productionAssemblySortContext ? productionAssemblySortContext.getPrintTemplate() : null; + printer = null != productionAssemblySortContext ? productionAssemblySortContext.getPrinter() : null; } if (null == labelTemplateCode) stepExpSendMsgAndThrowEx(reqBean, resultBean, String.format("工单号[%s]零件号[%s]未在ERP物料信息维护打印模板,请检查并修改!", productionPartContext.getWorkOrderNo(), productionPartContext.getPartNo()));