Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -556,6 +556,9 @@ public class AndonHqlPack {
         if (!StringUtils.isEmpty(mesEquipment.getWorkCellCode())){
             DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean);
         }
+        if (!StringUtils.isEmpty(mesEquipment.getWorkCenterCode())){
+            DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCenterCode(), "workCenterCode", packBean);
+        }
         if (!StringUtils.isEmpty(mesEquipment.getEquipmentCode())){
             DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean);
         }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -4276,15 +4276,6 @@ public class MesEnumUtil {
             return tmp;
         }
 
-        public static String valueOfDescription2(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
-                }
-            }
-            return tmp;
-        }
     }
 
     /**
@@ -4908,16 +4899,6 @@ public class MesEnumUtil {
             }
             return tmp;
         }
-
-        public static String valueOfDescription2(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
-                }
-            }
-            return tmp;
-        }
     }
 
     /**
@@ -5003,11 +4984,11 @@ public class MesEnumUtil {
             return tmp;
         }
 
-        public static String valueOfDescription2(int val) {
-            String tmp = null;
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
                 }
             }
             return tmp;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -20,7 +20,9 @@ public class MesPcnEnumUtil {
         MONITOR_MODULE(10, "监听组件"),
         REVEAL_MODULE(20, "展示组件"),
         BUTTON_MODULE(30, "按钮组件"),
-        TIMING_MODULE(40, "定时组件");
+        TIMING_MODULE(40, "定时组件"),
+        PCS_BACK_MODULE(50, "工序后台组件"),
+        PLC_CALLBACK_MODULE(60, "PLC回调工位参数");
 
         private int value;
         private String description;
@@ -2542,7 +2544,9 @@ public class MesPcnEnumUtil {
         STOP_PCS_CTL("stopPcsCtl", "停止监控"),
         RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"),
         PROCESS_CONTENT("processContent", "过程组件内容"),
-        TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容");
+        TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容"),
+        TIME_MODULE_START("timeModuleStart", "定时组件开始"),
+        TIME_MODULE_STOP("timeModuleStop", "定时组件暂停");
 
         private String value;
         private String description;
@@ -2919,7 +2923,9 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WORK_CELL_MONITOR_TYPE {
         MONITOR(10, "监听组件"),
-        SHOW(20, "展示组件");
+        SHOW(20, "展示组件"),
+        BUTTON(30, "按钮组件"),
+        PROCESS_MONITOR(40, "工序监听组件");
 
         private int value;
         private String description;
@@ -4232,7 +4238,7 @@ public class MesPcnEnumUtil {
     }
 
     /**
-     *  绑定模式
+     * 绑定模式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum KEY_BIND_MODE {
@@ -4470,4 +4476,92 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum AGV_BUTTON_TRIGGER {
+
+        DELAY(10, "延时启动"),
+        EMERGENCY_STOP(20, "紧急停止");
+
+        private int value;
+        private String description;
+
+        AGV_BUTTON_TRIGGER(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+    }
+
+    /**
+     * 工作中心 工位监控模式  10=工单作业，20=标准作业
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_CENTER_MONITOR_TYPE {
+
+        ORDER_WORK(10, "工单作业"),
+        STANDARD_WORK(20, "标准作业");
+
+        private int value;
+        private String description;
+
+        WORK_CENTER_MONITOR_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PLC_DATA_DIRECT {
+
+        PLC_WRITE(10, "plc->mes"),
+        MES_WRITE(20, "mes->plc"),
+        SHARE(30, "共用");
+
+        private int value;
+        private String description;
+
+        PLC_DATA_DIRECT(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+    }
+
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -764,18 +764,18 @@ public class WmsEnumUtil {
         VDA_QC(290, "VDA_QC", "VDA质检"),
         VDA_SN_SPLIT(300, "VDA_SN_SPLIT", "VDA物料拆分"),
         VDA_SN_MERGE(310, "VDA_SN_MERGE", "VDA物料合并"),
-        KT_RECEPTION(320, "KT_RECEPTION", "KT让步接收"),
-        KT_SCRAP(330, "KT_SCRAP", "KT报废"),
-        KT_QUARANTINE(340, "KT_QUARANTINE", "KT隔离"),
-        KT_BACK_QUARANTINE(350, "KT_BACK_QUARANTINE", "KT反隔离"),
-        KT_DEFINITE_FAIL(360, "KT_DEFINITE_FAIL", "KT不合格"),
-        KT_RETURN(370, "KT_RETURN", "KT退货"),
-        KT_REWORK(380, "KT_REWORK", "KT返工"),
-        KT_MISCALCULATION(390, "KT_MISCALCULATION", "KT误判"),
-        KT_SORTING(400, "KT_SORTING", "KT分选"),
+        RECEPTION(320, "RECEPTION", "让步接收"),
+        SCRAP(330, "SCRAP", "报废"),
+        QUARANTINE(340, "QUARANTINE", "隔离"),
+        BACK_QUARANTINE(350, "BACK_QUARANTINE", "反隔离"),
+        DEFINITE_FAIL(360, "DEFINITE_FAIL", "不合格"),
+        RETURN(370, "RETURN", "退货"),
+        REWORK(380, "REWORK", "返工"),
+        MISCALCULATION(390, "MISCALCULATION", "误判"),
+        SORTING(400, "SORTING", "分选"),
         VDA_STATIC_CS(410, "VDA_STATIC_CS", "静态盘点"),
         VDA_CS_SEARCH(420, "VDA_CS_SEARCH", "VDA盘点查询"),
-        KT_DEFINITE(430, "KT_DEFINITE", "KT合格"),
+        DEFINITE(430, "DEFINITE", "合格"),
         VDA_PACKAGE_MANAGE(440, "VDA_PACKAGE_MANAGE", "VDA编组管理"),
         KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"),
         KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"),

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java

@@ -79,6 +79,10 @@ public class MesEquipmentTooling extends BaseBean implements Serializable {
     @ApiParam("按钮颜色")
     private String btnColor;
 
+    @Transient
+    @ApiParam("按钮类别")
+    private String btnType;
+
     public Integer getToolingType() {
         return this.toolingType == null ? 0 : this.toolingType;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java

@@ -134,6 +134,14 @@ public class MesPlc extends BaseBean implements Serializable {
     @ApiParam("默认赋值属性")
     private String defaultRule;
 
+    @Column(name = "DATA_DIRECT")
+    @ApiParam("数据方向 10 plc->mes 20 mes->plc 30共用地址")
+    private Integer dataDirect;
+
+    @Column(name = "CALLBACK_METHOD")
+    @ApiParam("回调方法名称")
+    private String callbackMethod;
+
     @Transient
     @ApiParam("设备名称")
     private String equipmentName;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java

@@ -124,4 +124,8 @@ public class MesQcOrder extends BaseBean  implements Serializable {
     @ApiParam("产品条码")
     private String productSn;
 
+    @Transient
+    @ApiParam("本批次生产总数")
+    private Double locSrcLotNoQty;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java

@@ -176,6 +176,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("主队列状态")
     private Integer masterStatus;
 
+    @Transient
+    @ApiParam("产品条码")
+    private String productSn;
+
     public double getQueueSeqVal() {
         return this.queueSeq == null ? 0.0d : this.queueSeq;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java

@@ -50,6 +50,10 @@ public class MesWorkCellPoint extends BaseBean implements Serializable {
     @ApiParam("队列明细表序号")
     private Double queueDetailSeq;
 
+    @Column(name = "VIN_CODE")
+    @ApiParam("Vin")
+    private String vinCode;
+
     public double getQueueSeqVal() {
         return this.queueSeq == null ? 0 : this.queueSeq;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java

@@ -66,6 +66,11 @@ public class MesWorkCenter extends BaseBean implements Serializable {
     @ApiParam("条码生成模式")
     private Integer generateType;
 
+    // 10=工单作业，20=标准作业
+    @Column(name = "MONITOR_TYPE")
+    @ApiParam("工位监控模式")
+    private Integer monitorType;
+
     @Transient
     @ApiParam(value = "子集列表")
     private List<MesWorkCell> childTreeList;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java

@@ -74,6 +74,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("工单状态")
     private Integer workOrderStatus;
 
+    @Column(name = "IS_PULL")
+    @ApiParam("是否投料")
+    private Integer isPull = 2;
+
     @Column(name = "WO_TYPE")
     @ApiParam("工单类型")
     private Integer workOrderType;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java

@@ -31,11 +31,11 @@ import java.io.Serializable;
 public class MesWorkOrderLog extends BaseBean implements Serializable {
     private static final long serialVersionUID = -5859382100462830988L;
 
-    @Column(name = "ORDER_NO")
+    @Column(name = "ORDER_NO", nullable = false)
     @ApiParam("工单号")
     private String orderNo;
 
-    @Column(name = "PART_NO")
+    @Column(name = "PART_NO", nullable = false)
     @ApiParam("物料号")
     private String partNo;
 
@@ -154,7 +154,7 @@ public class MesWorkOrderLog extends BaseBean implements Serializable {
     @Lob
     @Column(name = "EXTEND")
     @ApiParam("扩展数据")
-    private String extend;
+    public String extend;
 
     @Column(name = "RESERVED1")
     @ApiParam("预留字段1")
@@ -172,6 +172,10 @@ public class MesWorkOrderLog extends BaseBean implements Serializable {
     @ApiParam("预留字段4")
     private String reserved4;
 
+    @Column(name = "PARENT_PART_NO")
+    @ApiParam("父阶物料号")
+    private String parentPartNo;
+
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value = "工作中心名称")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RefreshInitModuleModel.java

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class RefreshInitModuleModel<T> implements Serializable {
+
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("用户信息")
+    private String userInfo;
+
+    @ApiParam("队列展示类型（有序/无序）")
+    private Object resultObj;
+
+    @ApiParam("展示组件定时刷新频率")
+    private Integer timer;
+
+    @ApiParam("List字段集")
+    private List<AttrBean> DataAttrList;
+
+    @ApiParam("List结果集")
+    private List<T> resultList;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java

@@ -1,7 +1,9 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 
+import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesStateMachineStatus;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -58,6 +60,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("客户端信息")
     private String clientInfo;
 
+    @ApiParam("websocket session连接id")
+    private String sessionId;
+
     @ApiParam("用户信息")
     private String userInfo;
 
@@ -126,6 +131,7 @@ public class StationRequestBean implements Serializable {
     @ApiParam("当前流程状态")
     private MesStateMachineStatus curFsmState;
 
+    @JsonIgnore
     @ApiParam("展示组件")
     private Object moduleService;
 
@@ -141,14 +147,23 @@ public class StationRequestBean implements Serializable {
     @ApiParam("是否按时完成")
     private Integer isOnTimeComplete = 1;
 
+    @ApiParam("是否是调度程序调用")
+    private boolean isDispatcherInvoke;
+
     @ApiParam("工位剩余时间")
     private Long remainWorkTime;
 
+    @ApiParam("停机类型")
+    private MesPcnEnumUtil.STOP_MACHINE_TYPE stopMachineType;
+
+    @ApiParam("提醒时间点")
+    private Integer remindTime;
+
     @ApiParam("是否操作超时")
     private Integer isTimeOut = 2;
 
     @ApiParam("特殊展示数据")
-    private Map<String, Object> specialDisplayMap  = new HashMap<>();
+    private Map<String, Object> specialDisplayMap = new HashMap<>();
 
     @ApiParam("物料名称")
     private String partName;
@@ -159,6 +174,12 @@ public class StationRequestBean implements Serializable {
     @ApiParam("区域代码")
     private String areaCode;
 
+    @ApiParam("数量")
+    private Integer qty;
+
+    @ApiParam("班次名称")
+    private String shiftName;
+
     @Override
     public String toString() {
         return "StationRequestBean{" +

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java

@@ -22,6 +22,10 @@ public class StepDispatchModel {
 
     private String moduleDataMapKey;
 
+    private String pfKey;
+
+    private String dlKey;
+
     private String scanInfo;
 
     public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String requestBeanKey, String moduleDataMapKey, String scanInfo) {

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 
+import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
 import io.swagger.annotations.Api;
 import lombok.Data;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeModuleModel.java

@@ -0,0 +1,32 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
+import cn.estsh.i3plus.pojo.mes.bean.MesPlc;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/7/21 00:33
+ * @desc
+ */
+@Data
+public class TimeModuleModel {
+
+    private MesPcnEnumUtil timeWay;
+
+    private Integer startTime;
+
+    private Integer endTime;
+
+    private Integer remindTime;
+
+    private String remindContent;
+
+    private String needTimeOutRecord;
+
+    private MesPlc agvRunningPlc;
+
+    private MesPlc mesWriteFlagPlc;
+
+    private MesPlc plcReadFlagPlc;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WorkCellPointInfoModel.java

@@ -0,0 +1,34 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author: adair.song
+ * @CreateDate: 2020/07/25 14:21
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("工位队列信息model")
+public class WorkCellPointInfoModel {
+
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("工作单元名称")
+    private String workCellName;
+
+    @ApiParam("Vin")
+    private String vinCode;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -296,8 +296,15 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode);
-        DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
-        DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean);
+        if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikePack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterName())) {
+            DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterName(), "workCenterName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesWorkCenter.getAreaCode())) {
+            DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean);
+        }
         return packBean;
     }
 
