From 538ecf84c30a6d31dd65465d56a33b15e70d4333 Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Wed, 14 Nov 2018 13:31:52 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=BC=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 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 e151350..58943a0 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 @@ -508,16 +508,18 @@ public class WmsHqlPack { //发运单号 HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result); //客户编码 - HqlPack.getStringLikerPack(wmsShopping.getCustNo(), "custNo", result); + HqlPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result); //条码 - HqlPack.getStringLikerPack(wmsShopping.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsShopping.getSn(), "sn", result); //发运状态 HqlPack.getStringEqualPack(wmsShopping.getOrderStatus().toString(), "orderStatus", result); + //是否删除 + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); return result.toString(); } /** - * 产品发运信息 查询条件封装 + * 抽点记录信息 查询条件封装 * * @param wmsCheckFactRecord * @return @@ -536,6 +538,8 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsCheckFactRecord.getPartNo(), "partNo", result); //供应商编号 HqlPack.getStringEqualPack(wmsCheckFactRecord.getVendorNo(), "vendorNo", result); + //是否删除 + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); return result.toString(); } From d4929181c7e123f0eb592db8e4109c9eca3f8d3a Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Wed, 14 Nov 2018 16:37:23 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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 42f0798..6c85077 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 @@ -319,7 +319,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); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -343,7 +343,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); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -363,7 +363,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); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -378,7 +378,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); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -396,7 +396,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); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -404,7 +404,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); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -487,7 +487,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsASNMaster.getPoNo(), "poNo", result); //有效性 HqlPack.getNumEqualPack(wmsASNMaster.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); HqlPack.getStringEqualPack(wmsASNMaster.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -545,7 +545,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //有效性 HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -572,7 +572,7 @@ public class WmsHqlPack { //有效性 HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } From aa23a3973f09e5585ae0850bfba774df9f620a20 Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Wed, 14 Nov 2018 16:58:41 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=BD=E7=82=B9?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BF=A1=E6=81=AF=E5=92=8C=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 --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 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 1700e41..68a8d3f 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.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; @@ -515,9 +516,11 @@ public class WmsHqlPack { //条码 HqlPack.getStringLikerPack(wmsShopping.getSn(), "sn", result); //发运状态 - HqlPack.getStringEqualPack(wmsShopping.getOrderStatus().toString(), "orderStatus", result); + HqlPack.getNumEqualPack(wmsShopping.getOrderStatus(), "orderStatus", result); //是否删除 - HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + //工厂 + HqlPack.getStringEqualPack(wmsShopping.getOrganizeCode(),"organizeCode",result); return result.toString(); } @@ -542,7 +545,9 @@ public class WmsHqlPack { //供应商编号 HqlPack.getStringEqualPack(wmsCheckFactRecord.getVendorNo(), "vendorNo", result); //是否删除 - HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + //工厂 + HqlPack.getStringEqualPack(wmsCheckFactRecord.getOrganizeCode(),"organizeCode",result); return result.toString(); } From c66edabb7f51f6856e471e3aa5e6504f8bb6bcbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Wed, 14 Nov 2018 17:08:40 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 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 2995c26..ff97444 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 @@ -420,6 +420,7 @@ public class WmsHqlPack { */ public static String packHqlWmsZones(WmsZones wmsZones) { StringBuffer result = new StringBuffer(); + //有效性 HqlPack.getNumEqualPack(wmsZones.getIsValid(), "isValid", result); //仓库代码 @@ -428,6 +429,9 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result); //存储区代码 HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); + //删除标记 + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + return result.toString(); } @@ -462,8 +466,10 @@ public class WmsHqlPack { */ public static String packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag) { StringBuffer result = new StringBuffer(); - //有效性 + + //有效性,删除标记 HqlPack.getNumEqualPack(wmsShippingFlag.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); //供应商编号 HqlPack.getStringLikerPack(wmsShippingFlag.getFlagNo(), "flagNo", result); //供应商简称 @@ -588,6 +594,7 @@ public class WmsHqlPack { */ 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); @@ -605,7 +612,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result); HqlPack.getStringLikerPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result); HqlPack.getNumEqualPack(wmsFGInStock.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(wmsFGInStock.getIsDeleted(), "isDeleted", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -623,7 +630,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsTaskInfo.getReMark(), "reMark", result); HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result); HqlPack.getNumEqualPack(wmsTaskInfo.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(wmsTaskInfo.getIsDeleted(), "isDeleted", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } } From fb2de0496d0bb18b42e6b2d67be9e79d6bc00994 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 14 Nov 2018 17:57:05 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9B=BE=E5=83=8F?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java index 2c27950..00ed6cd 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java @@ -48,6 +48,13 @@ public class SysFile extends BaseBean { } } + @Column(name="DFS_GROUP_NAME") + @ApiParam(value ="FastDfs Group 名称(后台使用)") + private String dfsGroupName; + + @Column(name="DFS_FILE_NAME") + @ApiParam(value ="FastDfs 文件名称(后台使用)") + private String dfsFileName; @Column(name="FILE_PATH") @ApiParam(value ="文件路径")