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/Resource.java

@@ -1,10 +1,13 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.common.BaseCode;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_CLASS;
 import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_LOCK_TYPE;
 import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_TYPE;
 import cn.estsh.i3plus.pojo.aps.enums.TIME_ROUND_TYPE;
+import cn.estsh.i3plus.pojo.aps.holders.EResource;
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -12,6 +15,7 @@ import lombok.Data;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.util.List;
 
 /**
  * @Description :资源
@@ -96,4 +100,7 @@ public class Resource extends BaseCode {
     @Column(name="LOCK_TIME")
     @ApiParam(value ="锁定时间长度")
     private String lockTime;
+
+    @JsonBackReference
+    public List<WorkPlan> getWorkPlans() { return BeanRelation.list(this, EResource.WorkPlans); }
 }

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

@@ -0,0 +1,47 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :运输时间
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "APS_SHIPPING_TIME")
+@Api("运输时间")
+public class ShippingTime extends BaseAPS {
+    @Column(name="PREV_RES_CODE")
+    @ApiParam(value ="前资源编码")
+    private String prevResCode;
+
+    @Column(name="POST_RES_CODE")
+    @ApiParam(value ="后资源编码")
+    private String postResCode;
+
+    @Column(name="PREV_STAND_CODE")
+    @ApiParam(value ="前标准工序编码")
+    private String prevStandCode;
+
+    @Column(name="POST_STAND_CODE")
+    @ApiParam(value ="后标准工序编码")
+    private String postStandCode;
+
+    @Column(name="TIME")
+    @ApiParam(value ="运输时间")
+    private String time;
+
+    @Column(name="PRIORITY")
+    @ApiParam(value ="优先级")
+    private Integer priority;
+}

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

@@ -1,8 +1,10 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.enums.WORK_PLAN_TYPE;
 import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan;
 import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation;
 import io.swagger.annotations.Api;
@@ -33,6 +35,11 @@ import java.util.List;
 @Table(name="APS_WORK_PLAN")
 @Api("工作计划")
 public class WorkPlan extends BaseAPS {
+    @Column(name="TYPE")
+    @ApiParam(value ="工作计划类型")
+    @FieldAnnotation(modify = false, display = false)
+    private WORK_PLAN_TYPE type;
+
     @Column(name="PREV_SET_BEGIN")
     @ApiParam(value ="前设置开始时间")
     @FieldAnnotation(modify = false)
@@ -51,6 +58,8 @@ public class WorkPlan extends BaseAPS {
     @Column(name="PRODUCE_BEGIN")
     @ApiParam(value ="生产开始时间")
     @FieldAnnotation(modify = false)
+    @RippleAnnotation(dependence = {"Work.PrevRelations.PrevWork.WorkPlan.produceBegin",
+        "PrevPlan.produceBegin"}, method = "calcPositive")
     private Date produceBegin;
 
     @Column(name="PRODUCE_END")
@@ -81,6 +90,7 @@ public class WorkPlan extends BaseAPS {
     @Column(name="LOCK_BEGIN")
     @ApiParam(value ="锁定开始时间")
     @FieldAnnotation(modify = false)
+    @RippleAnnotation(dependence = {"PostRelations.PostWork.WorkPlan.produceBegin"}, method = "calcPositiveLockBegin")
     private Date lockBegin;
 
     @Column(name="LOCK_END")

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

@@ -34,17 +34,17 @@ public class WorkResource extends BaseAPS {
     @Column(name="PREV_TIME")
     @ApiParam(value ="前设置时间")
     @FieldAnnotation(modify = false)
-    private Long prevTime;
+    private Integer prevTime;
 
     @Column(name="PRODUCE_TIME")
     @ApiParam(value ="制造时间")
     @FieldAnnotation(modify = false)
-    private Long produceTime;
+    private Integer produceTime;
 
     @Column(name="POST_TIME")
     @ApiParam(value ="后设置时间")
     @FieldAnnotation(modify = false)
-    private Long postTime;
+    private Integer postTime;
 
     @Column(name="PRIORITY")
     @ApiParam(value ="优先级")

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

@@ -48,7 +48,7 @@ public class BeanRelation {
             return result;
         }
         for (Enum<?> holder : beanInfo.getAllHolders()) {
-            result.put(holder, new ArrayList<>());
+            result.put(holder, new LinkedList<>());
         }
         return result;
     }

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

@@ -139,12 +139,12 @@ public class DateDuration {
      * @param amount
      * @return
      */
