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

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

@@ -10,7 +10,7 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
-public class ResourceLodaRequest {
+public class ResourceLoadRequest {
     private ApsEnumUtil.RESOURCE_LOAD_SPAN span;
     @JsonSerialize(using = CustomDateSerializer.class)
     @JsonDeserialize(using = CustomDateDeserializer.class)

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

@@ -615,7 +615,8 @@ public class BlockSoftSwitchEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum DATABASE_OPERATE_TYPE{
         READ(1,"读取"),
-        WRITE(2,"写入");
+        WRITE(2,"写入"),
+        BATCH_WRITE(3,"批量写入");
 
         private int value;
         private String description;

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

@@ -13,6 +13,41 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class MesEnumUtil {
 
 
+    /**
+     * 是否解析
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PLC_IS_PARSE {
+        TRUE(1, "是"),
+        FALSE(2, "否");
+
+        private int value;
+        private String description;
+
+        PLC_IS_PARSE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CALENDAR_TYPE {
         DAY(10, "日"),

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

@@ -27,6 +27,11 @@ import javax.persistence.Table;
 @Table(name = "MES_WORK_CELL_POINT")
 @Api("工站队列")
 public class MesWorkCellPoint extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
     @Column(name = "WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;

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

@@ -40,6 +40,14 @@ public class QueueOrderModel implements Serializable {
     @Transient
     @ApiParam("显示颜色")
     private String color;
+    @ApiParam("工厂代码")
+    private String organizeCode;
+    @ApiParam("展示行数")
+    private Integer prodNum;
+    @ApiParam("产线")
+    private String workCenterCode;
+    @ApiParam("工位")
+    private String workCellCode;
 
     public QueueOrderModel() {
     }

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

@@ -31,6 +31,11 @@ import java.util.List;
 @Table(name = "MES_WORK_CELL_POINT")
 @Api("工站队列")
 public class MesWorkCellPoint extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
     @Column(name = "WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java

@@ -70,6 +70,12 @@ public class SysLocaleResource  extends BaseBean {
     @ApiParam(value ="产品类型", example = "0",access = "softTyp DOC: http://doc.estsh.com/docs/i3plus_api/i3plus_api-impp")
     @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class, refForeignKey = "value", value = "description",required = false)
     private Integer softType;
+    public int getSoftTypeVal(){
+        if(softType==null){
+            return CommonEnumUtil.SOFT_TYPE.IMPP.getValue();
+        }
+        return softType.intValue();
+    }
 
     //系统自带需要有初始化表，只能修改value，无法删除。
     @Column(name="is_system")

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

@@ -13,10 +13,12 @@ import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.math.NumberUtils;
 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 java.util.List;
 
 /**
  * @Description : 适配器出入参
@@ -53,6 +55,10 @@ public class BsSuitCaseParam extends BaseBean {
     @ApiParam(value = "参数名称)")
     private String paramName;
 
+    @Column(name = "PARENT_PARAM_Id")
+    @ApiParam(value = "上级参数id")
+    private String parentParamId;
+
     @Column(name = "PARENT_PARAM_NAME")
     @ApiParam(value = "上级参数名称)")
     private String parentParamName;
@@ -80,7 +86,18 @@ public class BsSuitCaseParam extends BaseBean {
 
     @Transient
     @ApiParam(value = "参数值")
-    private String paramValue;
+    private Object paramValue;
+
+    public String getParamValueStr() {
+        if (paramValue == null) {
+            return null;
+        }
+        return paramValue.toString();
+    }
+
+    @Transient
+    @ApiParam(value = "子级参数")
+    private List<BsSuitCaseParam> bsSuitCaseParamList;
 
 }
 

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

@@ -7,10 +7,8 @@ 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.Index;
-import javax.persistence.Table;
+
+import javax.persistence.*;
 
 /**
  * @Description : 适配记录参数
@@ -38,6 +36,7 @@ public class BsSuitRecordParam extends BaseBean {
     @ApiParam(value = "参数名称")
     private String paramName;
 
+    @Lob
     @Column(name = "PARAM_VAL")
     @ApiParam(value = "参数值")
     private String paramVal;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java

@@ -338,6 +338,7 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean);
         DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
+        DdlPreparedPack.timeBuilder(bsSuitRecord.getSuitStartTime(), "suitStartTime", ddlPackBean, false, true);
 
         ddlPackBean.setOrderByStr(bsSuitRecord.orderBy());
 

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

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
@@ -28,7 +29,11 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_DOC_CS_DETAILS")
+@Table(name = "WMS_DOC_CS_DETAILS", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "VENDOR_NO"),
+        @Index(columnList = "SN")
+})
 @Api("盘点单冻结信息")
 public class WmsCSOrderDetails extends BaseBean {
     private static final long serialVersionUID = 1054153436116196360L;

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -132,4 +133,9 @@ public class WmsDocFgDetail extends BaseBean {
     @Column(name="COMMIT_DATE")
     @ApiParam("提交日期")
     public String commitDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value = "BOM生效日期")
+    @Column(name = "EFF_START_TIME")
+    private String effStartTime;
 }