【1721 BH-BH检测结果管理】

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

@@ -6506,4 +6506,61 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
+    /**
+     * 返修、挑选状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REWORK_STATUS {
+        INIT(10, "INIT", "初始化"),
+        BE_HANDLE(20, "BE_HANDLE", "待处理"),
+        FINISH(30, "FINISH", "已处理"),
+        NONE(40, "NONE", "不处理");
+
+        private int value;
+        private String code;
+        private String description;
+
+        REWORK_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;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }

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

@@ -0,0 +1,63 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 检测结果明细表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-04-23 11:03
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_TEST_RESULT_DETAILS")
+@Api("检测结果明细表")
+public class WmsTestResultDetails extends BaseBean {
+
+    private static final long serialVersionUID = -3295112411840494690L;
+    @Column(name = "BH_CODE")
+    @ApiParam("BH号")
+    public String bhCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线代码")
+    public String workCenterCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    public String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    public String partName;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("大检测项类型")
+    public Integer checkType;
+
+    @Column(name = "qr_code")
+    @ApiParam("二维码")
+    public String qrCode;
+
+    @Column(name = "is_qualified")
+    @ApiParam("是否合格")
+    public Integer isQualified;
+
+    @Column(name = "check_value")
+    @ApiParam("检测值")
+    public String checkValue;
+}

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

@@ -0,0 +1,79 @@
+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.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 :检测结果汇总表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-04-23 10:50
+ * @Modify:
+ **/
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_TEST_RESULT_SUMMARY")
+@Api("检测结果汇总表")
+public class WmsTestResultSummary extends BaseBean {
+
+    private static final long serialVersionUID = -4600850017207281216L;
+
+    @Column(name = "BH_CODE")
+    @ApiParam("BH号")
+    public String bhCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线代码")
+    public String workCenterCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    public String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    public String partName;
+
+    @Column(name = "FLAG_NO")
+    @ApiParam("客户发往地")
+    public String flagNo;
+
+    @Column(name = "IS_QUALIFIED")
+    @ApiParam("是否合格")
+    public Integer isQualified;
+
+    @Column(name = "REWORK_STATUS")
+    @ApiParam("返修状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer reworkStatus;
+
+    @Column(name = "REWORK_RESULT")
+    @ApiParam("返修结果")
+    public Integer reworkResult;
+
+    @Column(name = "PICK_STATUS")
+    @ApiParam("挑选状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description")
+
+    public Integer pickStatus;
+
+    @Column(name = "PICK_RESULT")
+    @ApiParam("挑选结果")
+    public Integer pickResult;
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTestResultDetailsRepository.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.WmsTestResultDetails;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 检测结果明细表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-04-23 11:03
+ * @Modify:
+ **/
+@Repository
+public interface WmsTestResultDetailsRepository extends BaseRepository<WmsTestResultDetails, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTestResultSummaryRepository.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.WmsTestResultSummary;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 检测结果汇总表
+ * @Reference :
+ * @Author : jimmy.z
+ * @CreateDate : 2020-04-23 11:03
+ * @Modify:
+ **/
+@Repository
+public interface WmsTestResultSummaryRepository extends BaseRepository<WmsTestResultSummary, Long> {
+}

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

@@ -3110,4 +3110,29 @@ public class WmsHqlPack {
         getStringBuilderPack(details, result);
         return result;
     }
+
+    /**
+     * 检测结果汇总表 分页查询
+     *
+     * @param wmsTestResultSummary
+     * @return
+     */
+    public static DdlPackBean packHqWmsTestResultSummary(WmsTestResultSummary wmsTestResultSummary) {
+        DdlPackBean result = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getStringLikerPack(wmsTestResultSummary.getBhCode(), "bhCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getWorkCenterCode(), "workCenterCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getFlagNo(), "flagNo", result);
+        DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getReworkResult(), "reworkStatus", result);
+        DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getPickStatus(), "pickStatus", result);
+        DdlPreparedPack.timeBuilder(wmsTestResultSummary.getCreateDateTimeStart(),
+                wmsTestResultSummary.getCreateDateTimeEnd(), "createDatetime", result, true);
+        DdlPreparedPack.timeBuilder(wmsTestResultSummary.getModifyDateTimeStart(),
+                wmsTestResultSummary.getModifyDateTimeEnd(), "modifyDateTime", result, true);
+        getStringBuilderPack(wmsTestResultSummary, result);
+
+        return result;
+    }
 }