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

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

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

@@ -19,7 +19,7 @@ public class MesEnumUtil {
 
         SCRATCH(10, "划痕"),
         FRACTURE(20, "破碎"),
-        DEFECT(30, "缺失");
+        SCRAP_TYPE3(30, "缺失");
 
         private int value;
         private String description;
@@ -49,6 +49,45 @@ public class MesEnumUtil {
     }
 
     /**
+    * 设备台账报表查询标识
+     */
+    @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/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("产品条码")

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/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/sqlpack/MesHqlPack.java

@@ -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 != ''");