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

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

@@ -830,7 +830,8 @@ public class BlockSoftSwitchEnumUtil {
     public enum SUIT_PROCESS_STATUS {
         UNPROCESSED(10, "未处理"),
         PROCESSING(20,  "处理中"),
-        PROCESS(30,  "已处理");
+        PROCESS(30,  "已处理"),
+        PROCESS_FAIL(40,  "处理失败");
 
         private int value;
         private String description;
@@ -878,7 +879,8 @@ public class BlockSoftSwitchEnumUtil {
         REQUEST_ORGIN_PARAM(20,  "请求原始参数"),
         ORIGINAL_MESSAGE(30,  "原始报文"),
         CONVERTED_MESSAGE(40,  "转换报文"),
-        SUIT_SEND_MESSAGE(50,  "适配发送报文");
+        SUIT_SEND_MESSAGE(50,  "适配发送报文"),
+        PROCESS_RESULT(60,  "处理结果");
 
         private int value;
         private String description;
@@ -919,6 +921,52 @@ public class BlockSoftSwitchEnumUtil {
     }
 
     /**
+     * ftp连接模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FTP_CONNECTION_MODE {
+        LOCAL_ACTIVE_MODE(10,  "本地主动模式"),
+        LOCAL_PASSIVE_MODE(20, "本地被动模式"),
+//        REMOTE_ACTIVE_MODE(30, "远程主动模式"),
+        REMOTE_PASSIVE_MODE(40, "远程被动模式");
+
+        private final int value;
+        private final String description;
+
+        FTP_CONNECTION_MODE(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 FTP_CONNECTION_MODE valueOf(int val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return FTP_CONNECTION_MODE.LOCAL_ACTIVE_MODE;
+        }
+    }
+
+    /**
      * 脚本类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -957,7 +1005,6 @@ public class BlockSoftSwitchEnumUtil {
         }
 
         public static BS_SCRIPT_TYPE valueOf(int val) {
-            String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
                     return values()[i];
@@ -1003,7 +1050,6 @@ public class BlockSoftSwitchEnumUtil {
         }
 
         public static BS_SCRIPT_LANGUAGE valueOf(int val) {
-            String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
                     return values()[i];
@@ -1050,7 +1096,6 @@ public class BlockSoftSwitchEnumUtil {
         }
 
         public static BS_SCRIPT_EXECUTE_METHOD valueOf(int val) {
-            String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
                     return values()[i];

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

@@ -69,16 +69,21 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WORK_MODULE_TYPE {
-        MONITOR_MODULE(10, "监听组件"),
-        REVEAL_MODULE(20, "展示组件"),
-        BUTTON_MODULE(30, "按钮组件"),
-        TIMING_MODULE(40, "定时组件");
+        MONITOR_MODULE(10, "MONITOR_MODULE", "监听组件"),
+        REVEAL_MODULE(20, "REVEAL_MODULE", "展示组件"),
+        BUTTON_MODULE(30, "BUTTON_MODULE", "按钮组件"),
+        TIMING_MODULE(40, "TIMING_MODULE", "定时组件"),
+        PCS_BACK_MODULE(50, "PCS_BACK_MODULE", "工序后台组件"),
+        PLC_CALLBACK_MODULE(60, "PLC_CALLBACK_MODULE", "PLC回调工位参数"),
+        ASSIST_MODULE(70, "ASSIST_MODULE", "辅助组件");
 
         private int value;
+        private String data;
         private String description;
 
-        WORK_MODULE_TYPE(int value, String description) {
+        WORK_MODULE_TYPE(int value, String data, String description) {
             this.value = value;
+            this.data = data;
             this.description = description;
         }
 
@@ -86,6 +91,10 @@ public class MesEnumUtil {
             return value;
         }
 
+        public String getData() {
+            return data;
+        }
+
         public String getDescription() {
             return description;
         }
@@ -708,7 +717,8 @@ public class MesEnumUtil {
         EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
         EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
         EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"),
-        BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值");
+        BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值"),
+        WO_TYPE("WO_TYPE", "客户JIT队列工单类型");
 
         private String value;
         private String description;
@@ -4526,7 +4536,8 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG {
         NORMAL(10, "正常"),
-        EMPTYING(20, "放空");
+        EMPTYING(20, "放空"),
+        ERR_PERCH(30, "异常占位");
 
         private int value;
         private String description;
@@ -4778,7 +4789,8 @@ public class MesEnumUtil {
     public enum WORK_CELL_MONITOR_TYPE {
         MONITOR(10, "监听组件"),
         SHOW(20, "展示组件"),
-        BUTTON(30, "按钮组件");
+        BUTTON(30, "按钮组件"),
+        PROCESS_MONITOR(40, "工序监听组件");
 
         private int value;
         private String description;
@@ -6659,8 +6671,7 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum GROUP_SIDE {
         POSITIVE(10, "A", "正面"),
-        REVERSE_SIDE(20, "B", "背面"),
-        SPECIAL_SIDE(30, "C", "特殊件");
+        REVERSE_SIDE(20, "B", "背面");
 
         private Integer value;
         private String code;

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

@@ -2165,6 +2165,16 @@ public class MesPcnEnumUtil {
         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;
+        }
     }
 
     /**
@@ -5381,8 +5391,7 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum GROUP_SIDE {
         POSITIVE(10, "A", "正面"),
-        REVERSE_SIDE(20, "B", "背面"),
-        SPECIAL_SIDE(30, "C", "特殊件");
+        REVERSE_SIDE(20, "B", "背面");
 
         private Integer value;
         private String code;
@@ -5467,4 +5476,40 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 客户JIT生产队列特殊标识
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG {
+        NORMAL(10, "正常"),
+        EMPTYING(20, "放空"),
+        ERR_PERCH(30, "异常占位");
+
+        private int value;
+        private String description;
+
+        QUEUE_JIT_ACTUAL_SPECIAL_FLAG(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;
+        }
+    }
 }

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

@@ -146,4 +146,8 @@ public class IfQueueShipping extends BaseBean implements Serializable {
 	@Column(name = "VERSION")
 	@ApiParam("版本号")
 	private String version;
+
+	@Column(name = "SPECIAL_FLAG")
+	@ApiParam("特殊标识")
+	private Integer specialFlag;
 }

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

@@ -112,6 +112,14 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     @ApiParam("等级代码")
     private String gradeCode;
 
+    @Column(name = "JIT_SEQ")
+    @ApiParam("JIT排序号")
+    private String jitSeq;
+
+    @Column(name = "SPECIAL_FLAG")
+    @ApiParam("特殊标识")
+    private Integer specialFlag;
+
     @Transient
     @ApiParam("起始车号")
     private String custFlagNoStart;

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

@@ -91,6 +91,14 @@ public class MesWorkCellPointGroup extends BaseBean implements Serializable {
     @ApiParam("产品位置代码")
     private String produceCategoryCode;
 
+    @Column(name = "JIT_SEQ")
+    @ApiParam("JIT排序号")
+    private String jitSeq;
+
+    @Transient
+    @ApiParam("状态")
+    private String statusName;
+
     public double getQueueSeqVal() {
         return this.queueSeq == null ? 0 : this.queueSeq;
     }

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

@@ -113,6 +113,8 @@ public class QueueOrderModel implements Serializable {
 
     @ApiParam("是否放空")
     private Integer isEmpty;
+    @ApiParam("特殊标识")
+    private Integer specialFlag;
 
     public QueueOrderModel() {
     }
@@ -199,7 +201,8 @@ public class QueueOrderModel implements Serializable {
 
     // getPrintSnQueueOrderModel
     public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo,
-                           String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq, String groupSeq, String serialNumber, String custProdLineCode) {
+                           String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq,
+                           String groupSeq, String serialNumber, String custProdLineCode, Integer specialFlag, String workType) {
         this.id = id;
         this.queDetailSeq = queDetailSeq;
         this.pgCode = pgCode;
@@ -216,6 +219,8 @@ public class QueueOrderModel implements Serializable {
         this.groupSeq = groupSeq;
         this.serialNumber = serialNumber;
         this.custProdLineCode = custProdLineCode;
+        this.specialFlag = specialFlag;
+        this.workType = workType;
     }
 
     public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
@@ -259,7 +264,7 @@ public class QueueOrderModel implements Serializable {
     //getWaitQueueOrderModelNoSnMgn
     public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
                            String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode, String prodCfgTypeCode,
-                           String vinCode, String formulaContent, String queueGroupNo) {
+                           String vinCode, String formulaContent, String queueGroupNo, String jitSeq) {
         this.serialNumber = serialNumber;
         this.id = id;
         this.queueSeq = queueSeq;
@@ -279,11 +284,13 @@ public class QueueOrderModel implements Serializable {
         this.vinCode = vinCode;
         this.formulaContent = formulaContent;
         this.queueGroupNo = queueGroupNo;
+        this.jitSeq = jitSeq;
     }
 
     //getAlreadyQueueOrderModelNoSnMgn
     public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
-                           String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode, String formulaContent, String queueGroupNo, String produceCategoryCode) {
+                           String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode, String formulaContent,
+                           String queueGroupNo, String produceCategoryCode, String jitSeq) {
         this.id = id;
         this.queueSeq = queueSeq;
         this.queDetailSeq = queDetailSeq;
@@ -300,6 +307,7 @@ public class QueueOrderModel implements Serializable {
         this.formulaContent = formulaContent;
         this.queueGroupNo = queueGroupNo;
         this.produceCategoryCode = produceCategoryCode;
+        this.jitSeq = jitSeq;
     }
 
     //getAlreadyQueueOrderModelNoSn

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.softswitch.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -66,6 +67,15 @@ public class BsSuitCaseFTP extends BaseBean {
     @ApiParam(value = "ftp编码")
     private Integer encode;
 
+    @Column(name = "CONNECTION_MODE")
+    @ApiParam(value = "ftp连接模式")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.FTP_CONNECTION_MODE.class)
+    private Integer connectionMode;
+
+    public String getConnectionModeTxt(){
+        return connectionMode == null ? "无" : BlockSoftSwitchEnumUtil.FTP_CONNECTION_MODE.valueOfDescription(connectionMode);
+    }
+
     @Column(name = "IS_READ_AND_EMPTY")
     @ApiParam(value = "读取并清空")
     private Integer isReadAndEmpty;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java

@@ -138,6 +138,10 @@ public class BsSuitRecord extends BaseBean {
     @ApiParam(value = "脚本结果")
     private String scriptResult;
 
+    @Column(name = "PROCESS_RESULT")
+    @ApiParam(value = "处理结果")
+    private String processResult;
+
     /************************************** 临时属性 ***************************************/
 
     @Transient

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java

@@ -117,6 +117,10 @@ public class SwebPurchaseOrderSn extends BaseBean {
     @ApiParam(value = "重量")
     private Double weight;
 
+    @Column(name = "VEN_PRODUCT_TIME")
+    @ApiParam(value = "供应商生产日期")
+    private String venProductTime;
+
     @Transient
     @ApiParam(value = "合同号")
     private String refNo;

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java

@@ -65,6 +65,10 @@ public class SwebVendorStock extends BaseBean {
     @ApiParam("周")
     private String countWeek;
 
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
     @Transient
     @ApiParam("日期")
     private String dateStart;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1666,6 +1666,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsPoSn.getSn(), "snOneBarCode", result);
         DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNo(), "partNo", result);
         DdlPreparedPack.getNumEqualPack(wmsPoSn.getQcStatus(), "qcStatus", result);
+        DdlPreparedPack.getStringEqualPack(wmsPoSn.getItem(), "item", result);
         DdlPreparedPack.getStringLikerPack(wmsPoSn.getErpAreaNoAdd(), "erpAreaNoAdd", result);
         DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result);