From 58d4c25ccc22ce24beb4b7a3cd10cc59004e69e3 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Tue, 13 Nov 2018 14:19:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1=EF=BC=8C=E5=BC=B1=E5=88=A0=E9=99=A4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 5d7b764..dbbc2af 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -881,7 +881,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep public int deleteWeaklyByPropertyIn(String propName, Object[] propValues,String username) { if(propValues != null && propValues.length > 0){ String hql = "update " + persistentClass.getName() - + " model set model.isValid = :isValid,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where model." + + " model set model.isDeleted = :isDeleted,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where model." + propName + " in(:"+propName+") "; Query query = entityManager.createQuery(hql); query.setParameter("isDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); @@ -903,7 +903,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep public int deleteWeaklyByProperties(String[] propName, Object[] propValue,String username) { if ((propName != null) && (propName.length > 0) && (propValue != null) && (propValue.length > 0) && (propValue.length == propName.length)) { StringBuffer sb = new StringBuffer("update " + persistentClass.getName() - + " model set model.isValid = :isValid,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where 1=1 "); + + " model set model.isDeleted = :isDeleted,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where 1=1 "); appendQL(sb,propName,propValue); Query query = entityManager.createQuery(sb.toString()); query.setParameter("modifyUser",username); From 92d74bee7b627516add4a2d2f1c677c4d80421ff Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Tue, 13 Nov 2018 14:21:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BC=80=E5=8F=91po=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=B8=BB=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 60 ++++++++++++++++++++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 19 ++++--- .../i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 16 +++--- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 +- 4 files changed, 76 insertions(+), 23 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 feecd2a..bbd993b 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 @@ -12,14 +12,64 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class WmsEnumUtil { /** + * PO主表信息 单据来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PO_ORDER_SRC { + MNU(1, "MNU", "手工"), + ERP(2, "ERP", "ERP接口"); + + private int value; + private String code; + private String description; + + private PO_ORDER_SRC(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + 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; + } + } + /** * PO主表信息 单据类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PO_ORDER_TYPE { REG(1, "REG", "原物料采购"), - SUB(2, "SUB", "委外采购"), - TAR(3, "TAR", "多角贸易采购"), - TAP(4, "TAP", "多角代采购"); + SUB(10, "SUB", "委外采购"), + TAR(20, "TAR", "多角贸易采购"), + TAP(30, "TAP", "多角代采购"); private int value; private String code; @@ -68,7 +118,7 @@ public class WmsEnumUtil { * PO主表信息 状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum PO_ORDER_STATUS { + public enum ORDER_STATUS { CREATE(0, "新建"), RECEIPT(10, "收货中"), RECEIPT_FINISH(20, "收货完成"), @@ -80,7 +130,7 @@ public class WmsEnumUtil { private int value; private String description; - private PO_ORDER_STATUS(int value, String description) { + private ORDER_STATUS(int value, String description) { this.value = value; this.description = description; } 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 36c2b14..f5a0b69 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 @@ -33,20 +33,20 @@ public class WmsPOMaster extends BaseBean { public String orderNo; /** - * 单据类型:1 REG=原物料采购, - * 2 SUB=委外采购,3 TAR=多角贸易采购,4 TAP=多角代采购 + * 单据类型: + * 1 REG=原物料采购,10 SUB=委外采购,20 TAR=多角贸易采购,30 TAP=多角代采购 */ - @Column(name="TYPE") + @Column(name="PO_TYPE") @ApiParam("单据类型") - public String type; + public String poType; /** - * 状态:0=新建,10=收货中,20=收货完成, + * 状态:1=新建,10=收货中,20=收货完成, * 30=入库中,40=入库完成,90=已关闭,91=已取消 */ - @Column(name="STATUS") - @ApiParam(value = "状态", example = "0") - public Integer status; + @Column(name="PO_STATUS") + @ApiParam(value = "状态", example = "1") + public Integer poStatus; @Column(name="VENDOR_NO") @ApiParam("供应商编号") @@ -56,6 +56,9 @@ public class WmsPOMaster extends BaseBean { @ApiParam("版本") public String version; + /** + * 单据来源：1 MNU=手工,2 ERP=ERP接口 + */ @Column(name="SRC") @ApiParam("单据来源") public String src; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 7ebd1b1..d4fc07a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -45,28 +45,28 @@ public class WmsPOMasterDetails extends BaseBean { public String partNameRdd; @Column(name="QTY") - @ApiParam(value = "需求数量", example = "0") + @ApiParam(value = "需求数量", example = "-1") public Double qty; @Column(name="PRINT_QTY") @ApiParam("条码打印数量") - public String printQty; + public Double printQty; @Column(name="RC_QTY") @ApiParam("收货数量") - public String rcQty; + public Double rcQty; @Column(name="PASS_QTY") @ApiParam("质检合格数量") - public String passQty; + public Double passQty; @Column(name="NG_QTY") @ApiParam("质检不合格数量") - public String ngQty; + public Double ngQty; @Column(name="UNIT") @ApiParam("单位") - public String unit; + public Double unit; @Column(name="ZDATE") @ApiParam("计划交货日期") @@ -83,9 +83,9 @@ public class WmsPOMasterDetails extends BaseBean { /** * 状态:N=正常,C=行取消 */ - @Column(name="STATUS") + @Column(name="ITEM_STATUS") @ApiParam("状态") - public String status; + public String itemStatus; @Column(name="SNP") @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 4c7fc68..ff5b38b 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 @@ -23,8 +23,8 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result); - HqlPack.getStringLikerPack(wmsPOMaster.getType(), "type", result); - HqlPack.getNumEqualPack(wmsPOMaster.getStatus(), "status", result); + HqlPack.getStringLikerPack(wmsPOMaster.getPoType(), "poType", result); + HqlPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result); HqlPack.getStringLikerPack(wmsPOMaster.getVendorNo(), "vendorNo", result); HqlPack.getStringLikerPack(wmsPOMaster.getSrc(), "src", result); HqlPack.getNumEqualPack(wmsPOMaster.getIsValid(), "isValid", result); From b9db3d00760278c9bbbc8b78799b6fba30c6c801 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Tue, 13 Nov 2018 17:45:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BC=80=E5=8F=91po=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E3=80=81=E6=98=8E=E7=BB=86=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 85 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 14 ++-- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 20 +++++ 3 files changed, 112 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 bbd993b..5f37e6a 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 @@ -10,6 +10,90 @@ import com.fasterxml.jackson.annotation.JsonFormat; * @Modify: **/ public class WmsEnumUtil { + /** + * PO订单明细信息 是否免费 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IS_FREE { + CHARGING(0, "计费"), GRATIS(1, "免费"); + + private int value; + private String description; + + private IS_FREE(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; + } + } + + /** + * PO订单明细信息 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ORDER_DETAILS_STATUS { + NORMAL(10, "N", "正常"), + ANCEL(20, "C", "行取消"); + + private int value; + private String code; + private String description; + + private ORDER_DETAILS_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + 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; + } + } /** * PO主表信息 单据来源 @@ -167,6 +251,7 @@ public class WmsEnumUtil { /** * 交易状态 */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TRANS_STATUS { CREATE(1, "创建"), FINISH(2, "完成"),FAIL(3,"失败"); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index d4fc07a..97216a8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -45,28 +45,28 @@ public class WmsPOMasterDetails extends BaseBean { public String partNameRdd; @Column(name="QTY") - @ApiParam(value = "需求数量", example = "-1") + @ApiParam(value = "需求数量", example = "0") public Double qty; @Column(name="PRINT_QTY") - @ApiParam("条码打印数量") + @ApiParam(value = "条码打印数量", example = "0") public Double printQty; @Column(name="RC_QTY") - @ApiParam("收货数量") + @ApiParam(value = "收货数量", example = "0") public Double rcQty; @Column(name="PASS_QTY") - @ApiParam("质检合格数量") + @ApiParam(value = "质检合格数量", example = "0") public Double passQty; @Column(name="NG_QTY") - @ApiParam("质检不合格数量") + @ApiParam(value = "质检不合格数量", example = "0") public Double ngQty; @Column(name="UNIT") @ApiParam("单位") - public Double unit; + public String unit; @Column(name="ZDATE") @ApiParam("计划交货日期") @@ -81,7 +81,7 @@ public class WmsPOMasterDetails extends BaseBean { public String whNo; /** - * 状态:N=正常,C=行取消 + * 状态:10 N=正常,20 C=行取消 */ @Column(name="ITEM_STATUS") @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 bcfef78..d423b99 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 @@ -11,6 +11,25 @@ import cn.estsh.i3plus.pojo.wms.bean.*; * @Modify: **/ public class WmsHqlPack { + /** + * PO订单明细表 分页查询 + * + * @param wmsPOMasterDetails + * @return + */ + public static String packHqlWmsPOMasterDetails(WmsPOMasterDetails wmsPOMasterDetails) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); + HqlPack.getStringLikerPack(wmsPOMasterDetails.getItem(), "item", result); + HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); + HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "zTime", result); + HqlPack.getStringLikerPack(wmsPOMasterDetails.getZDate(), "zDate", result); + + return result.toString(); + } /** * PO订单主表信息 分页查询 @@ -28,6 +47,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsPOMaster.getVendorNo(), "vendorNo", result); HqlPack.getStringLikerPack(wmsPOMaster.getSrc(), "src", result); HqlPack.getNumEqualPack(wmsPOMaster.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(wmsPOMaster.getIsDeleted(), "isDeleted", result); return result.toString(); }