diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java index 1220b53..96ed7f1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java @@ -99,26 +99,26 @@ public class WmsTractics extends BaseBean { @ApiParam(value ="1级策略上架") @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_ONE.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_ONE") - private String lev1Strategy; + private Integer lev1Strategy; // @Column(name="LEV1_STRATEGY") @Transient @ApiParam(value ="1级策略拣货") @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_TRACTICS_ITEM_ONE.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "PICKING_TRACTICS_ITEM_ONE") - private String lev1StrategyPicking; + private Integer lev1StrategyPicking; @Column(name="LEV2_STRATEGY") @ApiParam(value ="2级策略") @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_TWO.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_TWO") - private String lev2Strategy; + private Integer lev2Strategy; @Column(name="LEV3_STRATEGY") @ApiParam(value ="3级策略") @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_THREE.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_THREE") - private String lev3Strategy; + private Integer lev3Strategy; // public String getIev1StrategyPicking (String lev1StrategyPicking) { // return this.lev1Strategy = lev1StrategyPicking; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStrategyModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStrategyModel.java new file mode 100644 index 0000000..26f97a1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStrategyModel.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.wms.bean.WmsTractics; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-15 13:21 + * @Modify: + **/ +@Data +@Api("策略返回model") +public class WmsStrategyModel { + + @ApiParam(value = "物料编号") + private String partNo; + + @ApiParam(value = "数量") + private Double qty; + + @ApiParam(value = "工厂代码") + private String organizeCode; + + @ApiParam("策略对象") + public WmsTractics wmsTractics; + + @ApiParam("List结果集") + public List resultList; + + @ApiParam("List结果集") + public List strategyList; + + @ApiParam("返回错误信息") + public String errorMsg; +}