From 9be6f3677df83a0f0d37b6d284a55e59e01bd11e Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 8 Nov 2018 10:23:48 +0800 Subject: [PATCH] =?UTF-8?q?wms=E5=B7=A5=E5=8E=82=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=B1=BB=E4=B9=A6=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 4 +- .../estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java | 60 ++++++++++++ .../i3plus/pojo/wms/bean/WmsMoveMentDetails.java | 4 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java | 44 +++++++++ .../estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 4 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java | 59 +++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsStockQuant.java | 108 ++++----------------- .../repository/WmsASNMasterDetailsRepository.java | 4 +- .../wms/repository/WmsASNMasterRepository.java | 4 +- .../repository/WmsPOMasterDetailsRepository.java | 4 +- .../pojo/wms/repository/WmsPOMasterRepository.java | 4 +- 11 files changed, 196 insertions(+), 103 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index fec412e..8322953 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -66,8 +66,8 @@ public class WmsASNMasterDetails extends BaseBean { * 状态:N=正常,C=行取消,R=已收货 */ @Column(name="STATUS") - @ApiParam("状态") - public String status; + @ApiParam(value = "状态", example = "1") + public Integer status; @Column(name="PACKAGE") @ApiParam("包装名称") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java new file mode 100644 index 0000000..5eadd36 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java @@ -0,0 +1,60 @@ +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 org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :责任区域分配信息 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-06 17:16 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_AREA_OWNER") +@DynamicInsert +@DynamicUpdate +@Api(value="责任区域分配信息",description = "责任区域分配信息") +public class WmsAreaOwner extends BaseBean { + + @Column(name = "WH_NO") + @ApiParam(value = "仓库代码") + private String whNo; + + @Column(name = "ZONE_NO") + @ApiParam(value = "存储区编号") + private String zoneNo; + + @Column(name = "LOCATE_NO") + @ApiParam(value = "库位编号") + private String locateNo; + + @Column(name="PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + private String vendorNo; + + @Column(name = "OWNER_USER_NO") + @ApiParam(value = "负责人") + private String ownerUserNo; + + @Column(name = "IS_PRE_ASSIGN") + @ApiParam(value = "是否预分配人员") + private String isPreAssign; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentDetails.java index 0dfb2ce..a2560d2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentDetails.java @@ -82,8 +82,8 @@ public class WmsMoveMentDetails extends BaseBean { * 状态:N=正常,C=行取消 */ @Column(name="STATUS") - @ApiParam("状态") - public String status; + @ApiParam(value = "状态", example = "1") + public Integer status; @Column(name="REMARK") @ApiParam("备注") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java new file mode 100644 index 0000000..40ac3af --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java @@ -0,0 +1,44 @@ +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 org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 物理包装信息 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="WMS_PACKAGE") +@Api("物理包装信息") +public class WmsPackage extends BaseBean { + + @Column(name="PACKAGE_NO") + @ApiParam("包装编号") + public String packageNo; + + @Column(name="PACKAGE_TYPE_ID") + @ApiParam(value = "包装类型", example = "1") + public Integer packTypeId; + + @Column(name="PARENT_PACKAGE_NO") + @ApiParam("上级包装编号") + public String parentPackageNo; + + @Column(name="SN") + @ApiParam("条码") + public String sn; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index 47a8fcb..7b08157 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -39,8 +39,8 @@ public class WmsQCDetails extends BaseBean { * 状态:N=正常,C=行取消 */ @Column(name="STATUS") - @ApiParam("状态") - public String status; + @ApiParam(value = "状态", example = "1") + public Integer status; @Column(name="REMARK") @ApiParam("备注") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java new file mode 100644 index 0000000..21a9a98 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java @@ -0,0 +1,59 @@ +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 org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 待打印信息 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="WMS_SN_PRINT") +@Api("待打印信息") +public class WmsSnPrint extends BaseBean { + + @Column(name="SRC_TYPE") + @ApiParam("来源单据类型") + public String srcType; + + @Column(name="SRC_NO") + @ApiParam("来源单据编号") + public String srcNo; + + @Column(name="PRINT_CONTEXT") + @ApiParam("打印内容") + public String printContext; + + @Column(name="REMARK") + @ApiParam("备注") + public String reMark; + + /** + * 状态:0=创建,5=待处理,10=已处理 + */ + @Column(name="STATUS") + @ApiParam(value = "状态", example = "0") + public Integer status; + + @Column(name="PRINT_TEMPLET") + @ApiParam("打印模板") + public String printTemplet; + + @Column(name="PRINT_MACHINE") + @ApiParam("打印机") + public String printMachine; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java index fdd7066..d11ec7a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java @@ -15,7 +15,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * @Description : 库存表 + * @Description : 库存信息 * @Reference : * @Author : jessica.chen * @CreateDate : 2018-11-02 11:06 @@ -23,35 +23,12 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_STOCK_QUANT") +@Table(name="WMS_STOCK_QUAN") @DynamicInsert @DynamicUpdate -@Api(value="库存表",description = "库存表") +@Api(value="库存信息",description = "库存信息") public class WmsStockQuant extends BaseBean{ - @Column(name="CUST_ID") - @ApiParam(value ="客户编号",example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long custId; - - @Column(name="CUST_CODE") - @ApiParam(value ="客户代码") - private String custCode; - - @Column(name="SUPP_ID") - @ApiParam(value ="供应商编号",example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long suppId; - - @Column(name="SUPP_CODE") - @ApiParam(value ="供应商代码") - private String suppCode; - - @Column(name="PART_ID") - @ApiParam(value ="零件id", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long partId; - @Column(name="PART_NO") @ApiParam(value ="零件编号") private String partNo; @@ -60,74 +37,27 @@ public class WmsStockQuant extends BaseBean{ @ApiParam(value ="零件名称") private String partNameRdd; - @Column(name="UNIT") - @ApiParam(value ="采购单位") - private String unit; + @Column(name="QTY") + @ApiParam(value = "可用数量", example = "0") + public Double qty; - @Column(name="QIT") - @ApiParam(value ="库存数", example = "0") - private Double qit; + @Column(name="UNIT") + @ApiParam("单位") + public String unit; - @Column(name="ERP_WAREHOUSE") - @ApiParam(value ="收货库存地") - private String erpWareHouse; + @Column(name="TOTAL_QTY") + @ApiParam(value ="总数量", example = "0") + private Double totalQty; - @Column(name="WH_ID") - @ApiParam(value ="仓库编号",example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long whId; + @Column(name="ZONE_NO") + @ApiParam(value ="存储区编号") + private String zoneNo; - @Column(name="WH_CODE") + @Column(name="WH_NO") @ApiParam(value ="仓库代码") - private String whCode; + private String whNo; - @Column(name="LOC_ID") - @ApiParam(value ="库位编号",example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long locId; - - @Column(name="LOC_CODE") + @Column(name="LOCATE_NO") @ApiParam(value ="库位代码") - private String locCode; - - public Long getCustId() { - if(custId != null) { - return custId.longValue(); - }else{ - return custId; - } - } - - public Long getSuppId() { - if(suppId != null) { - return suppId.longValue(); - }else{ - return suppId; - } - } - - public Long getPartId() { - if(partId != null) { - return partId.longValue(); - }else{ - return partId; - } - } - - public Long getWhId() { - if(whId != null) { - return whId.longValue(); - }else{ - return whId; - } - } - - public Long getLocId() { - if(locId != null) { - return locId.longValue(); - }else{ - return locId; - } - } - + private String locateNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsASNMasterDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsASNMasterDetailsRepository.java index 00e94fd..55bb6fc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsASNMasterDetailsRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsASNMasterDetailsRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.WmsASNMasterDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsAsnMasterDetails; import org.springframework.stereotype.Repository; /** @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface WmsASNMasterDetailsRepository extends BaseRepository { +public interface WmsASNMasterDetailsRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsASNMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsASNMasterRepository.java index 9644b9f..1dd5da5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsASNMasterRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsASNMasterRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.WmsASNMaster; +import cn.estsh.i3plus.pojo.wms.bean.WmsAsnMaster; import org.springframework.stereotype.Repository; /** @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface WmsASNMasterRepository extends BaseRepository { +public interface WmsASNMasterRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPOMasterDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPOMasterDetailsRepository.java index a12a784..33995c0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPOMasterDetailsRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPOMasterDetailsRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.WmsPOMasterDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsPoMasterDetails; import org.springframework.stereotype.Repository; /** @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface WmsPOMasterDetailsRepository extends BaseRepository { +public interface WmsPOMasterDetailsRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPOMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPOMasterRepository.java index cd937c8..5ecdfe7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPOMasterRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPOMasterRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.WmsPOMaster; +import cn.estsh.i3plus.pojo.wms.bean.WmsPoMaster; import org.springframework.stereotype.Repository; /** @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface WmsPOMasterRepository extends BaseRepository { +public interface WmsPOMasterRepository extends BaseRepository { }