From 6222923c8020e139c38c9b6548c861c4e4c8a746 Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Thu, 20 Jun 2019 20:03:55 +0800 Subject: [PATCH 1/3] =?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 d82fa02..10a2c6a 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 @@ -38,6 +38,6 @@ public class WmsUnit extends BaseBean { @Column(name = "UNIT_PRECISION") @ApiParam(value = "单位精度") - private String unitPrecision; + private Integer unitPrecision; } From fa59716c17ee3d277163d17174e893414c0a94cd Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 20 Jun 2019 20:53:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4=20?= =?UTF-8?q?=E5=86=BB=E7=BB=93=E7=9B=98=E7=82=B9=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsCSAdjustRange.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java index dfa6a4b..e383d9e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 盘点调差范围信息 @@ -39,4 +40,24 @@ public class WmsCSAdjustRange extends BaseBean { @Column(name="IS_ADJUST") @ApiParam(value = "调整标识", example = "1") public Integer isAdjust; + + @Transient + @ApiParam("物料编码") + public String partNo; + + @Transient + @ApiParam("物料名称") + public String partNameRdd; + + @Transient + @ApiParam("存储区编号") + public String zoneNo; + + @Transient + @ApiParam("库位编号") + public String locateNo; + + @Transient + @ApiParam("单位") + public String unit; } From 16ceb8ff7b2f23226dbad2d634e5ed46886f7618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 20 Jun 2019 21:21:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=9D=83=E9=99=90=E4=B8=9A=E5=8A=A1=E9=80=BB=E8=BE=91?= 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 | 2 +- 1 file changed, 1 insertion(+), 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 cfa2e2c..2413009 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 @@ -1435,7 +1435,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(dataAuth.getOrganizeCode(),"organizeCode",result); // String data = String.join(",", roleIds); DdlPreparedPack.getInPackList(roleIds, "roleCode", result); - getStringBuilderPack(new WmsDataAuth(), result); + getStringBuilderPack(dataAuth, result); return result; }