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

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java

@@ -35,8 +35,7 @@ public class ExportProject extends BaseAPS {
 
     @Column(name="LINK_ID")
     @ApiParam(value ="数据连接对象")
-    @FieldAnnotation(property = false)
+    @FieldAnnotation(relation = "Link", notEmpty = true)
-    @JsonIgnore
     private Long linkId;
 
     public DataLink getLink() {

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java

@@ -34,7 +34,7 @@ public class ImportProject extends BaseAPS {
 
     @Column(name="LINK_ID")
     @ApiParam(value ="数据连接对象")
-    @FieldAnnotation(property = false)
+    @FieldAnnotation(relation = "Link", notEmpty = true)
     private Long linkId;
 
     public DataLink getLink() {

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import io.swagger.annotations.Api;
@@ -27,17 +28,21 @@ import java.util.Date;
 public class OvertimeCalendar extends BaseAPS {
     @Column(name="RES_CODES")
     @ApiParam(value ="资源代码")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)
     private String resCodes;
 
     @Column(name="START")
     @ApiParam(value ="开始时间")
+    @FieldAnnotation(notEmpty = true)
     private Date start;
 
     @Column(name="END")
     @ApiParam(value ="结束时间")
+    @FieldAnnotation(notEmpty = true)
     private Date end;
 
     @Column(name="TYPE")
     @ApiParam(value ="类型")
+    @FieldAnnotation(defaultValue = "ENABLE")
     private ApsEnumUtil.CALENDAR_TYPE type;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java

@@ -52,7 +52,7 @@ public class DateDuration {
      * 是否为有效时间区间，若用户指定了时间区间，但解析错误，其时间区间为0
      * @return
      */
-    public boolean Valid() {
+    public boolean valid() {
         return this.bValid;
     }
 
@@ -124,7 +124,7 @@ public class DateDuration {
         return strExtraString.toString();
     }
 
-    public void Divide(double val) {
+    public void divide(double val) {
         if (val < PRECISION) {
             return;
         }
@@ -165,7 +165,7 @@ public class DateDuration {
             return;
         }
 
-        if (!ValueValid()) {
+        if (!valueValid()) {
             this.time = 0;
             this.rate = 0.0f;
             this.bValid = false;
@@ -173,42 +173,35 @@ public class DateDuration {
         }
 
         ArrayList<EV_STRING> lst = new ArrayList<EV_STRING>();
-        Decompound(lst);
+        decompound(lst);
 
         boolean oFlg = lst.size() == 1;
 
         for (EV_STRING evs : lst) {
-            if (evs.type == EV_STRING_TYPE.EVS_GOOD)
+            if (evs.type == EV_STRING_TYPE.EVS_GOOD) {
-            {
+                AbstractMap.SimpleEntry<Boolean, Integer> extraTime = transTimeEach(evs.value);
-                AbstractMap.SimpleEntry<Boolean, Integer> extraTime = TransTime_Each(evs.value);
+                if (extraTime.getKey() || !oFlg) {
-                if (extraTime.getKey() || !oFlg)
-                {
                     this.time += extraTime.getValue();
-                }
+                } else {
-                else
-                {
                     this.time += extraTime.getValue() * 1;
                 }
             }
-            else
+            else {
-            {
+                AbstractMap.SimpleEntry<Boolean, Double> extraPer = transRateEach(evs.value);
-                AbstractMap.SimpleEntry<Boolean, Double> extraPer = TransRate_Each(evs.value);
+                if (extraPer.getKey()) {
-                if (extraPer.getKey())
-                {
                     this.rate = extraPer.getValue();
                 }
             }
         }
 
-        if (this.time < 0)
+        if (this.time < 0) {
-        {
             this.time = 0;
             this.rate = 0.0f;
             this.bValid = false;
         }
     }
 
-    private boolean ValueValid() {
+    private boolean valueValid() {
         for (char ch : this.value.toCharArray()) {
             if (ch <= 'z' && ch >= 'a') {
                 ch -= 32;
@@ -232,61 +225,46 @@ public class DateDuration {
                 || ch == 'M' || ch == 'S' || ch == '+'||ch == '-'||ch == 'P');
     }
 
-    private void Decompound(ArrayList<EV_STRING> lst) {
+    private void decompound(ArrayList<EV_STRING> lst) {
         int len = this.value.length();
         int iStr = 0;
         EV_STRING evs = new EV_STRING();
         evs.type = EV_STRING_TYPE.EVS_GOOD;
-        while(iStr < len)
+        while(iStr < len) {
-        {
             char ch = this.value.charAt(iStr);
-            if (ch == '+')
+            if (ch == '+') {
-            {
                 lst.add(evs.clone());
                 evs.value = "";
                 evs.type = EV_STRING_TYPE.EVS_GOOD;
                 iStr++;
                 continue;
-            }
+            } else if (ch == '-') {
-            else if (ch == '-')
-            {
                 int iPre = iStr;
-                if (iPre != 0)
+                if (iPre != 0) {
-                {
                     iPre--;
                     char cp = this.value.charAt(iPre);
                     if (!(cp == 'D' || cp == 'H'
-                            || cp == 'M' || cp == 'S'))
+                            || cp == 'M' || cp == 'S')) {
-                    {
                         evs.value = evs.value + 'S';
                     }
                 }
-            }
+            } else if (ch == 'P') {
-            else if (ch == 'P')
-            {
                 int iTempIndex = 0;
                 StringBuffer temp1 = new StringBuffer();
                 StringBuffer temp2 = new StringBuffer();
                 int iTemp = evs.value.length() - 1;
-                for (;iTemp >= 0;iTemp--)
+                for (;iTemp >= 0;iTemp--) {
-                {
                     char cTemp = evs.value.charAt(iTemp);
                     if (cTemp == 'D' || cTemp == 'H'
-                            || cTemp == 'M' || cTemp == 'S')
+                            || cTemp == 'M' || cTemp == 'S') {
-                    {
                         iTempIndex++;
-                    }
+                    } if (iTempIndex >= 2) {
-                    if (iTempIndex >= 2)
-                    {
                         temp1.insert(0,cTemp);
-                    }
+                    } else {
-                    else
-                    {
                         temp2.insert(0,cTemp);
                     }
                 }
-                if (!temp1.toString().isEmpty())
+                if (!temp1.toString().isEmpty()) {
-                {
                     EV_STRING evs1 = new EV_STRING();
                     evs1.type = EV_STRING_TYPE.EVS_GOOD;
                     evs1.value = temp1.toString();
@@ -296,12 +274,10 @@ public class DateDuration {
                 evs.type = EV_STRING_TYPE.EVS_HAVE_P;
                 evs.value = evs.value + ch;
                 iStr++;
-                if (iStr != len)
+                if (iStr != len) {
-                {
                     char cp = this.value.charAt(iStr);
                     if (cp == 'D' || cp == 'H'
-                            || cp == 'M' || cp == 'S')
+                            || cp == 'M' || cp == 'S') {
-                    {
                         evs.value = evs.value + cp;
                         iStr++;
                     }
@@ -315,13 +291,12 @@ public class DateDuration {
             evs.value = evs.value + ch;
             iStr++;
         }
-        if (!evs.value.isEmpty())
+        if (!evs.value.isEmpty()) {
-        {
             lst.add(evs);
         }
     }
 
-    private AbstractMap.SimpleEntry<Boolean, Integer> TransTime_Each(String extraValue) {
+    private AbstractMap.SimpleEntry<Boolean, Integer> transTimeEach(String extraValue) {
         if (extraValue.isEmpty())
             return new AbstractMap.SimpleEntry<Boolean, Integer>(false, 0);
 
@@ -330,16 +305,13 @@ public class DateDuration {
         boolean flg = false;
         for (int i = 0; i < extraValue.length(); i++) {
             char ch = extraValue.charAt(i);
-            int rate = TimeUnit(ch);
+            int rate = timeUnit(ch);
-            if (rate > 0)
+            if (rate > 0) {
-            {
                 double iC = Double.parseDouble(temp.toString());
                 extraTime += (int)(iC*rate);
                 temp.setLength(0);
                 flg = true;
-            }
+            } else {
-            else
-            {
                 temp.append(ch);
             }
         }
@@ -347,7 +319,7 @@ public class DateDuration {
             extraTime += Double.parseDouble(temp.toString());
         return new AbstractMap.SimpleEntry<Boolean, Integer>(flg, extraTime);
     }
-    private AbstractMap.SimpleEntry<Boolean, Double> TransRate_Each(String extraValue) {
+    private AbstractMap.SimpleEntry<Boolean, Double> transRateEach(String extraValue) {
         if (extraValue.isEmpty())
             return new AbstractMap.SimpleEntry<Boolean, Double>(false, 0.0);
 
@@ -356,8 +328,7 @@ public class DateDuration {
         boolean flg = false;
         for (int i = 0; i < extraValue.length(); i++) {
             char ch = extraValue.charAt(i);
-            switch(ch)
+            switch(ch) {
-            {
                 case 'D': extraPer = flg ?  (1 / Double.parseDouble(temp.toString())) * 86400  : Double.parseDouble(temp.toString()) * 86400; return new AbstractMap.SimpleEntry<Boolean, Double>(true, extraPer);
                 case 'H': extraPer = flg ?  (1 / Double.parseDouble(temp.toString())) * 3600: Double.parseDouble(temp.toString()) * 3600; return new AbstractMap.SimpleEntry<Boolean, Double>(true, extraPer);
                 case 'M': extraPer = flg ?  (1 / Double.parseDouble(temp.toString())) * 60 : Double.parseDouble(temp.toString()) * 60; return new AbstractMap.SimpleEntry<Boolean, Double>(true, extraPer);
@@ -366,12 +337,11 @@ public class DateDuration {
                 default  : temp.append(ch);
             }
         }
-        return new AbstractMap.SimpleEntry<Boolean, Double>(true, extraPer);
+        return new AbstractMap.SimpleEntry<>(true, extraPer);
     }
 
-    private int TimeUnit(char ch) {
+    private int timeUnit(char ch) {
-        switch(ch)
+        switch(ch) {
-        {
             case 'D': return 86400;
             case 'H': return 3600;
             case 'M': return 60;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java

@@ -1,11 +1,20 @@
 package cn.estsh.i3plus.pojo.aps.model;
 
 import cn.estsh.i3plus.pojo.base.common.Pager;
+import io.swagger.annotations.Api;
 import lombok.Data;
 
 import java.util.List;
 
+/**
+ * @Description : 表格分页查询参数
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-11-22
+ * @Modify:
+ **/
 @Data
+@Api("表格分页查询参数")
 public class APSPager extends Pager {
     public static class SortData {
         // 排序对象

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
+import io.swagger.annotations.Api;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Description : 报表分页查询参数
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-11-22
+ * @Modify:
+ **/
+@Data
+@Api("报表分页查询参数")
+public class ReportPager extends Pager {
+    private String filter;  // 物料筛选条件
+    private Date begin;     // 统计开始时间
+    private Date end;       // 统计结束时间
+    private ApsEnumUtil.MATERIAL_REPORT_TYPE type;
+    private ApsEnumUtil.REPORT_TIME_SPAN span;  // 统计时间间隔
+}

modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Class name="ExportProject">
-    <Relation field="Link" name="DataLink" type="MULTI_TO_ONE">
+    <Relation field="Link" name="DataLink" type="MULTI_TO_ONE" owner="false">
     </Relation>
     <Relation field="Details" name="ExportDetail" reverse="Project" type="ONE_TO_MULTI" owner="true">
     </Relation>

modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Class name="ImportProject">
-    <Relation field="Link" name="DataLink" type="MULTI_TO_ONE">
+    <Relation field="Link" name="DataLink" type="MULTI_TO_ONE" owner="false">
     </Relation>
     <Relation field="Details" name="ImportDetail" reverse="Project" type="ONE_TO_MULTI" owner="true">
     </Relation>

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

@@ -80,6 +80,61 @@ public class ApsEnumUtil {
     }
 
     /**
+     * 物料报表统计类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MATERIAL_REPORT_TYPE {
+        PRODUCE("PRODUCE", "生产"),
+        PURCHASE("PURCHASE", "采购"),
+        INVENTORY("INVENTORY", "库存");
+
+        private String value;
+        private String description;
+
+        MATERIAL_REPORT_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 报表时间间隔
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REPORT_TIME_SPAN {
+        ONE_HOUR("ONE_HOUR", "1小时"),
+        EIGHT_HOUR("EIGHT_HOUR", "8小时"),
+        TWELVE_HOUR("TWELVE_HOUR", "12小时"),
+        ONE_DAY("ONE_DAY", "一天"),
+        ONE_WEEK("ONE_WEEK", "一周"),
+        ONE_MONTH("ONE_MONTH", "一月");
+
+        private String value;
+        private String description;
+
+        REPORT_TIME_SPAN(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
      * 备料类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -618,7 +673,6 @@ public class ApsEnumUtil {
         MIN_OPERATION_REMAIN_TIME("MIN_OPERATION_REMAIN_TIME", "最小工序宽裕时间"),
         WORK_LET("WORK_LET", "工作最晚结束时刻"),
         WORK_EST("WORK_EST", "工作最早开始时刻"),
-        INVENTORY_RELA("INVENTORY_RELA", "订单物品库存量相对值"),
         FIRST_WORK_BEGIN("FIRST_WORK_BEGIN", "订单首工作上次开始时刻"),
         HAVE_HIGH_WORK("HAVE_HIGH_WORK", "订单中含有高级别工作"),
         WORK_RESOURCE_SIZE("WORK_RESOURCE_SIZE", "工作的可用资源数"),

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

@@ -21,7 +21,8 @@ public class MesEnumUtil {
 
         DEFECT("DEFECT", "缺陷"),
         DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"),
-        REPAIR("REPAIR", "处理措施");
+        REPAIR("REPAIR", "处理措施"),
+        SCRAP("SCRAP", "报废原因");
 
         private String value;
         private String description;

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

@@ -643,8 +643,8 @@ public class WmsEnumUtil {
         KT_DEFINITE(430,"KT_DEFINITE", "KT合格"),
 		VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理"),
         KT_PURCHASE_RC(450,"KT_PURCHASE_RC", "采购收货"),
-        KT_PACK_RC(460,"KT_PACK_RC", "坤泰包装收货");
+        KT_PACK_RC(460,"KT_PACK_RC", "坤泰包装收货"),
-
+        FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运");
 
         private int value;
         private String code;

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

@@ -55,7 +55,7 @@ public class IfDismantleRecord extends BaseBean {
 
     @Column(name = "QTY")
     @ApiParam("产品数量")
-    private Integer qty;
+    private Double qty;
 
     @Column(name = "DISMANTLE_QTY")
     @ApiParam("拆解数")

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

@@ -50,7 +50,7 @@ public class IfPackageDetail extends BaseBean {
 
     @Column(name = "QTY")
     @ApiParam("数量")
-    private String qty;
+    private Double qty;
 
     @Column(name = "PACKAGE_NO2")
     @ApiParam("包装编号2")

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

@@ -42,7 +42,7 @@ public class IfProductOffLine extends BaseBean {
 
     @Column(name = "QTY")
     @ApiParam("数量")
-    private String qty;
+    private Double qty;
 
     @Column(name = "UNIT")
     @ApiParam("单位")

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

@@ -43,10 +43,24 @@ public class MesDefect extends BaseBean {
     private String defectType;
 
     @Transient
+    @ApiParam("缺陷类型名称")
+    private String defectTypeName;
+
+    @Transient
     @ApiParam("缺陷位置")
     private String defectLocation;
 
     @Transient
     @ApiParam("缺陷类型子集")
     private List<MesDefect> mesDefectList;
+    public MesDefect() {
+
+    }
+
+    public MesDefect(String defectCode, String defectName, String defectType, String defectTypeName) {
+        this.defectCode = defectCode;
+        this.defectName = defectName;
+        this.defectType = defectType;
+        this.defectTypeName = defectTypeName;
+    }
 }

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

@@ -56,7 +56,7 @@ public class MesDismantleRecord extends BaseBean {
 
     @Column(name = "QTY")
     @ApiParam("产品数量")
-    private Integer qty;
+    private Double qty;
 
     @Column(name = "DISMANTLE_QTY")
     @ApiParam("拆解数")

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

@@ -34,4 +34,12 @@ public class MesShiftGroup extends BaseBean {
     @Column(name = "GROUP_NAME")
     @ApiParam("班组名称")
     private String groupName;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "SQUAD_LEADER")
+    @ApiParam("班长")
+    private String squadLeader;
 }

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+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;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\22 16:56
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_TYPE_CFG")
+@Api("类型信息表")
+public class MesTypeCfg extends BaseBean {
+
+    @Column(name = "TYPE_CODE")
+    @ApiParam("类型代码")
+    private String typeCode;
+
+    @Column(name = "TYPE_NAME")
+    @ApiParam("类型名称")
+    private String typeName;
+
+    @Column(name = "BUSINESS_TYPE_CODE")
+    @ApiParam("业务类型代码")
+    private String businessTypeCode;
+
+    @Column(name = "BUSINESS_TYPE_NAME")
+    @ApiParam("业务类型名称")
+    private String businessTypeName;
+}

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

@@ -26,6 +26,10 @@ public class MesDefectModel {
     private String defectType;
 
     @Transient
+    @ApiParam("缺陷类型名称")
+    private String defectTypeName;
+
+    @Transient
     @ApiParam("缺陷分类子集")
     private List<MesDefect> mesDefectList;
 }

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

@@ -19,7 +19,7 @@ import java.util.List;
 public class SnPrintDataModel {
 
     @ApiParam("打印数据")
-    private List<SnPrintValueModel> valueList;
+    private List<StepPrintSnModel> valueList;
 
     @ApiParam("打印模板及参数")
     private MesLabelTemplate labelTemplate;

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

@@ -13,7 +13,7 @@ import lombok.Data;
  **/
 @Data
 @Api("打印信息汇总")
-public class SnPrintModel extends SnPrintValueModel {
+public class SnPrintModel extends StepPrintSnModel {
 
     @ApiParam("过程条码")
     private SnPrintDataModel serialPrintDataModel;

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

@@ -1,72 +0,0 @@
-package cn.estsh.i3plus.pojo.mes.pcn.model;
-
-import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-
-/**
- * @Description: 打印信息
- * @Reference:
- * @Author: wangjie
- * @CreateDate:2019-08-27-13:24
- * @Modify:
- **/
-@Data
-@Api("打印信息")
-public class SnPrintValueModel extends MesProduceSn {
-    @ApiParam("打印描述")
-    private String printDesc;
-
-    @ApiParam("条码")
-    private String barCode;
-
-    @ApiParam("物料号")
-    private String partNo;
-
-    @ApiParam("批次号")
-    private String batchNo;
-
-    @ApiParam("箱数量")
-    private String boxQty;
-
-    @ApiParam("订单号")
-    private String orderNo;
-
-    @ApiParam("生产日期")
-    private String productionTime;
-
-    @ApiParam("包装编码")
-    private String packageNo;
-
-    @ApiParam("包装规格")
-    private String packageSpec;
-
-    @ApiParam("供应商")
-    private String supplier;
-
-    @ApiParam("客户名称")
-    private String customerName;
-
-    @ApiParam("客户零件号")
-    private String customerPartNo;
-
-    @ApiParam("客户物料名称")
-    private String customerPartName;
-
-    @ApiParam("物料名称")
-    private String partNameRdd;
-
-    @ApiParam("单位")
-    private String unit;
-
-    @ApiParam("特殊批号")
-    private String fixLotNo;
-
-    @ApiParam("生产工单号")
-    private String workOrderNo;
-
-    @ApiParam("生产线代码")
-    private String workCenterCode;
-
-}

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

@@ -73,4 +73,7 @@ public class StepPrintSnModel extends MesProduceSn {
     @ApiParam("生产线代码")
     private String workCenterCode;
 
+    @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层")
+    private Integer packLevel;
+
 }

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

@@ -55,7 +55,7 @@ public class IfDismantleRecord extends BaseBean {
 
     @Column(name = "QTY")
     @ApiParam("产品数量")
-    private Integer qty;
+    private Double qty;
 
     @Column(name = "DISMANTLE_QTY")
     @ApiParam("拆解数")

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

@@ -50,7 +50,7 @@ public class IfPackageDetail extends BaseBean {
 
     @Column(name = "QTY")
     @ApiParam("数量")
-    private String qty;
+    private Double qty;
 
     @Column(name = "PACKAGE_NO2")
     @ApiParam("包装编号2")

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

@@ -42,7 +42,7 @@ public class IfProductOffLine extends BaseBean {
 
     @Column(name = "QTY")
     @ApiParam("数量")
-    private String qty;
+    private Double qty;
 
     @Column(name = "UNIT")
     @ApiParam("单位")

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

@@ -52,4 +52,8 @@ public class MesPartObject extends BaseBean {
     @Transient
     @ApiParam("字段总数")
     private Integer fieldNum;
+
+    @Transient
+    @ApiParam("数据组号")
+    private String groupNo;
 }

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

@@ -45,9 +45,17 @@ public class MesProductData extends BaseBean {
     private String workCellName;
 
     @Column(name = "SERIAL_NUMBER")
-    @ApiParam("产品条码")
+    @ApiParam("过程条码")
     private String serialNumber;
 
+    @Column(name = "PRODUCT_SN")
+    @ApiParam("产品条码")
+    private String productSn;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("工单号")
+    private String orderNo;
+
     @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;

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

@@ -34,4 +34,12 @@ public class MesShiftGroup extends BaseBean {
     @Column(name = "GROUP_NAME")
     @ApiParam("班组名称")
     private String groupName;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "SQUAD_LEADER")
+    @ApiParam("班长")
+    private String squadLeader;
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -73,26 +73,21 @@ public class CoreHqlPack {
 
     /**
      * 资源查询
-     * @param localeResource
+     * @param resource
      * @return
      */
-    public static String packHqlSysLocaleResource(SysLocaleResource localeResource){
+    public static DdlPackBean packHqlSysLocaleResource(SysLocaleResource resource){
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
-
-        //查询日期
-//        HqlPack.timeBuilder(sysLocaleResource.getCreateDateTimeStart(),sysLocaleResource.getCreateDateTimeEnd(),
-//                "createDateTime", result, false);
-        //数字类型封装
-        HqlPack.getNumEqualPack(localeResource.getResourceType(),"resourceType",result);
-        //字符串类型封装
-        HqlPack.getStringEqualPack(localeResource.getLanguageCode(),"languageCode",result);
-        //字符串类型封装
-        HqlPack.getStringLikerPack(localeResource.getResourceKey(),"resourceKey",result);
 
-        // 添加默认排序
+        if(resource != null){
-        HqlPack.getOrderDefault(localeResource);
+            DdlPreparedPack.getNumEqualPack(resource.getResourceType(),"resourceType",result);
+            DdlPreparedPack.getNumEqualPack(resource.getIsSystem(),"isSystem",result);
+            DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(),"languageCode",result);
+            DdlPreparedPack.getStringEqualPack(resource.getResourceKey(),"resourceKey",result);
+            DdlPreparedPack.getStringLikerPack(resource.getResourceValue(),"resourceValue",result);
+        }
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -265,6 +260,14 @@ public class CoreHqlPack {
             DdlPreparedPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result);
 
             result.setOrderByStr(menu.orderBy());
+        }else {
+            menu = new SysMenu();
+        }
+
+        if(!StringUtils.isNotBlank(menu.getOrderByParam())){
+            menu.setOrderByParam("menuSort");
+            menu.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue());
+            result.setOrderByStr(menu.orderBy());
         }
 
         return result;

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

@@ -60,8 +60,4 @@ public class BasCustomer extends BaseBean {
     @Column(name = "CUST_FAX")
     @ApiParam(value = "传真")
     private String custFax;
-
-    @Column(name = "SHIPP_QTY")
-    @ApiParam(value = "发运数量控制")
-    private Integer shippQty;
 }

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

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -51,6 +52,7 @@ public class WmsConfig extends BaseBean {
     @ApiParam(value ="参数值类型")
     private String configValueType;
 
+    @Lob
     @Column(name="CONFIG_VALUE")
     @ApiParam(value ="参数值")
     private String configValue;

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

@@ -151,6 +151,10 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam(value = "计划日期")
     private String assignPlanDate;
 
+    @Column(name = "FLAG_NO")
+    @ApiParam(value = "客户发往地编号")
+    private String flagNo;
+
     @Column(name = "PLAN_TIME")
     @ApiParam(value = "计划时间")
     private String assignPlanTime;

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

@@ -29,7 +29,6 @@ import javax.persistence.Transient;
 @Api("包装规格")
 public class WmsPackageSpec extends BaseBean {
     private static final long serialVersionUID = 4849044986767609445L;
-    @Column(name = "SPEC_CODE",unique = true)
     @ApiParam(value = "包装规格代码")
     private String specCode;
 

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

@@ -29,20 +29,29 @@ import javax.persistence.Table;
 public class WmsShippingFlag extends BaseBean {
 
     private static final long serialVersionUID = 8034283413609254479L;
+
+    @Column(name = "CUST_NO")
+    @ApiParam(value = "客户编号")
+    private String custNo;
+
     @Column(name = "FLAG_NO")
-    @ApiParam(value = "编号")
+    @ApiParam(value = "客户发往地编号")
     private String flagNo;
 
     @Column(name = "FLAG_NAME")
-    @ApiParam(value = "简称")
+    @ApiParam(value = "客户发往地名称")
     private String flagName;
 
+    @Column(name = "SHIPP_QTY")
+    @ApiParam(value = "发运数量控制")
+    private Integer shippQty;
+
     @Column(name = "FLAG_DESC")
     @ApiParam(value = "全称")
     private String flagDesc;
 
     @Column(name = "FLAG_ADDR")
-    @ApiParam(value = "地址")
+    @ApiParam(value = "客户发往地址")
     private String flagAddr;
 
     @Column(name = "FLAG_OWNER")

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

@@ -66,25 +66,29 @@ public class WmsStockSn extends BaseBean {
     private String partNameRdd;
 
     @Column(name = "LOT_NO", nullable = false)
-    @ApiParam("收货日期（批次编码）")
+    @ApiParam("收货批次")
     public String lotNo = "";
 
     @Column(name = "DATE_CODE", nullable = false)
-    @ApiParam(value = "生产日期")
+    @ApiParam(value = "供应商批次")
     public String dateCode = "";
 
+    @Column(name = "FIX_LOT_NO", nullable = false)
+    @ApiParam(value = "特殊批次")
+    private String fixLotNo = "";
+
+    @Column(name = "QUALITY_DATE")
+    @ApiParam("保质期")
+    private String qualityDate;
+
     @Column(name = "LEFT_CODE", nullable = false)
-    @ApiParam(value = "有效期")
+    @ApiParam(value = "生产批次")
     private String leftCode = "";
 
     @Column(name = "VENDOR_NO")
     @ApiParam(value = "供应商编码")
     public String vendorNo;
 
-    @Column(name = "FIX_LOT_NO", nullable = false)
-    @ApiParam(value = "特殊批次")
-    private String fixLotNo = "";
-
     @Column(name = "CUST_NO")
     @ApiParam(value = "客户编码")
     private String custNo;
@@ -163,10 +167,6 @@ public class WmsStockSn extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description")
     private Integer snType = 10;
 
-    @Column(name = "QUALITY_DATE")
-    @ApiParam("保质期日期")
-    private String qualityDate;
-
     @ApiParam(value = "仓库名称")
     @Transient
     public String whNameRdd;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsPartQtyDto.java

@@ -12,11 +12,24 @@ public class WmsPartQtyDto {
     @ApiParam(value = "物料名称")
     private String partName;
     @ApiParam(value = "物料编码")
-    private String partNO;
+    private String partNo;
     @ApiParam(value = "应收数量")
-    private String qty;
+    private Double qty;
     @ApiParam(value = "实收数量")
-    private String rcQty;
+    private Double rcQty;
     @ApiParam(value = "待收数量")
-    private String dueQty;
+    private Double dueQty;
+
+
+    public Double getQty() {
+        return qty == null? 0.0:qty;
+    }
+
+    public Double getRcQty() {
+        return rcQty == null? 0.0:qty;
+    }
+
+    public Double getDueQty() {
+        return dueQty == null? 0.0:qty;
+    }
 }