From d0c6ec627c86777185d44f9f52a68bc88e000d96 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Tue, 13 Nov 2018 10:25:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=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/CommonEnumUtil.java | 23 -------------------- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 25 ++++++++++++++++++++-- 2 files changed, 23 insertions(+), 25 deletions(-) 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 30cb2cf..0bd8dae 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 @@ -502,27 +502,4 @@ public class CommonEnumUtil { } } - /** - * 启用或禁用 - */ - public enum OPEN_CLOSE { - OPEN(1, "启用"), - CLOSE(2, "禁用"); - - private int value; - private String description; - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - OPEN_CLOSE(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/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index a806b32..520759e 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 @@ -325,8 +325,8 @@ public class WmsHqlPack { public static String packHqlWmsOpTypeUnique(WmsOpType wmsOpType) { StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); - HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result); + HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); + HqlPack.getStringEqualPack(wmsOpType.getOpTypeName(), "opTypeName", result); return result.toString(); } @@ -392,4 +392,25 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(), "flagDesc", result); return result.toString(); } + + /** + * ASN订单分页查询条件 + * @param wmsASNMaster + * @return + */ + public static String packHqlWmsASNMaster(WmsASNMaster wmsASNMaster){ + StringBuffer result = new StringBuffer(); + + HqlPack.getStringLikerPack(wmsASNMaster.getOrderNo(),"orderNo",result); + HqlPack.getStringLikerPack(wmsASNMaster.getType(),"type",result); + HqlPack.getStringLikerPack(wmsASNMaster.getStatus().toString(),"status",result); + HqlPack.getStringLikerPack(wmsASNMaster.getVendorNo(),"vendorNo",result); + HqlPack.getStringLikerPack(wmsASNMaster.getVersion(),"version",result); + HqlPack.getStringLikerPack(wmsASNMaster.getSrc(),"src",result); + HqlPack.getStringLikerPack(wmsASNMaster.getPoNo(),"poNo",result); + //有效性 + HqlPack.getNumEqualPack(wmsASNMaster.getIsValid(), "isValid", result); + + return result.toString(); + } } From 1ef429fc783ab40793b496226eb1e5e8aaa7e265 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Tue, 13 Nov 2018 11:50:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= 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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 8619023..46d292d 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 @@ -270,6 +270,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); HqlPack.getNumEqualPack(wareHouse.getIsValid(), "isValid", result); + HqlPack.getStringEqualPack(wareHouse.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -288,6 +289,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", result); HqlPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result); HqlPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result); + HqlPack.getStringEqualPack(basVendor.getOrganizeCode(), "organizeCode", result); if (basVendor.getIsAsn() != null) { HqlPack.getStringLikerPack(basVendor.getIsAsn().toString(), "isAsn", result); } @@ -310,6 +312,7 @@ public class WmsHqlPack { } HqlPack.getStringLikerPack(wmsOpType.getProCode(), "proCode", result); HqlPack.getNumEqualPack(wmsOpType.getIsValid(), "isValid", result); + HqlPack.getStringEqualPack(wmsOpType.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -425,7 +428,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsASNMaster.getPoNo(),"poNo",result); //有效性 HqlPack.getNumEqualPack(wmsASNMaster.getIsValid(), "isValid", result); - + HqlPack.getStringEqualPack(wmsASNMaster.getOrganizeCode(), "organizeCode", result); return result.toString(); } From 41edf3f7316f58fb27126c388b164509fb03b2b2 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Tue, 13 Nov 2018 13:46:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=8E=82?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BD=9C=E4=B8=BA=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=EF=BC=9B=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F=E8=BD=AF?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=B9=E6=B3=95?= 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 | 4 ++++ 1 file changed, 4 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 3e45e2b..77f6a00 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 @@ -27,6 +27,7 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsRoutingDetail.getParentSeq(), "parentSeq", result); HqlPack.timeBuilder(wmsRoutingDetail.getCreateDateTimeStart(), wmsRoutingDetail.getCreateDateTimeEnd(), "createDatetime", result, true); HqlPack.getNumEqualPack(wmsRoutingDetail.getIsValid(), "isValid", result); + HqlPack.getStringEqualPack(wmsRoutingDetail.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -45,6 +46,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsRoutingAssign.getVendorNo(), "vendorNo", result); HqlPack.getStringLikerPack(wmsRoutingAssign.getRoutingCode(), "routingCode", result); HqlPack.timeBuilder(wmsRoutingAssign.getCreateDateTimeStart(), wmsRoutingAssign.getCreateDateTimeEnd(), "createDatetime", result, true); + HqlPack.getStringEqualPack(wmsRoutingAssign.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -61,6 +63,7 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsRoutingMaster.getSeq(), "seq", result); HqlPack.timeBuilder(wmsRoutingMaster.getCreateDateTimeStart(), wmsRoutingMaster.getCreateDateTimeEnd(), "createDatetime", result, true); HqlPack.getNumEqualPack(wmsRoutingMaster.getIsValid(), "isValid", result); + HqlPack.getStringEqualPack(wmsRoutingMaster.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -79,6 +82,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsPart.getAbc(), "abc", result); HqlPack.getNumEqualPack(wmsPart.getIqc(), "iqc", result); HqlPack.getStringLikerPack(wmsPart.getPartGroup(), "partGroup", result); + HqlPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", result); return result.toString(); } 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 4/4] =?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);