@@ -310,13 +317,13 @@ public class MesHqlPack {
     public static DdlPackBean getMesWorkCell(MesWorkCell mesWorkCell, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCell, organizeCode);
         if (!StringUtils.isEmpty(mesWorkCell.getWorkCenterCode())) {
-            DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean);
+            DdlPreparedPack.getStringLikerPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean);
         }
         if (!StringUtils.isEmpty(mesWorkCell.getAreaCode())) {
-            DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean);
+            DdlPreparedPack.getStringLikerPack(mesWorkCell.getAreaCode(), "areaCode", packBean);
         }
         if (!StringUtils.isEmpty(mesWorkCell.getWorkCellCode())) {
-            DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean);
+            DdlPreparedPack.getStringLikerPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean);
         }
 
         return packBean;
@@ -1232,7 +1239,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringLikerPack(numberRule.getNumberRule(), "numberRule", packBean);
         }
         if (!StringUtils.isEmpty(numberRule.getPrefix())) {
-            DdlPreparedPack.getNumEqualPack(numberRule.getPrefix(), "prefix", packBean);
+            DdlPreparedPack.getStringLikerPack(numberRule.getPrefix(), "prefix", packBean);
         }
         if (null != numberRule.getIsCycle()) {
             DdlPreparedPack.getNumEqualPack(numberRule.getIsCycle(), "isCycle", packBean);
@@ -1345,7 +1352,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringLikerPack(mesPlc.getChannel(), "channel", packBean);
         }
         if (!StringUtils.isEmpty(mesPlc.getTagAddress())) {
-            DdlPreparedPack.getStringLikerPack(mesPlc.getTagAddress(), "tagAddress", packBean);
+            DdlPreparedPack.getStringEqualPack(mesPlc.getTagAddress(), "tagAddress", packBean);
         }
         if (!StringUtils.isEmpty(mesPlc.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCenterCode(), "workCenterCode", packBean);
@@ -1353,6 +1360,12 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesPlc.getPlcCode())) {
             DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCellCode(), "workCellCode", packBean);
         }
