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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -1160,7 +1160,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CS_ITEM_STATUS {
-        CREATE(1, "创建"),FINISH(10, "已盘");
+        CREATE(1, "创建"),FINISH(10, "已处理");
 
         private int value;
         private String description;

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

@@ -45,7 +45,7 @@ public class WmsCSFactTrans extends BaseBean {
     public String locateNo;
 
     @Column(name="PART_NO")
-    @ApiParam("物料编码")
+    @ApiParam("物料代码")
     public String partNo;
 
     @Column(name="PART_NAME_RDD")

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

@@ -45,7 +45,7 @@ public class WmsCSOrderDetails extends BaseBean {
     public String locateNo;
 
     @Column(name="PART_NO")
-    @ApiParam("物料编码")
+    @ApiParam("物料代码")
     public String partNo;
 
     @Column(name="PART_NAME_RDD")

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

@@ -70,5 +70,5 @@ public class WmsTransSn extends BaseBean {
 
     @Column(name="TRANS_NO")
     @ApiParam("事务编号")
-    public String transNo;
+    public Long transNo;
 }

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

@@ -820,10 +820,10 @@ public class WmsHqlPack {
      * @param tranNo
      * @return
      */
-    public static String packWmsTransSn(String tranNo) {
+    public static String packWmsTransSn(Long tranNo) {
         StringBuffer result = new StringBuffer();
         //查询参数封装
-        HqlPack.getStringEqualPack(tranNo, "transNo", result);
+        HqlPack.getNumEqualPack(tranNo, "transNo", result);
         HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
         return result.toString();
     }
@@ -1020,6 +1020,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装
+        HqlPack.getStringLikerPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result);
         getStringBuilderPack(wmsCSOrderDetails, result);
 
         return result.toString();
@@ -1035,6 +1036,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装
+        HqlPack.getStringLikerPack(wmsCSFactTrans.getOrderNo(), "orderNo", result);
         getStringBuilderPack(wmsCSFactTrans, result);
 
         return result.toString();