Merge remote-tracking branch 'remotes/origin/test'

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

@@ -494,6 +494,10 @@ public class CommonEnumUtil {
             return tmp;
         }
 
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {

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

@@ -3322,7 +3322,8 @@ public class MesEnumUtil {
         FICTIVE(90, "虚拟工单"),
         SPARE_PART_PRODUCTION(100, "备件生产"),
         REPRODUCTION_RMS(110, "重新生产-报功"),
-        REPRODUCTION_NOT_RMS(120, "重新生产-不报功");
+        REPRODUCTION_NOT_RMS(120, "重新生产-不报功"),
+        REVERSE_SPRAY_ORDER(130, "反喷工单");
 
         private int value;
         private String description;
@@ -4484,7 +4485,9 @@ public class MesEnumUtil {
     public enum QUEUE_JIT_ACTUAL_STATUS {
         CREATE(10, "创建"),
         LANDED(20, "下达"),
-        CANCEL(30, "取消");
+        CANCEL(30, "取消"),
+        OFFLINE(40, "下线"),
+        SHIPMENT(50, "发运");
 
         private int value;
         private String description;
@@ -7093,4 +7096,86 @@ public class MesEnumUtil {
         }
 
     }
+
+    /**
+     * 涂装导入--反喷标识（Y-正常；F-反喷）
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REVERSE_SPRAY_MARK {
+        REVERSE_SPRAY("F", "反喷"),
+        NORMAL("Y", "正常");
+
+        private String value;
+        private String description;
+
+        REVERSE_SPRAY_MARK(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * MES_出入库事务表--事务类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PACKAGE_TRANS_TYPE {
+
+        OUTSTOCK(10, "出库"),
+        INSTOCK(20, "入库"),
+        GOBACK(30, "退回");
+
+        private int value;
+        private String description;
+
+        PACKAGE_TRANS_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;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -1879,7 +1879,8 @@ public class MesPcnEnumUtil {
         FICTIVE(90, "虚拟工单"),
         SPARE_PART_PRODUCTION(100, "备件生产"),
         REPRODUCTION_RMS(110, "重新生产-报功"),
-        REPRODUCTION_NOT_RMS(120, "重新生产-不报功");
+        REPRODUCTION_NOT_RMS(120, "重新生产-不报功"),
+        REVERSE_SPRAY_ORDER(130, "反喷工单");
 
         private int value;
         private String description;
@@ -5102,4 +5103,107 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * 状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PACKAGE_SAMPLE_TYPE {
+
+        NORMAL(10, "正常batch"),
+        FIRST(20, "首件"),
+        MIDDLE(30, "中件"),
+        LAST(40, "末件");
+
+        private int value;
+        private String description;
+
+        PACKAGE_SAMPLE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+
+    }
+
+    /**
+     * 客户JIT生产队列状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_JIT_ACTUAL_STATUS {
+        CREATE(10, "创建"),
+        LANDED(20, "下达"),
+        CANCEL(30, "取消"),
+        OFFLINE(40, "下线"),
+        SHIPMENT(50, "发运");
+
+        private int value;
+        private String description;
+
+        QUEUE_JIT_ACTUAL_STATUS(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;
+        }
+    }
+
+    /**
+     * 涂装导入--反喷标识（Y-正常；F-反喷）
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REVERSE_SPRAY_MARK {
+        REVERSE_SPRAY("F", "反喷"),
+        NORMAL("Y", "正常");
+
+        private String value;
+        private String description;
+
+        REVERSE_SPRAY_MARK(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String 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/tool/DdlPreparedPack.java

@@ -254,15 +254,26 @@ public class DdlPreparedPack {
     }
 
     /**
-     * 封装String对象成equal语句
+     * 封装String对象成equal语句,不封装空值，空字符串
      *
      * @param columnName 列名
      * @param packBean
      */
     public static void getStringEqualPack(String val, String columnName, DdlPackBean packBean) {
         if (val != null && val.trim().length() > 0) {
-            packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, val);
+            getStringEqualAndAllowBlankPack(val, columnName, packBean);
+        }
     }
+
+    /**
+     * 封装String对象成equal语句,封装空值，空字符串
+     *
+     * @param val 条件
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getStringEqualAndAllowBlankPack(String val, String columnName, DdlPackBean packBean) {
+        packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, val);
     }
 
     /**

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

@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.mes.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.*;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/4/18 21:05
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PCN_SYSTEM_CFG")
+@Api("MES_PCN_系统配置")
+public class MesPcnSystemCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -2733956307324811596L;
+
+    @Column(name = "PCN_CODE")
+    @ApiParam("PCN代码")
+    private String pcnCode;
+
+    @Column(name = "SYS_NAME")
+    @ApiParam("系统名称")
+    private String sysName;
+
+    @Column(name = "COMPANY")
+    @ApiParam("公司名称")
+    private String company;
+
+    @Column(name = "SYS_LOG")
+    @ApiParam("系统LOG")
+    private String sysLog;
+
+    @Column(name = "MAIN_LOG")
+    @ApiParam("主页LOG")
+    private String mainLog;
+
+    @Column(name = "COPYRIGHT")
+    @ApiParam("版权信息")
+    private String copyright;
+
+    @Transient
+    @ApiParam("LOG存放地址")
+    private String logUrl;
+}

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -58,4 +59,26 @@ public class MesQueueJitPlanDetail extends BaseBean implements Serializable {
     @Column(name = "FORMULA_CONTENT")
     @ApiParam("配方内容")
     private String formulaContent;
+
+    @Transient
+    @ApiParam("工单类型")
+    private Integer woType;
+
+    @Transient
+    @ApiParam("子物料名称")
+    private String itemPartNo;
+
+    @Transient
+    @ApiParam("数量")
+    private long qty;
+
+    public MesQueueJitPlanDetail() {
+
+    }
+
+    public MesQueueJitPlanDetail(String partNo, String itemPartNo, long qty) {
+        this.partNo = partNo;
+        this.itemPartNo = itemPartNo;
+        this.qty = qty;
+    }
 }

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

@@ -66,4 +66,8 @@ public class PaintWorkOrderSnModel extends BaseBean {
     private List<ProdPackModel> prodPackageList;
 
     private String partNameRdd;
+
+    @ApiParam("反喷标识--工单类型")
+    private String reverseSprayMark;
+
 }

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

@@ -67,4 +67,12 @@ public class ProdOrgModel extends BaseBean {
     @Transient
     @ApiParam("序号")
     private Integer seq;
+
+    @Transient
+    @ApiParam("工位监控模式")
+    private Integer monitorType;
+
+    @Transient
+    @ApiParam("条码生成模式")
+    private Integer generateType;
 }

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

@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class TJMgnBoardModel extends BaseBean {
+
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("颜色")
+    private String partColor;
+
+    @ApiParam("生产数量")
+    private Double prodQty;
+
+    @ApiParam("一次合格数量")
+    private Double firstQuQty;
+
+    @ApiParam("抛光数量")
+    private Double polishQty;
+
+    @ApiParam("不合格数量")
+    private Double noQuQty;
+
+    @ApiParam("一次合格率")
+    private String firstPassRate;
+
+    @ApiParam("最终合格率")
+    private String finalPassRate;
+
+    @ApiParam("不良处理类型")
+    private String defectType;
+
+    @ApiParam("列名")
+    private List<List<String>> headModelList;
+
+    @ApiParam("列值")
+    private List<List<Double>> headValueModelList;
+
+}

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

@@ -51,7 +51,7 @@ public class ZzMesWorkOrderModel extends BaseBean {
     private String snp;
 
     @ApiParam(value = "包装规格")
-    @AnnoOutputColumn
+    @AnnoOutputColumn(required = false)
     private String packageSpec;
 
     @ApiParam(value = "备注")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSystemCfgRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipment;
+import cn.estsh.i3plus.pojo.mes.bean.MesPcnSystemCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesPcnSystemCfgRepository extends BaseRepository<MesPcnSystemCfg, Long> {
+}

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

@@ -0,0 +1,172 @@
+package cn.estsh.i3plus.pojo.model.platform;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseConstWords;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
+import cn.estsh.i3plus.pojo.platform.bean.SysUser;
+import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-09-09
+ * @Modify:
+ **/
+@Data
+@ApiModel
+public class UserExportModel extends BaseBean {
+
+    private static final long serialVersionUID = -6597413958814715617L;
+
+    @ApiModelProperty(value ="姓名" , access ="名称")
+    private String infoName;
+
+    @ApiModelProperty(value ="工号")
+    private String infoEmpNo;
+
+    @ApiModelProperty(value ="角色名称" , access ="角色名称")
+    private String roleNameRdd;
+
+    @ApiModelProperty(value ="登陆名称" , access ="登陆名称")
+    private String userLoginName;
+
+    @ApiModelProperty(value ="邮箱" , access ="邮箱")
+    private String userEmail;
+
+    @ApiModelProperty(value ="手机号" , access ="手机号")
+    private String userPhone;
+
+    @ApiModelProperty(value ="部门名称" , access ="部门名称")
+    private String departmentNameRdd;
+
+    @ApiModelProperty(value ="岗位名称" , access ="岗位名称")
+    private String positionNameRdd;
+
+    @ApiModelProperty(value ="组织名称" , access ="组织名称")
+    private String organizeNameRdd;
+
+    @ApiModelProperty(value ="员工类型", access ="实习、试用期、正式")
+    @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_EMPLOYEE_TYPE)
+    private Integer infoEmployeeType;
+
+    @ApiModelProperty(value ="员工等级")
+    @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_EMPLOYEE_GRADE)
+    private Integer infoGrade;
+
+    @ApiModelProperty(value ="性别（1.男，2.女）" , example ="1" , access ="性别（1.男，2.女）")
+    @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_SEX)
+    private Integer infoSex;
+
+    @ApiModelProperty(value ="婚姻" , example ="1" , access ="性别（1.未知，2.已婚,3未婚）")
+    @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_MARRIAGE)
+    private Integer infoMarriage;
+
+    @ApiModelProperty(value ="证件类型")
+    @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_CERTIFICATE_TYPE)
+    private Integer infoCardType;
+
+    @ApiModelProperty(value ="证件编号")
+    private String infoCardNumber;
+
+    @ApiModelProperty(value ="毕业专业")
+    private String infoSchoolProfession;
+
+    @ApiModelProperty(value ="毕业院校")
+    private String infoSchool;
+
+    @ApiModelProperty(value ="学历")
+    @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_EDUCATION)
+    private Integer infoSchoolEducation;
+
+    @ApiModelProperty(value ="毕业时间")
+    private String infoSchoolLeaveDate;
+
+    @ApiModelProperty(value ="籍贯")
+    private String infoBirthplace;
+
+    @ApiModelProperty(value ="种族")
+    @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_NATIONALITY)
+    private Integer infoRace;
+
+    @ApiModelProperty(value ="紧急联系人")
+    private String infoEmergencyContact;
+
+    @ApiModelProperty(value ="紧急联系人-电话")
+    private String infoEmergencyPhone;
+
+    @ApiModelProperty(value ="入职日期" , access ="默认当前时间")
+    private String infoJoinDate;
+
+    @ApiModelProperty(value ="离职日期" , access ="默认当前时间")
+    private String infoResignationDate;
+
+    @ApiModelProperty(value ="出生日期")
+    private String infoBornDate;
+
+    @ApiModelProperty(value ="政治面貌")
+    @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_POLITICAL_STATUS)
+    private Integer infoPoliticalStatus;
+
+    @ApiModelProperty(value ="兴趣爱好")
+    private String infoHobby;
+
+    @ApiModelProperty(value ="家庭地址")
+    private String infoFamilyAddress;
+
+    @ApiModelProperty(value ="账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.USER_STATUS.class)
+    private Integer userStatus;
+
+    @ApiModelProperty(value ="用户状态" , example ="-1")
+    private Integer infoStatus;
+
+    public UserExportModel() {
+    }
+
+    public UserExportModel(SysUser sysUser, SysUserInfo sysUserInfo) {
+        setSysUser(sysUser);
+        setSysUserInfo(sysUserInfo);
+    }
+
+    public UserExportModel setSysUser(SysUser sysUser){
+        this.userLoginName=sysUser.getUserLoginName();
+        this.userPhone=sysUser.getUserPhone();
+        this.userEmail=sysUser.getUserEmail();
+        this.infoEmpNo=sysUser.getUserEmpNo();
+        return this;
+    }
+
+    public UserExportModel setSysUserInfo(SysUserInfo sysUserInfo){
+        this.infoName=sysUserInfo.getName();
+        this.departmentNameRdd=sysUserInfo.getDepartmentNameRdd();
+        this.positionNameRdd=sysUserInfo.getPositionNameRdd();
+        this.organizeNameRdd=sysUserInfo.getOrganizeNameRdd();
+        this.infoEmployeeType=sysUserInfo.getUserEmployeeType();
+        this.infoGrade=sysUserInfo.getUserGrade();
+        this.infoSex=sysUserInfo.getUserSex();
+        this.infoMarriage=sysUserInfo.getUserMarriage();
+        this.infoCardType=sysUserInfo.getUserCardType();
+        this.infoCardNumber=sysUserInfo.getUserCardNumber();
+        this.infoSchoolProfession=sysUserInfo.getUserSchoolProfession();
+        this.infoSchool=sysUserInfo.getUserSchool();
+        this.infoSchoolEducation=sysUserInfo.getUserSchoolEducation();
+        this.infoSchoolLeaveDate=sysUserInfo.getUserSchoolLeaveDate();
+        this.infoBirthplace=sysUserInfo.getUserBirthplace();
+        this.infoRace=sysUserInfo.getUserRace();
+        this.infoEmergencyContact=sysUserInfo.getUserEmergencyContact();
+        this.infoEmergencyPhone=sysUserInfo.getUserEmergencyPhone();
+        this.infoJoinDate=sysUserInfo.getUserJoinDate();
+        this.infoResignationDate=sysUserInfo.getUserResignationDate();
+        this.infoBornDate=sysUserInfo.getUserBornDate();
+        this.infoPoliticalStatus=sysUserInfo.getUserPoliticalStatus();
+        this.infoHobby=sysUserInfo.getUserHobby();
+        this.infoFamilyAddress=sysUserInfo.getUserFamilyAddress();
+        return this;
+    }
+}

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

