From a219cdf441fb61a0a75c839ca1bc668fcf5a1ad7 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 25 Jun 2024 15:32:29 +0800 Subject: [PATCH] context --- .../ext/mes/pcn/pojo/context/MesProductionAssemblyContext.java | 6 ++++++ .../mes/pcn/pojo/context/MesProductionAssemblyNosortContext.java | 3 +++ .../ext/mes/pcn/pojo/context/MesProductionAssemblySortContext.java | 6 ------ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionAssemblyContext.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionAssemblyContext.java index eac23a4..b098670 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionAssemblyContext.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionAssemblyContext.java @@ -61,6 +61,12 @@ public class MesProductionAssemblyContext implements Serializable { @ApiParam(value = "装备序号") public Integer routeSeq; + @ApiParam(value = "装配爆炸图FID") + private Long imageFileId; + + @ApiParam(value = "音频文件") + private Long audioFileId; + @ApiParam("组织代码") public String organizeCode; diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionAssemblyNosortContext.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionAssemblyNosortContext.java index 6c86dad..df18e27 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionAssemblyNosortContext.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionAssemblyNosortContext.java @@ -34,6 +34,9 @@ public class MesProductionAssemblyNosortContext extends MesProductionAssemblyCon @ApiParam(value = "工序用量") private Integer qty; + @ApiParam(name = "产成品图") + private String outPartNoPic; + public MesProductionAssemblyNosortContext() {} public MesProductionAssemblyNosortContext copy(MesProdRuleContext prodRuleContext, MesAssemblyNosortCfg assemblyNosortCfg, String assemblySn) { diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionAssemblySortContext.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionAssemblySortContext.java index 1f33b1c..2c9a278 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionAssemblySortContext.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionAssemblySortContext.java @@ -67,9 +67,6 @@ public class MesProductionAssemblySortContext extends MesProductionAssemblyConte @ApiParam(value = "SAP目标库位") private String destErpLocation; - @ApiParam(value = "装配爆炸图FID") - private Long imageFileId; - @ApiParam(value = "条码打印方式") private Integer printType; @@ -82,9 +79,6 @@ public class MesProductionAssemblySortContext extends MesProductionAssemblyConte @ApiParam(value = "是否启动组合条码") private String isCombineSn; - @ApiParam(value = "音频文件") - private Long audioFileId; - @ApiParam(value = "逻辑数量") private Double logicNum;