From 2bded2e4a67c25d4def50a98acaae9a3a060b212 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 30 May 2022 22:14:56 +0800 Subject: [PATCH 1/6] andon --- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java index 6135b57..5f94b60 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java @@ -25,6 +25,7 @@ import java.io.Serializable; @Index(columnList = "ROUTE_CODE"), @Index(columnList = "ALARM_CODE"), @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "WORK_CENTER_CODE, ROUTE_TYPE"), @Index(columnList = "ROUTE_CODE, ALARM_CODE"), @Index(columnList = "ROUTE_CODE, ALARM_CODE, WORK_CENTER_CODE") }) From bf386f458083211a0b530cd96e0d293c9cb7c7b7 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 1 Jun 2022 16:18:30 +0800 Subject: [PATCH 2/6] andon --- .../main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java index 4303c7c..b1753cc 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java @@ -34,7 +34,7 @@ public class StationRequestBean extends StationRequestBeanAb implements Serializ ", alarmDetailCode='" + get(alarmDetailCode) + '\'' + ", andonOrderNo='" + get(andonOrderNo) + '\'' + ", msgData=" + get(msgData) + - ", fsmList=" + get(fsmList) + +// ", fsmList=" + get(fsmList) + ", curFsm=" + get(curFsm) + ", triggerEvent='" + get(triggerEvent) + '\'' + ", alarmErrorTime='" + get(alarmErrorTime) + '\'' + From 7432815bfbfd2a6e91428ff5f3cb3b13a10a6d94 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 3 Jun 2022 18:12:47 +0800 Subject: [PATCH 3/6] andon --- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java index f6bdeaa..42418b3 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java @@ -27,6 +27,7 @@ import java.io.Serializable; @Table(name = "ANDON_CONFIG", indexes = { @Index(columnList = "CONFIG_CODE"), @Index(columnList = "CONFIG_CODE, CONFIG_KEY"), + @Index(columnList = "CONFIG_CODE, CONFIG_KEY, CONFIG_VALUE_TYPE"), @Index(columnList = "CONFIG_CODE, CONFIG_KEY, CONFIG_GROUP") }) @Api(value="系统配置") From 9b58ec1623ce3e2443f7612dd794afad74d34070 Mon Sep 17 00:00:00 2001 From: "baoyu.wang" Date: Sun, 5 Jun 2022 11:25:42 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=B8=AD=E8=88=AA=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index c47f613..2b02892 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -1168,4 +1168,26 @@ public class WmsStockSn extends BaseBean { this.queueGroupNo = queueGroupNo; this.remark = remark; } + + + public WmsStockSn(String organizeCode, String batchNo, String sn, String workCenterCode, String partNo, + String partNameRdd, String shippingFlag,Double qty, String leftCode, String createUser, String createDatetime, + String modifyUser, String modifyDatetime) { + this.organizeCode = organizeCode; + this.batchNo = batchNo; + this.sn = sn; + this.workCenterCode = workCenterCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.shippingFlag = shippingFlag; + this.qty = qty; + this.leftCode = leftCode; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + + + + } } From 2bfb08f143cbddb825b2d35e28ab177aa075976c Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Sun, 5 Jun 2022 13:55:40 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=90=88=E5=B9=B6=E7=8E=8B=E5=AE=9D?= =?UTF-8?q?=E7=8E=89-wmsStockSn=20-=E5=A2=9E=E5=8A=A0=E6=9E=84=E9=80=A0?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index b85857b..bceef8b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -1173,4 +1173,26 @@ public class WmsStockSn extends BaseBean { this.queueGroupNo = queueGroupNo; this.remark = remark; } + + + public WmsStockSn(String organizeCode, String batchNo, String sn, String workCenterCode, String partNo, + String partNameRdd, String shippingFlag,Double qty, String leftCode, String createUser, String createDatetime, + String modifyUser, String modifyDatetime) { + this.organizeCode = organizeCode; + this.batchNo = batchNo; + this.sn = sn; + this.workCenterCode = workCenterCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.shippingFlag = shippingFlag; + this.qty = qty; + this.leftCode = leftCode; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + + + + } } From 35dede6c04c3cfbc6840f72357c9b6378e3b51e9 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 6 Jun 2022 09:33:12 +0800 Subject: [PATCH 6/6] andon --- .../src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java index 6197372..c13ca5c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java @@ -69,4 +69,7 @@ public class FsmModel implements Serializable { @ApiParam("进入触发方法时默认不需要校验外部触发") private boolean checkTriggerTypeFalg = false; + @ApiParam("状态机停在之后处理异常标志") + private boolean handleErrorAfterStopFsmFalg = false; + }