BH 需求变更

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

@@ -7047,9 +7047,10 @@ public class WmsEnumUtil {
         REPORT(10, "REPORT", "报工"),
         UNTYING(20, "UNTYING", "解绑"),
         CHECK(30, "CHECK", "检测"),
-        REPAIR(40, "REPAIR", "挑选返修"),
+        PICK(40, "REPAIR", "挑选"),
-        BIND(50, "BIND", "绑定"),
+        REPAIR(50, "REPAIR", "返修"),
-        OUTSTOCK(60, "OUTSTOCK", "出库");
+        BIND(60, "BIND", "绑定"),
+        OUTSTOCK(70, "OUTSTOCK", "出库");
         private int value;
         private String code;
         private String description;

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

@@ -48,7 +48,7 @@ public class WmsPartCheckType extends BaseBean {
 
     @Column(name = "CHECK_TYPE_CODE")
     @ApiParam("检测大类")
-    public String checkTypeCode;
+    public Integer checkTypeCode;
 
     @Column(name = "SAMPLE_SIZE")
     @ApiParam("样本数")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.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.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;
@@ -13,6 +15,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description :  产品条码事务表
@@ -27,11 +31,12 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_SERIAL_SN_TRANS")
-@Api("班次信息")
+@Api("产品条码事务表")
 public class WmsSerialSnTrans extends BaseBean {
 
     @Column(name = "BATCH_NO")
-    @ApiParam("batch号")
+    @ApiParam(value = "BATCH号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String batchNo;
 
     @Column(name="SERIAL_SN")
@@ -40,15 +45,22 @@ public class WmsSerialSnTrans extends BaseBean {
 
     @Column(name="BH_TYPE")
     @ApiParam("BH类型")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FG_INSTOCK_SN_TYPE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class, refForeignKey = "value", value = "description")
     private Integer bhType;
 
     @Column(name = "PART_NO")
-    @ApiParam("物料号")
+    @ApiParam(value = "物料编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
     private String partNo;
 
     @Column(name = "PART_NAME_RDD")
-    @ApiParam("物料名称")
+    @ApiParam(value = "物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName")
     private String partNameRdd;
 
     @Column(name="SRC_STOCK_SN")
@@ -61,8 +73,20 @@ public class WmsSerialSnTrans extends BaseBean {
 
     @Column(name="TRANS_TYPE")
     @ApiParam("操作类型")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BACTH_TRANS_TYPE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class, refForeignKey = "value", value = "description")
     private Integer transType;
 
+    @Column(name = "IS_OK")
+    @ApiParam(value = "是否合格")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
+    private Integer isOk;
+
+    @Transient
+    @ApiParam("操作类型")
+    private List<Integer> transTypeLst;
+
     public WmsSerialSnTrans(WmsSerialSn wmsSerialSn, Integer transType) {
         this.organizeCode = wmsSerialSn.getOrganizeCode();
         this.batchNo = wmsSerialSn.getBatchNo();

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

@@ -410,7 +410,7 @@ public class WmsStockSn extends BaseBean {
 
     @Transient
     @ApiParam("大检测项类型")
-    public String checkTypeCode;
+    public Integer checkTypeCode;
 
     @Transient
     @ApiParam("样本数")

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

@@ -50,7 +50,7 @@ public class WmsTestResultDetails extends BaseBean {
 
     @Column(name = "CHECK_TYPE_CODE")
     @ApiParam("检测大类")
-    public String checkTypeCode;
+    public Integer checkTypeCode;
 
     @Column(name = "QR_CODE")
     @ApiParam("二维码")
@@ -77,7 +77,7 @@ public class WmsTestResultDetails extends BaseBean {
     public WmsTestResultDetails() {
     }
 
-    public WmsTestResultDetails(String partNo, String checkTypeCode, String bhCode, Long checkSize) {
+    public WmsTestResultDetails(String partNo, Integer checkTypeCode, String bhCode, Long checkSize) {
         this.partNo = partNo;
         this.checkTypeCode = checkTypeCode;
         this.bhCode = bhCode;

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

@@ -13,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description :检测结果汇总表
@@ -78,4 +80,12 @@ public class WmsTestResultSummary extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.BH_TEST_RESULT_STATUS.class, refForeignKey = "value", value = "description")
     public Integer pickResult;
 
+
+    @Transient
+    @ApiParam("BH类型")
+    private Integer bhType;
+
+    @Transient
+    @ApiParam("BH号")
+    private List<String> bhCodeLts;
 }

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

@@ -17,6 +17,7 @@ import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
 import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Strings;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
@@ -3174,11 +3175,23 @@ public class WmsHqlPack {
         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.getReworkStatus(), "reworkStatus", result);
+        if (wmsTestResultSummary.getIsQualified() != null) {
+            DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getIsQualified(), "isQualified", result);
+        }
+        List<String> qmsBH = wmsTestResultSummary.getBhCodeLts();
+        if (CollectionUtils.isEmpty(qmsBH)) {
+            qmsBH = new ArrayList<>();
+        }
+        if (!StringUtils.isNotBlank(wmsTestResultSummary.getBhCode())) {
+            qmsBH.add(wmsTestResultSummary.getBhCode());
+        }
+        if (CollectionUtils.isNotEmpty(qmsBH)) {
+            DdlPreparedPack.getInPackList(qmsBH, "bhCode", result);
+        }
         DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getPickStatus(), "pickStatus", result);
         if (StringUtils.isNotBlank(wmsTestResultSummary.getCreateDateTimeStart())) {
             DdlPreparedPack.timeBuilder(wmsTestResultSummary.getCreateDateTimeStart(),
@@ -3206,7 +3219,7 @@ public class WmsHqlPack {
         //查询参数封装
         DdlPreparedPack.getStringLikerPack(wmsTestResultDetails.getBhCode(), "bhCode", result);
         DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getWorkCenterCode(), "workCenterCode", result);
-        DdlPreparedPack.getNumEqualPack(wmsTestResultDetails.getCheckType(), "checkType", result);
+        //DdlPreparedPack.getNumEqualPack(wmsTestResultDetails.getCheckType(), "checkType", result);
         DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getQrCode(), "qrCode", result);
         if (StringUtils.isNotBlank(wmsTestResultDetails.getCreateDateTimeStart())) {
@@ -3235,7 +3248,7 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(checkType.getWorkCenterCode(), "workCenterCode", result);
         DdlPreparedPack.getStringEqualPack(checkType.getPartNo(), "partNo", result);
-        DdlPreparedPack.getNumEqualPack(checkType.getCheckType(), "checkType", result);
+        //DdlPreparedPack.getNumEqualPack(checkType.getCheckType(), "checkType", result);
         getStringBuilderPack(checkType, result);
         return result;
     }
@@ -3316,4 +3329,36 @@ public class WmsHqlPack {
         getStringBuilderPack(healthVariableResult, result);
         return result;
     }
+
+
+    /**
+     * 产品条码事务查询条件
+     *
+     * @param wmsSerialSnTrans
+     * @return
+     */
+    public static DdlPackBean packHqlWmsSerialSnTrans(WmsSerialSnTrans wmsSerialSnTrans) {
+
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(wmsSerialSnTrans.getBatchNo(), "batchNo", packBean);
+        DdlPreparedPack.getInPackList(wmsSerialSnTrans.getTransTypeLst(), "transType", packBean);
+        getStringBuilderPack(wmsSerialSnTrans, packBean);
+        return packBean;
+    }
+
+
+    /**
+     * BH检测大类表查询条件
+     *
+     * @param qmsStockSnExtBh
+     * @return
+     */
+    public static DdlPackBean packHqlQmsStockSnExtBh(QmsStockSnExtBh qmsStockSnExtBh) {
+
+        DdlPackBean packBean = new DdlPackBean();
+/*        DdlPreparedPack.getStringEqualPack(qmsStockSnExtBh.getBatchNo(), "batchNo", packBean);
+        DdlPreparedPack.getInPackList(wmsSerialSnTrans.getTransTypeLst(),"transType",packBean);
+        getStringBuilderPack(wmsSerialSnTrans, packBean);*/
+        return packBean;
+    }
 }