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 79ea203..cf8e1ea 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 @@ -2244,7 +2244,8 @@ public class WmsEnumUtil { MATERIAL(40, "MATERIAL", "物料对象"), TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象"), BUSI_TYPE(60, "BUSI_TYPE", "业务类型对象"), - BUSI_OPERATION_TYPE(70, "BUSI_OPERATION_TYPE", "业务操作对象"); + BUSI_OPERATION_TYPE(70, "BUSI_OPERATION_TYPE", "业务操作对象"), + BH_CHECK_TYPE(80, "BH_CHECK_TYPE", "检测大类对象"); private String code; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java index 20e8f31..32ce767 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java @@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 销售订单明细表 @@ -67,4 +68,8 @@ public class WmsDocSoDetails extends BaseBean { @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; + + @Transient + @ApiParam(value = "客户编号") + private String custCode; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java index 8498c36..17ae233 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java @@ -63,7 +63,7 @@ public class WmsPartItemCheck extends BaseBean { @Column(name = "STANDARD") @ApiParam("标准值") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) - private Double standard; + private Integer standard; @Column(name = "MAX") @ApiParam("最大值") 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 314f299..2a8d3bd 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 @@ -353,6 +353,14 @@ public class WmsStockSn extends BaseBean { @Transient private String requerimentCode; + @Transient + @ApiParam("大检测项类型") + public Integer checkType; + + @Transient + @ApiParam("样本数") + private Integer sampleSize; + public WmsStockSn() { } 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 5329861..a181556 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 @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 检测结果明细表 @@ -64,4 +65,18 @@ public class WmsTestResultDetails extends BaseBean { @Column(name = "check_value") @ApiParam("检测值") public String checkValue; + + @Transient + @ApiParam("已检测数") + private Long checkSize; + + public WmsTestResultDetails() { + } + + public WmsTestResultDetails(String partNo, Integer checkType, String bhCode, Long checkSize) { + this.partNo = partNo; + this.checkType = checkType; + this.bhCode = bhCode; + this.checkSize = checkSize; + } } 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 c928e2b..e564dc9 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 @@ -70,7 +70,6 @@ public class WmsTestResultSummary extends BaseBean { @Column(name = "PICK_STATUS") @ApiParam("挑选状态") @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description") - public Integer pickStatus; @Column(name = "PICK_RESULT") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java index 9cd45da..29d481e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java @@ -48,6 +48,9 @@ public class WmsDataAuthModel extends BaseBean { @ApiParam("业务类型列表") private List busiOperationTypeList; + @ApiParam("检测大类列表") + private List bhCheckTypeList; + @ApiParam( value = "新增操作", example = "0" diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartItemCheckModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartItemCheckModel.java new file mode 100644 index 0000000..d872ba4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartItemCheckModel.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 子检测项 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-29 16:23 + * @Modify: + **/ +@Data +@Api("子检测项model") +public class WmsPartItemCheckModel { + + @ApiParam("子检测项代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String checkItemCode; + + @ApiParam("子检测项名称") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String checkItemName; + + @ApiParam("子检测箱值类型") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_VALUE_TYPE") + private Integer valueType; + + @ApiParam("检测值") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double checkValue; + + @ApiParam("是否合格") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + public Integer isQualified; + + @ApiParam("标准值") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer standard; + + @ApiParam("最大值") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double max; + + @ApiParam("最小值") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double min; + +} 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 9be3c1c..86700bb 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 @@ -3204,4 +3204,19 @@ public class WmsHqlPack { return result; } + + /** + * 根据条件分页查询物料检测大类 + * + * @param checkType + * @return + */ + public static DdlPackBean packHqlWmsPartCheckType(WmsPartCheckType checkType) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(checkType.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(checkType.getPartNo(), "partNo", result); + DdlPreparedPack.getNumEqualPack(checkType.getCheckType(), "checkType", result); + getStringBuilderPack(checkType, result); + return result; + } }