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

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

@@ -89,8 +89,9 @@ public class AndonEnumUtil {
         QUALITY_ALARM_CALL("QUALITY_ALARM_CALL", "质量呼叫弹框界面"),
         PART_ALARM_CALL("PART_ALARM_CALL", "物料呼叫弹框界面"),
         ROUTING_ALARM_CALL("ROUTING_ALARM_CALL", "工艺呼叫弹框界面"),
-        OTHER_ALARM_CALL("OTHER_ALARM_CALL", "自处理呼叫弹框界面"),
+        OTHER_ALARM_CALL("OTHER_ALARM_CALL", "工装呼叫弹框界面"),
         FIX_ERROR_CALL("FIX_ERROR_CALL", "自动报警呼叫弹框界面"),
+        MODULE_ALARM_CALL("MODULE_ALARM_CALL", "模具呼叫弹框界面"),
         ALARM_SIGN("ALARM_SIGN", "响应弹框界面"),
         ALARM_CANCEL("ALARM_CANCEL", "撤销二次提醒框"),
         ALARM_RESOLVE("ALARM_RESOLVE", "解决弹框界面");
@@ -1218,7 +1219,8 @@ public class AndonEnumUtil {
         PART("PART_ALARM", 110060104, "物料", "#24BDBA"),
         PROCESS("ROUTING_ALARM", 110060107, "工艺", "#2B97F9"),
         CHECK("OTHER_ALARM", 110060108, "工装", "#EAA510"),
-        FIX_ERROR("FIX_ERROR", 110060109, "自动报警", "#797B7F");
+        FIX_ERROR("FIX_ERROR", 110060109, "自动报警", "#797B7F"),
+        MOULD("MOULD_ALARM", 160060111, "模具", "#0A8BEE");
 
         private String value;
         private Integer code;

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

@@ -2813,6 +2813,15 @@ public class MesEnumUtil {
             }
             return tmp;
         }
+
+        public static MES_QC_CHECK_TYPE getByValue(int value) {
+            for (MES_QC_CHECK_TYPE type : values()) {
+                if (type.getValue() == value) {
+                    return type;
+                }
+            }
+            return null;
+        }
     }
 
     /**
@@ -7705,6 +7714,15 @@ public class MesEnumUtil {
             }
             return tmp;
         }
+
+        public static QC_CHECK_DATA_SOURCE getByValue(int value) {
+            for (QC_CHECK_DATA_SOURCE type : values()) {
+                if (type.getValue() == value) {
+                    return type;
+                }
+            }
+            return null;
+        }
     }
 
     /**
@@ -8179,4 +8197,50 @@ public class MesEnumUtil {
         }
     }
 
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRODUCT_PROCESS_CHECK_RESULT_TYPE {
+        YELLOW(5, "进行中"),
+        GREEN(10, "合格"),
+        RED(20, "不合格");
+
+        private int value;
+        private String description;
+
+        PRODUCT_PROCESS_CHECK_RESULT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getValueStr() {
+            return value + "";
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static MesEnumUtil.PRODUCT_PROCESS_CHECK_RESULT_TYPE getByValue(Integer value) {
+            for (MesEnumUtil.PRODUCT_PROCESS_CHECK_RESULT_TYPE showSupplierCode : values()) {
+                if (showSupplierCode.getValue() == value) {
+                    return showSupplierCode;
+                }
+            }
+            return null;
+        }
+
+        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-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -4231,6 +4231,7 @@ public class MesPcnEnumUtil {
     public enum PRODUCE_ERROR_RECORD {
         JUMP_PROCESS(10, "跳过工序"),
         JUMP_STEP(20, "跳过工步"),
+        JUMP_STEP_IN_STATE(25, "跳过状态点中的工步"),
         JUMP_STATE(30, "跳过状态点"),
         ABNORMAL_DEDUCTION(40, "扣减异常"),
         REDO_STATION(50, "工位重做"),
@@ -6068,4 +6069,32 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * MesWorkCellJumpRecord 跳过类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_WORK_CELL_JUMP_TYPE {
+
+        SERIAL_SN(10, "过程条码"),
+        PRODUCT_SN(20, "产品条码"),
+        PACK_SN(30, "包装条码"),
+        OTHER(40, "其他");
+
+        private int value;
+        private String description;
+
+        MES_WORK_CELL_JUMP_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

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

@@ -871,7 +871,8 @@ public class WmsEnumUtil {
         OTHER_OUT(740, "OTHER_OUT", "其它出库"),
         COGI_BALANCE(750, "COGI_BALANCE", "COGI调账入库"),
         SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"),
-        COGI_BALANCE_OUT(770, "COGI_BALANCE", "COGI调账出库");//默认DMR
+        COGI_BALANCE_OUT(770, "COGI_BALANCE", "COGI调账出库"),//默认DMR
+        PRODUCT_IN_STOCK(780, "PRODUCT_IN_STOCK", "成品入库");//默认DMR
 
         private int value;
         private String code;
@@ -9494,6 +9495,51 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
+    /**
+     * 报废类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SCRAP_TYPE {
+        ISOLATED_SCRAP(10, "ISOLATED", "隔离报废"),
+        AUTO_SCRAP(20, "AUTO_SCRAP", "自动报废");
+
+        private int value;
+        private String code;
+        private String description;
+
+        SCRAP_TYPE(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 String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }
 
 

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

@@ -42,10 +42,6 @@ public class MesFurnaceLocation extends BaseBean implements Serializable {
     @ApiParam("炉内位置代码")
     private String fnLocationNo;
 
-    @Column(name = "MODEL_IMG_URL")
-    @ApiParam("模式图片路径")
-    private String modelImgUrl;
-
     @Column(name = "SEQ")
     @ApiParam("推荐顺序")
     private Integer seq;

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

@@ -203,6 +203,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam(value = "生产线名称")
     private String workCenterName;
 
+    @Transient
+    @ApiParam("工序名称")
+    private String processName;
+
     public MesPackage() {
     }
 
@@ -246,4 +250,32 @@ public class MesPackage extends BaseBean implements Serializable {
         this.custCode = custCode;
         this.shiftGroup = shiftGroup;
     }
+
+    public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty,Double packSpecQty, String unit,String lotNo, String fixLotNo,String packSpec,Integer isSealed, Integer printStatus,Integer packLevel,String workOrderNo, String workCenterCode, String workCellCode,String memo, String custCode, String inLocationTime, String ctNo,String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo) {
+        this.packageNo = packageNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+        this.packSpecQty=packSpecQty;
+        this.unit = unit;
+        this.lotNo=lotNo;
+        this.fixLotNo = fixLotNo;
+        this.packSpec=packSpec;
+        this.isSealed=isSealed;
+        this.printStatus = printStatus;
+        this.packLevel=packLevel;
+        this.workOrderNo=workOrderNo;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.memo=memo;
+        this.custCode = custCode;
+        this.inLocationTime = inLocationTime;
+        this.ctNo = ctNo;
+        this.sampleType=sampleType;
+        this.packageLabelTemplate = packageLabelTemplate;
+        this.qrCode = qrCode;
+        this.locationCode = locationCode;
+        this.erpWorkCenterCode = erpWorkCenterCode;
+        this.fnLocationNo = fnLocationNo;
+    }
 }

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

@@ -60,12 +60,12 @@ public class MesPartCheck extends BaseBean implements Serializable {
     @ApiParam("数据查询类型")
     private Integer dataType = 1;
 
-    @Column(name = "LIMIT_TIMES")
-    @ApiParam("限定检测次数")
-    private Integer limitTimes;
+    @Column(name = "LIMIT_SPEL_EXPRESS")
+    @ApiParam("限定检测表达式")
+    private String limitSpelExpress;
 
     @Column(name = "RECORD_NUM_DESC")
-    @ApiParam("校验表达式描述")
+    @ApiParam("合格标准描述")
     private String recordNumDesc;
 
     @Transient

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

@@ -40,4 +40,8 @@ public class MesPartFurnace extends BaseBean implements Serializable {
     @Column(name = "PART_NO")
     @ApiParam("物料编码")
     private String partNo;
+
+    @Column(name = "MODEL_IMG_URL")
+    @ApiParam("模式图片路径")
+    private String modelImgUrl;
 }

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

@@ -22,9 +22,6 @@ public class DataReviewModel {
     @ApiParam("实际数量")
     private String realNum;
 
-    @ApiParam("限定次数")
-    private String limitTimes;
-
     @ApiParam("检测次数")
     private String checkTimes;
 

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

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesPackage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author: xiangming.liao
+ * @CreateDate: 2020/12/18 16:13 下午
+ * @Description: 包装查询报表返回model
+ **/
+@Api("包装查询报表返回model")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class MesPackageQueryModel extends MesPackage {
+    @ApiParam("工序名称")
+    private String processName;
+
+    @ApiParam("产线")
+    private String workCenterName;
+
+    @ApiParam("工作单元名称")
+    private String workCellName;
+
+    @ApiParam("是否封箱Name")
+    private String isSealedName;
+
+    public MesPackageQueryModel(String workCenterName, String workCellName) {
+        this.workCenterName = workCenterName;
+        this.workCellName = workCellName;
+    }
+
+    public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, String unit, String lotNo, String fixLotNo, String packSpec, Integer printStatus, Integer isSealed, Integer packLevel, String workOrderNo, String memo, String workCenterCode, String workCellCode, String custCode, String inLocationTime, String ctNo, String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo,String processName, String workCenterName, String workCellName) {
+        super(packageNo, partNo, partNameRdd, qty, packSpecQty, unit, lotNo, fixLotNo, packSpec, printStatus, isSealed, packLevel, workOrderNo, memo, workCenterCode, workCellCode, custCode, inLocationTime, ctNo, sampleType, packageLabelTemplate, qrCode, locationCode, erpWorkCenterCode, fnLocationNo);
+        this.processName=processName;
+        this.workCenterName = workCenterName;
+        this.workCellName = workCellName;
+    }
+
+    public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, String unit, String lotNo, String fixLotNo, String packSpec, Integer printStatus, Integer isSealed, Integer packLevel, String workOrderNo, String memo, String workCenterCode, String workCellCode, String custCode, String inLocationTime, String ctNo, String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo,String processName, String workCenterName, String workCellName,String isSealedName) {
+        super(packageNo, partNo, partNameRdd, qty, packSpecQty, unit, lotNo, fixLotNo, packSpec, printStatus, isSealed, packLevel, workOrderNo, memo, workCenterCode, workCellCode, custCode, inLocationTime, ctNo, sampleType, packageLabelTemplate, qrCode, locationCode, erpWorkCenterCode, fnLocationNo);
+        this.isSealedName=isSealedName;
+        this.processName=processName;
+        this.workCenterName = workCenterName;
+        this.workCellName = workCellName;
+    }
+
+}

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

