Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

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")
 })

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="系统配置")

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;
+
 }

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) + '\'' +

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;
+
+
+
+    }
 }