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

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;
@@ -7095,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

@@ -5103,6 +5103,36 @@ 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)

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

@@ -0,0 +1,50 @@
+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 List<List<String>> headModelList;
+
+    @ApiParam("列值")
+    private List<List<Double>> headValueModelList;
+
+}

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

@@ -3326,4 +3326,28 @@ 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);
+        }
+        return packBean;
+    }
 }

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/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;