@@ -25,4 +25,6 @@ public class ProductBiSeriesModel {
     private List<Double> snQtyList = new ArrayList<>();
     @ApiParam("计划数量集合")
     private List<Double> planQtyList = new ArrayList<>();
+    @ApiParam("零件号")
+    private String partNo;
 }

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

@@ -0,0 +1,39 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 卡斯马报废率趋势查询条件封装类
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2020-12-24 16:35
+ * @Modify:
+ **/
+@Data
+@Api("报废率趋势查询条件封装类")
+public class ScrapRateTrendQueryModel {
+
+    @ApiParam("组织机构代码")
+    private String organizeCode;
+
+    @ApiParam("工序代码")
+    private String processCode;
+
+    @ApiParam("开始时间")
+    private String startTime;
+
+    @ApiParam("结束时间")
+    private String endTime;
+
+    @ApiParam("时间类型")
+    private String timeType;
+
+    @ApiParam("项目号")
+    private String prodCfgTypeCode;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+}

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

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 时间计数
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2020/12/28 10:10
+ * @Modify:
+ **/
+@Data
+public class TimeCountModel {
+    @ApiParam("时间段")
+    private String time;
+
+    @ApiParam("计数")
+    private Integer count;
+}

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

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 时间比率
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2020/12/28 13:10
+ * @Modify:
+ **/
+@Data
+public class TimeRateModel {
+    @ApiParam("时间段")
+    private String time;
+
+    @ApiParam("比率")
+    private double rate;
+}

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

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 产品条码返回model
+ * @author xiangming.liao
+ * @version 1.0
+ * @date 2021/01/06 10:43
+ **/
+@Data
+@ApiModel("产品条码返回model")
+public class CosmaReportProductSnModel extends MesProduceSn implements Serializable {
+
+    private static final long serialVersionUID = 5217363746963291483L;
+    @ApiParam("条码类型Name")
+    private String snTypeName;
+
+}

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

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 产品履历报表-缺陷信息
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/18 15:16
+ **/
+@Data
+@ApiModel("产品履历报表-缺陷信息")
+public class DefectRecordModel implements Serializable {
+
+    private static final long serialVersionUID = 4994719388513997046L;
+
+
+    @ApiParam("不良处理类型")
+    private Integer defectActionType;
+
+    @ApiParam("不良处理类型名称")
+    private String defectActionTypeName;
+
+    @ApiParam("缺陷名称")
+    private String defectName;
+
+    @ApiParam("缺陷位置")
+    private String defectLocation;
+
+    @ApiParam("缺陷位置名称")
+    private String defectLocationName;
+
+    @ApiParam(value = "创建用户")
+    public String createUser;
+
+    @ApiParam(value = "创建日期")
+    public String createDatetime;
+
+}

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

