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

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java

@@ -31,6 +31,14 @@ public class BsDataSource extends BaseBean {
     @ApiParam(value = "数据源名称")
     private String dataSourceName;
 
+    @Column(name = "DATA_SOURCE_CODE")
+    @ApiParam(value = "数据源编码",access = "作为关系引用，在数据切换的时候会找不到ID 数据变了引用还在")
+    private String dataSourceCode;
+
+    @Column(name = "DATA_BASE_NAME")
+    @ApiParam(value = "数据库名称")
+    private String dataBaseName;
+
     @Column(name = "DATA_SOURCE_TYPE_ID")
     @ApiParam(value = "数据源类型id")
     private Integer dataSourceTypeId;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java

@@ -38,10 +38,9 @@ public class BsDataSourceSuitCase extends BaseBean {
     @ApiParam(value = "数据源套件模式（枚举，被动读，主动写）")
     private Integer dataSourceModeId;
 
-    @Column(name = "DATA_SOURCE_ID")
-    @ApiParam(value = "数据源id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long dataSourceId;
+    @Column(name = "DATA_SOURCE_CODE")
+    @ApiParam(value = "数据源编码")
+    private String dataSourceCode;
 
     @Column(name = "DATA_SOURCE_NAME_RDD")
     @ApiParam(value = "数据源名称")

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java

@@ -33,7 +33,7 @@ public class BsSuitType extends BaseBean {
 
     @Column(name = "SUIT_CASE_NUM")
     @ApiParam(value = "适配器数量")
-    private Integer suitCaseNum;
+    private Integer suitCaseNum = 0;
 
 }
 

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

@@ -2051,6 +2051,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsCSRange.getLocateNo(), "locateNo", result);
         DdlPreparedPack.getStringLikerPack(wmsCSRange.getZoneNo(), "zoneNo", result);
 
+        DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"item"}, result);
+
         getStringBuilderPack(wmsCSRange, result);
 
         return result;