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

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java

@@ -20,19 +20,23 @@ import javax.persistence.Table;
 @Data
 @Entity
 @EqualsAndHashCode(callSuper = true)
-@Table(name="sys_locale_language")
+@Table(name="SYS_LOCALE_LANGUAGE")
 @Api(value="系统语言表",description = "对系统语言进行匹配。")
 public class SysLocaleLanguage extends BaseBean {
 
-    @Column(name="language_name")
+    @Column(name="LANGUAGE_NAME")
     @ApiParam(value = "语言名称",example = "前台显示的名称")
     private String languageName;
 
-    @Column(name="language_code")
+    @Column(name="LANGUAGE_CODE")
     @ApiParam(value = "语言代码",example = "使用浏览器语言代码，参考java.util.Locale中的代码。CN/zh，TW/zh，HK/zh，US/en, FR/en,GB/en,JP/en,DE/en,KR/en")
     private String languageCode;
 
-    @Column(name="is_default")
-    @ApiParam(value = "是否默认",example = "1")
+    @Column(name="IS_DEFAULT")
+    @ApiParam(value = "是否默认",example = "2")
     private Integer isDefault;
+
+    @Column(name = "LANGUAGE_STATUS")
+    @ApiParam(value = "语言状态",example = "1")
+    private Integer languageStatus;
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java

@@ -60,5 +60,5 @@ public class SysLocaleResource  extends BaseBean {
     //系统自带需要有初始化表，只能修改value，无法删除。
     @Column(name="is_system")
     @ApiParam(value = "是否系统参数",example = "2")
-    private Integer isSystem;
+    private Integer isSystem = 2;
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java

@@ -59,7 +59,7 @@ public class CoreBsonPack {
         Bson bson = new BasicDBObject();
 
         bson = BsonPackTool.getNumEqualPack(sysLogException.getExcModule(),"excModule",bson);
-        bson = BsonPackTool.getStringLikerPack(sysLogException.getExcClassName(),"excClassName",bson);
+        bson = BsonPackTool.getStringLikerPack(sysLogException.getExcMessage(),"excMessage",bson);
         bson = BsonPackTool.timeBuilder(sysLogException.getCreateDatetime(),"createDatetime",bson,false,false);
 
         return bson;

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

@@ -230,6 +230,7 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wmsLocate.getLocateType(), "locateType", result);
         HqlPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result);
         HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result);
+        HqlPack.getNumEqualPack(wmsLocate.getIsEmpty(), "isEmpty", result);
         HqlPack.getNumEqualPack(wmsLocate.getIsValid(), "isValid", result);
         HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
         HqlPack.getStringEqualPack(wmsLocate.getOrganizeCode(),"organizeCode",result);