diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 693435d..ebf60a2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -130,10 +130,14 @@ public class WmsMoveMaster extends BaseBean { @ApiParam("交易类型名称") private String transTypeName; + @Column(name="FIX_ID") + @ApiParam(value = "设备编号") + public String fixId; + public WmsMoveMaster(){}; public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus, - String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty) { + String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId) { this.id = id; this.orderNo = orderNo; this.organizeCode = organizeCode; @@ -149,7 +153,7 @@ public class WmsMoveMaster extends BaseBean { this.destZoneNo = destZoneNo; this.transQty = transQty; this.rejectQty = rejectQty; - + this.fixId = fixId; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java new file mode 100644 index 0000000..362093a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java @@ -0,0 +1,76 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : WMS_包装箱条码表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-07-17 11:32 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_PACK_SN") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="包装箱条码表",description = "包装箱条码表") +public class WmsPackSn extends BaseBean { + + @Column(name = "ORDER_NO") + @ApiParam(value = "订单号") + private String orderNo; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "物料名称") + private String partNameAdd; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "SID") + @ApiParam("SID") + private Double sId; + + @Column(name = "COMMIT_DATE") + @ApiParam(value = "提交日期") + private String commitDate; + + @Column(name = "COMMIT_TIME") + @ApiParam(value = "提交时间") + private String commitTime; + + @Column(name = "SN") + @ApiParam(value = "条码") + private String sn; + + /** + * 状态:10=新建,20=已处理,30=处理出错 PRODUCT_INSTOCK_STATUS + */ + @Column(name = "ORDER_STATUS") + @ApiParam(value = "状态") + private Integer orderStatus; + + /** + * 数据来源:ZMMES=知明MES,TBMES=MES接口 SRC_STATUS + */ + @Column(name = "SRC") + @ApiParam(value = "单据来源") + private String src; +} 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 2e6e363..20e8a9e 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 @@ -230,8 +230,11 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "ERP库存地") public String erpZoneNo; - public WmsStockSn(){} + @Transient + @ApiParam(value = "目标数量") + public Double destQty; + public WmsStockSn(){} public WmsStockSn(String partNo){ this.partNo = partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackSnRepository.java new file mode 100644 index 0000000..87d61ea --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackSnRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPackSn; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-07-17 13:36 + * @Modify: + **/ +@Repository +public interface WmsPackSnRepository extends BaseRepository { +}