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

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

@@ -24,8 +24,11 @@ public class WmsBsonPack {
         Bson bson = new BasicDBObject();
         bson = BsonPackTool.timeBuilder(actionLog.getCreateDatetime(), "createDatetime", bson, false, false);
         bson = BsonPackTool.getStringEqualPack(actionLog.getOrderNo(), "orderNo", bson);
+        bson = BsonPackTool.getStringEqualPack(actionLog.getTransTypeCode(), "transTypeCode", bson);
+        bson = BsonPackTool.getStringEqualPack(actionLog.getFixId(), "fixId", bson);
         bson = BsonPackTool.getNumEqualPack(actionLog.getAgId(), "agId", bson);
         bson = BsonPackTool.getStringEqualPack(actionLog.getAgNameC(), "agNameC", bson);
+        bson = BsonPackTool.getStringEqualPack(actionLog.getTransTypeCode(), "transTypeCode", bson);
         bson = BsonPackTool.getStringEqualPack(actionLog.getOrganizeCode(), "organizeCode", bson);
         bson = BsonPackTool.getNumEqualPack(actionLog.getIsValid(), "isValid", bson);
         bson = BsonPackTool.getNumEqualPack(actionLog.getIsDeleted(), "isDeleted", bson);

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

@@ -91,5 +91,5 @@ public class WmsCSFactTrans extends BaseBean {
 
     @Column(name="REMARK")
     @ApiParam(value = "备注")
-    public String reMark;
+    public String remark;
 }

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

@@ -52,7 +52,7 @@ public class WmsCSOrderMaster extends BaseBean {
 
     @Column(name = "REMARK")
     @ApiParam("备注")
-    public String reMark;
+    public String remark;
 
     @Column(name = "IS_INVENTORY")
     @ApiParam(value = "是否允许清点", example = "1")

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

@@ -67,7 +67,7 @@ public class WmsFGInStock extends BaseBean {
 
     @Column(name="REMARK")
     @ApiParam("备注")
-    public String reMark;
+    public String remark;
 
     /**
      * 来源：MNU=手工,MES=MES接口

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

@@ -41,7 +41,7 @@ public class WmsMoveMaster extends BaseBean {
 
     @Column(name = "REMARK")
     @ApiParam("备注")
-    public String reMark;
+    public String remark;
 
     @Column(name = "TRANS_TYPE_CODE")
     @ApiParam(value = "交易类型代码")

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

@@ -64,7 +64,7 @@ public class WmsShopping extends BaseBean {
 
     @Column(name="REMARK")
     @ApiParam("备注")
-    public String reMark;
+    public String remark;
 
     @Column(name="SRC")
     @ApiParam("单据来源")

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

@@ -42,7 +42,7 @@ public class WmsSnPrint extends BaseBean {
 
     @Column(name="REMARK")
     @ApiParam("备注")
-    public String reMark;
+    public String remark;
 
     /**
      * 状态:0=创建,5=待处理,10=已处理

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

@@ -685,7 +685,7 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wmsFGInStock.getUnit(), "unit", result);
         HqlPack.getStringEqualPack(wmsFGInStock.getSn(), "sn", result);
         HqlPack.getNumEqualPack(wmsFGInStock.getOrderStatus(), "orderStatus", result);
-        HqlPack.getStringLikerPack(wmsFGInStock.getReMark(), "reMark", result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getRemark(), "remark", result);
         HqlPack.getStringLikerPack(wmsFGInStock.getSrc(), "src", result);
         HqlPack.getStringEqualPack(wmsFGInStock.getErpAreaNo(), "erpWhno", result);
         HqlPack.getStringEqualPack(wmsFGInStock.getLineNo(), "lineNo", result);