From 73c5e20c0165544937b35a531e7ec7f26d495c9b Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Tue, 13 Nov 2018 17:48:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E5=8D=95=E4=B8=BB=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E7=A7=BB=E5=BA=93=E5=8D=95=E8=AF=A6=E6=83=85=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsDocMovementDetails.java | 119 ++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 102 ++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsMoveMentDetails.java | 120 --------------------- .../i3plus/pojo/wms/bean/WmsMoveMentMaster.java | 101 ----------------- .../WmsDocMovementDetailsRepository.java | 16 +++ .../repository/WmsDocMovementMasterRepository.java | 16 +++ .../repository/WmsMoveMentDetailsRepository.java | 16 --- .../repository/WmsMoveMentMasterRepository.java | 16 --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 34 ++++++ 9 files changed, 287 insertions(+), 253 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentDetails.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentMaster.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementDetailsRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementMasterRepository.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentDetailsRepository.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentMasterRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java new file mode 100644 index 0000000..6680d2c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -0,0 +1,119 @@ +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 :移库单详情实体(用于转储类业务) + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2018-11-13 16:06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_DOC_MOVEMENT_DETAILS") +@Api("移库单详情表") +public class WmsDocMovementDetails extends BaseBean { + @Column(name = "ORDER_NO") + @ApiParam(value = "单号") + private String orderNo; + + @Column(name = "ITEM") + @ApiParam(value = "行号", example = "1") + private Integer item; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "物料名称") + private String partName; + + @Column(name = "UNIT") + @ApiParam(value = "单位") + private String unit; + + @Column(name = "SRC_WH") + @ApiParam(value = "发出库仓库") + private String srcWh; + + + @Column(name = "DEST_WH") + @ApiParam(value = "接收库仓库") + private String destWh; + + @Column(name = "QTY") + @ApiParam(value = "需求数量", example = "1") + private Double qty; + + @Column(name = "PRINT_QTY") + @ApiParam(value = "条码打印数量", example = "1") + private Double printQty; + + @Column(name = "FACT_QTY") + @ApiParam(value = "操作完成数量", example = "1") + private Double factQty; + + @Column(name = "ZDATE") + @ApiParam(value = "计划日期") + private String zdate; + + @Column(name = "ZTIME") + @ApiParam(value = "计划时间") + private String ztime; + + @Column(name = "SRC_NO") + @ApiParam(value = "源单号") + private String srcNo; + /** + * 状态:N=正常,C=行取消 + */ + @Column(name = "ITEM_STATUS") + @ApiParam(value = "状态", example = "1") + private Integer itemStatus; + + /** + * 是否免费:0=计费,1=免费 + */ + @Column(name = "IS_FREE") + @ApiParam(value = "是否免费", example = "1") + public Integer isFree; + + @Column(name = "REMARK") + @ApiParam(value = "操作原因") + private String remark; + + @Column(name = "PICK_QTY") + @ApiParam(value = "已配数量", example = "1") + private Double pickQty; + + @Column(name = "OUT_QTY") + @ApiParam(value = "已提交数量", example = "1") + private Double outQty; + + @Column(name = "INLINE_QTY") + @ApiParam(value = "已上线数量", example = "1") + private Double inlineQty; + + @Column(name = "REJECT_QTY") + @ApiParam(value = "退料数量", example = "1") + private Double rejectQty; + + @Column(name = "REJECT_POST_QTY") + @ApiParam(value = "退料提交数量", example = "1") + private Double rejectPostQty; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java new file mode 100644 index 0000000..1a3bc2a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -0,0 +1,102 @@ +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 :移库单实体(用于转储类业务) + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2018-11-13 16:06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_DOC_MOVEMENT_MASTER") +@Api("移库单表") +public class WmsDocMovementMaster extends BaseBean { + @Column(name = "ORDER_NO") + @ApiParam(value = "移库单单号") + private String orderNo; + /** + * 移动类型:IN=入库,OUT=出库,MOVE=移库 + */ + @Column(name = "MOVE_TYPE") + @ApiParam("移动类型") + public String moveType; + /** + * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发, + * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料, + * MI=移库入库,MO=移库出库,SO=发运 + */ + @Column(name = "BUSI_TYPE") + @ApiParam(value = "业务类型", example = "1") + public Integer busiType; + + /** + * 状态:0=新建,10=处理中 + * ,20=已完成,90=已关闭,91=已取消 + */ + @Column(name = "ORDER_STATUS") + @ApiParam(value = "状态", example = "1") + public Integer orderStatus; + + @Column(name = "CUSTOMER_NO") + @ApiParam(value = "客户编号") + private String customerNo; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编号") + private String vendorNo; + + @Column(name = "VERSION") + @ApiParam(value = "版本", example = "1") + private Integer version; + + /** + * 单据类型::1=工单配料 + */ + @Column(name = "REF_TYPE") + @ApiParam(value = "关联单据类型") + private String refType; + + @Column(name = "REF_NO") + @ApiParam(value = "关联单据") + private String refNo; + + @Column(name = "ERP_SRC_NO") + @ApiParam(value = "ERP单号") + private String erpSrcNo; + + /** + * 单据类型::1=工单配料 + */ + @Column(name = "ORDER_TYPE") + @ApiParam(value = "单据类型") + private String orderType; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "物料名称") + private String partName; + + @Column(name = "QTY") + @ApiParam(value = "数量", example = "1") + private Double qty; + +} 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 deleted file mode 100644 index a92ffd2..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentDetails.java +++ /dev/null @@ -1,120 +0,0 @@ -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 : 库存移动单明细信息 - * @Reference : - * @Author : silliter.yuan - * @CreateDate : 2018-11-06 15:58 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="WMS_DOC_MOVEMENT_DETAILS") -@Api("库存移动单明细信息") -public class WmsMoveMentDetails extends BaseBean { - - @Column(name="ORDER_NO") - @ApiParam("单号") - public String orderNo; - - @Column(name="ITEM") - @ApiParam("行号") - public String item; - - @Column(name="PART_NO") - @ApiParam("物料编码") - public String partNo; - - @Column(name="PART_NAME_RDD") - @ApiParam("物料名称") - public String partNameRdd; - - @Column(name="QTY") - @ApiParam(value = "需求数量", example = "0") - public Double qty; - - @Column(name="UNIT") - @ApiParam("单位") - public String unit; - - @Column(name="SRC_WH") - @ApiParam("发出库仓库") - public String srcWh; - - @Column(name="DEST_WH") - @ApiParam("接收库仓库") - public String destWh; - - @Column(name="PRINT_QTY") - @ApiParam("条码打印数量") - public String printQty; - - @Column(name="FACT_QTY") - @ApiParam("操作完成数量") - public String factQty; - - @Column(name="ZDATE") - @ApiParam("计划交货日期") - public String zDate; - - @Column(name="ZTIME") - @ApiParam("计划交货时间") - public String zTime; - - @Column(name="SRC_NO") - @ApiParam("源单号") - public String srcNo; - - /** - * 状态:N=正常,C=行取消 - */ - @Column(name="STATUS") - @ApiParam(value = "状态", example = "1") - public Integer status; - - @Column(name="REMARK") - @ApiParam("备注") - public String reMark; - - /** - * 是否免费:0=计费,1=免费 - */ - @Column(name="IS_FREE") - @ApiParam(value = "是否免费", example = "1") - public Integer isFree; - - @Column(name="PICK_QTY") - @ApiParam(value = "已配数量", example = "0") - public Double pickQty; - - @Column(name="OUT_QTY") - @ApiParam(value = "已提交数量", example = "0") - public Double outQty; - - @Column(name="INLINE_QTY") - @ApiParam(value = "已上线数量", example = "0") - public Double inLineQty; - - @Column(name="REJECT_QTY") - @ApiParam(value = "退料数量", example = "0") - public Double rejectQty; - - @Column(name="REJECT_POST_QTY") - @ApiParam(value = "退料提交数量", example = "0") - public Double rejectPostQty; -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentMaster.java deleted file mode 100644 index 92dc1ca..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentMaster.java +++ /dev/null @@ -1,101 +0,0 @@ -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 : 库存移动单主表信息(用于转储类业务) - * @Reference : - * @Author : silliter.yuan - * @CreateDate : 2018-11-06 15:58 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="WMS_DOC_MOVEMENT_MASTER") -@Api("库存移动单主表信息") -public class WmsMoveMentMaster extends BaseBean { - - @Column(name="ORDER_NO") - @ApiParam("单号") - public String orderNo; - - /** - * 移动类型:IN=入库,OUT=出库,MOVE=移库 - */ - @Column(name="MOVE_TYPE") - @ApiParam("移动类型") - public String moveType; - - /** - * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发, - * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料, - * MI=移库入库,MO=移库出库,SO=发运 - */ - @Column(name="TYPE") - @ApiParam("业务类型") - public String type; - - /** - * 状态:0=新建,10=处理中 - * ,20=已完成,90=已关闭,91=已取消 - */ - @Column(name="STATUS") - @ApiParam(value = "状态", example = "0") - public Integer status; - - @Column(name="CUSTOMER_NO") - @ApiParam("客户编号") - public String customerNo; - - @Column(name="VENDOR_NO") - @ApiParam("供应商编号") - public String vendorNo; - - @Column(name="VERSION") - @ApiParam("版本") - public String version; - - @Column(name="SRC") - @ApiParam("单据来源") - public String src; - - @Column(name="SRC_NO") - @ApiParam("关联单据") - public String srcNo; - - @Column(name="ERP_ORDERNO") - @ApiParam("ERP单号") - public String erpOrderNo; - - /** - * 单据类型:WO=工单配料 - */ - @Column(name="ORDER_TYPE") - @ApiParam("单据类型") - public String orderType; - - @Column(name="PART_NO") - @ApiParam("物料编码") - public String partNo; - - @Column(name="PART_NAME_RDD") - @ApiParam("物料名称") - public String partNameRdd; - - @Column(name="QTY") - @ApiParam(value = "需求数量", example = "0") - public Double qty; -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementDetailsRepository.java new file mode 100644 index 0000000..74e804a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementDetailsRepository.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.WmsDocMovementDetails; +import org.springframework.stereotype.Repository; + +/** +* @Description :库存移动单详情表的方法接口 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2018-11-13 10:19 +* @Modify: +**/ +@Repository +public interface WmsDocMovementDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementMasterRepository.java new file mode 100644 index 0000000..7dea50e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementMasterRepository.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.WmsDocMovementMaster; +import org.springframework.stereotype.Repository; + +/** +* @Description :库存移动单主表的方法接口 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2018-11-13 10:19 +* @Modify: +**/ +@Repository +public interface WmsDocMovementMasterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentDetailsRepository.java deleted file mode 100644 index ef0c9c5..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentDetailsRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.WmsMoveMentDetails; -import org.springframework.stereotype.Repository; - -/** - * @Description : 对象持久层仓用方法控制 - * @Reference : - * @Author : silliter.yuan - * @CreateDate : 2018-11-06 9:47 - * @Modify: - **/ -@Repository -public interface WmsMoveMentDetailsRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentMasterRepository.java deleted file mode 100644 index 6ea8bc5..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentMasterRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.WmsMoveMentMaster; -import org.springframework.stereotype.Repository; - -/** - * @Description : 对象持久层仓用方法控制 - * @Reference : - * @Author : silliter.yuan - * @CreateDate : 2018-11-06 9:47 - * @Modify: - **/ -@Repository -public interface WmsMoveMentMasterRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 98aca6c..63cbd80 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -13,6 +13,40 @@ import cn.estsh.i3plus.pojo.wms.bean.*; public class WmsHqlPack { /** + * 库存移动单详情查询封装 + * + * @param wmsDocMovementDetails + * @return + */ + public static String packWmsDocMovementDetails(WmsDocMovementDetails wmsDocMovementDetails) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsDocMovementDetails.getOrganizeCode(), "organizeCode", result); + + return result.toString(); + } + /** + * 库存移动单查询封装 + * + * @param wmsDocMovementMaster + * @return + */ + public static String packWmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", result); + HqlPack.getStringLikerPack(wmsDocMovementMaster.getMoveType(), "moveType", result); + HqlPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", result); + HqlPack.getNumEqualPack(wmsDocMovementMaster.getPartNo(), "partNo", result); + HqlPack.timeBuilder(wmsDocMovementMaster.getCreateDateTimeStart(), wmsDocMovementMaster.getCreateDateTimeEnd(), "createDatetime", result, true); + HqlPack.getNumEqualPack(wmsDocMovementMaster.getIsValid(), "isValid", result); + + return result.toString(); + } + /** * PO订单主表信息 分页查询 * * @param wmsPOMaster