Merge remote-tracking branch 'origin/dev' into dev

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

@@ -100,6 +100,14 @@ public class SysMessage extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long readCount;
 
+    public long getReadCountVal(){
+        if(readCount == null){
+            return 0;
+        } else {
+            return readCount.longValue();
+        }
+    }
+
     public SysMessage() {
     }
 

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

@@ -174,6 +174,10 @@ public class WmsStockSn extends BaseBean {
     @Transient
     public Boolean isSet = false;
 
+    @ApiParam(value = "加减库容标志")
+    @Transient
+    public Boolean isAdd;
+
     public WmsStockSn(){}
 
     public WmsStockSn(String partNo){

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

@@ -1023,6 +1023,8 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result);
         HqlPack.getStringEqualPack(wmsMoveSn.getRemark(), "remark", result);
+        HqlPack.getStringEqualPack(wmsMoveSn.getDestLocateNo(), "destLocateNo", result);
+        HqlPack.getStringEqualPack(wmsMoveSn.getSrcLocateNo(), "srcLocateNo", result);
         getStringBuilderPack(wmsMoveSn, result);
 
         return result.toString();