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

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

@@ -53,6 +53,20 @@ public class WmsActionResponseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     public Long alId;
 
+    /**
+     * 默认为False，如果这个值为True，
+     * 就把detailsData的内容以List的格式显示到 列表提示区域
+     */
+    @ApiParam(value = "是否需要选择单号")
+    public Boolean toSelected;
+
+    /**
+     * 与 toSelected 属性配合使用，
+     * 选择数据后把选中行的 keyColumn 字段的值写入界面输入框并触发回车事件
+     */
+    @ApiParam(value = "关键字段列名")
+    public String keyColumn;
+
     public WmsActionResponseBean(Boolean codeStatus, String message) {
         this.codeStatus = codeStatus;
         this.message = message;

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

@@ -33,15 +33,6 @@ public class WmsMoveMaster extends BaseBean {
     public String orderNo;
 
     /**
-     * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发,
-     * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料,
-     * MI=移库入库,MO=移库出库,SO=发运1
-     */
-    @Column(name="ORDER_TYPE")
-    @ApiParam(value = "业务类型", example = "0")
-    public Integer orderType;
-
-    /**
      * 状态:0=创建,5=待处理,10=已处理
      */
     @Column(name="ORDER_STATUS")

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

@@ -78,6 +78,6 @@ public class WmsPoSn extends BaseBean {
     public String groupNo;
 
     @Column(name="REC_QTY")
-    @ApiParam(value = "已收数量", example = "0")
+    @ApiParam(value = "收货数量", example = "0")
     public Double recQty;
 }

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

@@ -828,7 +828,6 @@ public class WmsHqlPack {
 
         HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
         HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result);
-        HqlPack.getNumEqualPack(wmsMoveMaster.getOrderType(),"orderType",result);
         getStringBuilderPack(wmsMoveMaster, result);
 
         return result.toString();
@@ -1110,6 +1109,8 @@ public class WmsHqlPack {
 
         getStringBuilderPack(wmsActionGroupDetails, result);
 
+        HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result);
+
         return result.toString();
     }
 
@@ -1190,4 +1191,23 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+
+    /**
+     * PO订单条码表 分页查询
+     *
+     * @param wmsPoSn
+     * @return
+     */
+    public static String packHqlWmsPoSn(WmsPoSn wmsPoSn) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getStringLikerPack(wmsPoSn.getOrderNo(), "orderNo", result);
+        HqlPack.getStringLikerPack(wmsPoSn.getPartNo(), "partNo", result);
+        HqlPack.getStringLikerPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result);
+
+        getStringBuilderPack(wmsPoSn, result);
+
+        return result.toString();
+    }
 }