From 58c29f5aee23b8631346dbcbee849b08d9b299cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= <gragon.xu@estsh.com>
Date: Wed, 8 May 2019 21:44:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=B5=81=E7=A8=8B=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3+=E4=BD=9C=E4=B8=9A=E7=BB=84=E4=BB=B6=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=81=94=E8=B0=83=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 56 +++++++++++-----------
 .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java  |  2 +-
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java
index 310e5fa..eef67a2 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java
@@ -49,33 +49,33 @@ public class WmsActionGroup extends BaseBean {
     @ApiParam(value = "初始化组件编号", example = "0")
     private Long initAmId;
 
-    @Transient
-    @ApiParam(value = "初始化组件名称")
-    private String initAmName;
+//    @Transient
+//    @ApiParam(value = "初始化组件名称")
+//    private String initAmName;
 
     @Column(name = "DETAILS_AM_ID")
     @ApiParam(value = "明细处理组件编号", example = "0")
     private Long detailsAmId;
 
-    @Transient
-    @ApiParam(value = "明细处理组件名称")
-    private String detailsAmName;
+//    @Transient
+//    @ApiParam(value = "明细处理组件名称")
+//    private String detailsAmName;
 
     @Column(name = "SUBMIT_AM_ID")
     @ApiParam(value = "提交组件编号", example = "0")
     private Long submitAmId;
 
-    @Transient
-    @ApiParam(value = "提交组件名称")
-    private String submitAmName;
+//    @Transient
+//    @ApiParam(value = "提交组件名称")
+//    private String submitAmName;
 
     @Column(name = "END_AM_ID")
     @ApiParam(value = "结束组件编号", example = "0")
     private Long endAmId;
-
-    @Transient
-    @ApiParam(value = "结束组件名称")
-    private String endAmName;
+//
+//    @Transient
+//    @ApiParam(value = "结束组件名称")
+//    private String endAmName;
 
     // 1=true, 2 = false
     @Column(name = "AUTO_INIT")
@@ -109,19 +109,19 @@ public class WmsActionGroup extends BaseBean {
     public WmsActionGroup() {
     }
 
-    public WmsActionGroup(String agNameE, String agDescE, String agNameC, String agDescC, Integer autoInit, Long initAmId, String initAmName, Long detailsAmId, String detailsAmName, Long submitAmId, String submitAmName, Long endAmId, String endAmName) {
-        this.agNameE = agNameE;
-        this.agDescE = agDescE;
-        this.agNameC = agNameC;
-        this.agDescC = agDescC;
-        this.autoInit = autoInit;
-        this.initAmId = initAmId;
-        this.initAmName = initAmName;
-        this.detailsAmId = detailsAmId;
-        this.detailsAmName = detailsAmName;
-        this.submitAmId = submitAmId;
-        this.submitAmName = submitAmName;
-        this.endAmId = endAmId;
-        this.endAmName = endAmName;
-    }
+//    public WmsActionGroup(String agNameE, String agDescE, String agNameC, String agDescC, Integer autoInit, Long initAmId, String initAmName, Long detailsAmId, String detailsAmName, Long submitAmId, String submitAmName, Long endAmId, String endAmName) {
+//        this.agNameE = agNameE;
+//        this.agDescE = agDescE;
+//        this.agNameC = agNameC;
+//        this.agDescC = agDescC;
+//        this.autoInit = autoInit;
+//        this.initAmId = initAmId;
+//        this.initAmName = initAmName;
+//        this.detailsAmId = detailsAmId;
+//        this.detailsAmName = detailsAmName;
+//        this.submitAmId = submitAmId;
+//        this.submitAmName = submitAmName;
+//        this.endAmId = endAmId;
+//        this.endAmName = endAmName;
+//    }
 }
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 f53fe7d..ec7c7fc 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
@@ -1291,7 +1291,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result);
         DdlPreparedPack.getNumEqualPack(wmsActionModule.getId(), "id", result);
         DdlPreparedPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result);
-        DdlPreparedPack.getNumEqualPack(wmsActionModule.getOpTypeCode(), "opTypeCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsActionModule.getOpTypeCode(), "opTypeCode", result);
         DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsShowInfo(), "isShowInfo", result);
 
         getStringBuilderPack(wmsActionModule, result);