Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -47,6 +49,7 @@ public class WmsActionGroup extends BaseBean {
 
     @Column(name = "INIT_AM_ID")
     @ApiParam(value = "初始化组件编号", example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long initAmId;
 
 //    @Transient
@@ -55,6 +58,7 @@ public class WmsActionGroup extends BaseBean {
 
     @Column(name = "DETAILS_AM_ID")
     @ApiParam(value = "明细处理组件编号", example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long detailsAmId;
 
 //    @Transient
@@ -63,6 +67,7 @@ public class WmsActionGroup extends BaseBean {
 
     @Column(name = "SUBMIT_AM_ID")
     @ApiParam(value = "提交组件编号", example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long submitAmId;
 
 //    @Transient
@@ -71,6 +76,7 @@ public class WmsActionGroup extends BaseBean {
 
     @Column(name = "END_AM_ID")
     @ApiParam(value = "结束组件编号", example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long endAmId;
 //
 //    @Transient

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java

@@ -87,5 +87,6 @@ public class WmsActionGroupDetails extends BaseBean {
 
     @Column(name = "SHOW_AM_ID")
     @ApiParam(value = "回显组件方法ID", example = "1")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long showAmId;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -50,6 +52,7 @@ public class WmsActionStep extends BaseBean {
 
     @Column(name = "AT_ID")
     @ApiParam(value = "步骤类型编号", example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long atId;
 
     //get单独处理

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1477,18 +1477,21 @@ public class WmsHqlPack {
      * @return
      */
     public static DdlPackBean packHqlWmsTransModule(WmsTransModule wmsTransModule) {
-        DdlPackBean result = new DdlPackBean();
+        DdlPackBean packBean = new DdlPackBean();
         if (!Strings.isNullOrEmpty(wmsTransModule.getTmName())) {
-            DdlPreparedPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", result);
+            DdlPreparedPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", packBean);
         }
         if (!Strings.isNullOrEmpty(wmsTransModule.getCallClass())) {
-            DdlPreparedPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", result);
+            DdlPreparedPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", packBean);
         }
         if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) {
-            DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", result);
+            DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", packBean);
         }
-        getStringBuilderPack(wmsTransModule, result);
+        if (StringUtils.isNotBlank(wmsTransModule.orderBy())) {
-        return result;
+            packBean.setOrderByStr(wmsTransModule.orderBy());
+        }
+        getStringBuilderPack(wmsTransModule, packBean);
+        return packBean;
     }
 
     /**