From c06fee639df76f1f2b32093aefe817ae7ce0044d Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 23 May 2020 19:10:12 +0800 Subject: [PATCH] =?UTF-8?q?BH=20=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 7 +-- .../i3plus/pojo/wms/bean/WmsPartCheckType.java | 2 +- .../i3plus/pojo/wms/bean/WmsSerialSnTrans.java | 38 +++++++++++++--- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 2 +- .../i3plus/pojo/wms/bean/WmsTestResultDetails.java | 4 +- .../i3plus/pojo/wms/bean/WmsTestResultSummary.java | 10 +++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 51 ++++++++++++++++++++-- 7 files changed, 97 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index df02291..291b0be 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/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", "挑选返修"), - BIND(50, "BIND", "绑定"), - OUTSTOCK(60, "OUTSTOCK", "出库"); + PICK(40, "REPAIR", "挑选"), + REPAIR(50, "REPAIR", "返修"), + BIND(60, "BIND", "绑定"), + OUTSTOCK(70, "OUTSTOCK", "出库"); private int value; private String code; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java index 2056d58..a31a564 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java +++ b/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("样本数") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java index 3823d2b..aaec61f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java +++ b/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("物料号") + @Column(name = "PART_NO") + @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("物料名称") + @Column(name = "PART_NAME_RDD") + @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 transTypeLst; + public WmsSerialSnTrans(WmsSerialSn wmsSerialSn, Integer transType) { this.organizeCode = wmsSerialSn.getOrganizeCode(); this.batchNo = wmsSerialSn.getBatchNo(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 3ba3899..2a1bff0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/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("样本数") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java index eff8e6c..7ddd599 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java +++ b/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; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java index 3ff22dd..618a4c1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java +++ b/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 bhCodeLts; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index b6e03ad..d2e106f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/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 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; + } }