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 b9ad153..c801a52 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 @@ -775,6 +775,19 @@ public class WmsEnumUtil { return tmp; } + public static OUT_MOVEMENT_BUSI_TYPE codeOfs(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 1f57cde..e639538 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -212,6 +212,10 @@ public class WmsMoveToERP extends BaseBean { @Transient private Long finishedCounts; + @Column(name = "POD_DIR") + @ApiParam(value = "方向") + private Integer podDir; + @Transient private Long shippingId; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java index 90713b3..1d9ed2e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java @@ -72,4 +72,8 @@ public class WmsPackageSpec extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, isRequire = 2, dataSrc = "/wms/base-data/wms-package-spec/query", listColumnName = "specName", explicitColumnName = "specName") private String parentName; + + @Column(name = "DIRECTION") + @ApiParam(value = "方向") + private Integer direction; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java index 16100ef..9ace250 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java @@ -1,8 +1,13 @@ package cn.estsh.i3plus.pojo.wms.modelbean; +import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; +import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @Description : @@ -14,14 +19,36 @@ import java.util.List; @Data public class WmsAutoTaskModel { - String lockLocacte; - String lockCar; + @ApiParam("业务类型") + private Integer busiType; - Integer busiType; + @ApiParam("存储区") + private String zoneNo; - String srcZoneNo; - String descZoneNo; - List partList; + @ApiParam("物料集合") + private List partList; - String organizeCode; + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("交易类型") + private String transTypeCode; + + @ApiParam("锁定库位") + private String lockLocacte; + + @ApiParam("方向") + private Integer direction; + + @ApiParam("货格") + private String packageNo; + + @ApiParam("锁定料车") + private String lockCar; + + @ApiParam("物料对应的明细集合") + Map partNoDetailsList; + + @ApiParam("锁定条码") + HashMap> stringListHashMap; }