@@ -37,7 +37,7 @@ public class SysRefUserRole extends BaseBean {
     private Long userId;
 
     @Column(name="USER_NAME_RDD")
-    @ApiParam(value ="角色名称")
+    @ApiParam(value ="用户名称")
     private String userNameRdd;
 
     @Column(name="ROLE_ID")

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

@@ -662,7 +662,7 @@ public class CoreHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         // and
-        DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryValue(), "dictionaryValue", result);
+        DdlPreparedPack.getStringEqualAndAllowBlankPack(dictionary.getDictionaryValue(), "dictionaryValue", result);
         DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result);
         DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result);
         // not

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

@@ -190,6 +190,11 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
     @AnnoOutputColumn(refClass = WmsEnumUtil.DOWN_OR_UP.class, refForeignKey = "value", value = "description")
     private Integer upY;
 
+    @Column(name = "LOCATE_ALIAS")
+    @ApiParam(value = "库位别名")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String locateAlias;
+
     // 导入用
     @ApiParam(value = "工厂")
     @Transient

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

@@ -11,7 +11,12 @@ import org.hibernate.annotations.ColumnDefault;
 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.Table;
+import javax.persistence.Transient;
+import javax.persistence.Version;
 
 /**
  * @Description : PO订单明细信息
@@ -190,6 +195,14 @@ public class WmsPOMasterDetails extends BaseBean {
     private String planEndDate;
 
 
+    /**
+     * 状态:1=新建,10=收货中,20=收货完成,
+     * 30=入库中,40=入库完成,90=已关闭,91=已取消
+     */
+    @Transient
+    @ApiParam(value = "状态", example = "1")
+    public Integer poStatus;
+
     public Double getSnpVal() {
         return snp;
     }

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

