From 505f80032c0d6e39c8cbed927f0b9d12c7e77b59 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 20 Apr 2021 19:52:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=E5=AD=97=E6=AE=B5=E4=B8=8B=E8=BD=BD?= 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 | 3 +++ 1 file changed, 3 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 8a218f9..a571907 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 @@ -3218,6 +3218,9 @@ public class WmsHqlPack { public static DdlPackBean packHqlBasImportTemplateDetails(BasImportTemplateDetails details) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(details.getTemplateCode(), "templateCode", result); + if (details.getIsRequire() != null) { + DdlPreparedPack.getNumEqualPack(details.getIsRequire(), "isRequire", result); + } getStringBuilderPack(details, result); return result; } From 9ed1a5d36ada3ee45617e32b4b5bcbfada2b8915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BF=8A=E7=94=9F?= <337942886@qq.com> Date: Wed, 21 Apr 2021 10:02:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?15241=2019081=20=E2=80=94=E2=80=94=E5=8C=97?= =?UTF-8?q?=E4=BA=AC=E9=BA=A6=E6=A0=BC=E7=BA=B3=E9=87=87=E8=B4=AD=E8=AE=A2?= =?UTF-8?q?=E8=B4=A7=E8=BF=9B=E5=BA=A6=E6=8A=A5=E8=A1=A8=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E9=9C=80=E6=8E=92=E5=BA=8F=EF=BC=8C2021-04-17=2015108=2019048-?= =?UTF-8?q?-=20=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B=E5=88=B0=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=20--20210417?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 2ae023d..25b4bb6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -250,6 +250,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", public Integer lockVersion; @Transient + @ApiParam("历史数据") + private Boolean lookHistory; + + @Transient @ApiParam("项目代码") private String prodCfgTypeCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 838218f..6312a19 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -94,6 +94,10 @@ public class WmsMoveMaster extends BaseBean { private String partNo; @Transient + @ApiParam("历史数据") + private Boolean lookHistory; + + @Transient @ApiParam("明细状态") @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class) private String itemStatus; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 889e64c..b194f43 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -209,6 +209,11 @@ public class WmsMoveSn extends BaseBean { private String ZoneNo; @Transient + @ApiParam("历史数据") + private Boolean lookHistory; + + + @Transient @ApiParam("交易类型名称") private String transTypeName; From 62ae1d9a134f2d1b46e20b427fb6bcee7710095e Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Wed, 21 Apr 2021 11:11:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=B1=A5=E5=8E=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9EqrCode=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E5=8D=A1=E6=96=AF=E9=A9=AC=E6=8A=A5=E8=A1=A8=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E5=B7=A5=E5=BA=8F=E6=9F=A5=E8=AF=A2=E5=8E=86=E5=8F=B2?= =?UTF-8?q?CMS=E6=A0=87=E7=AD=BE=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index 27b88aa..b463dcc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -73,4 +73,8 @@ public class MesPackageTravel extends BaseBean implements Serializable { @Column(name = "FN_LOCATION_NO") @ApiParam("炉内位置代码") private String fnLocationNo; + + @Column(name = "QR_CODE") + @ApiParam("包装二维码") + private String qrCode; }