冲突解决

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

@@ -1973,7 +1973,9 @@ public class MesEnumUtil {
         MES_PART_COLOR(540, "partColorExcelService", "产品颜色导入"),
         MES_PART_STOCK_SCHEDULE(550, "partStockScheduleExcelService", "库存排程配置导入"),
         MES_PROD_CFG_DETAIL(560, "prodCfgDetailExcelService", "产品配置明细导入"),
-        MES_LOCATION(570, "locationExcelService", "库位信息导入");
+        MES_LOCATION(570, "locationExcelService", "库位信息导入"),
+        MES_SUB_PART(580, "mesSubPartExcelService", "替代料导入"),
+        MES_WORK_CELL_DEFECT(590, "workCellDefectExcelService", "工位缺陷信息导入");
 
         private int value;
         private String service;
@@ -3321,8 +3323,8 @@ public class MesEnumUtil {
         EMERGENCY_ORDER(80, "紧急插单"),
         FICTIVE(90, "虚拟工单"),
         SPARE_PART_PRODUCTION(100, "备件生产"),
-        REPRODUCTION_RMS(110, "重新生产-报功"),
-        REPRODUCTION_NOT_RMS(120, "重新生产-不报功"),
+        REPRODUCTION_RMS(110, "重新生产-报工"),
+        REPRODUCTION_NOT_RMS(120, "重新生产-不报工"),
         REVERSE_SPRAY_ORDER(130, "反喷工单");
 
         private int value;
@@ -7178,4 +7180,41 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 通知标识
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum NOTICE_SIGN {
+
+        PENDING(10, "待处理"),
+        PROCESSED(20, "已处理");
+
+        private int value;
+        private String description;
+
+        NOTICE_SIGN(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;
+        }
+
+    }
 }

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

@@ -1878,8 +1878,9 @@ public class MesPcnEnumUtil {
         EMERGENCY_ORDER(80, "紧急插单"),
         FICTIVE(90, "虚拟工单"),
         SPARE_PART_PRODUCTION(100, "备件生产"),
-        REPRODUCTION_RMS(110, "重新生产-报功"),
-        REPRODUCTION_NOT_RMS(120, "重新生产-不报功");
+        REPRODUCTION_RMS(110, "重新生产-报工"),
+        REPRODUCTION_NOT_RMS(120, "重新生产-不报工"),
+        REVERSE_SPRAY_ORDER(130, "反喷工单");
 
         private int value;
         private String description;
@@ -2595,7 +2596,8 @@ public class MesPcnEnumUtil {
         TIME_MODULE_START("timeModuleStart", "定时组件开始"),
         ADDITIONAL_TIPS("additionalTips", "额外帮助信息显示"),
         ADDITIONAL_TIPS_HIDE("additionalTipsHide", "额外帮助信息隐藏"),
-        TIME_MODULE_STOP("timeModuleStop", "定时组件暂停");
+        TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"),
+        MESSAGE_POOL("messagePool", "消息池");
 
         private String value;
         private String description;
@@ -5171,6 +5173,41 @@ public class MesPcnEnumUtil {
     }
 
     /**
+     * 涂装导入--反喷标识（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;
+        }
+    }
+
+    /**
      * 客户JIT生产队列状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -1452,7 +1452,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CS_STRATEGY_TYPE {
-        PART_COVERAGE(110, "物料分类覆盖"),
+        MATERIAL_PART_COVERAGE(110, "物料分类覆盖"),
         TOUCH(120, "动碰"),
         ZORE_STOCK(130, "零库存"),
         MATERIAL_COVERAGE(140, "物料覆盖");
@@ -4287,7 +4287,8 @@ public class WmsEnumUtil {
         REPORT(10, "REPORT", "生产报工"),
         BOXING_ERROR_PROOFING(20, "BOXING_ERROR_PROOFING", "装箱防错"),
         REPORT_CANCEL(30, "REPORT_CANCEL", "报工撤销"),
-        PACKAGE(40, "BOXING_ERROR_PROOFING", "翻包");
+        PACKAGE(40, "BOXING_ERROR_PROOFING", "翻包"),
+        SHIP_CHECK(50, "SHIP_CHECK", "发运校验");
 
         private int value;
         private String code;
@@ -5062,6 +5063,58 @@ public class WmsEnumUtil {
 
 
     /**
+     * 生产计划主表计划状态
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_ORDER_PLAN_STATUS {
+        CREATE(10, "CREATE", "创建"),
+        PLANNED(20, "PLANNED", "处理中"),
+        CLOSE(30, "CLOSE", "已关闭");
+
+        private int value;
+        private String code;
+        private String description;
+
+        WORK_ORDER_PLAN_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(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 int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+    /**
      * 是否贵重物料
      * 默认为2
      */

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

@@ -3,8 +3,10 @@ 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.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -24,6 +26,8 @@ import java.io.Serializable;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@AllArgsConstructor
+@NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PART_STOCK_SCHEDULE")
 @Api("MES_库存排程配置")
@@ -75,6 +79,10 @@ public class MesPartStockSchedule extends BaseBean implements Serializable {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @Column(name = "STOCK_QTY")
+    @ApiParam("排程实时库存")
+    private Integer stockQty;
+
     @Transient
     @ApiParam("物料名称")
     private String partName;

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

@@ -134,6 +134,14 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     @ApiParam("工单类型")
     private Integer woType;
 
+    @Column(name = "OFFLINE_TIME")
+    @ApiParam("下线时间")
+    private String offlineTime;
+
+    @Column(name = "NOTICE_SIGN")
+    @ApiParam("通知标识")
+    private Integer noticeSign = 10;
+
     @Transient
     @ApiParam("客户需求开始时间")
     private String custPointStartDate;
@@ -158,4 +166,8 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     @ApiParam(value = "下达按钮编号")
     public String buttonCode;
 
+    @Transient
+    @ApiParam(value = "零件号")
+    public String partNo;
+
 }

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

@@ -36,4 +36,7 @@ public class MesSubPart extends BaseBean implements Serializable {
     @ApiParam("替代料")
     private String subPartNo;
 
+    @Column(name = "SUB_FLAG")
+    @ApiParam("替代料标识")
+    private String subFlag;
 }

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

@@ -350,6 +350,18 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("是否虚拟件")
     private Integer isFictive = 2;
 
+    @Transient
+    @ApiParam("圈数")
+    private Integer rounds;
+
+    @Transient
+    @ApiParam("小车号")
+    private String smallCarNo;
+
+    @Transient
+    @ApiParam("行颜色")
+    private String rowColor;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description: 条码解绑实体
+ * @Reference:
+ * @Author: siliter.yuan
+ * @CreateDate: 2020-06-28-11:44
+ * @Modify:
+ **/
+@Data
+public class FutrueTaskModel {
+
+    @ApiParam("实现类")
+    private Object futrueTaskService;
+
+    @ApiParam("包装条码")
+    private StationRequestBean stationRequestBean;
+
+    @ApiParam("过程条码")
+    private MesProduceSn produceSn;
+
+
+}

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

@@ -102,6 +102,9 @@ public class QueueOrderModel implements Serializable {
 
     @ApiParam("客户产线代码")
     private String custProdLineCode;
+    @ApiParam("JIT排序号")
+    private String jitSeq;
+    private Integer status;
 
     public QueueOrderModel() {
     }
@@ -309,7 +312,8 @@ public class QueueOrderModel implements Serializable {
 
     //料架分组队列展示组件-getQueueOrderDetailListByQueueGroupNo
     public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo,
-                           Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode, String vinCode, String produceCategoryCode) {
+                           Double queueSeq, Double queDetailSeq, String partNo,
+                           String partNameRdd, String organizeCode, String vinCode, String produceCategoryCode, String serialNumber) {
         this.queueGroupNo = queueGroupNo;
         this.groupNo = groupNo;
         this.orderNo = orderNo;
@@ -320,6 +324,7 @@ public class QueueOrderModel implements Serializable {
         this.organizeCode = organizeCode;
         this.vinCode = vinCode;
         this.produceCategoryCode = produceCategoryCode;
+        this.serialNumber = serialNumber;
     }
 
     // getQueueOrderBySerialNumber
@@ -332,4 +337,17 @@ public class QueueOrderModel implements Serializable {
         this.produceCategoryCode = produceCategoryCode;
         this.workType = workType;
     }
+
+    // getQueueJitActualJitSeq
+    public QueueOrderModel(Long id, Double queueSeq, String serialNumber, String orderNo, String prodCfgTypeCode, String vinCode, String queueGroupNo, String jitSeq, Integer status) {
+        this.id = id;
+        this.queueSeq = queueSeq;
+        this.serialNumber = serialNumber;
+        this.orderNo = orderNo;
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.vinCode = vinCode;
+        this.queueGroupNo = queueGroupNo;
+        this.jitSeq = jitSeq;
+        this.status = status;
+    }
 }

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

@@ -41,6 +41,9 @@ public class TJMgnBoardModel extends BaseBean {
     @ApiParam("最终合格率")
     private String finalPassRate;
 
+    @ApiParam("不良处理类型")
+    private String defectType;
+
     @ApiParam("列名")
     private List<List<String>> headModelList;
 

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

@@ -161,6 +161,9 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
             DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
         }
+        if (!StringUtils.isEmpty(mesWorkOrder.getPartNameRdd())) {
+            DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNameRdd(), "partNameRdd", packBean);
+        }
         if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean);
         }
@@ -2357,7 +2360,7 @@ public class MesHqlPack {
      * @param organizeCode
      * @return
      */
-    public static DdlPackBean getMesQueueJitActual(MesQueueJitActual queueJitActual, String organizeCode) {
+    public static DdlPackBean getMesQueueJitActual(MesQueueJitActual queueJitActual,List<String> orderList, String organizeCode) {
         DdlPackBean packBean = getAllBaseData(organizeCode);
         if (!StringUtils.isEmpty(queueJitActual.getJisActualNo())) {
             DdlPreparedPack.getStringLikerPack(queueJitActual.getJisActualNo(), "jisActualNo", packBean);
@@ -2389,6 +2392,10 @@ public class MesHqlPack {
                     queueJitActual.getCustPointEndDate(),
                     "createDatetime", packBean, true);
         }
+        if(!CollectionUtils.isEmpty(orderList)){
+            DdlPreparedPack.getInPackList(orderList, "jisActualNo", packBean);
+        }
+        DdlPreparedPack.getNumEqualPack(queueJitActual.getWoType(), "woType", packBean);
         return packBean;
     }
 
@@ -3327,27 +3334,12 @@ public class MesHqlPack {
         return packBean;
     }
 
-    /**
-     * 预装区域查询
-     *
-     * @param packageTrans
-     * @param organizeCode
-     * @return
-     */
-    public static DdlPackBean getMesPackageTrans(MesPackageTrans packageTrans, String organizeCode) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(packageTrans, organizeCode);
-        if (!StringUtils.isEmpty(packageTrans.getTransType())) {
-            DdlPreparedPack.getNumEqualPack(packageTrans.getTransType(), "transType", packBean);
-        }
-        if (!StringUtils.isEmpty(packageTrans.getPartNo())) {
-            DdlPreparedPack.getStringLikerPack(packageTrans.getPartNo(), "partNo", packBean);
-        }
-        if (!StringUtil.isEmpty(packageTrans.getCreateDateTimeStart()) || !StringUtil.isEmpty(packageTrans.getCreateDateTimeEnd())) {
-            DdlPreparedPack.timeBuilder(
-                    packageTrans.getCreateDateTimeStart(),
-                    packageTrans.getCreateDateTimeEnd(),
-                    "createDatetime", packBean, true);
-        }
+    public static DdlPackBean getMesSubPart(MesSubPart mesSubPart) {
+        DdlPackBean packBean = getAllBaseData(mesSubPart.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(mesSubPart.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(mesSubPart.getSubPartNo(), "subPartNo", packBean);
+        DdlPreparedPack.getStringLikerPack(mesSubPart.getSubFlag(), "subFlag", packBean);
+        DdlPreparedPack.getNumEqualPack(mesSubPart.getIsValid(), "isValid", packBean);
         return packBean;
     }
 }

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-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java

@@ -0,0 +1,24 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+
+import cn.estsh.i3plus.pojo.wms.bean.MesPpDetails;
+import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 生产领料计划
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2020-09-10 19:50
+ * @Modify:
+ **/
+@Data
+public class MesPPMasterModel {
+
+    @ApiParam("生产计划主数据")
+    private MesPpMaster mesPpMaster;
+
+    @ApiParam("生产计划明细数据")
+    private MesPpDetails mesPpDetails;
+}

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

@@ -81,6 +81,11 @@ public class MesPpMaster extends BaseBean{
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String remark;
 
+    @Column(name = "WORK_ORDER_PLAN_STATUS", columnDefinition = "int default 10")
+    @ApiParam("工单计划状态:10-创建，20-处理中，30-已关闭")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_PLAN_STATUS")
+    private Integer workOrderPlanStatus;
+
     public Integer getOrderStatus() {
         return orderStatus == null ? 0 : this.orderStatus.intValue();
     }

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

@@ -182,7 +182,7 @@ public class WmsDocMovementSn extends BaseBean {
 
     @Transient
     @ApiParam(value = "版本")
-    private String version;
+    private Integer version;
 
     public WmsDocMovementSn(){}
 
@@ -217,7 +217,7 @@ public class WmsDocMovementSn extends BaseBean {
     }
 
     public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String custNo,String partNameRdd,
-                            String whNo,String erpSrcNo,String version,Double sumQty) {
+                            String whNo,String erpSrcNo,Integer version,Double sumQty) {
         this.orderNo = orderNo;
         this.partNo = partNo;
         this.lotNo = lotNo;
@@ -242,7 +242,7 @@ public class WmsDocMovementSn extends BaseBean {
     }
 
     public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd,
-                            String version,String whNo,String custNo,
+                            Integer version,String whNo,String custNo,
                             String erpSrcNo,String planDate,Double sumQty) {
         this.orderNo = orderNo;
         this.partNo = partNo;
@@ -258,7 +258,7 @@ public class WmsDocMovementSn extends BaseBean {
     }
 
     public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd,
-                            String version,String whNo,Integer snStatus,Double sumQty) {
+                            Integer version,String whNo,Integer snStatus,Double sumQty) {
         this.orderNo = orderNo;
         this.partNo = partNo;
         this.lotNo = lotNo;
@@ -271,7 +271,7 @@ public class WmsDocMovementSn extends BaseBean {
     }
 
     public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd,
-                            String version,String whNo,String assignSrcWhNo,Integer snStatus,Double sumQty) {
+                            Integer version,String whNo,String assignSrcWhNo,Integer snStatus,Double sumQty) {
         this.orderNo = orderNo;
         this.partNo = partNo;
         this.lotNo = lotNo;
@@ -283,4 +283,19 @@ public class WmsDocMovementSn extends BaseBean {
         this.snStatus = snStatus;
         this.sumQty = sumQty;
     }
+
+    public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd,
+                            String erpSrcNo,String vendorNo,String whNo,String assignSrcWhNo,String planDate,Double sumQty) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.lotNo = lotNo;
+        this.createDatetime = createDatetime;
+        this.partNameRdd = partNameRdd;
+        this.erpSrcNo = erpSrcNo;
+        this.vendorNo = vendorNo;
+        this.whNo = whNo;
+        this.srcWhNo = assignSrcWhNo;
+        this.planDate = planDate;
+        this.sumQty = sumQty;
+    }
 }

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

@@ -1,7 +1,9 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -47,6 +49,7 @@ public class WmsMoveToERP extends BaseBean {
      * 状态:1=创建,10=待处理,20=已处理
      */
     @Column(name = "ORDER_STATUS")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description")
     @ApiParam(value = "状态", example = "0")
     public Integer orderStatus;
 

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

@@ -173,6 +173,10 @@ public class WmsPOMaster extends BaseBean {
     private Integer boardStatus;
 
     @Transient
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Transient
     private List<String> orderNoList;
 
     @Column(name = "DOCK", columnDefinition = "varchar(50) default ''")
@@ -195,6 +199,11 @@ public class WmsPOMaster extends BaseBean {
     @ApiParam(value = "部门名称", example = "1")
     public Integer departName;
 
+    @Transient
+    @ApiParam("周总数")
+    private Integer weekRcCount;
+
+
     public WmsPOMaster() {
 
     }
@@ -219,6 +228,17 @@ public class WmsPOMaster extends BaseBean {
         this.planTime = planTime;
     }
 
+    public WmsPOMaster(String orderNo, Integer poStatus, String vendorNo, String vendorName,
+                       String dockCode, String planDate, String planTime) {
+        this.orderNo = orderNo;
+        this.poStatus = poStatus;
+        this.vendorNo = vendorNo;
+        this.vendorName = vendorName;
+        this.dock = dockCode;
+        this.planDate = planDate;
+        this.planTime = planTime;
+    }
+
     public int getPoStatusVal() {
         return this.poStatus == null ? 0 : this.poStatus;
     }

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

@@ -169,7 +169,7 @@ public class WmsPartExtend extends BaseBean {
     private Integer qcPassCount;
 
     @Column(name = "LAST_QC_TIME")
-    @ApiParam(value = "上次质检时间")
+    @ApiParam(value = "首次质检时间合格")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String lastQcTime;
 

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

@@ -545,6 +545,15 @@ public class WmsStockSn extends BaseBean {
         this.locateNo = locateNo;
     }
 
+    public WmsStockSn(String locateNo, String partNo, String partName, String zoneNo, String unit, String whNo) {
+        this.locateNo = locateNo;
+        this.partNo = partNo;
+        this.partNameRdd = partName;
+        this.zoneNo = zoneNo;
+        this.unit = unit;
+        this.whNo = whNo;
+    }
+
     //locate_no,part_no,sn_status,qc_status,sum(qty),is_deleted,is_valid
     public WmsStockSn(String locateNo, String partNo, Integer snStatus,
                       Integer qcStatus, Double qty, Integer isDeleted, Integer isValid) {

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

@@ -72,4 +72,13 @@ public class WmsWorkCenter extends BaseBean {
             searchColumnName = "zoneNo,locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
     private String descLocationCode;
 
+
+    /**
+     * 分钟
+     **/
+    @Column(name = "ADVANCE_PULL_TIMES", columnDefinition = "int default 0")
+    @ApiParam(value = "提前拉动时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer advancePullTimes;
+
 }

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

@@ -0,0 +1,47 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : AGV接口Model
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-09-10 20:21
+ * @Modify:
+ **/
+@Data
+@Api("AGV接口Model")
+public class WmsAgvModel {
+
+    @ApiParam(value = "任务ID")
+    private String taskId;
+
+    @ApiParam(value = "源库位")
+    private String srcLocateNo;
+
+    @ApiParam(value = "目标库位")
+    private String destLocateNo;
+
+    @ApiParam(value = "物料编号")
+    private String partNo;
+
+    @ApiParam(value = "物料名称")
+    private String partName;
+
+    @ApiParam(value = "需求数量")
+    private Double qty;
+
+    @ApiParam(value = "工厂代码")
+    private String organizeCode;
+
+    @ApiParam(value = "物料编号集合")
+    private List<String> partNoList;
+
+    @ApiParam(value = "目标库位编号集合")
+    private List<String> destLocateNoList;
+
+}

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

@@ -54,7 +54,7 @@ public class WmsPoAsnRecvModel extends BaseBean implements Comparable<WmsPoAsnRe
     private Map<String, Map<Integer, WmsPOMaster>> gteCurrentDayResultMap;
 
     @ApiParam("小于今天的结果集")
-    private Map<Integer, Map<String, String>> ltCurrentDayResultMap;
+    private Map<Integer, Map<String, Object>> ltCurrentDayResultMap;
 
     public WmsPoAsnRecvModel(String orderNo, String partNo, String vendorName, String dock, String prodCfgTypeName,
                              String planTime, Double transQty, Double resQty) {

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

@@ -0,0 +1,67 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : PO明细回传汇总Model
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-09-12 13:56
+ * @Modify:
+ **/
+@Data
+@Api("PO明细回传汇总Model")
+public class WmsPoCountModel {
+
+    @ApiParam(value = "po单号")
+    private String poOrderNo;
+
+    @ApiParam(value = "收货日期")
+    private String rcDate;
+
+    @ApiParam(value = "源单号")
+    private String srcOrderNo;
+
+    @ApiParam(value = "源行号")
+    private Integer srcItem;
+
+    @ApiParam(value = "收货批次")
+    private String lotNo;
+
+    @ApiParam(value = "物料号")
+    private String partNo;
+
+    @ApiParam(value = "物料名称")
+    private String partName;
+
+    @ApiParam(value = "仓库")
+    private String whNo;
+
+    @ApiParam(value = "汇总数量")
+    private Double sumQty;
+
+    @ApiParam(value = "供应商批次")
+    private String venLotNo;
+
+    @ApiParam(value = "操作人")
+    private String user;
+
+    public WmsPoCountModel() {
+    }
+
+    public WmsPoCountModel(String poOrderNo, String rcDate, String srcOrderNo, Integer srcItem, String lotNo, String partNo, String partName, String whNo, Double sumQty, String venLotNo, String user) {
+        this.poOrderNo = poOrderNo;
+        this.rcDate = rcDate;
+        this.srcOrderNo = srcOrderNo;
+        this.srcItem = srcItem;
+        this.lotNo = lotNo;
+        this.partNo = partNo;
+        this.partName = partName;
+        this.whNo = whNo;
+        this.sumQty = sumQty;
+        this.venLotNo = venLotNo;
+        this.user = user;
+    }
+}

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

@@ -18,6 +18,7 @@ import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipDto;
 import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
 import com.google.common.base.Strings;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -259,7 +260,6 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result);
         DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
@@ -277,10 +277,10 @@ public class WmsHqlPack {
             DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result);
         }
 
-
-        //  查询计划时间在指定范围的单号，查询这些单号的数据
-        if (StringUtils.isNotBlank(wmsPOMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsPOMaster.getPlanDateEnd())) {
+        if (!CollectionUtils.isEmpty(wmsPOMaster.getOrderNoList())) {
             DdlPreparedPack.getInPackList(wmsPOMaster.getOrderNoList(), "orderNo", result);
+        } else {
+            DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result);
         }
 
         //按创建时间查询单据信息