From a3ec5cfcd80ce69bbbf3905cf7022ac67148e0c2 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 27 Nov 2024 20:07:46 +0800 Subject: [PATCH] JIS --- .../mes/pcn/apiservice/serviceimpl/busi/MesPullingOrderInfoService.java | 2 +- .../serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPullingOrderInfoService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPullingOrderInfoService.java index 014aa5a..3e6828a 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPullingOrderInfoService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPullingOrderInfoService.java @@ -248,7 +248,7 @@ public class MesPullingOrderInfoService implements IMesPullingOrderInfoService { //查询拉动单主表是JIS拉动且拉动状态为10 String append = packBean.getWhereAppend() + " AND EXISTS (select 1 from MesPullingOrderInfo po where po.organizeCode = '"+ bean.getOrganizeCode() +"' and po.pullingOrderNo = model.pullingOrderNo" + - " and po.pullOrderType=20 and po.workCenterCode ='" + bean.getWorkCenterCode() + "' "; + " and po.pullOrderType = 20 and po.pullOrderStatus != 50 and po.workCenterCode = '" + bean.getWorkCenterCode() + "' "; packBean.setWhereAppend(append + " )"); DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"pullingOrderNo"}, packBean); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java index 4ea59ea..0304cdc 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java @@ -70,7 +70,7 @@ public class AssemblyVisualListPrintStrategy implements IPrintTemplateStrategySe resultMap.put(MesPcnExtConstWords.CUST_PART_NO, workOrder.getCustPartNo()); // 客户条码 resultMap.put(MesPcnExtConstWords.SN, workOrder.getCustSn()); - // 车型名称 + // 工单备注 resultMap.put(MesPcnExtConstWords.REMARK, workOrder.getDescription()); // 重打印 resultMap.put(MesPcnExtConstWords.REPRINT, "");