@@ -157,4 +157,23 @@ public class WmsPartExtend extends BaseBean {
     @ApiParam(value = "自动采购数量")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     private Integer autoPurchaseQty;
+
+    @Column(name = "QC_SKIP_CYCLE")
+    @ApiParam(value = "质检跳批周期")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer qcSkipCycle;
+
+    @Column(name = "QC_PASS_COUNT")
+    @ApiParam(value = "质检合格次数")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer qcPassCount;
+
+    @Column(name = "LAST_QC_TIME")
+    @ApiParam(value = "上次质检时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String lastQcTime;
+
+    public Integer getQcPassCount() {
+        return this.qcPassCount == null ? 0 :this.qcPassCount.intValue();
+    }
 }

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

@@ -1,11 +1,13 @@
 package cn.estsh.i3plus.pojo.wms.modelbean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPOMaster;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.time.LocalTime;
+import java.util.Map;
 
 /**
  * @Description : 供应商收货看板信息
@@ -48,6 +50,12 @@ public class WmsPoAsnRecvModel extends BaseBean implements Comparable<WmsPoAsnRe
     @ApiParam("收货状态")
     private String receiveStatus;
 
+    @ApiParam("大于等于今天的结果集")
+    private Map<String, Map<Integer, WmsPOMaster>> gteCurrentDayResultMap;
+
+    @ApiParam("小于今天的结果集")
+    private Map<Integer, Map<String, String>> ltCurrentDayResultMap;
+
     public WmsPoAsnRecvModel(String orderNo, String partNo, String vendorName, String dock, String prodCfgTypeName,
                              String planTime, Double transQty, Double resQty) {
         this.orderNo = orderNo;