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

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

@@ -3505,6 +3505,7 @@ public class MesEnumUtil {
     public enum QUALITY_OBJECT_TYPE {
 
         ORGANIZE(10, "工厂"),
+        WORK_CENTER_CODE(20, "产线"),
         PRODUCT(30, "产品");
 
         private int value;

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

@@ -6192,4 +6192,64 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
+    /**
+     * 数据格式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DATA_FORMAT {
+        STRING_FORMAT(1, "String", "字符串格式"),
+        INTEGER_FORMAT(2, "Integer", "整数格式"),
+        DOUBLE_FORMAT(3, "Double", "高精度浮点格式"),
+        DATE_FORMAT(4, "Date", "日期格式"),
+        FLOAT_FORMAT(5, "Float", "浮点格式"),
+        BOOL_FORMAT(6, "Boolean", "布尔格式"),
+        LONG_FORMAT(7, "LONG", "长整数格式");
+
+        private int value;
+        private String code;
+        private String description;
+
+        DATA_FORMAT(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(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 int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }

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

@@ -1,74 +0,0 @@
-package cn.estsh.i3plus.pojo.mes.model;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import java.io.Serializable;
-
-/**
- * @Description :MES_JIT发运队列
- * @Reference :
- * @Author : qianhausheng
- * @CreateDate : 2020-03-06 10:16 上午
- * @Modify:
- **/
-@Data
-@Entity
-@DynamicInsert
-@DynamicUpdate
-@EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QUEUE_SHIPPING")
-@Api("MES_JIT发运队列")
-public class MesQueueShipping extends BaseBean implements Serializable {
-
-    private static final long serialVersionUID = 655875369308414110L;
-
-    @Column(name = "JIT_NO")
-    @ApiParam("队列编号")
-    private String jitNo;
-
-    @Column(name = "PROD_CFG_CODE")
-    @ApiParam("配置代码")
-    private String prodCfgCode;
-
-    @Column(name = "VIN_CODE")
-    @ApiParam("vin")
-    private String vinCode;
-
-    @Column(name = "CUST_FLAG_NO")
-    @ApiParam("客户标识号")
-    private String custFlagNo;
-
-    @Column(name = "SEQ")
-    @ApiParam("排序号")
-    private Double seq;
-
-    @Column(name = "STATUS")
-    @ApiParam("状态")
-    private Integer status;
-
-    @Column(name = "CUST_CODE")
-    @ApiParam("客户代码")
-    private String custCode;
-
-    @Column(name = "CUST_PLANT_CODE")
-    @ApiParam("客户产线代码")
-    private String custPlantCode;
-
-    @Column(name = "JIT_LOT_NO")
-    @ApiParam("JIT队列批次")
-    private String jitLotNo;
-
-    @Column(name = "JIT_ACTUAL_NO")
-    @ApiParam("客户JIT队列编号")
-    private String jitActualNo;
-
-}

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

@@ -1,73 +0,0 @@
-package cn.estsh.i3plus.pojo.mes.model;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import java.io.Serializable;
-
-/**
- * @Description :MES_JIT发运队列明细
- * @Reference :
- * @Author : qianhausheng
- * @CreateDate : 2020-03-06 10:16 上午
- * @Modify:
- **/
-@Data
-@Entity
-@DynamicInsert
-@DynamicUpdate
-@EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QUEUE_SHIPPING_DETAIL")
-@Api("MES_JIT发运队列明细")
-public class MesQueueShippingDetail extends BaseBean implements Serializable {
-
-    private static final long serialVersionUID = 1442091799346314190L;
-
-    @Column(name = "JIT_NO")
-    @ApiParam("队列编号")
-    private String jitNo;
-
-    @Column(name = "PROD_CFG_CODE")
-    @ApiParam("配置代码")
-    private String prodCfgCode;
-
-    @Column(name = "PART_NO")
-    @ApiParam("物料号")
-    private String partNo;
-
-    @Column(name = "PART_NAME_RDD")
-    @ApiParam("物料名称")
-    private String partNameRdd;
-
-    @Column(name = "status")
-    @ApiParam("状态")
-    private Integer status;
-
-    @Column(name="SERIAL_NUMBER")
-    @ApiParam("过程条码")
-    private String serialNumber;
-
-    @Column(name = "QUEUE_GROUP_NO")
-    @ApiParam("分组队列编号")
-    private String queueGroupNo;
-
-    @Column(name = "GROUP_NO")
-    @ApiParam("组内编号")
-    private Integer groupNo;
-
-    @Column(name = "GROUP_SEQ")
-    @ApiParam("分组序号")
-    private String groupSeq;
-
-    @Column(name = "qty")
-    @ApiParam("数量")
-    private Double qty;
-}

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

@@ -21,17 +21,20 @@ public class QueueJitActualModule {
     private String queueGroupNo;
     @ApiParam("组内编号")
     private Integer groupNo;
+    @ApiParam("JIT排序号")
+    private String jitSeq;
 
     public QueueJitActualModule() {
 
     }
 
-    public QueueJitActualModule(Long id, String vinCode, Double seq, String queueGroupNo, Integer groupNo) {
+    public QueueJitActualModule(Long id, String vinCode, Double seq, String queueGroupNo, Integer groupNo, String jitSeq) {
         this.id = id;
         this.vinCode = vinCode;
         this.seq = seq;
         this.queueGroupNo = queueGroupNo;
         this.groupNo = groupNo;
+        this.jitSeq = jitSeq;
     }
 
 }

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

@@ -84,6 +84,9 @@ public class QueueOrderModel implements Serializable {
     @ApiParam("vin")
     private String vinCode;
 
+    @ApiParam("客户JIT队列编号")
+    private String jitActualNo;
+
     public QueueOrderModel() {
     }
 
@@ -167,7 +170,7 @@ public class QueueOrderModel implements Serializable {
         this.orderNo = orderNo;
     }
 
-    public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted) {
+    public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo) {
         this.id = id;
         this.queDetailSeq = queDetailSeq;
         this.pgCode = pgCode;
@@ -175,6 +178,7 @@ public class QueueOrderModel implements Serializable {
         this.groupNo = groupNo;
         this.prodCfgCode = prodCfgCode;
         this.isGroupPrinted = isGroupPrinted;
+        this.jitActualNo = jitActualNo;
     }
 
     public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,

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

@@ -97,7 +97,7 @@ public class StepPrintSnModel extends MesProduceSn {
     @ApiParam("车型代码")
     private String carModuleCode;
     @ApiParam("上一个序列号")
-    private Double lastQueDetailSeq;
+    private String lastQueDetailSeq;
     @ApiParam("包装数量")
     private Integer pgCodeNum;
 

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

@@ -0,0 +1,40 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+
+import cn.estsh.i3plus.pojo.model.mes.ImportErrorModel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @Author: siliter.yuan
+ * @CreateDate: 2020/4/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("导入结果model")
+public class ExcelImportModel implements Serializable {
+
+    @ApiParam("结果")
+    private boolean result;
+
+    @ApiParam("成功行数量")
+    private int successRowNum;
+
+    @ApiParam("工作薄名称")
+    private String sheetName;
+
+    @ApiParam("导入数据集合")
+    private List<ConcurrentHashMap<String, Object>> excelList;
+
+    @ApiParam("错误信息集合")
+    private List<ImportErrorModel> ImportErrorModels;
+}

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

@@ -305,4 +305,10 @@ public class WmsPart extends BaseBean {
         this.qty = cqty;
         this.partType = partType;
     }
+
+    public WmsPart(String partGroup, Double cqty, String createDateTime) {
+        this.partGroup = partGroup;
+        this.qty = cqty;
+        this.createDatetime = createDateTime;
+    }
 }

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

@@ -3094,6 +3094,7 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringLikerPack(template.getTemplateName(), "templateName", result);
         DdlPreparedPack.getStringEqualPack(template.getTemplateCode(), "templateCode", result);
+        DdlPreparedPack.getStringEqualPack(template.getGroupName(), "groupName", result);
         getStringBuilderPack(template, result);
         return result;
     }