From b768efd78dede7d438b64e94aa0b16f9cf414f56 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 15 Feb 2025 23:01:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E6=89=93=E5=8C=85=20?= =?UTF-8?q?=E7=BC=BA=E5=B0=91=E5=B7=A5=E5=8D=95=E5=8F=B7=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/station/function/MesFunctionPackagePartService.java | 1 + .../apiservice/serviceimpl/step/MesPackageNoGenerateStepService.java | 1 + .../estsh/i3plus/ext/mes/pcn/pojo/context/MesPackageRuleContext.java | 3 +++ 3 files changed, 5 insertions(+) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionPackagePartService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionPackagePartService.java index 08ded7c..1a8d096 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionPackagePartService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionPackagePartService.java @@ -129,6 +129,7 @@ public class MesFunctionPackagePartService extends BaseSwsService implements IFs stepResult = StepResult.getSuccessComplete(); //零件打包不写包装明细数据, 默认赋值[仅统计包装], 生成虚拟条码 packageDataContext.setGenerateType(MesExtEnumUtil.PACKING_RULE_GENERATE_TYPE.PACKAGE.getValue()); + packageDataContext.setPartPackWorkOrderNo(packageDataContext.getWorkOrderNo()); try { //零件打包业务处理 stepResult.setDataCollection(new ArrayList()); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesPackageNoGenerateStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesPackageNoGenerateStepService.java index 8460540..979f905 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesPackageNoGenerateStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesPackageNoGenerateStepService.java @@ -392,6 +392,7 @@ public class MesPackageNoGenerateStepService extends BaseStepService implements if (!CollectionUtils.isEmpty(serialNoModel.getDataMap()) && serialNoModel.getDataMap().containsKey(packageNo)) { packageDb.setPackageOneCode(serialNoModel.getDataMap().get(packageNo).toString()); } + if (!StringUtils.isEmpty(packageRuleContext.getPartPackWorkOrderNo())) packageDb.setWorkOrderNo(packageRuleContext.getPartPackWorkOrderNo()); return packageDb; } diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesPackageRuleContext.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesPackageRuleContext.java index 980dcdd..4fb39c6 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesPackageRuleContext.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesPackageRuleContext.java @@ -61,4 +61,7 @@ public class MesPackageRuleContext implements Serializable { @ApiParam(name = "同步状态WMS") public Integer systemSyncStatusWms = 2; + @ApiParam("零件打包加工单号") + public String partPackWorkOrderNo; + }