From d2860e03fc93698346ae72f42d66a508b158ae7c Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Tue, 13 Nov 2018 10:08:38 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=BD=92=E6=A1=A3=E8=A1=A8=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=92=8C=E5=BA=93=E5=AD=98=E8=A1=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 21 +++++++++++++++++++++ 1 file changed, 21 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 a806b32..5d904dd 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 @@ -392,4 +392,25 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(), "flagDesc", result); return result.toString(); } + + /** + * 产品发运信息 查询条件封装 + * + * @param wmsShopping + * @return + */ + public static String packHqlWmsShipping(WmsShopping wmsShopping) { + StringBuffer result = new StringBuffer(); + //有效性 + HqlPack.getNumEqualPack(wmsShopping.getIsValid(), "isValid", result); + //发运单号 + HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result); + //客户编码 + HqlPack.getStringLikerPack(wmsShopping.getCustNo(), "custNo", result); + //条码 + HqlPack.getStringLikerPack(wmsShopping.getPartNo(), "partNo", result); + //发运状态 + HqlPack.getStringEqualPack(wmsShopping.getStatus().toString(), "status", result); + return result.toString(); + } } 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 02/15] =?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 f7ceb96badb0670c2894db951912f8224ea5bb6f Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Tue, 13 Nov 2018 10:39:39 +0800 Subject: [PATCH 03/15] =?UTF-8?q?1=EF=BC=8C=E5=BC=B1=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E8=B0=83=E6=95=B4=202=EF=BC=8C=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=BC=B1=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java | 2 +- .../cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index 7955b74..d9790e8 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -229,7 +229,7 @@ public interface BaseRepository extends JpaReposito public int deleteWeaklyByProperties(String[] propNames, Object[] objValues,String username); /** - * 更新有效无效状态 + * 更新启用禁用 * @return count */ public int updateValidStatusById(ID id,int status,String username); 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 dce4a33..fdd8369 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 @@ -883,7 +883,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep + " model set model.isValid = :isValid,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where model." + propName + " in(:"+propName+") "; Query query = entityManager.createQuery(hql); - query.setParameter("isValid",CommonEnumUtil.IS_VAILD.INVAILD.getValue()); + query.setParameter("isDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); query.setParameter("modifyUser",username); query.setParameter("modifyDatetime",getNowTime(true)); query.setParameter(propName, Arrays.asList(propValues)); @@ -907,7 +907,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep Query query = entityManager.createQuery(sb.toString()); query.setParameter("modifyUser",username); query.setParameter("modifyDatetime",getNowTime(true)); - query.setParameter("isValid",CommonEnumUtil.IS_VAILD.INVAILD.getValue()); + query.setParameter("isDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); setParameter(query,propName,propValue); @@ -933,7 +933,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep } /** - * 批量弱删除 + * 批量禁用 * @return */ @Override @@ -955,7 +955,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep } /** - * 批量弱删除 + * 批量禁用 * @return */ @Override From 0bacd88012822bcf427b2ab4493c2e894f6348b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 13 Nov 2018 10:42:33 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{BasCustomerRepositry.java => BasCustomerRepository.java} | 2 +- .../{WmsShippingFlagRepositry.java => WmsShippingFlagRepository.java} | 2 +- .../wms/repository/{WmsZonesRepositry.java => WmsZonesRepository.java} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/{BasCustomerRepositry.java => BasCustomerRepository.java} (82%) rename modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/{WmsShippingFlagRepositry.java => WmsShippingFlagRepository.java} (81%) rename modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/{WmsZonesRepositry.java => WmsZonesRepository.java} (83%) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepositry.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepository.java similarity index 82% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepositry.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepository.java index 40478e5..7d24900 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepositry.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepository.java @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface BasCustomerRepositry extends BaseRepository { +public interface BasCustomerRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingFlagRepositry.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingFlagRepository.java similarity index 81% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingFlagRepositry.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingFlagRepository.java index cab9915..cae338f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingFlagRepositry.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingFlagRepository.java @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface WmsShippingFlagRepositry extends BaseRepository { +public interface WmsShippingFlagRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepositry.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepository.java similarity index 83% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepositry.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepository.java index c61fec7..776cec3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepositry.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepository.java @@ -12,6 +12,6 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface WmsZonesRepositry extends BaseRepository { +public interface WmsZonesRepository extends BaseRepository { } 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 05/15] =?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 06/15] =?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 07/15] =?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 08/15] =?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 09/15] =?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(); } From 73c5e20c0165544937b35a531e7ec7f26d495c9b Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Tue, 13 Nov 2018 17:48:13 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E5=8D=95=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E7=A7=BB=E5=BA=93=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsDocMovementDetails.java | 119 ++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 102 ++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsMoveMentDetails.java | 120 --------------------- .../i3plus/pojo/wms/bean/WmsMoveMentMaster.java | 101 ----------------- .../WmsDocMovementDetailsRepository.java | 16 +++ .../repository/WmsDocMovementMasterRepository.java | 16 +++ .../repository/WmsMoveMentDetailsRepository.java | 16 --- .../repository/WmsMoveMentMasterRepository.java | 16 --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 34 ++++++ 9 files changed, 287 insertions(+), 253 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentDetails.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentMaster.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementDetailsRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementMasterRepository.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentDetailsRepository.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentMasterRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java new file mode 100644 index 0000000..6680d2c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -0,0 +1,119 @@ +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; + +/** + * @Description :移库单详情实体(用于转储类业务) + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2018-11-13 16:06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_DOC_MOVEMENT_DETAILS") +@Api("移库单详情表") +public class WmsDocMovementDetails extends BaseBean { + @Column(name = "ORDER_NO") + @ApiParam(value = "单号") + private String orderNo; + + @Column(name = "ITEM") + @ApiParam(value = "行号", example = "1") + private Integer item; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "物料名称") + private String partName; + + @Column(name = "UNIT") + @ApiParam(value = "单位") + private String unit; + + @Column(name = "SRC_WH") + @ApiParam(value = "发出库仓库") + private String srcWh; + + + @Column(name = "DEST_WH") + @ApiParam(value = "接收库仓库") + private String destWh; + + @Column(name = "QTY") + @ApiParam(value = "需求数量", example = "1") + private Double qty; + + @Column(name = "PRINT_QTY") + @ApiParam(value = "条码打印数量", example = "1") + private Double printQty; + + @Column(name = "FACT_QTY") + @ApiParam(value = "操作完成数量", example = "1") + private Double factQty; + + @Column(name = "ZDATE") + @ApiParam(value = "计划日期") + private String zdate; + + @Column(name = "ZTIME") + @ApiParam(value = "计划时间") + private String ztime; + + @Column(name = "SRC_NO") + @ApiParam(value = "源单号") + private String srcNo; + /** + * 状态:N=正常,C=行取消 + */ + @Column(name = "ITEM_STATUS") + @ApiParam(value = "状态", example = "1") + private Integer itemStatus; + + /** + * 是否免费:0=计费,1=免费 + */ + @Column(name = "IS_FREE") + @ApiParam(value = "是否免费", example = "1") + public Integer isFree; + + @Column(name = "REMARK") + @ApiParam(value = "操作原因") + private String remark; + + @Column(name = "PICK_QTY") + @ApiParam(value = "已配数量", example = "1") + private Double pickQty; + + @Column(name = "OUT_QTY") + @ApiParam(value = "已提交数量", example = "1") + private Double outQty; + + @Column(name = "INLINE_QTY") + @ApiParam(value = "已上线数量", example = "1") + private Double inlineQty; + + @Column(name = "REJECT_QTY") + @ApiParam(value = "退料数量", example = "1") + private Double rejectQty; + + @Column(name = "REJECT_POST_QTY") + @ApiParam(value = "退料提交数量", example = "1") + private Double rejectPostQty; +} 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 new file mode 100644 index 0000000..1a3bc2a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -0,0 +1,102 @@ +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; + +/** + * @Description :移库单实体(用于转储类业务) + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2018-11-13 16:06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_DOC_MOVEMENT_MASTER") +@Api("移库单表") +public class WmsDocMovementMaster extends BaseBean { + @Column(name = "ORDER_NO") + @ApiParam(value = "移库单单号") + private String orderNo; + /** + * 移动类型:IN=入库,OUT=出库,MOVE=移库 + */ + @Column(name = "MOVE_TYPE") + @ApiParam("移动类型") + public String moveType; + /** + * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发, + * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料, + * MI=移库入库,MO=移库出库,SO=发运 + */ + @Column(name = "BUSI_TYPE") + @ApiParam(value = "业务类型", example = "1") + public Integer busiType; + + /** + * 状态:0=新建,10=处理中 + * ,20=已完成,90=已关闭,91=已取消 + */ + @Column(name = "ORDER_STATUS") + @ApiParam(value = "状态", example = "1") + public Integer orderStatus; + + @Column(name = "CUSTOMER_NO") + @ApiParam(value = "客户编号") + private String customerNo; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编号") + private String vendorNo; + + @Column(name = "VERSION") + @ApiParam(value = "版本", example = "1") + private Integer version; + + /** + * 单据类型::1=工单配料 + */ + @Column(name = "REF_TYPE") + @ApiParam(value = "关联单据类型") + private String refType; + + @Column(name = "REF_NO") + @ApiParam(value = "关联单据") + private String refNo; + + @Column(name = "ERP_SRC_NO") + @ApiParam(value = "ERP单号") + private String erpSrcNo; + + /** + * 单据类型::1=工单配料 + */ + @Column(name = "ORDER_TYPE") + @ApiParam(value = "单据类型") + private String orderType; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "物料名称") + private String partName; + + @Column(name = "QTY") + @ApiParam(value = "数量", example = "1") + private Double qty; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentDetails.java deleted file mode 100644 index a92ffd2..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentDetails.java +++ /dev/null @@ -1,120 +0,0 @@ -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; - -/** - * @Description : 库存移动单明细信息 - * @Reference : - * @Author : silliter.yuan - * @CreateDate : 2018-11-06 15:58 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="WMS_DOC_MOVEMENT_DETAILS") -@Api("库存移动单明细信息") -public class WmsMoveMentDetails extends BaseBean { - - @Column(name="ORDER_NO") - @ApiParam("单号") - public String orderNo; - - @Column(name="ITEM") - @ApiParam("行号") - public String item; - - @Column(name="PART_NO") - @ApiParam("物料编码") - public String partNo; - - @Column(name="PART_NAME_RDD") - @ApiParam("物料名称") - public String partNameRdd; - - @Column(name="QTY") - @ApiParam(value = "需求数量", example = "0") - public Double qty; - - @Column(name="UNIT") - @ApiParam("单位") - public String unit; - - @Column(name="SRC_WH") - @ApiParam("发出库仓库") - public String srcWh; - - @Column(name="DEST_WH") - @ApiParam("接收库仓库") - public String destWh; - - @Column(name="PRINT_QTY") - @ApiParam("条码打印数量") - public String printQty; - - @Column(name="FACT_QTY") - @ApiParam("操作完成数量") - public String factQty; - - @Column(name="ZDATE") - @ApiParam("计划交货日期") - public String zDate; - - @Column(name="ZTIME") - @ApiParam("计划交货时间") - public String zTime; - - @Column(name="SRC_NO") - @ApiParam("源单号") - public String srcNo; - - /** - * 状态:N=正常,C=行取消 - */ - @Column(name="STATUS") - @ApiParam(value = "状态", example = "1") - public Integer status; - - @Column(name="REMARK") - @ApiParam("备注") - public String reMark; - - /** - * 是否免费:0=计费,1=免费 - */ - @Column(name="IS_FREE") - @ApiParam(value = "是否免费", example = "1") - public Integer isFree; - - @Column(name="PICK_QTY") - @ApiParam(value = "已配数量", example = "0") - public Double pickQty; - - @Column(name="OUT_QTY") - @ApiParam(value = "已提交数量", example = "0") - public Double outQty; - - @Column(name="INLINE_QTY") - @ApiParam(value = "已上线数量", example = "0") - public Double inLineQty; - - @Column(name="REJECT_QTY") - @ApiParam(value = "退料数量", example = "0") - public Double rejectQty; - - @Column(name="REJECT_POST_QTY") - @ApiParam(value = "退料提交数量", example = "0") - public Double rejectPostQty; -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentMaster.java deleted file mode 100644 index 92dc1ca..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentMaster.java +++ /dev/null @@ -1,101 +0,0 @@ -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; - -/** - * @Description : 库存移动单主表信息(用于转储类业务) - * @Reference : - * @Author : silliter.yuan - * @CreateDate : 2018-11-06 15:58 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="WMS_DOC_MOVEMENT_MASTER") -@Api("库存移动单主表信息") -public class WmsMoveMentMaster extends BaseBean { - - @Column(name="ORDER_NO") - @ApiParam("单号") - public String orderNo; - - /** - * 移动类型:IN=入库,OUT=出库,MOVE=移库 - */ - @Column(name="MOVE_TYPE") - @ApiParam("移动类型") - public String moveType; - - /** - * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发, - * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料, - * MI=移库入库,MO=移库出库,SO=发运 - */ - @Column(name="TYPE") - @ApiParam("业务类型") - public String type; - - /** - * 状态:0=新建,10=处理中 - * ,20=已完成,90=已关闭,91=已取消 - */ - @Column(name="STATUS") - @ApiParam(value = "状态", example = "0") - public Integer status; - - @Column(name="CUSTOMER_NO") - @ApiParam("客户编号") - public String customerNo; - - @Column(name="VENDOR_NO") - @ApiParam("供应商编号") - public String vendorNo; - - @Column(name="VERSION") - @ApiParam("版本") - public String version; - - @Column(name="SRC") - @ApiParam("单据来源") - public String src; - - @Column(name="SRC_NO") - @ApiParam("关联单据") - public String srcNo; - - @Column(name="ERP_ORDERNO") - @ApiParam("ERP单号") - public String erpOrderNo; - - /** - * 单据类型:WO=工单配料 - */ - @Column(name="ORDER_TYPE") - @ApiParam("单据类型") - public String orderType; - - @Column(name="PART_NO") - @ApiParam("物料编码") - public String partNo; - - @Column(name="PART_NAME_RDD") - @ApiParam("物料名称") - public String partNameRdd; - - @Column(name="QTY") - @ApiParam(value = "需求数量", example = "0") - public Double qty; -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementDetailsRepository.java new file mode 100644 index 0000000..74e804a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementDetailsRepository.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.WmsDocMovementDetails; +import org.springframework.stereotype.Repository; + +/** +* @Description :库存移动单详情表的方法接口 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2018-11-13 10:19 +* @Modify: +**/ +@Repository +public interface WmsDocMovementDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementMasterRepository.java new file mode 100644 index 0000000..7dea50e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementMasterRepository.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.WmsDocMovementMaster; +import org.springframework.stereotype.Repository; + +/** +* @Description :库存移动单主表的方法接口 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2018-11-13 10:19 +* @Modify: +**/ +@Repository +public interface WmsDocMovementMasterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentDetailsRepository.java deleted file mode 100644 index ef0c9c5..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentDetailsRepository.java +++ /dev/null @@ -1,16 +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.WmsMoveMentDetails; -import org.springframework.stereotype.Repository; - -/** - * @Description : 对象持久层仓用方法控制 - * @Reference : - * @Author : silliter.yuan - * @CreateDate : 2018-11-06 9:47 - * @Modify: - **/ -@Repository -public interface WmsMoveMentDetailsRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentMasterRepository.java deleted file mode 100644 index 6ea8bc5..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentMasterRepository.java +++ /dev/null @@ -1,16 +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.WmsMoveMentMaster; -import org.springframework.stereotype.Repository; - -/** - * @Description : 对象持久层仓用方法控制 - * @Reference : - * @Author : silliter.yuan - * @CreateDate : 2018-11-06 9:47 - * @Modify: - **/ -@Repository -public interface WmsMoveMentMasterRepository 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 98aca6c..63cbd80 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 @@ -13,6 +13,40 @@ import cn.estsh.i3plus.pojo.wms.bean.*; public class WmsHqlPack { /** + * 库存移动单详情查询封装 + * + * @param wmsDocMovementDetails + * @return + */ + public static String packWmsDocMovementDetails(WmsDocMovementDetails wmsDocMovementDetails) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsDocMovementDetails.getOrganizeCode(), "organizeCode", result); + + return result.toString(); + } + /** + * 库存移动单查询封装 + * + * @param wmsDocMovementMaster + * @return + */ + public static String packWmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", result); + HqlPack.getStringLikerPack(wmsDocMovementMaster.getMoveType(), "moveType", result); + HqlPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", result); + HqlPack.getNumEqualPack(wmsDocMovementMaster.getPartNo(), "partNo", result); + HqlPack.timeBuilder(wmsDocMovementMaster.getCreateDateTimeStart(), wmsDocMovementMaster.getCreateDateTimeEnd(), "createDatetime", result, true); + HqlPack.getNumEqualPack(wmsDocMovementMaster.getIsValid(), "isValid", result); + + return result.toString(); + } + /** * PO订单主表信息 分页查询 * * @param wmsPOMaster From 72407a5afcae848d5adb3ad53c3d315eea66d6ca Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Tue, 13 Nov 2018 18:01:49 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E5=8F=91=E8=BF=90=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsCheckFactRecord.java | 3 +++ .../cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java | 11 ++++++---- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 25 +++++++++++++++++++++- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java index 0890c54..cc86295 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java @@ -63,4 +63,7 @@ public class WmsCheckFactRecord extends BaseBean { @Column(name="CHECK_QTY") @ApiParam(value = "抽点数量", example = "0") public Double checkQty; + + @ApiParam(value ="供应商全称") + private transient String vendorDesc; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java index b68e949..2bba402 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java @@ -53,11 +53,11 @@ public class WmsShopping extends BaseBean { public String sn; /** - * 状态:0=新建,10=已处理,20=处理出错 + * 状态:10=新建,20=已处理,30=处理出错 */ - @Column(name="STATUS") - @ApiParam(value = "状态", example = "0") - public Integer status; + @Column(name="ORDER_STATUS") + @ApiParam(value = "状态", example = "10") + public Integer orderStatus; @Column(name="REMARK") @ApiParam("备注") @@ -74,4 +74,7 @@ public class WmsShopping extends BaseBean { @Column(name="SHIPPING_FLAG") @ApiParam("特殊发货标志") public String shippingFlag; + + @ApiParam(value ="客户简称") + private transient String custName; } 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 98aca6c..c2e314d 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 @@ -453,7 +453,30 @@ public class WmsHqlPack { //条码 HqlPack.getStringLikerPack(wmsShopping.getPartNo(), "partNo", result); //发运状态 - HqlPack.getStringEqualPack(wmsShopping.getStatus().toString(), "status", result); + HqlPack.getStringEqualPack(wmsShopping.getOrderStatus().toString(), "orderStatus", result); + return result.toString(); + } + + /** + * 产品发运信息 查询条件封装 + * + * @param wmsCheckFactRecord + * @return + */ + public static String packHqlWmsCheckFactRecord(WmsCheckFactRecord wmsCheckFactRecord) { + StringBuffer result = new StringBuffer(); + //有效性 + HqlPack.getNumEqualPack(wmsCheckFactRecord.getIsValid(), "isValid", result); + //采购单号 + HqlPack.getStringLikerPack(wmsCheckFactRecord.getPoNo(), "poNo", result); + //ASN单号 + HqlPack.getStringLikerPack(wmsCheckFactRecord.getAsnNo(), "asnNo", result); + //条码 + HqlPack.getStringLikerPack(wmsCheckFactRecord.getSn(), "getSn", result); + //物料编码 + HqlPack.getStringEqualPack(wmsCheckFactRecord.getPartNo(), "partNo", result); + //供应商编号 + HqlPack.getStringEqualPack(wmsCheckFactRecord.getVendorNo(), "vendorNo", result); return result.toString(); } } From 37008febabde05bdc57becce09d42934dea08254 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Tue, 13 Nov 2018 18:02:03 +0800 Subject: [PATCH 12/15] =?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 --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 54 ++++++++++++++++++++-- 1 file changed, 49 insertions(+), 5 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 98aca6c..1cd5189 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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; @@ -209,7 +210,6 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsObject.getTableName(), "tableName", result); // 自定义业务拦截 HqlPack.getStringEqualPack(wmsObject.getBizIntercept(), "bizIntercept", result); - return result.toString(); } @@ -241,7 +241,6 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsTransType.getIsValid(), "isValid", result); HqlPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result); - return result.toString(); } @@ -258,7 +257,6 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsTrans.getTransCode(), "transCode", result); HqlPack.getStringEqualPack(wmsTrans.getSn(), "sn", result); HqlPack.timeBuilder(wmsTrans.getCreateDatetime(), null, "createDatetime", result, true); - return result.toString(); } @@ -275,6 +273,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); HqlPack.getNumEqualPack(wareHouse.getIsValid(), "isValid", result); HqlPack.getStringEqualPack(wareHouse.getOrganizeCode(), "organizeCode", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); return result.toString(); } @@ -298,6 +297,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(basVendor.getIsAsn().toString(), "isAsn", result); } HqlPack.getNumEqualPack(basVendor.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); return result.toString(); } @@ -317,6 +317,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsOpType.getProCode(), "proCode", result); HqlPack.getNumEqualPack(wmsOpType.getIsValid(), "isValid", result); HqlPack.getStringEqualPack(wmsOpType.getOrganizeCode(), "organizeCode", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); return result.toString(); } @@ -331,6 +332,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wareHouse.getName(), "name", result); HqlPack.getStringEqualPack(wareHouse.getCode(), "code", result); HqlPack.getNumNOEqualPack(wareHouse.getId(), "id", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); return result.toString(); } @@ -348,6 +350,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result); HqlPack.getStringEqualPack(basVendor.getVendorName(), "vendorName", result); HqlPack.getStringEqualPack(basVendor.getVendorDesc(), "vendorDesc", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); return result.toString(); } @@ -355,6 +358,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); HqlPack.getStringEqualPack(wmsOpType.getOpTypeName(), "opTypeName", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); return result.toString(); } @@ -424,14 +428,15 @@ public class WmsHqlPack { 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.getAsnType(),"type",result); + HqlPack.getStringLikerPack(wmsASNMaster.getAsnStatus().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); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); HqlPack.getStringEqualPack(wmsASNMaster.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -456,4 +461,43 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsShopping.getStatus().toString(), "status", result); return result.toString(); } + + /** + * 明细表唯一性查询 + * @return + */ + public static String packHqlwmsASNMasterDetailsUnique(WmsASNMasterDetails wmsASNMasterDetails){ + StringBuffer result = new StringBuffer(); + //有效性 + HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); + return result.toString(); + } + + public static String packHqlWmsASNMasterDetails(WmsASNMasterDetails wmsASNMasterDetails){ + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getItem(), "item", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getPartNameRdd(), "partNameRdd", result); + HqlPack.getNumLikerPack(wmsASNMasterDetails.getQty(), "qty", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getPoItem(), "poItem", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getUnit(), "unit", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getZDate(), "zDate", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getZTime(), "zTime", result); + HqlPack.getNumLikerPack(wmsASNMasterDetails.getItemStatus(), "itemStatus", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getPackAge(), "packAge", result); + HqlPack.getNumLikerPack(wmsASNMasterDetails.getIsFree(), "isFree", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getDock(), "dock", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getSnOneBarCode(), "snOneBarCode", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getSnTwoBarCode(), "snTwoBarCode", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getGroupNo(), "groupNo", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getErpWhNo(), "erpWhNo", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getVendorLotNo(), "vendorLotNo", result); + + //有效性 + HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); + return result.toString(); + } } From 22d5ba1c0f3158e5b230918b31d7465987fd3a20 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Tue, 13 Nov 2018 18:02:30 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=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 --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 120 +++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 8 +- .../i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 6 +- 3 files changed, 127 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 feecd2a..9226919 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 @@ -213,4 +213,124 @@ public class WmsEnumUtil { return tmp; } } + + /** + * ASN单据类型 + */ + public enum ASN_ORDER_TYPE{ + + REG("REG","原物料采购"),SUB("SUB","委外采购"),TAR("TAR","多角贸易采购"),TAP("TAP","多角代采购"); + + private String value; + private String description; + + ASN_ORDER_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * ASN明细表状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ASN_MASTER_ORDER_STATUS { + NORMAL(1, "N", "正常"), + CANCEL(2, "C", "行取消"), + RECEIPTED(3, "R", "已收货"); + + private int value; + private String code; + private String description; + + private ASN_MASTER_ORDER_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; + } + } + + /** + * 是否已删除 + */ + public enum IS_DELETED { + DELETED(1, "已删除"), INDELETED(2, "未删除"); + + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + IS_DELETED(int value, String description) { + this.value = value; + this.description = 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/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index f561ecf..d0f47fa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -36,17 +36,17 @@ public class WmsASNMaster extends BaseBean { * 单据类型:REG=原物料采购, * SUB=委外采购,TAR=多角贸易采购,TAP=多角代采购 */ - @Column(name="TYPE") + @Column(name="ASN_TYPE") @ApiParam("单据类型") - public String type; + public String asnType; /** * 状态:0=新建,10=收货中,20=收货完成, * 30=入库中,40=入库完成,90=已关闭,91=已取消 */ - @Column(name="STATUS") + @Column(name="ASN_STATUS") @ApiParam(value = "状态", example = "0") - public Integer status; + public Integer asnStatus; @Column(name="VENDOR_NO") @ApiParam("供应商编号") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index de5cc1f..ccc7391 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -67,13 +67,13 @@ public class WmsASNMasterDetails extends BaseBean { /** * 状态:N=正常,C=行取消,R=已收货 */ - @Column(name="STATUS") + @Column(name="ITEM_STATUS") @ApiParam(value = "状态", example = "1") - public Integer status; + public Integer itemStatus; @Column(name="PACKAGE") @ApiParam("包装名称") - public String pageAge; + public String packAge; /** * 是否免费:0=计费,1=免费 From 6fe3f2a1ff0a5af965b3f43f5ff1dfe5f437da82 Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Tue, 13 Nov 2018 18:03:30 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=BD=E7=82=B9?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/repository/WmsCheckFactRecordRepository.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCheckFactRecordRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCheckFactRecordRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCheckFactRecordRepository.java new file mode 100644 index 0000000..9970ffd --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCheckFactRecordRepository.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.WmsCheckFactRecord; +import cn.estsh.i3plus.pojo.wms.bean.WmsIbCheckPlan; + +/** + * @Description : 抽点记录表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2018-11-13 15:38 + * @Modify: + **/ +public interface WmsCheckFactRecordRepository extends BaseRepository { +} From 5914c4e74690146de52a9f67135134921a2887fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 13 Nov 2018 18:12:38 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=92=8C=E4=BD=9C=E4=B8=9A=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=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/WmsFGInStock.java | 15 +++++--- .../cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 8 ++-- .../pojo/wms/repository/WmsTaskInfoRepository.java | 16 ++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 45 ++++++++++++++++++++++ 4 files changed, 74 insertions(+), 10 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskInfoRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java index 837a423..9be8adb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java @@ -57,16 +57,19 @@ public class WmsFGInStock extends BaseBean { public String sn; /** - * 状态:0=新建,10=已处理,20=处理出错 + * 状态：1=新建,10=已处理,20=处理出错 */ - @Column(name="STATUS") - @ApiParam(value = "状态", example = "0") - public Integer status; + @Column(name="ORDER_STATUS") + @ApiParam(value = "状态", example = "1") + public Integer orderStatus; @Column(name="REMARK") @ApiParam("备注") public String reMark; + /** + * 来源：MNU=手工,MES=MES接口 + */ @Column(name="SRC") @ApiParam("单据来源") public String src; @@ -91,7 +94,7 @@ public class WmsFGInStock extends BaseBean { @ApiParam("特殊发货标志") public String shippingFlag; - @Column(name="LOT_NO") + @Column(name="MFG_LOG_NO") @ApiParam("生产批次") - public String lotNo; + public String mfgLogNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index 6b67dcf..764561c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -45,9 +45,9 @@ public class WmsTaskInfo extends BaseBean { public String reMark; /** - * 状态:0=创建,5=待处理,10=已处理 + * 状态:1=创建,10=待处理,20=已处理 */ - @Column(name="STATUS") - @ApiParam(value = "状态", example = "0") - public Integer status; + @Column(name="TASK_STATUS") + @ApiParam(value = "状态", example = "1") + public Integer taskStatus; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskInfoRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskInfoRepository.java new file mode 100644 index 0000000..cb32291 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskInfoRepository.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.WmsTaskInfo; +import org.springframework.stereotype.Repository; + +/** + * @Description :对象持久层仓用方法控制(作业任务信息) + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-13 15:53 + * @Modify: + **/ +@Repository +public interface WmsTaskInfoRepository 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 3bb74ab..e151350 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 @@ -577,4 +577,49 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); return result.toString(); } + + /** + * 产品入库信息 条件封装 + * @param wmsFGInStock + * @return + */ + public static String packHqlWmsFGInStock(WmsFGInStock wmsFGInStock){ + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsFGInStock.getOrderNo(),"orderNo",result); + HqlPack.getStringLikerPack(wmsFGInStock.getWoNo(),"woNo",result); + HqlPack.getStringLikerPack(wmsFGInStock.getPartNo(),"partNo",result); + HqlPack.getStringLikerPack(wmsFGInStock.getPartNameRdd(),"partNameRdd",result); + HqlPack.getNumEqualPackDouble(wmsFGInStock.getQty(),"qty",result); + HqlPack.getStringLikerPack(wmsFGInStock.getUnit(),"unit",result); + HqlPack.getStringLikerPack(wmsFGInStock.getSn(),"sn",result); + HqlPack.getNumEqualPack(wmsFGInStock.getOrderStatus(),"orderStatus",result); + HqlPack.getStringLikerPack(wmsFGInStock.getReMark(),"reMark",result); + HqlPack.getStringLikerPack(wmsFGInStock.getSrc(),"src",result); + HqlPack.getStringLikerPack(wmsFGInStock.getErpWhNo(),"erpWhno",result); + HqlPack.getStringLikerPack(wmsFGInStock.getLineNo(),"lineNo",result); + HqlPack.getStringLikerPack(wmsFGInStock.getWhNo(),"whNo",result); + HqlPack.getStringLikerPack(wmsFGInStock.getCustNo(),"custNo",result); + HqlPack.getStringLikerPack(wmsFGInStock.getShippingFlag(),"shippingFlag",result); + HqlPack.getStringLikerPack(wmsFGInStock.getMfgLogNo(),"mfgLogNo",result); + HqlPack.getNumEqualPack(wmsFGInStock.getIsValid(),"isValid",result); + HqlPack.getNumEqualPack(wmsFGInStock.getIsDeleted(),"isDeleted",result); + return result.toString(); + } + + /** + * 作业任务信息条件封装 + * @param wmsTaskInfo + * @return + */ + public static String packHqlWmsTaskInfo(WmsTaskInfo wmsTaskInfo){ + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(),"moveNo",result); + HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(),"userNo",result); + HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(),"opTypeCode",result); + HqlPack.getStringLikerPack(wmsTaskInfo.getReMark(),"reMark",result); + HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(),"taskStatus",result); + HqlPack.getNumEqualPack(wmsTaskInfo.getIsValid(),"isValid",result); + HqlPack.getNumEqualPack(wmsTaskInfo.getIsDeleted(),"isDeleted",result); + return result.toString(); + } }