@@ -0,0 +1,76 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 产品履历报表-料箱信息
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/18 17:16
+ **/
+@Data
+@NoArgsConstructor
+@ApiModel("产品履历报表-料箱信息")
+public class PackageTravelModel implements Serializable {
+
+    private static final long serialVersionUID = -7031472442162953544L;
+
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("料箱编号")
+    private String ctNo;
+
+    @ApiParam("包装号")
+    private String packageNo;
+
+    @ApiParam("料箱类型")
+    private String cnCode;
+
+    @ApiParam("料箱状态")
+    private String useStatus;
+
+    @ApiParam("料箱状态名称")
+    private String useStatusName;
+
+    @ApiParam("物料码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("工序信息")
+    private String processCode;
+
+    @ApiParam("执行动作")
+    private Integer opType;
+
+    @ApiParam("执行动作名称")
+    private String opTypeName;
+
+    @ApiParam("执行时间")
+    private String createDatetime;
+
+    public PackageTravelModel(String serialNumber, String ctNo, String packageNo, String cnCode, String useStatus, String partNo, String partNameRdd, String workCenterCode, String processCode, Integer opType, String createDatetime) {
+        this.serialNumber = serialNumber;
+        this.ctNo = ctNo;
+        this.packageNo = packageNo;
+        this.cnCode = cnCode;
+        this.useStatus = useStatus;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workCenterCode = workCenterCode;
+        this.processCode = processCode;
+        this.opType = opType;
+        this.createDatetime = createDatetime;
+    }
+}

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

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 工序代码+工序名称 实体类
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/22 16:56
+ **/
+@Data
+@ApiModel("工序代码+工序名称")
+public class ProcessModel implements Serializable {
+
+
+    private static final long serialVersionUID = -6653836427174801385L;
+
+    @ApiParam("工序代码")
+    private String processCode;
+
+    @ApiParam("工序名称")
+    private String processName;
+}

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

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * 全工序报废率-查询结果-model
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/21 10:10
+ **/
+@Data
+@NoArgsConstructor
+@ApiModel("全工序报废率-查询结果")
+public class ProcessScrapRate {
+
+    @ApiParam("工序")
+    private String processCode;
+
+    @ApiParam("工序名称")
+    private String processName;
+
+    @ApiParam("项目号")
+    private String prodCfgTypeCode;
+
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @ApiParam("报废率")
+    private BigDecimal scrapRate;
+
+
+    public ProcessScrapRate(String processCode,String processName, String prodCfgTypeCode, String workCellCode) {
+        this.processCode = processCode;
+        this.processName = processName;
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.workCellCode = workCellCode;
+    }
+}

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

@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @Author: xiangming.liao
+ * @CreateDate: 2020/12/28 14:24 下午
+ * @Description: 一次性通过率占比柏拉图报表model
+ **/
+@Api("一次性通过率占比柏拉图报表model")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ProduceDispPassPlatoModel {
+
+    @ApiParam("项目号")
+    private String prodCfgTypeCode;
+
+    @ApiParam("零件号")
+    private String partNo;
+
+    @ApiParam("缺陷代码")
+    private String defectCode;
+
+    @ApiParam("缺陷名称")
+    private String defectName;
+
+    @ApiParam("单项占比")
+    private Double singleRatio;
+
+    @ApiParam("累计占比")
+    private Double cumulativeRatio;
+
+    @ApiParam("数量")
+    private Long qty;
+
+    public ProduceDispPassPlatoModel(String prodCfgTypeCode, String partNo, String defectCode, String defectName, Long qty) {
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.partNo = partNo;
+        this.defectCode = defectCode;
+        this.defectName = defectName;
+        this.qty = qty;
+    }
+
+    public ProduceDispPassPlatoModel(String prodCfgTypeCode, String partNo, Long qty) {
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.partNo = partNo;
+        this.qty = qty;
+    }
+}

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

@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Author: xiangming.liao
+ * @CreateDate: 2020/12/28 14:18 下午
+ * @Description: 一次性通过率占比柏拉图报表查询参数model
+ **/
+@Api("一次性通过率占比柏拉图报表查询参数model")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ProduceDispPassPlatoQueryModel extends BaseBean {
+    /**
+     * 必选
+     */
+
+    @ApiParam("工序")
+    private List<String> processCodeList;
+
+    //质量状态（20冻结，30报废）
+    @ApiParam("质量状态")
+    private List<Integer> qcStatusList;
+    /**
+     * 可选
+     */
+    @ApiParam("项目号")
+    private List<String> prodCfgTypeCodeList;
+
+    @ApiParam("零件号")
+    private List<String> partNoList;
+
+    //统计方式（0按月，1按天）
+    @ApiParam("统计方式")
+    private Integer statisticalMethod;
+
+    @ApiParam("开始时间")
+    private String modifyStartDate;
+
+    @ApiParam("结束时间")
+    private String modifyEndDate;
+}

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

@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author: xiangming.liao
+ * @CreateDate: 2020/12/22 14:38 下午
+ * @Description: 每个月/天的冻结数、报废数、生产总数、占比回model
+ **/
+@Api("每个月/天的冻结数、报废数、生产总数、占比返回model")
+@Data
+public class ProduceDispPassRateModel {
+    @ApiParam("统计时间")
+    private String statisticalTime;
+
+    //统计选项（10=全部，20=冻结，30=报废）
+    @ApiParam("统计选项")
+    private Integer statisticalOption;
+
+    @ApiParam("冻结数")
+    private BigDecimal freezeQty;
+
+    @ApiParam("报废数")
+    private BigDecimal scrapQty;
+
+    @ApiParam("生产总数")
+    private BigDecimal produceSumQty;
+
+    @ApiParam("占比率")
+    private BigDecimal ratio;
+
+    public ProduceDispPassRateModel(String statisticalTime, Integer statisticalOption, BigDecimal freezeQty, BigDecimal scrapQty, BigDecimal produceSumQty, BigDecimal ratio) {
+        this.statisticalTime = statisticalTime;
+        this.statisticalOption = statisticalOption;
+        this.freezeQty = freezeQty;
+        this.scrapQty = scrapQty;
+        this.produceSumQty = produceSumQty;
+        this.ratio = ratio;
+    }
+
+    public ProduceDispPassRateModel() {
+    }
+}

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

@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Author: xiangming.liao
+ * @CreateDate: 2020/12/23 13:38 下午
+ * @Description: 一次性通过率查询参数model
+ **/
+@Api("一次性通过率查询参数model")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ProduceDispPassRateQueryModel {
+    /**
+     * 必选
+     */
+
+    @ApiParam("工序")
+    private String processCode;
+
+    //统计方式（0=按月，1按天）
+    @ApiParam("统计方式")
+    private Integer statisticalMethod;
+
+    //质量状态（10=合格，20=冻结，30=报废）
+    @ApiParam("质量类型")
+    private Integer qcStatus;
+
+    @ApiParam("开始时间")
+    private String modifyStartDate;
+
+    @ApiParam("结束时间")
+    private String modifyEndDate;
+
+
+    /**
+     * 可选
+     */
+    @ApiParam("项目号")
+    private List<String> prodCfgTypeCodeList;
+
+    @ApiParam("零件号")
+    private List<String> partNoList;
+
+
+}

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

@@ -0,0 +1,65 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/24 18:57
+ **/
+@Data
+@NoArgsConstructor
+@ApiModel("生产统计明细")
+public class ProductDetailResult {
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("零件号")
+    private String partNo;
+
+    @ApiParam("零件描述")
+    private String partNameRdd;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("工序")
+    private String processCode;
+
+    @ApiParam("工序名称")
+    private String processName;
+
+    @ApiParam("条码状态")
+    private String qcStatus;
+
+    @ApiParam(value = "创建用户")
+    public String createUser;
+
+    @ApiParam(value = "创建日期")
+    public String createDatetime;
+
+    @ApiParam(value = "修改人")
+    public String modifyUser;
+
+    @ApiParam(value = "修改日期")
+    public String modifyDatetime;
+
+
+    public ProductDetailResult(String serialNumber, String partNo, String partNameRdd, String workCenterCode, String processCode, String processName, String qcStatus, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+        this.serialNumber = serialNumber;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workCenterCode = workCenterCode;
+        this.processCode = processCode;
+        this.processName = processName;
+        this.qcStatus = qcStatus;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+    }
+}

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

@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * @author yumingxing 生产总数
+ * @version 1.0
+ * @date 2020/12/24 18:57
+ **/
+@Data
+@NoArgsConstructor
+public class ProductResult {
+
+    @ApiParam("工作单元")
+    private String workCellCode;
+    @ApiParam("零件号")
+    private String partNo;
+    @ApiParam("零件描述")
+    private String partNameRdd;
+    @ApiParam("生产线")
+    private String workCenterCode;
+    @ApiParam("工序")
+    private String processCode;
+    @ApiParam("工序名称")
+    private String processName;
+    @ApiParam("生产总数")
+    private long totalProduction;
+    @ApiParam("合格数")
+    private long qualified;
+    @ApiParam("冻结数")
+    private long unqualified;
+    @ApiParam("报废数")
+    private long scrap;
+    @ApiParam("合格率")
+    private BigDecimal qualifiedRate;
+    @ApiParam("冻结率")
+    private BigDecimal unqualifiedRate;
+    @ApiParam("报废率")
+    private BigDecimal scrapRate;
+
+    public ProductResult(String workCellCode,String partNo, String partNameRdd, String workCenterCode, String processCode, String processName, long qualified, long unqualified, long scrap) {
+        this.workCellCode = workCellCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workCenterCode = workCenterCode;
+        this.processCode = processCode;
+        this.processName = processName;
+        this.qualified = qualified;
+        this.unqualified = unqualified;
+        this.scrap = scrap;
+    }
+}

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

@@ -0,0 +1,62 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 产品履历报表-产品信息
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/18 15:16
+ **/
+@Data
+@ApiModel("产品履历报表-产品信息")
+public class ProductSnModel implements Serializable {
+
+    private static final long serialVersionUID = 5217363746963291483L;
+
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("条码状态")
+    private Integer snStatus;
+
+    @ApiParam("条码状态Name")
+    private String snStatusName;
+
+    @ApiParam("质量状态")
+    private Integer qcStatus;
+
+    @ApiParam("质量状态Name")
+    private String qcStatusName;
+
+    @ApiParam("物料码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @ApiParam("当前工序")
+    private String processCode;
+
+    @ApiParam("条码类型")
+    private Integer snType;
+
+    @ApiParam("条码类型Name")
+    private String snTypeName;
+
+
+    @ApiParam(value = "执行时间")
+    public String modifyDatetime;
+
+}

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

@@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 产品履历报表-过程信息
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/18 15:16
+ **/
+@Data
+@ApiModel("产品履历报表-过程信息")
+public class ProductSnTravelModel implements Serializable {
+
+    private static final long serialVersionUID = 6720300188491659067L;
+
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("条码状态")
+    private Integer snStatus;
+
+    @ApiParam("条码状态Name")
+    private String snStatusName;
+
+    @ApiParam("质量状态")
+    private Integer qcStatus;
+
+    @ApiParam("质量状态Name")
+    private String qcStatusName;
+
+    @ApiParam("物料码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @ApiParam("当前工序")
+    private String processCode;
+
+    @ApiParam("当前工序")
+    private String nextProcessCode;
+
+    @ApiParam("条码类型")
+    private Integer snType;
+
+    @ApiParam("条码类型Name")
+    private String snTypeName;
+
+    @ApiParam(value = "执行时间")
+    public String modifyDatetime;
+
+}

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

@@ -0,0 +1,29 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * 生产统计
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/24 16:13
+ **/
+@Data
+public class ProductStatisticsQueryModel {
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+    @ApiParam("工序")
+    private String processCode;
+    @ApiParam("零件号")
+    private String partNo;
+    @ApiParam("开始日期")
+    private String modifyStartDate;
+    @ApiParam("结束日期")
+    private String modifyEndDate;
+    @ApiParam("质量状态")
+    private String qcStatus;
+    @ApiParam("过程条码")
+    private String serialNumber;
+}

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

@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/21 10:10
+ **/
+@Data
+public class ReportQueryModel {
+
+    @ApiParam("工序")
+    private List<String> processCodeList;
+
+    @ApiParam("项目号")
+    private List<String> prodCfgTypeCodeList;
+
+    /**
+     * 零件号取物料号
+     */
+    @ApiParam("零件号")
+    private List<String> partNoList;
+
+    @ApiParam("开始日期")
+    private String modifyStartDate;
+
+    @ApiParam("结束日期")
+    private String modifyEndDate;
+
+    @ApiParam("账号")
+    private String userLoginName;
+
+    @ApiParam("姓名")
+    private String userName;
+
+}

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

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * 报废占比柏拉图Model
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/23 15:09
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("报废占比柏拉图")
+public class ScrapOfPlatoModel {
+
+    @ApiParam("零件号")
+    private String partNo;
+    @ApiParam("项目")
+    private String prodCfgTypeCode;
+    @ApiParam("缺陷代码")
+    private String defectCode;
+    @ApiParam("缺陷名称")
+    private String defectName;
+    @ApiParam("缺陷数")
+    private long numberOfDefects;
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @ApiParam("报废率")
+    private BigDecimal scrapRate;
+    @ApiParam("报废占比")
+    private BigDecimal scrapRatio;
+    @ApiParam("柏拉图报废占比")
+    private BigDecimal scrapRatioPlato;
+
+
+    public ScrapOfPlatoModel(String partNo, String prodCfgTypeCode, String defectCode, String defectName, long numberOfDefects,String workCellCode) {
+        this.partNo = partNo;
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.defectCode = defectCode;
+        this.defectName = defectName;
+        this.numberOfDefects = numberOfDefects;
+        this.workCellCode = workCellCode;
+    }
+}

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

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 用户查询-账号+姓名
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/22 10:51
+ **/
+@Data
+@ApiModel("用户查询-账号+姓名")
+public class UserQueryModel implements Serializable {
+
+    @ApiParam("账号")
+   private String userLoginName;
+    @ApiParam("姓名")
+   private String userName;
+
+
+}

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

@@ -2784,7 +2784,8 @@ public class MesHqlPack {
      * @return
      */
     public static DdlPackBean getMesWorkCellSkill(MesWorkCellSkill mesWorkCellSkill) {
-        DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesWorkCellSkill.getOrganizeCode());;
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesWorkCellSkill.getOrganizeCode());
+        ;
         if (!StringUtils.isEmpty(mesWorkCellSkill.getSkillCode())) {
             DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getSkillCode(), "skillCode", packBean);
         }
@@ -3627,11 +3628,11 @@ public class MesHqlPack {
         return packBean;
     }
 
-    public static DdlPackBean getMesFurnaceLocation(MesFurnaceLocation mesFurnaceLocation) {
-        DdlPackBean packBean = getAllBaseData(mesFurnaceLocation.getOrganizeCode());
-        DdlPreparedPack.getStringLikerPack(mesFurnaceLocation.getFnLocationNo(), "fnLocationNo", packBean);
-        DdlPreparedPack.getStringLikerPack(mesFurnaceLocation.getModelNo(), "modelNo", packBean);
-        DdlPreparedPack.getNumEqualPack(mesFurnaceLocation.getIsValid(), "isValid", packBean);
+    public static DdlPackBean getPartFurnace(MesPartFurnace partFurnace) {
+        DdlPackBean packBean = getAllBaseData(partFurnace.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(partFurnace.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(partFurnace.getModelNo(), "modelNo", packBean);
+        DdlPreparedPack.getNumEqualPack(partFurnace.getIsValid(), "isValid", packBean);
         return packBean;
     }
 
@@ -3692,10 +3693,19 @@ public class MesHqlPack {
         DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringLikerPack(mesPackage.getWorkOrderNo(), "workOrderNo", packBean);
         DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean);
-        DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean);
+        DdlPreparedPack.getStringRightLikerPack(mesPackage.getPackageNo(), "packageNo", packBean);
+        DdlPreparedPack.getStringRightLikerPack(mesPackage.getCtNo(), "ctNo", packBean);
         DdlPreparedPack.getStringBiggerPack(mesPackage.getCreateDateTimeStart(), "createDatetime", packBean);
         DdlPreparedPack.getStringSmallerPack(mesPackage.getCreateDateTimeEnd(), "createDatetime", packBean);
         return packBean;
     }
 
+    public static DdlPackBean getMesProduceCtgyPicture(MesProduceCtgyPicture mesProduceCtgyPicture) {
+        DdlPackBean packBean = getAllBaseData(mesProduceCtgyPicture.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getProduceCtgyCode(), "produceCtgyCode", packBean);
+        DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getDefectLocation(), "defectLocation", packBean);
+        DdlPreparedPack.getNumEqualPack(mesProduceCtgyPicture.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
+
 }

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

@@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -15,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
@@ -156,6 +156,19 @@ public class WmsCSFactTrans extends BaseBean {
     @ApiParam("行号")
     private String item;
 
+
+    @ApiParam("应盘人")
+    public String detailsCreateUser;
+
+    @ApiParam("应盘时间")
+    public String detailsCreateDatetime;
+
+    @ApiParam("实盘人")
+    public String factCreateUser;
+
+    @ApiParam("实盘时间")
+    public String factCreateDatetime;
+
     public WmsCSFactTrans(){}
 
     public Integer getIsScopeVal() {

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

@@ -740,4 +740,22 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
         this.destLocateName = locateName;
     }
 
+    public WmsDocMovementDetails(String organizeCode, String workOrderCode, String orderNo,Integer moveType, Integer busiType,
+                                 String item, String partNo, String partNameRdd,String unit, Double qty,
+                                 Integer isSn, Integer orderMasterStatus,String createUser, String createDatetime) {
+        this.organizeCode = organizeCode;
+        this.workOrderCode = workOrderCode;
+        this.orderNo = orderNo;
+        this.moveType = moveType;
+        this.busiType = busiType;
+        this.item = item;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.unit = unit;
+        this.qty = qty;
+        this.isSn = isSn;
+        this.orderMasterStatus = orderMasterStatus;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+    }
 }

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

@@ -8,14 +8,18 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -269,6 +273,17 @@ public class WmsDocMovementMaster extends BaseBean {
             isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_DEPARTMENT_REMARK", listColumnName = "name", explicitColumnName = "dictionaryValue")
     private String fourthRemake;
 
+
+    /**
+     *
+     */
+    @Column(name = "SCRAP_TYPE")
+    @ApiParam("报废类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.SCRAP_TYPE.class, refForeignKey = "value", value = "description")
+    public Integer scrapType;
+
+
+
     @Column(name = "IS_REMOVE_ORDER")
     @ApiParam(value = "是否撤销单据")
     private Integer isRemoveOrder = CommonEnumUtil.FALSE;

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

@@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -15,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Index;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.Lob;
 import javax.persistence.Table;
 import javax.persistence.Transient;
@@ -214,6 +214,29 @@ public class WmsMoveMaster extends BaseBean {
     public WmsMoveMaster() {
     }
 
+
+    public WmsMoveMaster(String organizeCode, String partNo, String partNameRdd, String transTypeCode,
+                         String transTypeName, String unit, String destZoneNo, Double transQty, Double handledQty, Double rejectQty,
+                         Integer busiTypeCode, String createDatetime, String createUser, String modifyUser,
+                         String modifyDatetime, String refSrc) {
+        this.organizeCode = organizeCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.transTypeCode = transTypeCode;
+        this.transTypeName = transTypeName;
+        this.unit = unit;
+        this.destZoneNo = destZoneNo;
+        this.transQty = transQty;
+        this.handledQty = handledQty;
+        this.rejectQty = rejectQty;
+        this.busiTypeCode = busiTypeCode;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+        this.refSrc = refSrc;
+    }
+
     public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage,
                          Integer isUrgent, String carNo, Integer busiTypeCode, String refOrderNo, String refSrc, String partNo, Integer itemStatus, String remark,
                          String organizeCode, String createDatetime, String createUser, String modifyDatetime, String modifyUser, String fixId,

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

@@ -366,12 +366,13 @@ public class WmsPart extends BaseBean {
         this.partSpec = partSpec;
     }
 
-    public WmsPart(String partNo, String partName, String partSpec, Double snp, String buyUnit, Integer snControl, Double qty) {
+    public WmsPart(String partNo, String partName, String partSpec, Double snp, String buyUnit, String stockUnit, Integer snControl, Double qty) {
         this.partNo = partNo;
         this.partName = partName;
         this.partSpec = partSpec;
         this.snp = snp;
         this.buyUnit = buyUnit;
+        this.stockUnit = stockUnit;
         this.snControl = snControl;
         this.qty = qty;
     }

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

@@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -15,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Index;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 
 /**
@@ -96,6 +96,9 @@ public class WmsPartExtend extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String lotControl;
 
+    /**
+     * 单位：天
+     */
     @Column(name = "RANGE_LOT")
     @ApiParam(value = "批次容差")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)

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

@@ -6,16 +6,11 @@ import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 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 javax.persistence.Transient;
+import javax.persistence.*;
 import java.util.List;
 
 /**
@@ -137,6 +132,11 @@ public class WmsTmsShippingExt extends BaseBean {
     @ApiParam("调拨单录入字段")
     private String defectiveAllocation;
 
+    //关联单号
+    @Column(name="ORDER_NO")
+    @ApiParam("关联单号")
+    private String orderNo;
+
 //    @Transient
 //    @ApiParam("打印模板列表")
 //    private String defectiveAllocation;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java

@@ -0,0 +1,166 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn;
+import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : GCDC集装箱model
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-11-24 18:17
+ * @Modify:
+ **/
+@Data
+@Api("GCDC集装箱model")
+public class WmsGcdcContainerModel extends BaseBean {
+
+    @ApiParam("移库单号号")
+    public String orderNo;
+
+    @ApiParam("库存移动单号")
+    public String moveNo;
+
+    @ApiParam("条码")
+    public String sn;
+
+    @ApiParam(value = "ERP单号")
+    private String erpSrcNo;
+
+    @ApiParam(value = "客户编号")
+    private String custNo;
+
+    @ApiParam(value = "单据状态")
+    public Integer orderStatus;
+
+    @ApiParam(value = "库存移动单状态")
+    public Integer itemStatus;
+
+    @ApiParam(value = "包装编号")
+    private String packageNo;
+
+    @ApiParam("集装箱号")
+    private String containerNo;
+
+    @ApiParam("产地")
+    private String productPlace;
+
+    @ApiParam("托盘重量")
+    private Double packageWeight;
+
+    @ApiParam(value = "客户名称")
+    public String custNameRdd;
+
+    @ApiParam(value = "业务类型")
+    public Integer busiType;
+
+    @ApiParam(value = "交易类型代码")
+    private String transTypeCode;
+
+    @ApiParam(value = "物料号")
+    public String partNo;
+
+    @ApiParam(value = "物料号")
+    public String partNameRdd;
+
+    @ApiParam(value = "客户地址")
+    private String custAddr;
+
+    @ApiParam(value = "客户联系人")
+    private String custOwner;
+
+    @ApiParam(value = "客户电话号码")
+    private String custTel;
+
+    @ApiParam(value = "是否集装箱号")
+    private Integer isContainer;
+
+    @ApiParam("移库单号集合")
+    private List<String> orderNoList;
+
+    @ApiParam("库存移动单号集合")
+    private List<String> moveNoList;
+
+    @ApiParam("库存移动单条码集合")
+    private List<WmsMoveSn> moveSnList;
+
+    @ApiParam("库存条码集合")
+    private List<WmsStockSn> stockSnList;
+
+    @ApiParam(value = "仓库代码")
+    private String whNo;
+
+    @ApiParam(value = "存储区编号")
+    private String zoneNo;
+
+    @ApiParam(value = "库位代码")
+    private String locateNo;
+
+    @ApiParam(value = "客户发往地名称")
+    private String flagName;
+
+    @ApiParam(value = "客户发往地代码")
+    private String flagNo;
+
+    @ApiParam(value = "是否绑定发运")
+    private Integer isBindingShip = WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+
+    public WmsGcdcContainerModel() {
+    }
+
+    public WmsGcdcContainerModel(Long id, String orderNo, String moveNo, String erpSrcNo, String custNo,
+                                 Integer orderStatus, String createDatetime, String createUser) {
+        this.id = id;
+        this.orderNo = orderNo;
+        this.moveNo = moveNo;
+        this.erpSrcNo = erpSrcNo;
+        this.custNo = custNo;
+        this.orderStatus = orderStatus;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+    }
+
+    public WmsGcdcContainerModel(Long id, String orderNo, String moveNo, String erpSrcNo, String custNo,
+                                 Integer itemStatus, String createDatetime, String createUser, Integer busiType) {
+        this.id = id;
+        this.orderNo = orderNo;
+        this.moveNo = moveNo;
+        this.erpSrcNo = erpSrcNo;
+        this.custNo = custNo;
+        this.itemStatus = itemStatus;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+        this.busiType = busiType;
+    }
+
+    public WmsGcdcContainerModel(Long id, String orderNo, String packageNo, Double packageWeight, String custNo, String partNo, String flagNo) {
+        this.id = id;
+        this.orderNo = orderNo;
+        this.packageNo = packageNo;
+        this.packageWeight = packageWeight;
+        this.custNo = custNo;
+        this.partNo = partNo;
+        this.flagNo = flagNo;
+    }
+
+    public WmsGcdcContainerModel(Long id, String organizeCode, Double packageWeight, String packageNo, String zoneNo,
+                                 String locateNo, String whNo, String partNo, String partNameRdd, String custNo, String flagNo) {
+        this.id = id;
+        this.organizeCode = organizeCode;
+        this.packageWeight = packageWeight;
+        this.packageNo = packageNo;
+        this.zoneNo = zoneNo;
+        this.locateNo = locateNo;
+        this.whNo = whNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.custNo = custNo;
+        this.flagNo = flagNo;
+    }
+}

sonar-project.properties

@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-DEV-SNAPSHOT
+sonar.projectVersion=1.0-TEST-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./