From c332718ffb6f3b54394acccac7a0217f1ddbc81f Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Sun, 18 Nov 2018 15:13:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=A8=A1=E5=9D=97=E4=B8=94?= =?UTF-8?q?=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(); + } + }