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 3c36fe5..ae4fa00 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 @@ -104,6 +104,10 @@ public class WmsSerialSnTrans extends BaseBean { @ApiParam("操作类型") private List transTypeLst; + public int getIsOkVal() { + return this.isOk == null ? 0 : this.isOk; + } + 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/modelbean/WmsBatchModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBatchModel.java new file mode 100644 index 0000000..5d6f4d1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBatchModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.wms.bean.WmsSerialSn; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : Batch数据模型 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2021-04-05 14:53 + * @Modify: + **/ +@Data +@Api("Batch数据模型") +public class WmsBatchModel { + + @ApiParam("二维条码集合") + private List wmsSerialSns; + + @ApiParam("条码集合") + private List wmsStockSnList; + + @ApiParam("Batch号") + private String bhCode; + + @ApiParam("上一个熔深Batch号") + private String firstSnBatch; + + @ApiParam("新事务单号") + private String moveNo; + + @ApiParam("是否正常件") + private boolean flag; + + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("操作人") + private String userName; + +}