From c332718ffb6f3b54394acccac7a0217f1ddbc81f Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Sun, 18 Nov 2018 15:13:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=B8=94=E6=96=B0=E5=A2=9E=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 8 +++- .../cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 14 ++++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java | 8 +++- .../wms/repository/WmsQCDetailsRepository.java | 17 +++++++ .../pojo/wms/repository/WmsQCMasterRepository.java | 18 ++++++++ .../pojo/wms/repository/WmsQCTransRepository.java | 17 +++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 54 ++++++++++++++++++++++ 7 files changed, 128 insertions(+), 8 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCDetailsRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCMasterRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCTransRepository.java 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 4cfc25d..bf71c21 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 @@ -40,9 +40,9 @@ public class WmsQCDetails extends BaseBean { /** * 状态:N=正常,C=行取消 */ - @Column(name="STATUS") + @Column(name="ITEM_STATUS") @ApiParam(value = "状态", example = "1") - public Integer status; + public Integer itemStatus; @Column(name="REMARK") @ApiParam("备注") @@ -56,6 +56,10 @@ public class WmsQCDetails extends BaseBean { @ApiParam(value = "实检数量", example = "0") public Double factQty; + @Column(name="PASS_QTY") + @ApiParam(value = "实检数量", example = "0") + public Double passQty; + @Column(name="REJECT_QTY") @ApiParam(value = "不合格数量", example = "0") public Double rejectQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index 643ab9d..3d250b5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -36,16 +36,16 @@ public class WmsQCMaster extends BaseBean { * 业务类型:IQC=进料检验,IPQC=在线检验, * FQC=成品检验,OQC=出货检验 */ - @Column(name="TYPE") + @Column(name="ORDER_TYPE") @ApiParam("业务类型") - public String type; + public String orderType; /** * 状态:0=新建,5=待处理,10=已完成,90=已关闭,91=已取消 */ - @Column(name="STATUS") + @Column(name="ORDER_STATUS") @ApiParam(value = "状态", example = "0") - public Integer status; + public Integer orderStatus; @Column(name="REMARK") @ApiParam("备注") @@ -74,4 +74,10 @@ public class WmsQCMaster extends BaseBean { @Column(name="IB_NO") @ApiParam("入库单号") public String ibNo; + + @ApiParam(value ="客户简称") + private transient String custName; + + @ApiParam(value = "供应商简称") + private transient String VendorDesc; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java index 5991651..11b6767 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java @@ -39,9 +39,9 @@ public class WmsQCTrans extends BaseBean { /** * 状态:0=创建,10=已处理 */ - @Column(name="STATUS") + @Column(name="ITEM_STATUS") @ApiParam(value = "状态", example = "0") - public Integer status; + public Integer itemStatus; @Column(name="REMARK") @ApiParam("备注") @@ -63,6 +63,10 @@ public class WmsQCTrans extends BaseBean { @ApiParam("物料编码") public String partNo; + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + @Column(name="SN") @ApiParam("条码") public String sn; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCDetailsRepository.java new file mode 100644 index 0000000..9803076 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCDetailsRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsQCDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsQCMaster; +import org.springframework.stereotype.Repository; + +/** + * @Description : 质检单明细数据库操作类 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2018-11-18 11:25 + * @Modify: + **/ +@Repository +public interface WmsQCDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCMasterRepository.java new file mode 100644 index 0000000..554c7fb --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCMasterRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsAreaOwner; +import cn.estsh.i3plus.pojo.wms.bean.WmsQCMaster; +import org.springframework.stereotype.Repository; +import org.springframework.stereotype.Service; + +/** + * @Description : 质检单数据库操作类 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2018-11-18 10:25 + * @Modify: + **/ +@Repository +public interface WmsQCMasterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCTransRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCTransRepository.java new file mode 100644 index 0000000..a8878e1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCTransRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsQCDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsQCTrans; +import org.springframework.stereotype.Repository; + +/** + * @Description : 质检单操作明细数据库操作类 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2018-11-18 11:25 + * @Modify: + **/ +@Repository +public interface WmsQCTransRepository 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 8fb6631..36d5814 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 @@ -832,4 +832,58 @@ public class WmsHqlPack { getStringBuilderPack(wmsTransQuan, result); return result.toString(); } + + /** + * 质检单信息 查询条件封装 + * + * @param wmsQCMaster + * @return + */ + public static String packHqlWmsQCMaster(WmsQCMaster wmsQCMaster) { + StringBuffer result = new StringBuffer(); + //单号 + HqlPack.getStringLikerPack(wmsQCMaster.getOrderNo(), "orderNo", result); + //业务类型 + HqlPack.getStringEqualPack(wmsQCMaster.getOrderType(), "orderType", result); + //采购单号 + HqlPack.getStringLikerPack(wmsQCMaster.getPoNo(), "poNo", result); + //ASN单号 + HqlPack.getStringLikerPack(wmsQCMaster.getAsnNo(), "asnNo", result); + //入库单号 + HqlPack.getStringLikerPack(wmsQCMaster.getIbNo(), "ibNo", result); + + getStringBuilderPack(wmsQCMaster, result); + return result.toString(); + } + + /** + * 质检单明细信息 查询条件封装 + * + * @param wmsQCDetails + * @return + */ + public static String packHqlWmsQCDetails(WmsQCDetails wmsQCDetails) { + StringBuffer result = new StringBuffer(); + //单号 + HqlPack.getStringEqualPack(wmsQCDetails.getOrderNo(), "orderNo", result); + getStringBuilderPack(wmsQCDetails, result); + return result.toString(); + } + + /** + * 质检单操作明细信息 查询条件封装 + * + * @param wmsQCTrans + * @return + */ + public static String packHqlWmsQCTrans(WmsQCTrans wmsQCTrans) { + StringBuffer result = new StringBuffer(); + //单号 + HqlPack.getStringEqualPack(wmsQCTrans.getOrderNo(), "orderNo", result); + //行号 + HqlPack.getStringEqualPack(wmsQCTrans.getItem(), "item", result); + getStringBuilderPack(wmsQCTrans, result); + return result.toString(); + } + } From 64ea8f7fab99526be7da6eee98fea90deff00a13 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Sun, 18 Nov 2018 16:50:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E3=80=81=E7=9B=98=E7=82=B9=E5=86=BB=E7=BB=93?= =?UTF-8?q?=E8=A1=A8=E3=80=81=E7=9B=98=E7=82=B9=E5=AE=9E=E7=9B=98=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 231 +++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 6 +- .../i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 10 +- .../i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 14 +- .../wms/repository/WmsCSFactTransRepository.java | 14 ++ .../repository/WmsCSOrderDetailsRepository.java | 15 ++ .../wms/repository/WmsCSOrderMasterRepository.java | 14 ++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 49 +++++ 8 files changed, 338 insertions(+), 15 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSFactTransRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSOrderDetailsRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSOrderMasterRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 217cdd0..012b8a4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -794,6 +794,7 @@ public class WmsEnumUtil { return tmp; } } + /** * 外部单据：移库单关联单据类型 */ @@ -839,4 +840,234 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 盘点主表 单据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CS_ORDER_TYPE { + DAY_INVENTORY(10, "日常盘点"), + MONTH_INVENTORY(20, "月度盘点"), + SEASON_INVENTORY(30, "季度盘点"), + YEAR_INVENTORY(40, "年度盘点"); + + private int value; + private String description; + + CS_ORDER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 盘点主表 盘点状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CS_ORDER_STATUS { + CREATE(1, "创建"), + FROZEN(10, "已冻结"), + IN_INVENTORY(20, "盘点中"), + INVENTORY_FINISH(30, "盘点完成"), + THAWING(40, "已解冻"), + CLOSED(50, "已关闭"); + + private int value; + private String description; + + CS_ORDER_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 盘点冻结 质检状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_STATUS { + NO_QC(1, "未质检"), + IN_QC(10, "质检中"), + QUALIFIED_QC(20, "质检合格"), + DISQUALIFIED_QC(30, "质检不合格"), + RETURN_GOODS(40, "已退货"); + + private int value; + private String description; + + QC_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 盘点冻结 条码状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SN_STATUS { + CREATE(1, "创建"), + RECEIVE_GOODS(10, "已收货"), + QUALITY_TESTING(20, "已质检"), + IN_STORE(30, "已入库"), + WAIT_STORE(40, "待出库"), + OUT_STORE(50, "已出库"), + ON_PASSAGE(60, "在途"), + QUARANTINE(70, "已隔离"), + BALE_BROKEN(80, "破包"), + FROZEN(90, "冻结"), + RETURN_GOODS(100, "取消冻结"); + + private int value; + private String description; + + SN_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 盘点冻结 处理状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CS_TRANS_STATUS { + CREATE(1, "已创建"), + INVENTORY(5, "已盘"), + FROZEN(10, "已冻结"), + THAWING(20, "已解冻"), + RETURN_GOODS(30, "取消冻结"); + + private int value; + private String description; + + CS_TRANS_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 盘点实盘 处理状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CS_ITEM_STATUS { + CREATE(1, "创建"),FINISH(10, "已盘"); + + private int value; + private String description; + + CS_ITEM_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 1b9190c..7663880 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -69,11 +69,11 @@ public class WmsCSFactTrans extends BaseBean { public Double factQty; /** - * 状态:0=创建,10=已处理 + * 状态:1=创建,10=已处理 */ - @Column(name="STATUS") + @Column(name="ITEM_STATUS") @ApiParam(value = "状态", example = "1") - public Integer status; + public Integer itemStatus; @Column(name="REMARK") @ApiParam(value = "备注") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 0833e48..eadb67e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -65,7 +65,7 @@ public class WmsCSOrderDetails extends BaseBean { public String unit; /** - * 质检状态:0=未质检,10=质检中,20=质检合格, + * 质检状态:1=未质检,10=质检中,20=质检合格, * 30=质检不合格,40=已退货 */ @Column(name="QC_STATUS") @@ -73,16 +73,16 @@ public class WmsCSOrderDetails extends BaseBean { public Integer qcStatus; /** - * 条码状态:0=创建,10=已收货,20=已质检, + * 条码状态:1=创建,10=已收货,20=已质检, * 30=已入库,40=待出库,50=已出库, * 60=在途,70=已隔离,80=破包,90=冻结,100=作废 */ - @Column(name="STATUS") + @Column(name="SN_STATUS") @ApiParam(value = "条码状态", example = "1") - public Integer status; + public Integer snStatus; /** - * 处理状态:0=已创建,5=已盘,10=已冻结 + * 处理状态:1=已创建,5=已盘,10=已冻结 * ,20=已解冻,30=取消冻结 */ @Column(name="TRANS_STATUS") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index 50ac521..cfefd6b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -37,16 +37,16 @@ public class WmsCSOrderMaster extends BaseBean { * 30=季度盘点,40=年度盘点 */ @Column(name="ORDER_TYPE") - @ApiParam("单据类型") - public String orderType; + @ApiParam(value = "单据类型", example = "10") + public Integer orderType; - @Column(name="STATUS") - @ApiParam("状态") - public String status; + @Column(name="ORDER_STATUS") + @ApiParam(value = "状态", example = "1" ) + public Integer orderStatus; - @Column(name="PERSENT") + @Column(name="ACTION_PERSENT") @ApiParam("盘点进度") - public String persent; + public String actionPersent; @Column(name="REMARK") @ApiParam("备注") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSFactTransRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSFactTransRepository.java new file mode 100644 index 0000000..1a01441 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSFactTransRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsCSFactTrans; + +/** + * @Description : 盘点实盘信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2018-11-18 15:48 + * @Modify: + **/ +public interface WmsCSFactTransRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSOrderDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSOrderDetailsRepository.java new file mode 100644 index 0000000..90a63ca --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSOrderDetailsRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsCSOrderDetails; + +/** + * @Description : 盘点单冻结信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2018-11-18 14:33 + * @Modify: + **/ +public interface WmsCSOrderDetailsRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSOrderMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSOrderMasterRepository.java new file mode 100644 index 0000000..73ef1fa --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSOrderMasterRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsCSOrderMaster; + +/** + * @Description : 盘点单主表信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2018-11-18 11:55 + * @Modify: + **/ +public interface WmsCSOrderMasterRepository 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 67388a3..eb8b3e4 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 @@ -667,4 +667,53 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 盘点单主表信息 分页查询 + * + * @param wmsCSOrderMaster + * @return + */ + public static String packHqlWmsCSOrderMasters(WmsCSOrderMaster wmsCSOrderMaster) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result); + HqlPack.getNumEqualPack(wmsCSOrderMaster.getOrderType(), "orderType", result); + HqlPack.getNumEqualPack(wmsCSOrderMaster.getOrderStatus(), "orderStatus", result); + + getStringBuilderPack(wmsCSOrderMaster, result); + + return result.toString(); + } + + /** + * 盘点单冻结表信息 分页查询 + * + * @param wmsCSOrderDetails + * @return + */ + public static String packHqlWmsCSOrderDetails(WmsCSOrderDetails wmsCSOrderDetails) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + getStringBuilderPack(wmsCSOrderDetails, result); + + return result.toString(); + } + + /** + * 盘点实盘表信息 分页查询 + * + * @param wmsCSFactTrans + * @return + */ + public static String packHqlWmsCSFactTrans(WmsCSFactTrans wmsCSFactTrans) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + getStringBuilderPack(wmsCSFactTrans, result); + + return result.toString(); + } }