From a2eab983d92a88af3a43a87d50a6d05462563475 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 29 Aug 2020 13:01:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=B1=A0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=B1=A0=E5=A2=9E=E5=8A=A0jit=5Fseq=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index e27e140..397a28c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -143,4 +143,8 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "JIS_BACKFLUSH_STATUS") @ApiParam("回冲状态") private String jisBackflushStatus; + + @Column(name = "CUST_PROD_LINE_CODE") + @ApiParam("客户产线代码") + private String custProdLineCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java index 25b58db..653bb98 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java @@ -47,6 +47,10 @@ public class MesJitIssueCfg extends BaseBean implements Serializable { @ApiParam("缓存类型") private Integer cfgType; + @Column(name = "SEQ") + @ApiParam("排序号") + private Integer seq; + @Transient @ApiParam("当前JIT缓存数") private Integer currentJitCacheNum; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java index 5f98f5e..36dd48a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java @@ -49,4 +49,8 @@ public class MesJitLockCache extends BaseBean implements Serializable { @Column(name = "STATUS") @ApiParam("状态") private Integer status; + + @Column(name = "JIT_SEQ") + @ApiParam("JIT排序号") + private String jitSeq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java index d764ed1..29f74c0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java @@ -52,4 +52,8 @@ public class MesJitOrderCache extends BaseBean implements Serializable { @Column(name = "SEQ") @ApiParam("序号") private Integer seq; + + @Column(name = "JIT_SEQ") + @ApiParam("JIT排序号") + private String jitSeq; } From 36e90007103d695c42d0abe3bfba49ceea1b16ca Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 29 Aug 2020 15:08:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java index c9fcfd4..4781543 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.wms.engine.rule; -import cn.estsh.i3plus.pojo.wms.bean.WmsZones; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -54,5 +53,10 @@ public class GenerateLocateRule { */ private boolean orderByAxle; + /** + * 是否空库位 + */ + private boolean isEmptyLocate; + }