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 9adf080..e92e884 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 @@ -41,6 +41,7 @@ public class WmsSerialSnTrans extends BaseBean { @Column(name="SERIAL_SN") @ApiParam("产品条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String serialSn; @Column(name="BH_TYPE") @@ -65,15 +66,17 @@ public class WmsSerialSnTrans extends BaseBean { @Column(name="SRC_STOCK_SN") @ApiParam("源库存条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String srcStockSn; @Column(name="DEST_STOCK_SN") @ApiParam("目标库存条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String destStockSn; @Column(name="TRANS_TYPE") @ApiParam("操作类型") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BACTH_TRANS_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 1, dataSrc = "BACTH_TRANS_TYPE") @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class, refForeignKey = "value", value = "description") private Integer transType; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java index e137f64..b64d25b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.wms.modelbean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -18,26 +20,38 @@ public class WmsMoveInfoModel { @ApiParam(value = "操作时间") private String modifyDateTime; + @ApiParam(value = "物料号") private String partNo; + @ApiParam(value = "物料名称") private String partNameRdd; + @ApiParam(value = "交易类型") private String transTypeCode; + @ApiParam(value = "交易类型名称") private String transTypeName; + @ApiParam(value = "业务类型") - private String busiTypeCode; + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") + private Integer busiTypeCode; + @ApiParam(value = "处理数量") private String sumQty; + @ApiParam(value = "工厂代码") private String organizeCode; + + @ApiParam(value = "操作状态") - private String itemStatus; + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") + private Integer itemStatus; + public WmsMoveInfoModel() { } - public WmsMoveInfoModel(String modifyDateTime, String partNo, String partNameRdd, String transTypeCode, String transTypeName, String busiTypeCode, String sumQty, String organizeCode) { + public WmsMoveInfoModel(String modifyDateTime, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer busiTypeCode, String sumQty, String organizeCode) { this.modifyDateTime = modifyDateTime; this.partNo = partNo; this.partNameRdd = partNameRdd;