From 16400aa31c1b99e4006a74480a7752c4c099f110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Thu, 20 Jun 2019 11:27:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=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/wms/bean/WmsUnit.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java index 43fbac8..d82fa02 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java @@ -30,7 +30,7 @@ public class WmsUnit extends BaseBean { @Column(name = "UNIT_CODE") @ApiParam(value = "单位代码") - private String vendorNo; + private String unitCode; @Column(name = "UNIT_NAME") @ApiParam(value = "单位名称") From f7d4f85d458240ee8eb15b701272ba61f34afab4 Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Thu, 20 Jun 2019 13:08:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BA=93=E4=BD=8D=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=92=8C=E4=BE=9B=E5=BA=94=E5=95=86=E7=89=A9=E6=96=99bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java | 2 +- .../estsh/i3plus/pojo/wms/repository/WmsUnitConvertReposity.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitConvertReposity.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java index 43fbac8..b960f52 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java @@ -30,7 +30,7 @@ public class WmsUnit extends BaseBean { @Column(name = "UNIT_CODE") @ApiParam(value = "单位代码") - private String vendorNo; + private String UnitNo; @Column(name = "UNIT_NAME") @ApiParam(value = "单位名称") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitConvertReposity.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitConvertReposity.java new file mode 100644 index 0000000..0e71027 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitConvertReposity.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsUnitConvert; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsUnitConvertReposity extends BaseRepository { +} From 8289de825971b80fb03b24693cbb58cc82e51c94 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 20 Jun 2019 13:52:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=8C=83=E5=9B=B4=E6=95=B0=E6=8D=AE=20?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=9B=B4=E6=96=B0=20=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E5=86=BB=E7=BB=93=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 17 +++++++++++++++++ 1 file changed, 17 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 30d28bc..5916433 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 @@ -1845,4 +1845,21 @@ public class WmsHqlPack { return result; } + /** + * 物料 条件封装 + * + * @param wmsPart + * @return + */ + public static DdlPackBean packHqlWmsPartByList(WmsPart wmsPart,List partNoList) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getInPackList(partNoList.stream().map(part -> part.getPartNo()).collect(Collectors.toList()),"partNo",packBean); + DdlPreparedPack.getStringEqualPack(wmsPart.getOrganizeCode(),"organizeCode",packBean); + getStringBuilderPack(wmsPart, packBean); + + return packBean; + } + + }