【1722 BH-Bacth条码查询】

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

@@ -12,7 +12,11 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.Date;
 import java.util.List;
 
@@ -501,4 +505,28 @@ public class WmsStockSn extends BaseBean {
         this.modifyUser = modifyUser;
     }
 
+    public WmsStockSn(String organizeCode, String refSrc, String partNo, String partNameRdd, Integer snType,
+                      String locateNo, String workCenterCode, String packageNo, String shippingFlag, String lotNo, String dateCode, String fixLotNo
+            , String leftCode, Double qty, String sn, String createUser, String createDatetime, String modifyDatetime, String modifyUser) {
+        this.organizeCode = organizeCode;
+        this.refSrc = refSrc;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.snType = snType;
+        this.locateNo = locateNo;
+        this.workCenterCode = workCenterCode;
+        this.packageNo = packageNo;
+        this.shippingFlag = shippingFlag;
+        this.lotNo = lotNo;
+        this.dateCode = dateCode;
+        this.fixLotNo = fixLotNo;
+        this.leftCode = leftCode;
+        this.qty = qty;
+        this.sn = sn;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+    }
+
 }

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

@@ -1,6 +1,8 @@
 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;
@@ -47,6 +49,7 @@ public class WmsTestResultDetails extends BaseBean {
 
     @Column(name = "CHECK_TYPE")
     @ApiParam("大检测项类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BH_CHECK_TYPE.class, refForeignKey = "value", value = "description")
     public Integer checkType;
 
     @Column(name = "qr_code")
@@ -55,6 +58,7 @@ public class WmsTestResultDetails extends BaseBean {
 
     @Column(name = "is_qualified")
     @ApiParam("是否合格")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     public Integer isQualified;
 
     @Column(name = "check_value")

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

@@ -55,6 +55,7 @@ public class WmsTestResultSummary extends BaseBean {
 
     @Column(name = "IS_QUALIFIED")
     @ApiParam("是否合格")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     public Integer isQualified;
 
     @Column(name = "REWORK_STATUS")

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

@@ -3127,12 +3127,48 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getFlagNo(), "flagNo", result);
         DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getReworkResult(), "reworkStatus", result);
         DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getPickStatus(), "pickStatus", result);
+        if (StringUtils.isNotBlank(wmsTestResultSummary.getCreateDateTimeStart())) {
             DdlPreparedPack.timeBuilder(wmsTestResultSummary.getCreateDateTimeStart(),
                     wmsTestResultSummary.getCreateDateTimeEnd(), "createDatetime", result, true);
+        }
+
+        if (StringUtils.isNotBlank(wmsTestResultSummary.getModifyDateTimeStart())) {
             DdlPreparedPack.timeBuilder(wmsTestResultSummary.getModifyDateTimeStart(),
                     wmsTestResultSummary.getModifyDateTimeEnd(), "modifyDateTime", result, true);
+        }
         getStringBuilderPack(wmsTestResultSummary, result);
 
         return result;
     }
+
+    /**
+     * 检测结果明细表 分页查询
+     *
+     * @param wmsTestResultDetails
+     * @return
+     */
+    public static DdlPackBean packHqWmsTestResultDetails(WmsTestResultDetails wmsTestResultDetails) {
+        DdlPackBean result = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getStringLikerPack(wmsTestResultDetails.getBhCode(), "bhCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getWorkCenterCode(), "workCenterCode", result);
+        DdlPreparedPack.getNumEqualPack(wmsTestResultDetails.getCheckType(), "checkType", result);
+        DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getQrCode(), "qrCode", result);
+        if (StringUtils.isNotBlank(wmsTestResultDetails.getCreateDateTimeStart())) {
+            DdlPreparedPack.timeBuilder(wmsTestResultDetails.getCreateDateTimeStart(),
+                    wmsTestResultDetails.getCreateDateTimeEnd(), "createDatetime", result, true);
+        }
+
+        if (StringUtils.isNotBlank(wmsTestResultDetails.getModifyDateTimeStart())) {
+            DdlPreparedPack.timeBuilder(wmsTestResultDetails.getModifyDateTimeStart(),
+                    wmsTestResultDetails.getModifyDateTimeEnd(), "modifyDateTime", result, true);
+        }
+
+
+        getStringBuilderPack(wmsTestResultDetails, result);
+
+        return result;
+    }
 }