-    public long getTime(double amount) {
+    public int getTime(double amount) {
         if (amount < PRECISION)
             return getTime();
 
         double result = (amount * this.rate) + this.time;
-        return (long)Math.ceil(result);
+        return (int)Math.ceil(result);
     }
 
     /**

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java

@@ -8,6 +8,7 @@ package cn.estsh.i3plus.pojo.aps.enums;
  * @Modify:
  **/
 public enum RESOURCE_CLASS {
-    MAIN,   // 主资源
-    ASS     // 副资源
+    LIMITLESS,  // 无限能力
+    SINGLE,     // 单能力
+    BATCH       // 炉资源
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java

@@ -8,7 +8,6 @@ package cn.estsh.i3plus.pojo.aps.enums;
  * @Modify:
  **/
 public enum RESOURCE_TYPE {
-    LIMITLESS,  // 无限能力
-    SINGLE,     // 单能力
-    BATCH       // 炉资源
+    MAIN,   // 主资源
+    ASS     // 副资源
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_PLAN_TYPE.java

@@ -0,0 +1,7 @@
+package cn.estsh.i3plus.pojo.aps.enums;
+
+public enum WORK_PLAN_TYPE {
+    MAIN_PLAN,   // 主资源计划
+    ASS_PLAN,   // 副资源计划
+    BATCH_PLAN  // 炉资源计划
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java

@@ -1,4 +1,5 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
 public enum EResource {
+    WorkPlans
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ShippingTimeRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.repository;
+
+import cn.estsh.i3plus.pojo.aps.bean.ShippingTime;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ShippingTimeRepository extends CrudRepository<ShippingTime, Long> {
+}

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

@@ -1,3 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Class name="Resource">
+    <Relation field="WorkPlans" name="WorkPlan" reverse="Resource" type="ONE_TO_MULTI" owner="true">
+    </Relation>
 </Class>

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

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Class name="WorkPlan">
-    <Relation field="Resource" name="Resource" type="MULTI_TO_ONE" owner="false">
-    </Relation>
     <Relation field="WorkResource" name="WorkResource" type="ONE_TO_ONE" owner="false">
     </Relation>
     <Relation field="AssPlans" name="WorkPlan" reverse="MainPlan" type="ONE_TO_MULTI" owner="false">

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

@@ -33,6 +33,7 @@ public class CommonEnumUtil {
         HARDSWITCH(25,"block-hardswitch","硬件适配器"),
         LAC(26,"lac","连接适配器"),
         ANDON(27,"andon","安灯"),
+        APS(28,"APS","高级计划与排程"),
         CENTER(99,"icloud-server","注册中心"),
         SURFACE(98,"i3surface","对外服务"),
         CLOUD(97,"i3cloud","微服务"),

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

@@ -12,6 +12,82 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class MesEnumUtil {
 
     /**
+     * MesRepair 处理措施
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_REPAIR_TYPE {
+
+        SCRATCH(10, "划痕"),
+        FRACTURE(20, "破碎"),
+        SCRAP_TYPE3(30, "缺失");
+
+        private int value;
+        private String description;
+
+        MES_REPAIR_TYPE(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 EQUIPMENT_REPORT_TYPE {
+
+        TASK(10, "作业任务"),
+        PLAN(20, "周期计划"),
+        REPAIR(30, "维修记录"),
+        CHECK(40, "点检记录"),
+        MAINTAIN(50, "保养记录");
+
+        private int value;
+        private String description;
+
+        EQUIPMENT_REPORT_TYPE(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;
+        }
+    }
+
+    /**
      * MesScrap 报废原因
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -42,7 +42,7 @@ public class MesConfig extends BaseBean {
 
     @Column(name = "CFG_KEY")
     @ApiParam("配置key")
-    private String cfgkey;
+    private String cfgKey;
 
     @Column(name = "CFG_VALUE")
     @ApiParam("配置value")

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

@@ -31,7 +31,6 @@ public class MesDataObject extends BaseBean {
     @ApiParam("对象代码")
     private String objectCode;
 
-
     @Column(name = "OBJECT_NAME")
     @ApiParam("对象名称")
     private String objectName;
@@ -43,4 +42,28 @@ public class MesDataObject extends BaseBean {
     @Column(name = "OPERATE_TYPE")
     @ApiParam("操作类型")
     private Integer operateType;
+
+    @Column(name = "FIELD_PK")
+    @ApiParam("主键")
+    private String fieldPk;
+
+    @Column(name = "READ_FLAG_VALUE")
+    @ApiParam("读取标志值")
+    private String readFlagValue;
+
+    @Column(name = "FEED_FIELD")
+    @ApiParam("反馈字段")
+    private String feedField;
+
+    @Column(name = "FEED_VALUE")
+    @ApiParam("反馈值")
+    private String feedValue;
+
+    @Column(name = "SELF_ADDITION")
+    @ApiParam("自增列")
+    private String selfAddition;
+
+    @Column(name = "SELF_ADDITION_VALUE")
+    @ApiParam("自增列值")
+    private Long selfAdditionValue;
 }

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

@@ -27,7 +27,6 @@ import javax.persistence.Table;
 @Api("对象结构")
 public class MesObjectCfg extends BaseBean {
 
-
     @Column(name = "OBJECT_CODE")
     @ApiParam("对象代码")
     private String objectCode;
@@ -48,18 +47,6 @@ public class MesObjectCfg extends BaseBean {
     @ApiParam("列长度")
     private String fieldLength;
 
-    @Column(name = "FIELD_PK")
-    @ApiParam("主键标记")
-    private String fieldPk;
-
-    @Column(name = "FEED_FIELD")
-    @ApiParam("反馈字段")
-    private String feedField;
-
-    @Column(name = "FEED_VALUE")
-    @ApiParam("反馈值")
-    private String feedValue;
-
     @Column(name = "POJO_ATTR")
     @ApiParam("对应的pojo属性")
     private String pojoAttr;

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

@@ -27,6 +27,7 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PLC_CONFIGURE")
 @Api("PLC设备信息配置表")
+@Deprecated
 public class MesPLCConfigure extends BaseBean {
     @Column(name = "IP")
     @ApiParam("设备ip")

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

@@ -82,6 +82,9 @@ public class MesPackage extends BaseBean {
     @ApiParam("备注")
     private String memo;
 
+    public MesPackage() {
+    }
+
     public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) {
         this.packageNo = packageNo;
         this.partNo = partNo;

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

@@ -23,7 +23,7 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE")
+@Table(name = "MES_PACKAGE_DETAIL")
 @Api("包装规格")
 public class MesPackageDetail extends BaseBean {
 

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

@@ -28,7 +28,6 @@ import javax.persistence.Transient;
 @Api("PLC配置表")
 public class MesPlc extends BaseBean {
 
-
     @Column(name = "PLC_CODE")
     @ApiParam("PLC代码")
     private String plcCode;
@@ -65,6 +64,10 @@ public class MesPlc extends BaseBean {
     @ApiParam("分组名称")
     private String groupName;
 
+    @Column(name = "DEVICE")
+    @ApiParam("驱动")
+    private String device;
+
     @Column(name = "EQUIPMENT_CODE")
     @ApiParam("设备代码")
     private String equipmentCode;

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

@@ -43,4 +43,16 @@ public class MesProduceCtgyPicture extends BaseBean {
     @Column(name = "PICTURE_NAME")
     @ApiParam("图片名称")
     private String pictureName;
+
+    @Column(name = "FILE_ORIGIN_NAME")
+    @ApiParam("FILE_ORIGIN_NAME")
+    private String fileOriginName;
+
+    @Column(name = "FILE_SIZE")
+    @ApiParam("FILE_SIZE")
+    private String fileSize;
+
+    @Column(name = "FILE_TYPE_ID")
+    @ApiParam("FILE_TYPE_ID")
+    private String fileTypeId;
 }

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

@@ -12,6 +12,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description:
@@ -27,7 +28,9 @@ import javax.persistence.Transient;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PRODUCE_SN")
 @Api("产品条码表")
-public class MesProduceSn extends BaseBean {
+public class MesProduceSn extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 6641051790330191326L;
 
     @Column(name = "SERIAL_NUMBER")
     @ApiParam("产品条码")
@@ -62,11 +65,11 @@ public class MesProduceSn extends BaseBean {
     private Integer printStatus;
 
     @Column(name = "WORK_CENTER_CODE")
-    @ApiParam("工作中心代码")
+    @ApiParam("生产线")
     private String workCenterCode;
 
     @Column(name = "WORK_CELL_CODE")
-    @ApiParam("工作单元代码")
+    @ApiParam("工位")
     private String workCellCode;
 
     @Column(name = "ROUTE_CODE")

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

@@ -108,6 +108,10 @@ public class MesProduceSnTravel extends BaseBean {
     @ApiParam("包装条码")
     private String packageSn;
 
+    @Column(name="OPERATE_TYPE")
+    @ApiParam("操作类型")
+    private Integer operateType;
+
     @Transient
     @ApiParam("返回信息")
     private String resultMsg;

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

@@ -95,6 +95,10 @@ public class MesQcCheckData extends BaseBean {
     private String custCode;
 
     @Transient
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Transient
     @ApiParam("过程质量检测数据")
     private List<MesQcCheckStandard> mesQcCheckStandardList;
 

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

@@ -42,7 +42,7 @@ public class MesConfig extends BaseBean {
 
     @Column(name = "CFG_KEY")
     @ApiParam("配置key")
-    private String cfgkey;
+    private String cfgKey;
 
     @Column(name = "CFG_VALUE")
     @ApiParam("配置value")

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

@@ -43,4 +43,28 @@ public class MesDataObject extends BaseBean {
     @Column(name = "OPERATE_TYPE")
     @ApiParam("操作类型")
     private Integer operateType;
+
+    @Column(name = "FIELD_PK")
+    @ApiParam("主键")
+    private String fieldPk;
+
+    @Column(name = "READ_FLAG_VALUE")
+    @ApiParam("读取标志值")
+    private String readFlagValue;
+
+    @Column(name = "FEED_FIELD")
+    @ApiParam("反馈字段")
+    private String feedField;
+
+    @Column(name = "FEED_VALUE")
+    @ApiParam("反馈值")
+    private String feedValue;
+
+    @Column(name = "SELF_ADDITION")
+    @ApiParam("自增列")
+    private String selfAddition;
+
+    @Column(name = "SELF_ADDITION_VALUE")
+    @ApiParam("自增列值")
+    private Long selfAdditionValue;
 }

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

@@ -83,4 +83,8 @@ public class MesEquTaskDetail extends BaseBean {
     @ApiParam(value = "处理方法")
     private String fmCode;
 
+    @Transient
+    @ApiParam(value = "任务类型")
+    private Integer taskType;
+
 }

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

@@ -53,6 +53,10 @@ public class MesEquTaskPlan extends BaseBean {
     @ApiParam("创建提前天数")
     private Integer daysInAdvance;
 
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String memo;
+
     @Transient
     @ApiParam(value = "生产线")
     private String workCenterCode;

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

@@ -27,7 +27,6 @@ import javax.persistence.Table;
 @Api("对象结构")
 public class MesObjectCfg extends BaseBean {
 
-
     @Column(name = "OBJECT_CODE")
     @ApiParam("对象代码")
     private String objectCode;
@@ -48,19 +47,6 @@ public class MesObjectCfg extends BaseBean {
     @ApiParam("列长度")
     private String fieldLength;
 
-    @Column(name = "FIELD_PK")
-    @ApiParam("主键标记")
-    private String fieldPk;
-
-    @Column(name = "FEED_FIELD")
-    @ApiParam("反馈字段")
-    private String feedField;
-
-    @Column(name = "FEED_VALUE")
-    @ApiParam("反馈值")
-    private String feedValue;
-
-
     @Column(name = "POJO_ATTR")
     @ApiParam("对应的pojo属性")
     private String pojoAttr;

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

@@ -27,6 +27,7 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PLC_CONFIGURE")
 @Api("PLC设备信息配置表")
+@Deprecated
 public class MesPLCConfigure extends BaseBean {
     @Column(name = "IP")
     @ApiParam("设备ip")

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

@@ -66,6 +66,10 @@ public class MesPlc extends BaseBean {
     @ApiParam("分组名称")
     private String groupName;
 
+    @Column(name = "DEVICE")
+    @ApiParam("驱动")
+    private String device;
+
     @Column(name = "EQUIPMENT_CODE")
     @ApiParam("设备代码")
     private String equipmentCode;

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

@@ -30,7 +30,7 @@ public class MesProduceCtgyPicture extends BaseBean {
 
     @Column(name = "PRODUCE_CTGY_CODE")
     @ApiParam("产品类型代码")
-    private String produceCtgyCode;
+    private String produceCategoryCode;
 
     @Column(name = "SIDE_LOCATION")
     @ApiParam("面位")
@@ -43,4 +43,16 @@ public class MesProduceCtgyPicture extends BaseBean {
     @Column(name = "PICTURE_NAME")
     @ApiParam("图片名称")
     private String pictureName;
+
+    @Column(name = "FILE_SIZE")
+    @ApiParam("FILE_SIZE")
+    private String fileSize;
+
+    @Column(name = "FILE_TYPE_ID")
+    @ApiParam("FILE_TYPE_ID")
+    private String fileTypeId;
+
+    @Column(name = "FILE_TYPE_NAME")
+    @ApiParam("FILE_TYPE_NAME")
+    private String fileTypeName;
 }

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

@@ -121,6 +121,10 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("托盘号")
     private String tray;
 
+    @Column(name="OPERATE_TYPE")
+    @ApiParam("操作类型")
+    private Integer operateType;
+
     @Transient
     @ApiParam("返回信息")
     private String resultMsg;

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

@@ -108,6 +108,10 @@ public class MesProduceSnTravel extends BaseBean {
     @ApiParam("包装条码")
     private String packageSn;
 
+    @Column(name="OPERATE_TYPE")
+    @ApiParam("操作类型")
+    private Integer operateType;
+
     @Transient
     @ApiParam("返回信息")
     private String resultMsg;

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

@@ -28,6 +28,9 @@ public class MesEquTaskPlanModel implements Serializable {
     @ApiParam("创建提前天数")
     private Integer daysInAdvance;
 
+    @ApiParam("备注")
+    private String memo;
+
     @ApiParam("生产线")
     private String workCenterCode;
 
@@ -66,7 +69,7 @@ public class MesEquTaskPlanModel implements Serializable {
 
     }
 
-    public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+    public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String memo, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
@@ -74,6 +77,7 @@ public class MesEquTaskPlanModel implements Serializable {
         this.taskCycle = taskCycle;
         this.lastTime = lastTime;
         this.daysInAdvance = daysInAdvance;
+        this.memo = memo;
         this.workCenterCode = workCenterCode;
         this.equipmentCategory = equipmentCategory;
         this.organizeCode = organizeCode;

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

@@ -8,7 +8,9 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -60,4 +62,8 @@ public class ProdOrgModel extends BaseBean {
 
     @ApiParam("当前级")
     private Integer level;
+
+    @Transient
+    @ApiParam("工位类型")
+    private Integer workCellType;
 }

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

@@ -1428,8 +1428,8 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesProduceCtgyPicture(MesProduceCtgyPicture mesProduceCtgyPicture, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceCtgyPicture, organizeCode);
-        if (!StringUtils.isEmpty(mesProduceCtgyPicture.getProduceCtgyCode())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getProduceCtgyCode(), "produceCtgyCode", packBean);
+        if (!StringUtils.isEmpty(mesProduceCtgyPicture.getProduceCategoryCode())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getProduceCategoryCode(), "produceCtgyCode", packBean);
         }
         if (!StringUtils.isEmpty(mesProduceCtgyPicture.getPictureName())) {
             DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getPictureName(), "pictureName", packBean);
@@ -1553,4 +1553,55 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 按条件分页查询首检件配置信息
+     * @param mesFiCfg
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesFiCfg(MesFiCfg mesFiCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesFiCfg, organizeCode);
+        if (!StringUtils.isEmpty(mesFiCfg.getWorkCenterCode())) {
+            DdlPreparedPack.getStringEqualPack(mesFiCfg.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesFiCfg.getPartNo())) {
+            DdlPreparedPack.getStringEqualPack(mesFiCfg.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesFiCfg.getCustCode())) {
+            DdlPreparedPack.getStringLikerPack(mesFiCfg.getCustCode(), "custCode", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 维修记录
+     * @param mesEquTaskRepairRecord
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesEquTaskRepairRecord(MesEquTaskRepairRecord mesEquTaskRepairRecord, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquTaskRepairRecord, organizeCode);
+        if (!StringUtils.isEmpty(mesEquTaskRepairRecord.getEquipmentCode())) {
+            DdlPreparedPack.getStringEqualPack(mesEquTaskRepairRecord.getEquipmentCode(), "equipmentCode", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 点检或保养记录
+     * @param mesEquTaskStandardRecord
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesEquTaskStandardRecord(MesEquTaskStandardRecord mesEquTaskStandardRecord, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquTaskStandardRecord, organizeCode);
+        if (!StringUtils.isEmpty(mesEquTaskStandardRecord.getEquipmentCode())) {
+            DdlPreparedPack.getStringEqualPack(mesEquTaskStandardRecord.getEquipmentCode(), "equipmentCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquTaskStandardRecord.getTaskType())) {
+            DdlPreparedPack.getNumEqualPack(mesEquTaskStandardRecord.getTaskType(), "taskType", packBean);
+        }
+        return packBean;
+    }
 }

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

@@ -18,6 +18,8 @@ import java.util.List;
 @Data
 public class StationRequestBean implements Serializable {
 
+    private static final long serialVersionUID = -8597212451891803174L;
+
     @ApiParam("扫描信息")
     private String scanInfo;
 

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

@@ -7,6 +7,9 @@ import java.io.Serializable;
 
 @Data
 public class StepModel implements Serializable {
+
+    private static final long serialVersionUID = -5772746720347236465L;
+
     @ApiParam("工步代码")
     private String stepCode;
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java

@@ -171,6 +171,7 @@ public class UserDetailModel extends BaseBean {
         user.setUserPhone(this.userPhone);
         user.setUserLoginPassword(this.userLoginPassword);
         user.setLanguageCode(this.userLanguageCode);
+        user.setOrganizeCode(this.organizeCode);
 
         return user;
     }
@@ -204,6 +205,7 @@ public class UserDetailModel extends BaseBean {
         info.setUserPoliticalStatus(this.infoPoliticalStatus);
         info.setUserGrade(this.infoGrade);
         info.setUserEmployeeType(this.infoEmployeeType);
+        info.setOrganizeCode(this.organizeCode);
 
         return info;
     }

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

@@ -89,6 +89,10 @@ public class WmsPoSn extends BaseBean {
     @ApiParam(value = "收货数量", example = "0")
     public Double recQty;
 
+    @Column(name = "ERP_AREA_NO_ADD")
+    @ApiParam("默认收货库存地")
+    private String erpAreaNoAdd;
+
     @ApiParam(value = "供应商名称")
     @Transient
     public String vendorNameRdd;

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

@@ -262,6 +262,14 @@ public class WmsStockSn extends BaseBean {
     @Transient
     private Integer isSnapshot;
 
+    @Transient
+    @ApiParam("临保天数")
+    private String qualityDay;
+
+    @Transient
+    @ApiParam("筛选（>=）或<")
+    private String choose;
+
     public WmsStockSn() {
     }
 

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

@@ -889,6 +889,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
+        DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(),"packageNo",result);
+        DdlPreparedPack.getStringLikerPack(wmsStockSn.getQualityDate(),"qualityDate",result);
         if (wmsStockSn.getSnStatus() == null) {
             DdlPreparedPack.getInPackArray(new Integer[]{
                     WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue(), WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue(),
@@ -1509,6 +1511,7 @@ public class WmsHqlPack {
         //查询参数封装
         DdlPreparedPack.getStringEqualPack(wmsPoSn.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsPoSn.getErpAreaNoAdd(), "erpAreaNoAdd", result);
         DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result);
 
         getStringBuilderPack(wmsPoSn, result);
@@ -1964,6 +1967,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result);
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
+        DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(),"packageNo", result);
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getVendorNo(),"vendorNo", result);
         DdlPreparedPack.getStringNotNullPack("locateNo", result);
         result.setWhereAppend(result.getWhereAppend() + " and locateNo != ''");