From 9b58ec1623ce3e2443f7612dd794afad74d34070 Mon Sep 17 00:00:00 2001 From: "baoyu.wang" Date: Sun, 5 Jun 2022 11:25:42 +0800 Subject: [PATCH 1/2] =?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 35dede6c04c3cfbc6840f72357c9b6378e3b51e9 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 6 Jun 2022 09:33:12 +0800 Subject: [PATCH 2/2] 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; + }