+        if (!StringUtils.isEmpty(mesPlc.getEquipmentCode())) {
+            DdlPreparedPack.getStringEqualPack(mesPlc.getEquipmentCode(), "equipmentCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesPlc.getObjectCode())) {
+            DdlPreparedPack.getStringEqualPack(mesPlc.getObjectCode(), "objectCode", packBean);
+        }
         return packBean;
     }
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java

@@ -54,4 +54,7 @@ public class MesElectricDataModel implements Serializable {
 
     @ApiParam(value = "FTP文件")
     private Object ftpFile;
+
+    @ApiParam(value = "过程条码")
+    private String serialNumber;
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java

@@ -138,6 +138,9 @@ public class TorqueCollectionModel implements Serializable {
     @ApiParam("psets总数")
     private Integer psetSum;
 
+    @ApiParam("防错码")
+    private String pokeYokeFix;
+
     private Map<String, PsetModel> psets = new LinkedHashMap<>();
 
     /**
@@ -158,7 +161,8 @@ public class TorqueCollectionModel implements Serializable {
      */
     public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, String colorCode, String partNo,
                                  String partName, Integer torqueNo, Integer checkScanCount, Integer sendSeq,
-                                 Integer yellowGunRule, Integer isEndSeq, String groupCode, Integer isPf, Double qualifiedCount) {
+                                 Integer yellowGunRule, Integer isEndSeq, String groupCode, Integer isPf, Double qualifiedCount,
+                                 String pokeYokeFix) {
         this.vinCode = vinCode;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.gradeCode = gradeCode;
@@ -173,6 +177,7 @@ public class TorqueCollectionModel implements Serializable {
         this.groupCode = groupCode;
         this.isPf = isPf;
         this.qualifiedCount = qualifiedCount;
+        this.pokeYokeFix = pokeYokeFix;
     }
 
     /**
@@ -197,7 +202,7 @@ public class TorqueCollectionModel implements Serializable {
     public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode,
                                  String colorCode, String partNo, String partName, Integer pset1, Integer pset2,
                                  Integer pset3, Integer pset4, Integer pset5, Integer pset6, Integer pset7, Integer pset8,
-                                 Integer torqueNo, Integer sendSeq, Integer checkScanCount) {
+                                 Integer torqueNo, Integer sendSeq, Integer checkScanCount, String pokeYokeFix) {
         this.vinCode = vinCode;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.gradeCode = gradeCode;
@@ -215,6 +220,7 @@ public class TorqueCollectionModel implements Serializable {
         this.torqueNo = torqueNo;
         this.sendSeq = sendSeq;
         this.checkScanCount = checkScanCount;
+        this.pokeYokeFix = pokeYokeFix;
         assemblePsets();
     }
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java

@@ -119,6 +119,12 @@ public class WmsActionResponseBean<Obj> implements Serializable {
     @ApiParam(value = "工厂代码")
     private String organizeCode;
 
+    @ApiParam(value = "提交模式")
+    private Integer commitMode;
+
+    @ApiParam(value = "是否允许重置")
+    private Integer isResetAble;
+
     public WmsActionResponseBean(Boolean codeStatus, String message) {
         this.codeStatus = codeStatus;
         this.message = message;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description : 任务单模型
@@ -35,6 +36,9 @@ public class WmsTaskInfoModel implements Serializable {
     @ApiParam(value = "关联单据业务类型代码")
     private String busiTypeCode;
 
+    @ApiParam(value = "关联单据业务类型代码集合")
+    private List<String> busiTypeCodeLst;
+
     @ApiParam(value = "计划日期")
     private String zdate;
 
@@ -107,4 +111,9 @@ public class WmsTaskInfoModel implements Serializable {
         this.srcZoneNo = srcZoneNo;
         this.createUser = createUser;
     }
+
+    public WmsTaskInfoModel(String organizeCode, String busiTypeCode) {
+        this.organizeCode = organizeCode;
+        this.busiTypeCode = busiTypeCode;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java

@@ -81,6 +81,12 @@ public class WmsActionGroup extends BaseBean {
     @AnnoOutputColumn
     private Integer isAutoCommit;
 
+    // 1=true, 2 = false
+    @Column(name = "IS_RESET_ABLE", columnDefinition = "int default 1", nullable = false)
+    @ApiParam(value = "是否允许重置")
+    @AnnoOutputColumn
+    private Integer isResetAble;
+
     @Lob
     @Column(name = "POSITION", columnDefinition = "TEXT")
     @ApiParam(value = "GOJS位置")
@@ -114,7 +120,11 @@ public class WmsActionGroup extends BaseBean {
         return this.autoInit == null ? 0 : this.autoInit.intValue();
     }
 
-    public int geSubmitStepSeqVal() {
+    public int getSubmitStepSeqVal() {
         return this.submitStepSeq == null ? 0 : this.submitStepSeq.intValue();
     }
+
+    public int getIsResetAbleVal() {
+        return this.isResetAble == null ? 0 : this.isResetAble.intValue();
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java

@@ -177,4 +177,15 @@ public class WmsDocFgDetail extends BaseBean {
     @Column(name = "QUEUE_GROUP_NO")
     @ApiParam(value = "jis料架号")
     private String queueGroupNo;
+
+    @Column(name = "JIS_NO")
+    @ApiParam(value = "jis编号")
+    private String jisNo;
+
+    public WmsDocFgDetail(String jisNo) {
+        this.jisNo = jisNo;
+    }
+
+    public WmsDocFgDetail() {
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java

@@ -229,11 +229,11 @@ public class WmsDocMovementMaster extends BaseBean {
 
     @Column(name = "REMAKE")
     @ApiParam(value = "备注1")
-    private Integer remake;
+    private String remake;
 
-    @Column(name = "DESC")
+    @Column(name = "SECONDARY_REMAKE")
     @ApiParam(value = "备注2")
-    private String desc;
+    private String secondaryRemake;
 
     @Transient
     @ApiParam(value = "发运单号")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java

@@ -169,6 +169,10 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("供应商编号")
     private String vendorNo;
 
+    @Column(name = "srcSn")
+    @ApiParam("原条码")
+    private String srcSn;
+
     @Column(name = "SERIAl_SN")
     @ApiParam("产品条码")
     public String serialSn;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java

@@ -221,9 +221,9 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam(value = "成本中心")
     private String costCenter;
 
-    @Column(name = "DESC")
+    @Column(name = "SECONDARY_REMAKE")
     @ApiParam(value = "备注2")
-    private String desc;
+    private String secondaryRemake;
 
     @Column(name = "QUEUE_GROUP_NO")
     @ApiParam(value = "jis料架号")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java

@@ -175,6 +175,10 @@ public class WmsPOMaster extends BaseBean {
     @Column(name = "SHIPMENT_NOTE_NUMBER")
     public String shipmentNoteNumber;
 
+    @ApiParam("erp单号")
+    @Column(name = "ERP_SRC_NO")
+    private String erpSrcNo;
+
     public WmsPOMaster() {
 
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java

@@ -60,6 +60,7 @@ public class WmsPackage extends BaseBean {
 
     @Column(name="PRINT_STATUS")
     @ApiParam(value = "打印状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class)
     public Integer printStatus;
 
     @Column(name="PACK_LEVEL")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java

@@ -280,6 +280,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "包装零件号")
     private String packagePartNo;
 
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam(value = "jis料架号")
+    private String queueGroupNo;
+
     @Transient
     @ApiParam(value = "工厂名称")
     public String organizeName;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java

@@ -112,6 +112,10 @@ public class WmsTaskInfo extends BaseBean {
     @ApiParam("工厂集合")
     private List<String> organizeCodeList;
 
+    @Transient
+    @ApiParam("业务类型代码")
+    public String busiTypeCode;
+
     public WmsTaskInfo(){};
 
     public WmsTaskInfo(String orderNo ,Integer taskStatus , String zdate ,String ztime,String custNo,String vendorNo){