From 108188b6f758cfa77ca8cb669a272a3a863ddac9 Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Fri, 16 Nov 2018 18:50:20 +0800 Subject: [PATCH 01/26] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 ++ 1 file changed, 2 insertions(+) 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 d52d52f..aa58d78 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 @@ -548,6 +548,8 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result); //客户编码 HqlPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result); + //物料编码 + HqlPack.getStringEqualPack(wmsShopping.getPartNo(), "partNo", result); //条码 HqlPack.getStringLikerPack(wmsShopping.getSn(), "sn", result); //发运状态 From 3fdeb69eee9cc6d315b541e8bd02182a8fc591eb Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Fri, 16 Nov 2018 18:50:21 +0800 Subject: [PATCH 02/26] dragon --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 88 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 8 +- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 - 3 files changed, 92 insertions(+), 7 deletions(-) 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 19cfb3a..217cdd0 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 @@ -751,4 +751,92 @@ public class WmsEnumUtil { return tmp; } } + /** + * 外部单据：移库单单据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OUT_MOVEMENT_MASTER_ORDER_TYPE { + ORDER_PULL_PART(1, "工单配料"); + + private int value; + private String description; + + OUT_MOVEMENT_MASTER_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; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + /** + * 外部单据：移库单关联单据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE { + ASN(1, "ASN"), + PO(10, "PO"), + SO(20, "SO"); + + private int value; + private String description; + + OUT_MOVEMENT_MASTER_LINK_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; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } 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 index 1a3bc2a..3c168e6 100644 --- 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 @@ -35,7 +35,7 @@ public class WmsDocMovementMaster extends BaseBean { */ @Column(name = "MOVE_TYPE") @ApiParam("移动类型") - public String moveType; + public Integer moveType; /** * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发, * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料, @@ -66,11 +66,11 @@ public class WmsDocMovementMaster extends BaseBean { private Integer version; /** - * 单据类型::1=工单配料 + * 关联单据类型:1=ASN,10=PO,20=SO */ @Column(name = "REF_TYPE") @ApiParam(value = "关联单据类型") - private String refType; + private Integer refType; @Column(name = "REF_NO") @ApiParam(value = "关联单据") @@ -85,7 +85,7 @@ public class WmsDocMovementMaster extends BaseBean { */ @Column(name = "ORDER_TYPE") @ApiParam(value = "单据类型") - private String orderType; + private Integer orderType; @Column(name = "PART_NO") @ApiParam(value = "物料编码") 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 d52d52f..4e16ac0 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 @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.base.tool.SqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; @@ -71,7 +70,6 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); @@ -130,7 +128,6 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(routingCode, "routingCode", result); - HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); From 7bc674d0273a6839d002485d97a0a3b509b408d3 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Fri, 16 Nov 2018 19:22:17 +0800 Subject: [PATCH 03/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index 3b6b83d..0004a3f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -36,7 +36,7 @@ public class WmsLocatePart extends BaseBean{ @ApiParam(value ="物料编码") private String partNo; - @Column(name="PART_NAME") + @Column(name="PART_NAME_RDD") @ApiParam(value ="物料名称") - private String partName; + private String partNameRdd; } 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 d52d52f..a8e3f52 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 @@ -210,7 +210,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result); HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsLocatePart.getPartName(), "partName", result); + HqlPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result); HqlPack.getNumEqualPack(wmsLocatePart.getIsValid(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); HqlPack.getStringEqualPack(wmsLocatePart.getOrganizeCode(),"organizeCode",result); From fe92584fa8ab899b1950bca44c5167093fc9dff2 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Fri, 16 Nov 2018 20:44:26 +0800 Subject: [PATCH 04/26] =?UTF-8?q?=E5=BC=80=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) 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..233564a 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 @@ -444,8 +444,8 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OUT_MOVEMENT_MOVE_TYPE { IN_STORE(1, "IN", "入库"), - OUT_STORE(2, "OUT", "出库"), - MOVE_STORE(3, "MOVE", "移库"); + OUT_STORE(10, "OUT", "出库"), + MOVE_STORE(20, "MOVE", "移库"); private int value; private String code; @@ -496,17 +496,17 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OUT_MOVEMENT_BUSI_TYPE { RECEIVE_GOODS(1, "RC", "收货"), - QUALITY_TESTING(2, "QC", "质检"), - IN_STORE(3, "IN", "入库"), - MIX_RECEIVE(4, "ZI", "杂收"), - MIX_SEND(5, "ZO", "杂发"), - SUPPLIER_RETURN_GOODS(6, "VJ", "供应商退货"), - CUSTOMER_RETURN_GOODS(7, "CJ", "客户退货"), - ORDER_PICKING_PART(8, "WP", "工单领料"), - ORDER_RETURN_PART(9, "WJ", "工单退料"), - MOVE_IN(10, "MI", "移库入库"), - MOVE_OUT(11, "MO", "移库出库"), - SEND(12, "SO", "发运"); + QUALITY_TESTING(10, "QC", "质检"), + IN_STORE(20, "IN", "入库"), + MIX_RECEIVE(30, "ZI", "杂收"), + MIX_SEND(40, "ZO", "杂发"), + SUPPLIER_RETURN_GOODS(50, "VJ", "供应商退货"), + CUSTOMER_RETURN_GOODS(60, "CJ", "客户退货"), + ORDER_PICKING_PART(70, "WP", "工单领料"), + ORDER_RETURN_PART(80, "WJ", "工单退料"), + MOVE_IN(90, "MI", "移库入库"), + MOVE_OUT(100, "MO", "移库出库"), + SEND(110, "SO", "发运"); private int value; private String code; From 4c4edda8dd6bf93e7af8d8ee5147a19dc51c8a0e Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 16 Nov 2018 21:15:21 +0800 Subject: [PATCH 05/26] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 6 ++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index f5a0b69..80481ee 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -66,4 +66,10 @@ public class WmsPOMaster extends BaseBean { @Column(name="IS_ASN") @ApiParam("是否有ASN") public String isAsn; + + /** + * 供应商名称 + */ + @ApiParam("供应商名称") + private transient String vendorName; } 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 d52d52f..ee20e6d 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 @@ -128,11 +128,12 @@ public class WmsHqlPack { */ public static String packHqlWmsRoutingChildren(String routingCode) { StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(routingCode, "routingCode", result); + HqlPack.getStringEqualPack(routingCode, "routingCode", result); HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + return result.toString(); } From c87c0384109ab785c4d83d15d2d1b342d9371377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Sat, 17 Nov 2018 01:35:17 +0800 Subject: [PATCH 06/26] meiju --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) 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 19cfb3a..d9cc28f 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 @@ -751,4 +751,38 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 作业任务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TASK_INFO_STATUS { + CREATE(10, "创建"), FINISH(20, "待处理"), FAIL(30, "已处理"); + + private int value; + private String description; + + TASK_INFO_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; + } + } } From 1917c01c09486729c40f5b570829cea9a7fea2c7 Mon Sep 17 00:00:00 2001 From: Silliter Date: Sat, 17 Nov 2018 17:53:12 +0800 Subject: [PATCH 07/26] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java | 20 ++++++++++---------- .../pojo/wms/repository/WmsSnPrintRepository.java | 20 ++++++++++++++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 22 ++++++++++++++++++++++ 3 files changed, 52 insertions(+), 10 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnPrintRepository.java 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 index 52b3d07..61d3b3e 100644 --- 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 @@ -13,7 +13,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * @Description : 待打印信息 + * @Description : 打印队列信息 * @Reference : * @Author : silliter.yuan * @CreateDate : 2018-11-06 15:58 @@ -25,16 +25,16 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="WMS_SN_PRINT") -@Api("待打印信息") +@Api("打印队列信息") public class WmsSnPrint extends BaseBean { - @Column(name="SRC_TYPE") + @Column(name="REF_TYPE") @ApiParam("来源单据类型") - public String srcType; + public String refType; - @Column(name="SRC_NO") + @Column(name="REF_NO") @ApiParam("来源单据编号") - public String srcNo; + public String refNo; @Column(name="PRINT_CONTEXT") @ApiParam("打印内容") @@ -51,11 +51,11 @@ public class WmsSnPrint extends BaseBean { @ApiParam(value = "状态", example = "0") public Integer status; - @Column(name="PRINT_TEMPLET") + @Column(name="PRINT_TEMPLATE") @ApiParam("打印模板") - public String printTemplet; + public String printTemplete; - @Column(name="PRINT_MACHINE") + @Column(name="PRINTER") @ApiParam("打印机") - public String printMachine; + public String printer; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnPrintRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnPrintRepository.java new file mode 100644 index 0000000..5ea9042 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnPrintRepository.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsSnPrint; +import cn.estsh.i3plus.pojo.wms.bean.WmsTransCode; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; + +/** + * @Description : 打印机队列数据操作类 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-17 14:47 + * @Modify: + **/ +@Repository +public interface WmsSnPrintRepository 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..09af532 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,26 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 根据条件查询打印机队列信息封装类 + * @param wmsSnPrint 打印机队列信息 + * @return 打印机队列信息 + */ + public static String packHqlWmsSnPrint(WmsSnPrint wmsSnPrint) { + StringBuffer result = new StringBuffer(); + + // 来源单据类型 + HqlPack.getStringLikerPack(wmsSnPrint.getRefType(), "refType", result); + // 来源单据号 + HqlPack.getStringEqualPack(wmsSnPrint.getRefNo(), "refNo", result); + // 打印机 + HqlPack.getStringEqualPack(wmsSnPrint.getPrinter(), "printer", result); + // 打印机状态 + HqlPack.getNumEqualPack(wmsSnPrint.getStatus(), "status", result); + + getStringBuilderPack(wmsSnPrint, result); + + return result.toString(); + } } From f68378ba48d7b48adf1d39ff20598f78346c3b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Sat, 17 Nov 2018 18:46:37 +0800 Subject: [PATCH 08/26] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=AD=90=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/repository/WmsCSLocateRepository.java | 14 +++++++ .../pojo/wms/repository/WmsCSPartRepository.java | 14 +++++++ .../pojo/wms/repository/WmsCSZoneRepository.java | 14 +++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 46 ++++++++++++++++++++++ 4 files changed, 88 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSLocateRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSPartRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSZoneRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSLocateRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSLocateRepository.java new file mode 100644 index 0000000..50f76dc --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSLocateRepository.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.WmsCSLocate; + +/** + * @Description :对象持久层仓用方法控制(盘点库位信息) + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-17 14:48 + * @Modify: + **/ +public interface WmsCSLocateRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSPartRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSPartRepository.java new file mode 100644 index 0000000..e74b9db --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSPartRepository.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.WmsCSPart; + +/** + * @Description :对象持久层仓用方法控制(盘点物料信息) + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-17 16:10 + * @Modify: + **/ +public interface WmsCSPartRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSZoneRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSZoneRepository.java new file mode 100644 index 0000000..c47c116 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSZoneRepository.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.WmsCSZone; + +/** + * @Description :对象持久层仓用方法控制(盘点存储区信息) + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-17 17:11 + * @Modify: + **/ +public interface WmsCSZoneRepository 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..0ffce7e 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,50 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 盘点库位 条件封装 + * @param wmsCSLocate + * @return + */ + public static String packHqlWmsCSLocate(WmsCSLocate wmsCSLocate){ + StringBuffer result = new StringBuffer(); + + HqlPack.getStringEqualPack(wmsCSLocate.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsCSLocate.getLocateNo(), ";locateNo", result); + getStringBuilderPack(wmsCSLocate, result); + + return result.toString(); + } + + /** + * 盘点物料 条件封装 + * @param wmsCSPart + * @return + */ + public static String packHqlWmsCSPart(WmsCSPart wmsCSPart){ + StringBuffer result = new StringBuffer(); + + HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(),"orderNo", result); + HqlPack.getStringEqualPack(wmsCSPart.getPartNo(),"partNo", result); + HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(),"partNameRdd", result); + getStringBuilderPack(wmsCSPart, result); + + return result.toString(); + } + + /** + * 盘点存储区 条件封装 + * @param wmsCSZone + * @return + */ + public static String packHqlWmsCSZone(WmsCSZone wmsCSZone){ + StringBuffer result = new StringBuffer(); + + HqlPack.getStringEqualPack(wmsCSZone.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsCSZone.getZoneNo(), "zoneNo", result); + getStringBuilderPack(wmsCSZone, result); + + return result.toString(); + } } From 62b5dec0d62881a6fceb908c48bbaa09ce2149ba Mon Sep 17 00:00:00 2001 From: Silliter Date: Sat, 17 Nov 2018 18:50:53 +0800 Subject: [PATCH 09/26] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java | 14 +++++++++++- .../wms/repository/WmsAreaOwnerRepository.java | 16 +++++++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 26 ++++++++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAreaOwnerRepository.java 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 index b8c8085..bc3db4a 100644 --- 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 @@ -58,5 +58,17 @@ public class WmsAreaOwner extends BaseBean { @Column(name = "IS_PRE_ASSIGN") @ApiParam(value = "是否预分配人员") - private String isPreAssign; + private Integer isPreAssign; + + @ApiParam(value = "供应商名称") + private transient String vendorName; + + @ApiParam(value = "仓库名称") + private transient String whName; + + @ApiParam(value = "存储区名称") + private transient String zoneName; + + @ApiParam(value = "库位名称") + private transient String locateName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAreaOwnerRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAreaOwnerRepository.java new file mode 100644 index 0000000..b48bb3c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAreaOwnerRepository.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.WmsAreaOwner; +import org.springframework.stereotype.Service; + +/** + * @Description : 责任区分配数据库操作类 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-17 11:24 + * @Modify: + **/ +@Service +public interface WmsAreaOwnerRepository 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 09af532..e1fb599 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 @@ -689,4 +689,30 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 根据条件查询责任区分配信息封装类 + * @param wmsAreaOwner 责任区分配信息 + * @return 责任区分配信息 + */ + public static String packHqlWmsAreaOwner(WmsAreaOwner wmsAreaOwner) { + StringBuffer result = new StringBuffer(); + + // 仓库代码 + HqlPack.getStringLikerPack(wmsAreaOwner.getWhNo(), "whNo", result); + // 来源单据号 + HqlPack.getStringEqualPack(wmsAreaOwner.getZoneNo(), "zoneNo", result); + // 供应商编码 + HqlPack.getStringEqualPack(wmsAreaOwner.getVendorNo(), "vendorNo", result); + // 物料编码 + HqlPack.getStringEqualPack(wmsAreaOwner.getPartNo(), "partNo", result); + // 负责人 + HqlPack.getStringEqualPack(wmsAreaOwner.getOwnerUserNo(), "ownerUserNo", result); + // 是否预分配 + HqlPack.getNumEqualPack(wmsAreaOwner.getIsPreAssign(), "isPreAssign", result); + + getStringBuilderPack(wmsAreaOwner, result); + + return result.toString(); + } } From 46beafb09e7a23b33e107d73c309378c5ead3785 Mon Sep 17 00:00:00 2001 From: Silliter Date: Sat, 17 Nov 2018 19:22:49 +0800 Subject: [PATCH 10/26] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java | 4 ++-- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java index 084898d..6aff20c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java @@ -13,7 +13,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * @Description : 盘点单主表信息 + * @Description : 单据操作并发锁定信息 * @Reference : * @Author : silliter.yuan * @CreateDate : 2018-11-06 15:58 @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="WMS_TMP_ORDER_LOCK") -@Api("盘点单主表信息") +@Api("单据操作并发锁定信息") public class WmsTempOrderLock extends BaseBean { /** 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 e6e7bb9..3183a3a 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 @@ -761,4 +761,22 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 根据条件查询责任区分配信息封装类 + * @param wmsTempOrderLock 责任区分配信息 + * @return 责任区分配信息 + */ + public static String packHqlWmsTempOrderLock(WmsTempOrderLock wmsTempOrderLock) { + StringBuffer result = new StringBuffer(); + + // 订单号 + HqlPack.getStringLikerPack(wmsTempOrderLock.getOrderNo(), "orderNo", result); + // 业务类型 + HqlPack.getStringEqualPack(wmsTempOrderLock.getBizType(), "bizType", result); + + getStringBuilderPack(wmsTempOrderLock, result); + + return result.toString(); + } } From 9498b3e2dcc4b7d50943ea4f23b0309da4aee46a Mon Sep 17 00:00:00 2001 From: Silliter Date: Sat, 17 Nov 2018 19:23:26 +0800 Subject: [PATCH 11/26] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/repository/WmsTempOrderLockRepository.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTempOrderLockRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTempOrderLockRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTempOrderLockRepository.java new file mode 100644 index 0000000..ae89073 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTempOrderLockRepository.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.WmsTempOrderLock; + +/** + * @Description :对象持久层仓用方法控制(单据操作并发锁信息) + * @Reference : + * @Author : silliter + * @CreateDate : 2018-11-17 14:48 + * @Modify: + **/ +public interface WmsTempOrderLockRepository extends BaseRepository { +} From 12392de1a496dd6984460cf9b6fd5f72f1705215 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Sat, 17 Nov 2018 19:27:42 +0800 Subject: [PATCH 12/26] =?UTF-8?q?=E5=BA=93=E5=AD=98=EF=BC=8C=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=9D=A1=E7=A0=81=EF=BC=8C=E5=BA=93=E5=AD=98=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=BA=93=E5=AD=98=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E6=9D=A1=E7=A0=81V1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 99 ++++++++++++++++ .../bean/{WmsStockQuant.java => WmsStockQuan.java} | 54 ++++----- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 132 +++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 61 +++++----- .../wms/repository/WmsStockQuantRepository.java | 15 --- .../pojo/wms/repository/WmsStockSnRepository.java | 14 +++ .../wms/repository/WmsTransQuanRepository.java | 14 +++ .../pojo/wms/repository/WmsTransSnRepository.java | 14 +++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 100 ++++++++++++---- 9 files changed, 403 insertions(+), 100 deletions(-) rename modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/{WmsStockQuant.java => WmsStockQuan.java} (54%) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockQuantRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransQuanRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransSnRepository.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 233564a..a13c87d 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 @@ -839,4 +839,103 @@ public class WmsEnumUtil { return tmp; } } + /** + * 业务表：库存条码状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STOCK_SN_STATUS { + CREATE(1, "创建"), + RECEIVED(10, "已收货"), + QUALITY_TESTED(20, "已质检"), + PUTIN_STORE(30, "已入库"), + WAIT_OUT_STORE(40, "待出库"), + IS_OUT_STORE(50, "已出库"), + ON_THE_WAY(60, "在途"), + QUARANTINED(70, "已隔离"), + BREAK_BUG(80, "破包"), + FROZEN(90, "冻结"), + CANCEL(100, "作废"); + + private int value; + private String description; + + STOCK_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; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + /** + * 业务表：库存条码质检状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STOCK_SN_QC_STATUS { + CREATE(1, "未质检"), + RECEIVED(10, "质检合格"), + QUALITY_TESTED(20, "质检不合格"), + PUTIN_STORE(30, "已退货"); + + private int value; + private String description; + + STOCK_SN_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; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } 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/WmsStockQuan.java similarity index 54% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 8cd6c5d..1ef80a0 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/WmsStockQuan.java @@ -1,10 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; @@ -24,42 +21,43 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_STOCK_QUAN") +@Table(name = "WMS_STOCK_QUAN") @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api(value="库存信息",description = "库存信息") -public class WmsStockQuant extends BaseBean{ +@Api(value = "库存信息", description = "库存信息") +public class WmsStockQuan extends BaseBean { - @Column(name="PART_NO") - @ApiParam(value ="零件编号") + @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(value = "物料编号") private String partNo; - @Column(name="PART_NAME_RDD") - @ApiParam(value ="零件名称") + @Column(name = "PART_NAME_RDD") + @ApiParam(value = "物料名称") private String partNameRdd; - @Column(name="QTY") - @ApiParam(value = "可用数量", example = "0") - public Double qty; - - @Column(name="UNIT") + @Column(name = "UNIT") @ApiParam("单位") public String unit; - @Column(name="TOTAL_QTY") - @ApiParam(value ="总数量", example = "0") - private Double totalQty; - - @Column(name="ZONE_NO") - @ApiParam(value ="存储区编号") - private String zoneNo; + @Column(name = "QTY") + @ApiParam(value = "可用数量", example = "0") + public Double qty; - @Column(name="WH_NO") - @ApiParam(value ="仓库代码") - private String whNo; + @Column(name = "TOTAL_QTY") + @ApiParam(value = "总数量", example = "0") + private Double totalQty; - @Column(name="LOCATE_NO") - @ApiParam(value ="库位代码") - private String locateNo; } 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 new file mode 100644 index 0000000..01d0144 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -0,0 +1,132 @@ +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; +import java.util.Date; + +/** + * @Description : 库存条码信息 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2018-11-17 14:50 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_STOCK_SN") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "库存条码信息", description = "库存条码信息") +public class WmsStockSn 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(value = "物料编号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam(value = "物料名称") + private String partNameRdd; + + @Column(name = "LOT_NO") + @ApiParam("批次编码") + public String lotNo; + + @Column(name = "DATE_CODE") + @ApiParam(value = "生产日期") + public String dateCode; + + @Column(name = "LEFT_CODE") + @ApiParam(value = "有效期") + private String leftCode; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + public String vendorNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam(value = "特殊批次") + private String fixLotNo; + + @Column(name = "CUST_NO") + @ApiParam(value = "客户编码") + private String custNo; + + @Column(name = "SHIPPING_FLAG") + @ApiParam(value = "发往地") + private String shippingFlag; + + @Column(name = "SN") + @ApiParam(value = "条码") + private String sn; + + @Column(name = "SN_2D") + @ApiParam(value = "二维码") + private String sn2d; + + @Column(name = "PACKAGE_NO") + @ApiParam(value = "包装编号") + private String packageNo; + + @Column(name = "UNIT") + @ApiParam(value = "单位") + private String unit; + + @Column(name = "QTY") + @ApiParam(value = "数量", example = "0") + private Double qty; + /** + * 1=未质检,10=质检合格,20=质检不合格,30=已退货 + */ + @Column(name = "QC_STATUS") + @ApiParam(value = "质检状态", example = "0") + private Integer qcStatus; + /** + * :1=创建,10=已收货,20=已质检,30=已入库,40=待出库,50=已出库, + * 60=在途,70=已隔离,80=破包,90=冻结,100=作废 + */ + @Column(name = "SN_STATUS") + @ApiParam(value = "条码状态", example = "0") + private Integer snStatus; + /** + * 1:已打印；2：未打印 + */ + @Column(name = "PRINTED") + @ApiParam(value = "是否打印", example = "0") + private Integer printed; + + @Column(name = "PDATE") + @ApiParam(value = "打印时间") + private Date pdate; + /** + * 1=ASN,10=PO,20=SO + */ + @Column(name = "REF_TYPE") + @ApiParam(value = "关联单据类型", example = "0") + private Integer refType; + + @Column(name = "REF_SRC") + @ApiParam(value = "关联单号") + private String refSrc; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index 494e30b..624d7fc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -24,68 +24,61 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_TRANS_QUAN") +@Table(name = "WMS_TRANS_QUAN") @Api("库存交易信息") public class WmsTransQuan extends BaseBean { - @Column(name="ORDER_NO") - @ApiParam("单号") - public String orderNo; - - @Column(name="WH_NO") + @Column(name = "WH_NO") @ApiParam("仓库代码") public String whNo; - @Column(name="ZONE_NO") + @Column(name = "ZONE_NO") @ApiParam("存储区编号") public String zoneNo; - @Column(name="LOCATE_NO") + @Column(name = "LOCATE_NO") @ApiParam("库位编号") public String locateNo; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料编码") public String partNo; - @Column(name="PART_NAME_RDD") + @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") public String partNameRdd; - @Column(name="SN") + @Column(name = "SN") @ApiParam("条码") public String sn; - @Column(name="QTY") - @ApiParam(value = "需求数量", example = "0") - public Double qty; - - @Column(name="UNIT") + @Column(name = "UNIT") @ApiParam("单位") public String unit; /** - * 质检状态:0=未质检,10=质检中,20=质检合格, - * 30=质检不合格,40=已退货 + * 关联交易类型表 */ - @Column(name="QC_STATUS") - @ApiParam(value = "质检状态", example = "1") - public Integer qcStatus; + @Column(name = "TRANS_CODE") + @ApiParam(value = "交易类型代码") + public String transCode; - /** - * 条码状态:0=创建,10=已收货,20=已质检, - * 30=已入库,40=待出库,50=已出库, - * 60=在途,70=已隔离,80=破包,90=冻结,100=作废 - */ - @Column(name="STATUS") - @ApiParam(value = "条码状态", example = "1") - public Integer status; + @Column(name = "QTY") + @ApiParam(value = "交易数量", example = "0") + public Double qty; + + @Column(name = "TRANS_NO") + @ApiParam(value = "事务编号", example = "1") + public Long transNo; /** - * 处理状态:0=已创建,5=已盘,10=已冻结 - * ,20=已解冻,30=取消冻结 + * ASN,PO,SO */ - @Column(name="TRANS_STATUS") - @ApiParam(value = "处理状态", example = "1") - public Integer transStatus; + @Column(name = "REF_TYPE") + @ApiParam(value = "关联单据类型", example = "1") + public Integer refType; + + @Column(name = "REF_SRC") + @ApiParam(value = "关联单号") + public String refSrc; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockQuantRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockQuantRepository.java deleted file mode 100644 index f11c7dd..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockQuantRepository.java +++ /dev/null @@ -1,15 +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.WmsStockQuant; -import cn.estsh.i3plus.pojo.wms.bean.WmsTransRcd; - -/** - * @Description : 库存表 - * @Reference : - * @Author : jessica.chen - * @CreateDate : 2018-11-02 17:08 - * @Modify: - **/ -public interface WmsStockQuantRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java new file mode 100644 index 0000000..88085bf --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.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.WmsStockSn; + +/** +* @Description : 库存条码dao层 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2018-11-17 15:53 +* @Modify: +**/ +public interface WmsStockSnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransQuanRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransQuanRepository.java new file mode 100644 index 0000000..41992cd --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransQuanRepository.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.WmsTransQuan; + +/** +* @Description : 库存业务dao层 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2018-11-17 15:57 +* @Modify: +**/ +public interface WmsTransQuanRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransSnRepository.java new file mode 100644 index 0000000..d226783 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransSnRepository.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.WmsTransSn; + +/** +* @Description : 库存业务条码dao层 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2018-11-17 15:57 +* @Modify: +**/ +public interface WmsTransSnRepository 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..33184f1 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 @@ -18,7 +18,8 @@ public class WmsHqlPack { /** * 封装公用查询参数 - * @param bean 实体对象 + * + * @param bean 实体对象 * @param hqlStr 查询语句 * @return 封装完成的查询语句 */ @@ -70,8 +71,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), - "isDeleted", result); + getStringBuilderPack(wmsDocMovementDetails, result); return result.toString(); } @@ -90,10 +90,7 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", result); HqlPack.getStringLikerPack(wmsDocMovementMaster.getCustomerNo(), "customerNo", result); - HqlPack.getStringEqualPack(wmsDocMovementMaster.getOrganizeCode(), "organizeCode", result); - HqlPack.getNumEqualPack(wmsDocMovementMaster.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), - "isDeleted", result); + getStringBuilderPack(wmsDocMovementMaster, result); return result.toString(); } @@ -127,9 +124,7 @@ public class WmsHqlPack { public static String packHqlWmsRoutingChildren(String routingCode) { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(routingCode, "routingCode", result); - - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), - "isDeleted", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -145,10 +140,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result); HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result); - HqlPack.getStringEqualPack(wmsRoutingMaster.getOrganizeCode(), "organizeCode", result); - HqlPack.getNumEqualPack(wmsRoutingMaster.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), - "isDeleted", result); + getStringBuilderPack(wmsRoutingMaster, result); return result.toString(); } @@ -166,11 +158,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); - HqlPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", result); - HqlPack.getNumEqualPack(wmsPart.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), - "isDeleted", result); - + getStringBuilderPack(wmsPart, result); return result.toString(); } @@ -190,7 +178,7 @@ public class WmsHqlPack { HqlPack.timeBuilder(wmsIbCheckPlan.getEndDate(), null, "endDate", result, true); HqlPack.getNumEqualPack(wmsIbCheckPlan.getIsValid(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - HqlPack.getStringEqualPack(wmsIbCheckPlan.getOrganizeCode(),"organizeCode",result); + HqlPack.getStringEqualPack(wmsIbCheckPlan.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -210,7 +198,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result); HqlPack.getNumEqualPack(wmsLocatePart.getIsValid(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - HqlPack.getStringEqualPack(wmsLocatePart.getOrganizeCode(),"organizeCode",result); + HqlPack.getStringEqualPack(wmsLocatePart.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -232,7 +220,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result); HqlPack.getNumEqualPack(wmsLocate.getIsValid(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - HqlPack.getStringEqualPack(wmsLocate.getOrganizeCode(),"organizeCode",result); + HqlPack.getStringEqualPack(wmsLocate.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -318,7 +306,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsTransType.getOrganizeCode(), "organizeCode", result); HqlPack.getNumEqualPack(wmsTransType.getIsValid(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - HqlPack.getStringEqualPack(wmsTransType.getOrganizeCode(),"organizeCode",result); + HqlPack.getStringEqualPack(wmsTransType.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -667,4 +655,70 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 业务：库存条码查询封装 + * + * @param wmsStockSn + * @return + */ + public static String packWmsStockSn(WmsStockSn wmsStockSn) { + StringBuffer result = new StringBuffer(); + //查询参数封装 + HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); + HqlPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result); + + getStringBuilderPack(wmsStockSn, result); + return result.toString(); + } + + /** + * 业务：库存查询封装 + * + * @param wmsStockQuan + * @return + */ + public static String packWmsStockQuan(WmsStockQuan wmsStockQuan) { + StringBuffer result = new StringBuffer(); + //查询参数封装 + HqlPack.getStringLikerPack(wmsStockQuan.getWhNo(), "whNo", result); + HqlPack.getStringLikerPack(wmsStockQuan.getZoneNo(), "zoneNo", result); + HqlPack.getStringLikerPack(wmsStockQuan.getLocateNo(), "locateNo", result); + HqlPack.getStringLikerPack(wmsStockQuan.getPartNo(), "partNo", result); + + getStringBuilderPack(wmsStockQuan, result); + return result.toString(); + } + + /** + * 业务：库存交易条码查询封装(根据交易编码查询所有未删除的) + * + * @param tranNo + * @return + */ + public static String packWmsTransSn(String tranNo) { + StringBuffer result = new StringBuffer(); + //查询参数封装 + HqlPack.getStringEqualPack(tranNo, "tranNo", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + return result.toString(); + } + + /** + * 业务：库存交易查询封装 + * + * @param wmsTransQuan + * @return + */ + public static String packWmsTransQuan(WmsTransQuan wmsTransQuan) { + StringBuffer result = new StringBuffer(); + //查询参数封装 + HqlPack.getStringLikerPack(wmsTransQuan.getWhNo(), "whNo", result); + HqlPack.getStringLikerPack(wmsTransQuan.getZoneNo(), "zoneNo", result); + HqlPack.getStringLikerPack(wmsTransQuan.getLocateNo(), "locateNo", result); + HqlPack.getStringLikerPack(wmsTransQuan.getPartNo(), "partNo", result); + + getStringBuilderPack(wmsTransQuan, result); + return result.toString(); + } } From 1dba2e2011397380a4419d32da4a627e37e00e8d Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Sun, 18 Nov 2018 09:46:56 +0800 Subject: [PATCH 13/26] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E6=89=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) 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 d52d52f..c26ebe0 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 @@ -580,22 +580,9 @@ public class WmsHqlPack { return result.toString(); } - /** - * 明细表唯一性查询 - * - * @return - */ - public static String packHqlwmsASNMasterDetailsUnique(WmsASNMasterDetails wmsASNMasterDetails) { - StringBuffer result = new StringBuffer(); - //有效性 - HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - return result.toString(); - } - public static String packHqlWmsASNMasterDetails(WmsASNMasterDetails wmsASNMasterDetails) { StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result); HqlPack.getStringLikerPack(wmsASNMasterDetails.getItem(), "item", result); HqlPack.getStringLikerPack(wmsASNMasterDetails.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsASNMasterDetails.getPartNameRdd(), "partNameRdd", result); From 87def59c4d0777d4ed729b29678f00a48c062715 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Sun, 18 Nov 2018 10:54:31 +0800 Subject: [PATCH 14/26] =?UTF-8?q?=E5=BA=93=E5=AD=98=EF=BC=8C=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=9D=A1=E7=A0=81=EF=BC=8C=E5=BA=93=E5=AD=98=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=BA=93=E5=AD=98=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E6=9D=A1=E7=A0=81V1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/repository/WmsStockQuanRepository.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockQuanRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockQuanRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockQuanRepository.java new file mode 100644 index 0000000..84f60c8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockQuanRepository.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.WmsStockQuan; + +/** + * @Description :库存dao层 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2018-11-02 17:08 + * @Modify: + **/ +public interface WmsStockQuanRepository extends BaseRepository { +} From 71c78ec2b4fc8d3c68f39cf3298572673c963d10 Mon Sep 17 00:00:00 2001 From: Silliter Date: Sun, 18 Nov 2018 10:58:59 +0800 Subject: [PATCH 15/26] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/repository/WmsPackAgeRepository.java | 16 ++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 20 ++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackAgeRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackAgeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackAgeRepository.java new file mode 100644 index 0000000..d98f17e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackAgeRepository.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.WmsPackage; +import org.springframework.stereotype.Repository; + +/** + * @Description : 物料包装 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-18 14:46 + * @Modify: + **/ +@Repository +public interface WmsPackAgeRepository 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..d312771 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,24 @@ public class WmsHqlPack { getStringBuilderPack(wmsTransQuan, result); return result.toString(); } + + /** + * 业务：物料包装查询封装 + * + * @param wmsPackage + * @return + */ + public static String packWmsPackAge(WmsPackage wmsPackage) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringEqualPack(wmsPackage.getPackageNo(), "packageNo", result); + HqlPack.getStringEqualPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result); + HqlPack.getStringEqualPack(wmsPackage.getSn(), "sn", result); + HqlPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result); + + getStringBuilderPack(wmsPackage, result); + + return result.toString(); + } } From 21a79af65a17667f8c76e9223e18dc149cd2b0c4 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Sun, 18 Nov 2018 11:52:47 +0800 Subject: [PATCH 16/26] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 8 +++---- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 26 ++++++++++++++++++++++ 3 files changed, 31 insertions(+), 5 deletions(-) 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 880a811..0d49de6 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 @@ -491,7 +491,7 @@ public class WmsEnumUtil { } /** - * 外部单据：移库单业务类型 + * 移库单业务类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OUT_MOVEMENT_BUSI_TYPE { 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 7058997..2de8339 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 @@ -37,16 +37,16 @@ public class WmsMoveMaster extends BaseBean { * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料, * MI=移库入库,MO=移库出库,SO=发运 */ - @Column(name="TYPE") + @Column(name="ORDER_TYPE") @ApiParam("业务类型") - public String type; + public String orderType; /** * 状态:0=创建,5=待处理,10=已处理 */ - @Column(name="STATUS") + @Column(name="ORDER_STATUS") @ApiParam(value = "状态", example = "0") - public Integer status; + public Integer orderStatus; @Column(name="REMARK") @ApiParam("备注") 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..81fae7a 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,30 @@ public class WmsHqlPack { getStringBuilderPack(wmsTransQuan, result); return result.toString(); } + + /** + *内部单据：库存移动单主表唯一性查询 + * @param wmsMoveMaster + * @return + */ + public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster){ + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result); + HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(),"id",result); + getStringBuilderPack(wmsMoveMaster, result); + return result.toString(); + } + + /** + * 内部单据：库存移动单主表分页查询 + * @param wmsMoveMaster + * @return + */ + public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster){ + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result); + HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result); + getStringBuilderPack(wmsMoveMaster, result); + return result.toString(); + } } From 2aed8cfa1daa5ec1385d2cde88ab0651de0f12b7 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Sun, 18 Nov 2018 11:56:29 +0800 Subject: [PATCH 17/26] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/repository/WmsMoveMasterRepository.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMasterRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMasterRepository.java new file mode 100644 index 0000000..51c61fe --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMasterRepository.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.WmsMoveMaster; +import org.springframework.stereotype.Repository; + +/** + * @Description : 库存移动单主表信息接口 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-18 10:10 + * @Modify: + **/ +@Repository +public interface WmsMoveMasterRepository extends BaseRepository { +} From c332718ffb6f3b54394acccac7a0217f1ddbc81f Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Sun, 18 Nov 2018 15:13:24 +0800 Subject: [PATCH 18/26] =?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 19/26] =?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(); + } } From fecbfe821eb595c50f1570f798af078fa884c5ab Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Sun, 18 Nov 2018 17:16:56 +0800 Subject: [PATCH 20/26] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 14 +++++-- .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 4 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 16 +++++--- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 47 ++++++++++++++++++++++ 4 files changed, 70 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 6a08fd8..1c0dfab 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -32,6 +32,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("单号") public String orderNo; + @Column(name="ITEM") + @ApiParam(value = "行号", example = "0") + public Integer item; + @Column(name="PART_NO") @ApiParam("物料编码") public String partNo; @@ -40,6 +44,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("物料名称") public String partNameRdd; + @Column(name="VENDOR_NO") + @ApiParam("供应商编号") + public String vendorNo; + @Column(name="CUST_NO") @ApiParam("客户编号") public String custNo; @@ -71,16 +79,16 @@ public class WmsMoveDetails extends BaseBean { /** * 状态:0=创建,5=待处理,10=已处理 */ - @Column(name="STATUS") + @Column(name="ITEM_STATUS") @ApiParam(value = "状态", example = "0") - public Integer status; + public Integer itemStatus; /** * ASN,PO,SO */ @Column(name="REF_TYPE") @ApiParam("关联单据类型") - public String refType; + public Integer refType; @Column(name="REF_SRC") @ApiParam("关联单号") 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 2de8339..8aeed96 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 @@ -38,8 +38,8 @@ public class WmsMoveMaster extends BaseBean { * MI=移库入库,MO=移库出库,SO=发运 */ @Column(name="ORDER_TYPE") - @ApiParam("业务类型") - public String orderType; + @ApiParam(value = "业务类型", example = "0") + public Integer orderType; /** * 状态:0=创建,5=待处理,10=已处理 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 070b88c..5ec6c3c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -44,17 +44,21 @@ public class WmsMoveSn extends BaseBean { @ApiParam("物料名称") public String partNameRdd; - /** - * 状态:0=创建,10=已处理 - */ - @Column(name="STATUS") - @ApiParam(value = "状态", example = "0") - public Integer status; + @Column(name="UNIT") + @ApiParam(value = "单位") + public String unit; @Column(name="SN") @ApiParam("条码") public String sn; + /** + * 状态:0=创建,10=已处理 + */ + @Column(name="ITEM_STATUS") + @ApiParam(value = "状态", example = "0") + public Integer itemStatus; + @Column(name="REMARK") @ApiParam("备注") public String reMark; 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 0f2af1b..6d3c73a 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 @@ -859,9 +859,11 @@ public class WmsHqlPack { */ public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster){ StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result); HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(),"id",result); getStringBuilderPack(wmsMoveMaster, result); + return result.toString(); } @@ -872,9 +874,54 @@ public class WmsHqlPack { */ public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster){ StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result); HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result); getStringBuilderPack(wmsMoveMaster, result); + + return result.toString(); + } + + /** + * 内部单据：库存移动单明细表分页查询 + * @param wmsMoveDetails + * @return + */ + public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails){ + StringBuffer result = new StringBuffer(); + + HqlPack.getStringLikerPack(wmsMoveDetails.getOrderNo(), "orderNo", result); + HqlPack.getNumEqualPack(wmsMoveDetails.getItem(), "item", result); + HqlPack.getStringLikerPack(wmsMoveDetails.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsMoveDetails.getPartNameRdd(), "partNameRdd", result); + HqlPack.getStringLikerPack(wmsMoveDetails.getVendorNo(), "vendorNo", result); + HqlPack.getStringLikerPack(wmsMoveDetails.getCustNo(), "custNo", result); + HqlPack.getStringLikerPack(wmsMoveDetails.getUnit(), "unit", result); + HqlPack.getStringLikerPack(wmsMoveDetails.getWhNo(),"whNo",result); + HqlPack.getStringLikerPack(wmsMoveDetails.getZoneNo(),"zoneNo",result); + HqlPack.getStringLikerPack(wmsMoveDetails.getLocateNo(),"locateNo",result); + HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(),"itemStatus",result); + HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(),"refType",result); + HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(),"refSrc",result); + getStringBuilderPack(wmsMoveDetails, result); + + return result.toString(); + } + + /** + * 内部单据：库存移动单条码信息分页查询 + * @param wmsMoveSn + * @return + */ + public static String packHqlWmsMoveSn(WmsMoveSn wmsMoveSn){ + StringBuffer result = new StringBuffer(); + + HqlPack.getStringLikerPack(wmsMoveSn.getOrderNo(), "orderNo", result); + HqlPack.getNumEqualPack(wmsMoveSn.getItem(), "item", result); + HqlPack.getStringLikerPack(wmsMoveSn.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result); + getStringBuilderPack(wmsMoveSn, result); + return result.toString(); } } From 8841e18a4d078c990ca871ef5c00e6367d90e3a7 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Sun, 18 Nov 2018 17:28:36 +0800 Subject: [PATCH 21/26] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/repository/WmsMoveDetailsRepository.java | 14 ++++++++++++++ .../i3plus/pojo/wms/repository/WmsMoveSnRepository.java | 16 ++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveDetailsRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveSnRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveDetailsRepository.java new file mode 100644 index 0000000..fea096d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveDetailsRepository.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.WmsMoveDetails; + +/** + * @Description : 库存移动单明细信息 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-18 13:59 + * @Modify: + **/ +public interface WmsMoveDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveSnRepository.java new file mode 100644 index 0000000..6edff0c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveSnRepository.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.WmsMoveSn; +import org.springframework.stereotype.Repository; + +/** + * @Description : 库存移动单条码信息 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-18 15:24 + * @Modify: + **/ +@Repository +public interface WmsMoveSnRepository extends BaseRepository { +} From ccdfc19affd4ca8f2b3a6e5da6e6028a52bbdb39 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Sun, 18 Nov 2018 20:13:25 +0800 Subject: [PATCH 22/26] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E6=9E=9A=E4=B8=BE=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) 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 f684e42..1ac1c1e 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 @@ -1194,4 +1194,38 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 库存移动单状态 状态:0=创建,5=待处理,10=已处理 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MOVE_ORDER_STATUS { + CREATE(0, "创建"),BE_HANDLE(5, "待处理"),FINISH(10, "已处理"); + + private int value; + private String description; + + MOVE_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; + } + } } From 9b529bf4387a86225de5f06500ce5c72b31ede83 Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Sun, 18 Nov 2018 20:22:24 +0800 Subject: [PATCH 23/26] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 108 +++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 4 +- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 3 files changed, 111 insertions(+), 3 deletions(-) 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 0d49de6..64be3f6 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 @@ -963,4 +963,112 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 质检业务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_INFO_TYPE { + FEED(1, "进料检验"), ONLINE(10, "在线检验"), EMDPRODUCT(30, "成品检验,"), SHIPMENTS(40, "出货检验,"); + + private int value; + private String description; + + QC_INFO_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 QC_INFO_STATUS { + CREATE(1, "新建"), + FINISH(5, "待处理"), + FAIL(10, "已完成,"), + CLOSE(90, "已关闭,"), + CANCEL(91, "已取消,"); + + private int value; + private String description; + + QC_INFO_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_ITEM_STATUS { + NORMAL(1, "正常"), + CANCELLATION(10, "行取消"); + + private int value; + private String description; + + QC_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/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index 3d250b5..b986ff5 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 @@ -37,8 +37,8 @@ public class WmsQCMaster extends BaseBean { * FQC=成品检验,OQC=出货检验 */ @Column(name="ORDER_TYPE") - @ApiParam("业务类型") - public String orderType; + @ApiParam(value = "业务类型", example = "0") + public Integer orderType; /** * 状态:0=新建,5=待处理,10=已完成,90=已关闭,91=已取消 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 bb276e4..ae6a500 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 @@ -889,7 +889,7 @@ public class WmsHqlPack { //单号 HqlPack.getStringLikerPack(wmsQCMaster.getOrderNo(), "orderNo", result); //业务类型 - HqlPack.getStringEqualPack(wmsQCMaster.getOrderType(), "orderType", result); + HqlPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result); //采购单号 HqlPack.getStringLikerPack(wmsQCMaster.getPoNo(), "poNo", result); //ASN单号 From 98671522780008cbc872d6a0330be94b0d8c9314 Mon Sep 17 00:00:00 2001 From: "frin.fei" <123456> Date: Mon, 19 Nov 2018 11:20:36 +0800 Subject: [PATCH 24/26] =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 2e108ed..06cea07 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -20,7 +20,8 @@ public class CommonEnumUtil { CORE(2, "i3core", "i3业务平台"), WMS(3, "i3wms", "仓库管理软件"), MES(4, "i3mes", "生产管理软件"), - CENTER(99,"regist-center","注册服务中心"); + SURFACE(98,"i3surface","对外服务"), + CENTER(99,"icloud-center","云服务中心"); public int value; public String code; From 80962cf2b3dfbb0e464f1661f5811f4185faaac3 Mon Sep 17 00:00:00 2001 From: "frin.fei" <123456> Date: Mon, 19 Nov 2018 14:18:46 +0800 Subject: [PATCH 25/26] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=B3=A8=E5=86=8C=E4=B8=AD=E5=BF=83icloud=20center=20?= =?UTF-8?q?service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 06cea07..840ee61 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -21,7 +21,7 @@ public class CommonEnumUtil { WMS(3, "i3wms", "仓库管理软件"), MES(4, "i3mes", "生产管理软件"), SURFACE(98,"i3surface","对外服务"), - CENTER(99,"icloud-center","云服务中心"); + CENTER(99,"icloud-server","云服务中心"); public int value; public String code; From 1cd4f356fd2b968908319de06e3052cbd659f51e Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 19 Nov 2018 14:24:34 +0800 Subject: [PATCH 26/26] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 index 61d3b3e..7e6d4ab 100644 --- 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 @@ -47,9 +47,9 @@ public class WmsSnPrint extends BaseBean { /** * 状态:0=创建,5=待处理,10=已处理 */ - @Column(name="STATUS") + @Column(name="PRINT_STATUS") @ApiParam(value = "状态", example = "0") - public Integer status; + public Integer printStatus; @Column(name="PRINT_TEMPLATE") @ApiParam("打印模板") 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 8c3fef6..956bae2 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 @@ -683,7 +683,7 @@ public class WmsHqlPack { // 打印机 HqlPack.getStringEqualPack(wmsSnPrint.getPrinter(), "printer", result); // 打印机状态 - HqlPack.getNumEqualPack(wmsSnPrint.getStatus(), "status", result); + HqlPack.getNumEqualPack(wmsSnPrint.getPrintStatus(), "printStatus", result); getStringBuilderPack(wmsSnPrint, result);