From 6c6710dd675c1bc1248d5ccd0a2c9275f109dd4c Mon Sep 17 00:00:00 2001 From: "Jack.lv" Date: Fri, 8 Mar 2019 13:27:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9C=A8=E9=80=94=E5=BA=93=E4=BD=8D=20?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 2 +- 2 files changed, 3 insertions(+), 2 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 5c4d7c6..0fc4a96 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 @@ -454,7 +454,8 @@ public class WmsEnumUtil { COMBINATION_LOCATE(40, "D", "组合库"), LINE_LOCATE(50, "L", "线边库"), NC_LOCATE(60, "N", "NC库"), - SPILLAGE_LOCATE(70, "Y", "溢料库"); + SPILLAGE_LOCATE(70, "Y", "溢料库"), + TRANSIT_LOCATE(80, "T", "在途库"); private int value; private String code; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 6e17fab..67cc0ee 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -37,7 +37,7 @@ public class WmsLocate extends BaseBean { private String locateName; /** - * 1=收货库,10=基础库,20=机动库,30=组合库,40=线边库,50=NC库 + * 库位类型:10=收货库,20=基础库,30=机动库,40=组合库,50=线边库,60=NC库，70=溢料,80=在途库位 */ @Column(name="LOCATE_TYPE") @ApiParam(value ="库位类型") From a5390d7b1a6e72d375b1dad31bb5a81e43cd3dc8 Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 8 Mar 2019 13:33:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=8B=86=E5=88=86?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E9=80=BB=E8=BE=91?= 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, 13 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 e2e2f47..b70830d 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 @@ -1306,6 +1306,19 @@ public class WmsHqlPack { } /** + * 根据条件模糊查询库存条码信息 + * @param wmsStockSn + * @return + */ + public static String packHqlWmsStockSnLike(WmsStockSn wmsStockSn) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsStockSn.getSn(),"sn", result); + HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); + getStringBuilderPack(wmsStockSn, result); + return result.toString(); + } + + /** * 根据条件查询库存信息 * @param wmsStockQuan * @return From fc89b8493dca00a6d9d93430218e1a9b1c1e887e Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Fri, 8 Mar 2019 14:56:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E5=8D=95=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=96=B0=E5=A2=9E=E6=BA=90=EF=BC=8C=E7=9B=AE=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=9C=B0=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 index 84eb6f5..32d1581 100644 --- 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 @@ -97,4 +97,12 @@ public class WmsDocMovementDetails extends WmsOrderDetailsModel { @Column(name = "REC_QTY") @ApiParam(value = "已收货数量", example = "1") private Double recQty; + + @Column(name = "SRC_AREA_NO") + @ApiParam("源库存地代码") + public String srcAreaNo; + + @Column(name = "DEST_AREA_NO") + @ApiParam("目的库存地代码") + public String destAreaNo; }