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

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

@@ -0,0 +1,23 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import io.swagger.annotations.Api;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :刷新计划规则
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-07-11
+ * @Modify:
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "APS_FLUSH_PLAN_RULE")
+@Api("刷新计划规则")
+public class FlushPlanRule extends BaseRule {
+}

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

@@ -28,6 +28,7 @@ public class DateDuration {
     private int time = 0;
     private double rate = 0.0;
     private boolean bValid = false;
+    private int unit = 0;
 
     public DateDuration(int value) {
         this.time = value;
@@ -147,6 +148,9 @@ public class DateDuration {
         if (amount < PRECISION)
             return getTime();
 
+        if (this.unit > 0) {
+            amount = Math.ceil(amount / this.unit);
+        }
         double result = (amount * this.rate) + this.time;
         return (int)Math.ceil(result);
     }
@@ -184,10 +188,11 @@ public class DateDuration {
         for (EV_STRING evs : lst) {
             if (evs.type == EV_STRING_TYPE.EVS_GOOD) {
                 AbstractMap.SimpleEntry<Boolean, Integer> extraTime = transTimeEach(evs.value);
-                if (extraTime.getKey() || !oFlg) {
+                if (extraTime.getKey() || oFlg) {
                     this.time += extraTime.getValue();
                 } else {
-                    this.time += extraTime.getValue() * 1;
+                    //this.time += extraTime.getValue() * 1;
+                    this.unit = extraTime.getValue();
                 }
             }
             else {

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import lombok.Data;
+
+/**
+ * 表格右键菜单
+ */
+@Data
+public class ContextMenu {
+
+    private String text;
+
+    private String uri;
+}

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

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+@Data
+public class ShiftReportModel {
+    private List<String> dates = new ArrayList<>();
+    private List<String> headers = new ArrayList<>();
+    private Set<String> labels = new HashSet<>();
+
+    private List<Map<String, List<String>>> datas = new ArrayList<>();
+}

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

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Description :时间段信息，包含指示该时间段是上班还是下班
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+@Data
+public class TimeBlock implements Comparable<TimeBlock> {
+    private Date begin;
+    private Date end;
+    private boolean onDuty = true;
+    private String shift;
+
+    @Override
+    public int compareTo(TimeBlock o) {
+        if (this.getBegin().equals(o.getBegin())) {
+            if (this.getEnd().equals(o.getEnd())) {
+                return 0;
+            }
+            return this.getEnd().before(o.getEnd()) ? -1 : 1 ;
+        }
+        return this.getBegin().before(o.getBegin()) ? -1 : 1;
+    }
+}

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

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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -83,7 +83,6 @@ public abstract class BaseBean implements Serializable {
 
     @Column(name="CREATE_USER",updatable = false)
     @ApiParam(value = "创建用户")
-    @AnnoOutputColumn(hidden = true)
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
             dataSrc = "/impp/operate/sys-user/query-user-by-pager",
             searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName")
@@ -97,7 +96,6 @@ public abstract class BaseBean implements Serializable {
 
     @Column(name="MODIFY_USER")
     @ApiParam(value = "修改人")
-    @AnnoOutputColumn(hidden = true)
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
             dataSrc = "/impp/operate/sys-user/query-user-by-pager",
             searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName")

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

@@ -283,7 +283,8 @@ public class ApsEnumUtil {
         CANCEL_PLAN("CANCEL_PLAN", "取消计划"),
         MAT_CALC("MAT_CALC", "物料运算"),
         HEURISTIC("HEURISTIC", "排程运算"),
-        FIELD_SET("FIELD_SET", "字段赋值");
+        FIELD_SET("FIELD_SET", "字段赋值"),
+        FLUSH_PLAN("FLUSH_PLAN", "刷新计划");
 
         private String value;
         private String description;
@@ -420,7 +421,9 @@ public class ApsEnumUtil {
         NEARLY_WORK("NEARLY_WORK", "前后工作"),
         POST_RESOURCE("POST_RESOURCE", "后资源制约"),
         SAME_ASS_RESOURCE("SAME_ASS_RESOURCE", "相同副资源"),
-        RESOURCE_PRIORITY("RESOURCE_PRIORITY", "资源优先级");
+        RESOURCE_PRIORITY("RESOURCE_PRIORITY", "资源优先级"),
+        RESOURCE_USEAGE("RESOURCE_USEAGE", "资源使用率"),
+        CUST_EXPRESSION("CUST_EXPRESSION", "自定义表达式");
 
         private String value;
         private String description;

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

@@ -991,6 +991,51 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * Mes  对象结构是否展示
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OBJECT_CFG_IS_SHOW {
+
+        SHOW(1, "是"),
+        NO_SHOW(2, "否");
+
+        private int value;
+        private String description;
+
+        OBJECT_CFG_IS_SHOW(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;
+        }
+    }
 
     /**
      * Mes  客户订单来源
@@ -6595,4 +6640,55 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 队列 料架摆放位置
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum GROUP_SIDE {
+        POSITIVE(10, "A", "正面"),
+        REVERSE_SIDE(20, "B", "背面");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        GROUP_SIDE(Integer value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -718,7 +718,7 @@ public class MesPcnEnumUtil {
         DEFECTED(20, "不合格"),
         SCRAPED(30, "报废"),
         DISMANTLED(40, "已拆解"),
-        PRE_CHECK(50, "待检测");
+        PRE_CHECK(5, "待检测");
 
         private int value;
         private String description;
@@ -2385,6 +2385,7 @@ public class MesPcnEnumUtil {
         INSTOCKED(40, "入库"),
         SHIPPING(50, "发运"),
         REDO(60, "重做"),
+        FORCE(70, "强过"),
         CLOSE(90, "关闭");
 
         private int value;

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

@@ -300,6 +300,63 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 收货状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REC_STATUS_KANBAN {
+        TO_BE_RECEIVED(10, "TO_BE_RECEIVED", "待收货"),
+        RECEIVING(20, "RECEIVING", "收货中"),
+        DELAYED_NON_RECEIPT(30, "DELAYED_NON_RECEIPT", "延迟未收货"),
+        COMPLETED(40, "COMPLETED", "已完成");
+
+        private int value;
+        private String code;
+        private String description;
+
+        REC_STATUS_KANBAN(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
      * 订单明细状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -515,7 +572,8 @@ public class WmsEnumUtil {
         SPILLAGE_LOCATE(70, "Y", "溢料库"),
         TRANSIT_LOCATE(80, "T", "在途库"),
         UTENSIL_LOCATE(90, "U", "器具库"),
-        OPERATION_PALTFORM(100, "W", "工作台");
+        OPERATION_PALTFORM(100, "W", "工作台"),
+        CUST_LOCATE(110, "CUST", "客户库位");
 
         private int value;
         private String code;
@@ -1649,6 +1707,42 @@ public class WmsEnumUtil {
      * 质检业务状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_STATUS {
+        INSPECTION_FREE(10, "免检"),
+        PENDING_QUALITY_INSPECTION(20, "待质检"),
+        QUALITY_INSPECTION_COMPLETED(30, "质检完成");
+
+        private int value;
+        private String description;
+
+        QC_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 质检业务状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QC_INFO_STATUS {
         CREATE(10, "新建"),
         FINISH(20, "处理中"),
@@ -2546,7 +2640,8 @@ public class WmsEnumUtil {
         BOX(10, "BOX", "BOX（盒）"),
         CARTON(20, "CARTON", "CARTON（箱）"),
         PALLET(30, "PALLET", "PALLET（栈板）"),
-        CONTAINER(40, "PALLET", "PALLET（集装箱）");
+        CONTAINER(40, "PALLET", "PALLET（集装箱）"),
+        FEEDER(50, "FEEDER", "料架");
 
         private String code;
         private String description;
@@ -2569,6 +2664,16 @@ public class WmsEnumUtil {
         public String getDescription() {
             return description;
         }
+
+        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;
+        }
     }
 
     /**
@@ -8454,4 +8559,154 @@ public class WmsEnumUtil {
             return null;
         }
     }
+
+    /**
+     * RFID操作类型枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RFID_OPERATE_TYPE {
+        IN_STORAGE(10, "IN_STORAGE", "入库"),
+        SHIPEMNT(20, "SHIPEMNT", "发运"),
+        BACK_STORAGE(30, "BACK_STORAGE", "回库"),
+        UN_BUNDING(40, "UN_BUNDING", "解绑"),
+        BUNDING(50, "BUNDING", "绑定");
+
+        private String code;
+        private String description;
+        int value;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        RFID_OPERATE_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        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 String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        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;
+        }
+
+        public static RFID_OPERATE_TYPE codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * 频次
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FREQUENCY {
+        ORDER_GENERATE(10, "MULTI_FREQUENCY", "多频次"),
+        STRATEGIC_ACTION(20, "NON_MULTI_FREQUENCY", "非多频次"),
+        TASK_GENERATE(30, "AMP", "AMP");
+
+        private int value;
+        private String code;
+        private String description;
+
+        FREQUENCY(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+         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 String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        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;
+        }
+
+        public static FREQUENCY codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
 }

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

@@ -36,7 +36,7 @@ public class MesJitIssueCfg extends BaseBean implements Serializable {
     private String custPlantCode;
 
     @Column(name = "QTY")
-    @ApiParam("数量")
+    @ApiParam("配置数量")
     private Integer qty;
 
     @Column(name = "THRESHOLD_QTY")

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

@@ -58,6 +58,14 @@ public class MesObjectCfg extends BaseBean implements Serializable {
     @ApiParam("是否保存 1存 2不存")
     private Integer isSave;
 
+    @Column(name = "SHOW_SEQ")
+    @ApiParam("显示顺序")
+    private Integer showSeq;
+
+    @Column(name = "IS_SHOW")
+    @ApiParam("是否显示")
+    private Integer isShow;
+
     @Transient
     @ApiParam("是否存储名")
     private String isSaveName;

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

@@ -27,14 +27,14 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PROD_CFG_TYPE")
-@Api("产品配置类型")
+@Api("项目")
 public class MesProdCfgType extends BaseBean implements Serializable {
     private static final long serialVersionUID = -1726288926948811617L;
     @Column(name = "PROD_CFG_TYPE_CODE")
-    @ApiParam("产品配置类型代码")
+    @ApiParam("项目代码")
     private String prodCfgTypeCode;
 
     @Column(name = "PROD_CFG_TYPE_NAME")
-    @ApiParam("产品配置类型名称")
+    @ApiParam("项目名称")
     private String prodCfgTypeName;
 }

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

@@ -68,4 +68,8 @@ public class MesProdPack extends BaseBean implements Serializable {
     @Column(name = "PROD_CFG_TYPE")
     @ApiParam("项目")
     private String prodCfgType;
+
+    @Column(name = "CUST_LABEL_TEMPLATE")
+    @ApiParam("客户标签模板")
+    private String custLabelTemplate;
 }

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

@@ -78,6 +78,10 @@ public class MesProdRouteOptParam extends BaseBean implements Serializable {
     @ApiParam("是否执行 1=是 2=否")
     private Integer isActive;
 
+    @Column(name = "STEP_DISPLAY_NAME")
+    @ApiParam("工步展示名称")
+    private String stepDisplayName;
+
     @Transient
     @Column(name = "PARAM_ATTRIBUTE")
     @ApiParam("参数属性")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.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;
 
 /**
@@ -46,4 +47,8 @@ public class MesQueueGroupCount extends BaseBean implements Serializable {
     @Column(name = "CNT_QTY")
     @ApiParam("累计数")
     private Integer cntQty;
+
+    @Column(name = "GROUP_SIDE")
+    @ApiParam("料架摆放位置")
+    private String groupSide;
 }

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

@@ -14,7 +14,7 @@ import javax.persistence.Table;
 import java.io.Serializable;
 
 /**
- * @Description :MES_QUEUE_GROUP_COUNT
+ * @Description :
  * @Reference :
  * @Author : joke
  * @CreateDate : 2020-03-06 10:16 上午

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

@@ -116,6 +116,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("已生产数量")
     private Double finsihQty;
 
+    @Column(name = "GROUP_SIDE")
+    @ApiParam("料架摆放位置")
+    private String groupSide;
+
     @Transient
     @ApiParam("Vin")
     private String vinCode;

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

@@ -58,6 +58,10 @@ public class MesRouteProcessStep extends BaseBean implements Serializable {
     @ApiParam("工步参数值")
     private String paramValue;
 
+    @Column(name = "STEP_DISPLAY_NAME")
+    @ApiParam("工步展示名称")
+    private String stepDisplayName;
+
     @Transient
     @Column(name = "PARAM_ATTRIBUTE")
     @ApiParam("参数属性")

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

@@ -282,6 +282,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("零件名称集合")
     private String partNameList;
 
+    @Transient
+    @ApiParam("客户集合")
+    private List<String> custList;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -60,6 +60,9 @@ public class PaintWorkOrderSnModel extends BaseBean {
     @ApiParam("父阶物料名称")
     private String parentPartName;
 
+    @ApiParam("实际包装数量")
+    private Integer compQty;
+
     private List<ProdPackModel> prodPackageList;
 
     private String partNameRdd;

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

@@ -21,6 +21,9 @@ public class ProdPackModel implements Serializable {
     @ApiParam("产品条码")
     public String productSn;
 
+    @ApiParam("过程条码")
+    private String serialNumber;
+
     // 包装主表--包装编号
     @ApiParam("一检箱条码")
     public String packageNo;
@@ -33,6 +36,9 @@ public class ProdPackModel implements Serializable {
     @ApiParam("箱条码状态")
     public Integer printStatus;
 
+    @ApiParam("打印状态")
+    public String printStatusDesc;
+
     // 涂装客户标签打印
     @ApiParam("客户标签")
     public String custSn;
@@ -43,7 +49,7 @@ public class ProdPackModel implements Serializable {
 
     // 涂装客户标签打印
     @ApiParam("更新时间")
-    public String modifyDateTime;
+    public String modifyDatetime;
 
     @ApiParam("工单号")
     public String workOrderNo;
@@ -57,18 +63,18 @@ public class ProdPackModel implements Serializable {
     public ProdPackModel() {
     }
 
-    public ProdPackModel(String productSn, String packageNo, String createDatetime, Integer printStatus) {
+    public ProdPackModel(String serialNumber, String packageNo, String createDatetime, Integer printStatus) {
-        this.productSn = productSn;
+        this.serialNumber = serialNumber;
         this.packageNo = packageNo;
         this.createDatetime = createDatetime;
         this.printStatus = printStatus;
     }
 
-    public ProdPackModel(String productSn, String packageNo, String custSn, String processCode, String modifyDateTime) {
+    public ProdPackModel(String serialNumber, String packageNo, String custSn, Integer printStatus, String modifyDatetime) {
-        this.productSn = productSn;
+        this.serialNumber = serialNumber;
         this.packageNo = packageNo;
         this.custSn = custSn;
-        this.processCode = processCode;
+        this.printStatus = printStatus;
-        this.modifyDateTime = modifyDateTime;
+        this.modifyDatetime = modifyDatetime;
     }
 }

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

@@ -203,7 +203,7 @@ public class QueueOrderModel implements Serializable {
 
     //getWaitQueueOrderModelNoSn
     public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
-                           String partNo, String partNameRdd, String workType, Double finsihQty, Double qty,String pptCode) {
+                           String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode) {
         this.serialNumber = serialNumber;
         this.id = id;
         this.queueSeq = queueSeq;
@@ -217,10 +217,12 @@ public class QueueOrderModel implements Serializable {
         this.finsihQty = finsihQty;
         this.qty = qty;
         this.orderNo = orderNo;
-        this.pptCode=pptCode;
+        this.pptCode = pptCode;
+        this.produceCategoryCode = produceCategoryCode;
     }
+
     //getAlreadyQueueOrderModelNoSn
-    public QueueOrderModel(String serialNumber,String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
+    public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
                            String partNo, String partNameRdd, String workType) {
         this.id = id;
         this.queueSeq = queueSeq;
@@ -232,7 +234,7 @@ public class QueueOrderModel implements Serializable {
         this.partNameRdd = partNameRdd;
         this.workType = workType;
         this.orderNo = orderNo;
-        this.serialNumber=serialNumber;
+        this.serialNumber = serialNumber;
     }
 
     //料架分组队列展示组件-getQueueOrderDetailListByQueueGroupNo
@@ -251,7 +253,7 @@ public class QueueOrderModel implements Serializable {
     }
 
     // getQueueOrderBySerialNumber
-    public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode, String produceCategoryCode, String workType) {
+    public QueueOrderModel(Long id, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType) {
         this.id = id;
         this.queueGroupNo = queueGroupNo;
         this.jitLotNo = jitLotNo;

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

@@ -73,6 +73,9 @@ public class StepModel implements Serializable {
     @ApiParam("参数代码")
     private String paramCode;
 
+    @ApiParam("工步展示名称")
+    private String stepDisplayName;
+
     /**
      * 工作单元代码
      */
@@ -83,7 +86,7 @@ public class StepModel implements Serializable {
     }
 
     public StepModel(String stepCode, String stepName, String stepText, String stepType, String stepObject,
-                     String routeCode, String processCode, Integer stepSeq, String paramCode, String workCellCode) {
+                     String routeCode, String processCode, Integer stepSeq, String paramCode, String stepDisplayName, String workCellCode) {
         this.stepCode = stepCode;
         this.stepName = stepName;
         this.stepText = stepText;
@@ -93,6 +96,7 @@ public class StepModel implements Serializable {
         this.processCode = processCode;
         this.stepSeq = stepSeq;
         this.paramCode = paramCode;
+        this.stepDisplayName = stepDisplayName;
         this.workCellCode = workCellCode;
     }
 }

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

@@ -954,6 +954,12 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(qcOrder.getCheckType())) {
             DdlPreparedPack.getNumEqualPack(qcOrder.getCheckType(), "checkType", packBean);
         }
+        if (!StringUtils.isEmpty(qcOrder.getWorkCenterCode())) {
+            DdlPreparedPack.getNumEqualPack(qcOrder.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(qcOrder.getRelationOrderNo())) {
+            DdlPreparedPack.getNumEqualPack(qcOrder.getRelationOrderNo(), "relationOrderNo", packBean);
+        }
         // 时间段查询
         if (!StringUtils.isEmpty(qcOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrder.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(

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

@@ -630,6 +630,9 @@ public class MesPcnHqlPack {
         if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) {
             DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean);
         }
+        if (!CollectionUtils.isEmpty(mesWorkOrder.getCustList())) {
+            DdlPreparedPack.getInPackList(mesWorkOrder.getCustList(), "custCode", packBean);
+        }
         if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
             DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
         }

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

@@ -885,6 +885,23 @@ public class CoreHqlPack {
         return result;
     }
 
+
+    /**
+     * 任务复杂查询
+     *
+     * @param sysTask
+     * @return
+     */
+    public static DdlPackBean packHqlCheckSysTaskOnly(SysTask sysTask) {
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getNumNOEqualPack(sysTask.getId(), "id", result);
+        DdlPreparedPack.getStringEqualPack(sysTask.getName(), "name", result);
+        DdlPreparedPack.getStringEqualPack(sysTask.getTaskCode(), "taskCode", result);
+
+        return result;
+    }
+
     public static String packHqlSysLocaleLanguageExistDefaultByIds(Long[] ids) {
         StringBuffer result = new StringBuffer();
 

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java

@@ -39,10 +39,18 @@ public class IfPickData extends BaseBean implements Serializable {
     @ApiParam("区段编号")
     private String sectionNo;
 
+    @Column(name = "SECTION_TASK_NO")
+    @ApiParam("区段任务编号")
+    private String sectionTaskNo;
+
     @Column(name = "PART_NO")
     @ApiParam("物料编号")
     private String partNo;
 
+    @Column(name = "BIN位代码")
+    @ApiParam("物料编号")
+    private String binNo;
+
     @Column(name = "QTY")
     @ApiParam("拣货数量")
     private Integer qty;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java

@@ -335,6 +335,12 @@ public class PtlHqlPack {
         return packBean;
     }
 
+    /**
+     * 区域
+     * @param area
+     * @param organizeCode
+     * @return
+     */
     public static DdlPackBean getPtlArea(PtlArea area, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(area, organizeCode);
         DdlPreparedPack.getStringLikerPack(area.getAreaNo(), "areaNo", packBean);
@@ -342,6 +348,12 @@ public class PtlHqlPack {
         return packBean;
     }
 
+    /**
+     * 流程状态异常记录
+     * @param routeStatusErrorRecord
+     * @param organizeCode
+     * @return
+     */
     public static DdlPackBean getPtlRouteStatusErrorRecord(PtlRouteStatusErrorRecord routeStatusErrorRecord, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(routeStatusErrorRecord, organizeCode);
         DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getRouteCode(), "routeCode", packBean);
@@ -351,4 +363,16 @@ public class PtlHqlPack {
         DdlPreparedPack.getNumEqualPack(routeStatusErrorRecord.getHandleStatus(), "handleStatus", packBean);
         return packBean;
     }
+
+    /**
+     * IF_拣货数据
+     * @param pickData
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getIfPickData(IfPickData pickData, String organizeCode) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getNumEqualPack(pickData.getSyncFlag(), "syncFlag", packBean);
+        return packBean;
+    }
 }

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

@@ -16,6 +16,7 @@ import javax.persistence.Entity;
 import javax.persistence.Index;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : 盘点单冻结信息
@@ -154,6 +155,14 @@ public class WmsCSOrderDetails extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class,refForeignKey = "value",value = "description")
     public Integer differenceType;
 
+    /**
+     * 差异类型：10：盘平，20：盘亏，30盘赢
+     */
+    @Transient
+    @ApiParam("差异集合")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class, refForeignKey = "value", value = "description")
+    public List<Integer> differenceTypeList;
+
     public Integer getDifferenceTypeVal() {
         return this.differenceType == null ?
         -1: this.differenceType;

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

@@ -227,6 +227,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
     @ApiParam(value = "库位箱数")
     private Long qty;
 
+    @Transient
+    @ApiParam(value = "不等于库位类型")
+    private Integer notLocateType;
+
     public WmsLocate() {
     }
 

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

@@ -1,6 +1,10 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 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;
@@ -34,6 +38,7 @@ public class WmsPackage extends BaseBean {
     public String packageNo;
 
     @Column(name="PACKAGE_TYPE_ID")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PACKAGE_TYPE.class)
     @ApiParam(value = "包装类型", example = "1")
     public Integer packTypeId;
 
@@ -64,4 +69,9 @@ public class WmsPackage extends BaseBean {
     @Column(name="MEMO")
     @ApiParam(value = "备注")
     public String memo;
+
+    @Column(name = "LOCATE_NO")
+    @ApiParam(value = "库位代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String locateNo;
 }

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

@@ -284,6 +284,13 @@ public class WmsPart extends BaseBean {
     public Integer isRecycle;
 
 
+    @Column(name = "FREQUENCY")
+    @ApiParam(value = "频次", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FREQUENCY")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.FREQUENCY.class, refForeignKey = "value", value = "description", hidden = true)
+    private Integer frequency;
+
+
     public int getIqcVal() {
         return this.iqc == null ? 0 : this.iqc.intValue();
     }

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

@@ -0,0 +1,66 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+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;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : RFID条码操作记录表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-07-10 14:38
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_RFID_OPERATE_RECORD")
+@Api("RFID条码操作记录表")
+public class WmsRfidOperateRecord extends BaseBean {
+    private static final long serialVersionUID = -2506345764570725810L;
+
+    @Column(name="RFID_SN")
+    @ApiParam("RFID_条码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    public String rfidSn;
+
+    @Column(name="OPERATE_TYPE")
+    @ApiParam("操作类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PACKAGE_TYPE.class)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    public Integer operateType;
+
+    @Column(name="SRC_LOCATE")
+    @ApiParam("源库位")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    public String srcLocate;
+
+    @Column(name="DEST_LOCATE")
+    @ApiParam("目标库位")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    public String destLocate;
+
+    @Column(name="SRC_QTY")
+    @ApiParam("源数量")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    public Integer srcQty;
+
+    @Column(name="DEST_QTY")
+    @ApiParam("目标数量")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    public Integer destQty;
+}

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

@@ -499,6 +499,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "检测结果ID")
     private Long summaryId;
 
+    @Transient
+    @ApiParam(value = "颜色")
+    private String color;
+
     public WmsStockSn() {
     }
 
@@ -745,7 +749,7 @@ public class WmsStockSn extends BaseBean {
                       String shippingFlag, String workCenterCode, Integer snType,
                       String packagePartNo, Integer useCount, Integer seqNo,
                       String whNameRdd, String locateNameRdd, String zoneNameRdd, String partTypeDesc,
-                      String prodCfgTypeName, String custNameRdd, String workOrderCode) {
+                      String prodCfgTypeName, String custNameRdd, String workOrderCode, String color) {
         this.organizeCode = organizeCode;
         this.id = id;
         this.sn = sn;
@@ -792,6 +796,7 @@ public class WmsStockSn extends BaseBean {
         this.prodCfgTypeName = prodCfgTypeName;
         this.custNameRdd = custNameRdd;
         this.workOrderCode = workOrderCode;
+        this.color = color;
     }
 
 

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

@@ -100,30 +100,29 @@ public class WmsTractics extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
     private String tracticsEndTime;
 
-    @Column(name="LEV1_STRATEGY")
+    @Column(name="LEV1_STRATEGY_PUT")
     @ApiParam(value ="1级策略上架")
     @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_ONE.class, refForeignKey = "value", value = "description")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_ONE")
-    private Integer lev1Strategy;
+    private Integer lev1StrategyPut;
 
-//    @Column(name="LEV1_STRATEGY")
+    @Column(name="LEV1_STRATEGY_PICKING")
-    @Transient
     @ApiParam(value ="1级策略拣货")
     @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_TRACTICS_ITEM_ONE.class, refForeignKey = "value", value = "description")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "PICKING_TRACTICS_ITEM_ONE")
     private Integer lev1StrategyPicking;
 
-    @Column(name="LEV2_STRATEGY")
+    @Column(name="LEV2_STRATEGY_PUT")
     @ApiParam(value ="2级策略")
     @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_TWO.class, refForeignKey = "value", value = "description")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_TWO")
-    private Integer lev2Strategy;
+    private Integer lev2StrategyPut;
 
-    @Column(name="LEV3_STRATEGY")
+    @Column(name="LEV3_STRATEGY_PUT")
     @ApiParam(value ="3级策略")
     @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_THREE.class, refForeignKey = "value", value = "description")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_THREE")
-    private Integer lev3Strategy;
+    private Integer lev3StrategyPut;
 
 //    public String getIev1StrategyPicking (String lev1StrategyPicking) {
 //        return this.lev1Strategy = lev1StrategyPicking;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java

@@ -14,7 +14,7 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class MappingItem {
+public class MappingItem implements Comparable<MappingItem> {
     /**
      * 来源字段名称
      */
@@ -38,6 +38,11 @@ public class MappingItem {
      */
     public Object defaultValue;
 
+    /**
+     * 字段的顺序号
+     */
+    public int seq;
+
     @Override
     public String toString() {
         return "srcName:"
@@ -45,6 +50,12 @@ public class MappingItem {
                 + this.destBeanName + ", destName"
                 + this.destName + ", defaultValue:"
                 + this.defaultValue + ", destPk:"
-                + this.destPk;
+                + this.destPk + ", seq:"
+                + this.seq;
+    }
+
+    @Override
+    public int compareTo(MappingItem o) {
+        return this.seq - o.seq;
     }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsReceiptKanbanDto.java

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author :QianHuaSheng
+ * @CreateDate : 2020-07-09 9:50 上午
+ * @Modify:
+ **/
+@Data
+@Api("静态盘点查询输出实体类")
+public class WmsReceiptKanbanDto {
+
+    @ApiParam(value = "供应商编号")
+    private String vendorNo;
+
+    @ApiParam(value = "频次")
+    private String frequency;
+
+    @ApiParam(value = "供应商名称")
+    private String verdorName;
+
+    @ApiParam(value = "订单号")
+    private String orderNo;
+
+
+    @ApiParam(value = "道口")
+    private String dock;
+
+    @ApiParam(value = "项目")
+    private String prodCfgTypeCode;
+
+    @ApiParam(value = "窗口时间")
+    private String planDate;
+
+    @ApiParam(value = "开始收货时间")
+    private String earliestReceTime;
+
+    @ApiParam(value = "结束收货时间")
+    private String latestReceTime;
+
+    @ApiParam(value = "收货状态")
+    private String receStatus;
+
+    @ApiParam(value = "质检状态")
+    private String qcStatus;
+
+    @ApiParam(value = "工厂代码")
+    private String organizeCode;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRfidOperateRecordRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsRfidOperateRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : RFID条码操作记录表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-07-10 14:46
+ * @Modify:
+ **/
+@Repository
+public interface WmsRfidOperateRecordRepository extends BaseRepository<WmsRfidOperateRecord, Long> {
+}

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

@@ -198,6 +198,7 @@ public class WmsHqlPack {
         DdlPackBean packBean = new DdlPackBean();
         //查询参数封装
         DdlPreparedPack.getNumEqualPack(wmsPackage.getOrganizeCode(), "organizeCode", packBean);
+        DdlPreparedPack.getStringLikerPack(wmsPackage.getMemo(), "memo", packBean);
         DdlPreparedPack.getNumEqualPack(wmsPackage.getPrintStatus(), "printStatus", packBean);
         DdlPreparedPack.getStringLikePack(wmsPackage.getPackageNo()==null?"":wmsPackage.getPackageNo()+"%", "packageNo", packBean);
         DdlPreparedPack.getStringEqualPack(wmsPackage.getPackSpec(), "packSpec", packBean);
@@ -1756,13 +1757,13 @@ public class WmsHqlPack {
      * @param groupDataAuth
      * @return
      */
-    public static DdlPackBean packHqlWmsTaskDetail(Map<String, List<WmsDataAuth>> groupDataAuth, String refSrc, String organizeCode) {
+    /*public static DdlPackBean packHqlWmsTaskDetail(Map<String, List<WmsDataAuth>> groupDataAuth, String refSrc, String organizeCode) {
         DdlPackBean result = new DdlPackBean();
         Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet();
         //拼sql
         entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey()));
 
-        /*for (Map.Entry<String, List<WmsDataAuth>> map : entries) {
+        *//*for (Map.Entry<String, List<WmsDataAuth>> map : entries) {
 
             String key = map.getKey();
             List<WmsDataAuth> valueList = map.getValue();
@@ -1785,22 +1786,24 @@ public class WmsHqlPack {
                     packMutilConditionHql(mapList, "PART_NO", "partNo", result);
                 }
             }
-        }*/
+        }*//*
 
         //转换封装后的hql
-        /*String packedHql = result.getPackedHql();
+        *//*String packedHql = result.getPackedHql();
         if(packedHql.startsWith(" or")){
             packedHql = " and (" + packedHql.substring(3,packedHql.length()) + ") ";
             System.out.println(packedHql);
         }
 
-        result.setWhereAppend(packedHql);*/
+        result.setWhereAppend(packedHql);*//*
         // 通用数据拼接
         WmsDataAuth wmsDataAuth = new WmsDataAuth();
         wmsDataAuth.setOrganizeCode(organizeCode);
         getStringBuilderPack(wmsDataAuth, result);
         return result;
-    }
+    }*/
+
+
 
     /**
      * 把 List<Map> 中的一组数据重新封装到List<String>中
@@ -1845,7 +1848,7 @@ public class WmsHqlPack {
      * @param orderList
      * @return
      */
-    public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> orderList, Map<String, List<WmsDataAuth>> groupDataAuth) {
+    /*public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> orderList, Map<String, List<WmsDataAuth>> groupDataAuth) {
         DdlPackBean packBean = new DdlPackBean();
         Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet();
         //拼sql
@@ -1865,13 +1868,13 @@ public class WmsHqlPack {
             }
         }
         //转换封装后的hql
-        /*String packedHql = packBean.getPackedHql();
+        *//*String packedHql = packBean.getPackedHql();
         if(packedHql.startsWith(" or")){
             packedHql = " and (" + packedHql.substring(3,packedHql.length()) + ") ";
             System.out.println(packedHql);
         }
 
-        packBean.setWhereAppend(packedHql);*/
+        packBean.setWhereAppend(packedHql);*//*
         DdlPreparedPack.getInPackList(orderList, columnName, packBean);
         DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean);
         DdlPreparedPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", packBean);
@@ -1880,7 +1883,7 @@ public class WmsHqlPack {
 
         DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, packBean);
         return packBean;
-    }
+    }*/
 
     /**
      * 根据条件查询dataAuth

sonar-project.properties

@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-TEST-SNAPSHOT
+sonar.projectVersion=1.0-DEV-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./