库存订单实体字段修改

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

@@ -32,6 +32,10 @@ public class WmsMoveDetails extends BaseBean {
     @ApiParam("单号")
     public String orderNo;
 
+    @Column(name="ITEM")
+    @ApiParam(value = "行号", example = "0")
+    public Integer item;
+
     @Column(name="PART_NO")
     @ApiParam("物料编码")
     public String partNo;
@@ -40,6 +44,10 @@ public class WmsMoveDetails extends BaseBean {
     @ApiParam("物料名称")
     public String partNameRdd;
 
+    @Column(name="VENDOR_NO")
+    @ApiParam("供应商编号")
+    public String vendorNo;
+
     @Column(name="CUST_NO")
     @ApiParam("客户编号")
     public String custNo;
@@ -71,16 +79,16 @@ public class WmsMoveDetails extends BaseBean {
     /**
      * 状态:0=创建,5=待处理,10=已处理
      */
-    @Column(name="STATUS")
+    @Column(name="ITEM_STATUS")
     @ApiParam(value = "状态", example = "0")
-    public Integer status;
+    public Integer itemStatus;
 
     /**
      * ASN,PO,SO
      */
     @Column(name="REF_TYPE")
     @ApiParam("关联单据类型")
-    public String refType;
+    public Integer refType;
 
     @Column(name="REF_SRC")
     @ApiParam("关联单号")

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

@@ -38,8 +38,8 @@ public class WmsMoveMaster extends BaseBean {
      * MI=移库入库,MO=移库出库,SO=发运
      */
     @Column(name="ORDER_TYPE")
-    @ApiParam("业务类型")
+    @ApiParam(value = "业务类型", example = "0")
-    public String orderType;
+    public Integer orderType;
 
     /**
      * 状态:0=创建,5=待处理,10=已处理

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

@@ -44,17 +44,21 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("物料名称")
     public String partNameRdd;
 
-    /**
+    @Column(name="UNIT")
-     * 状态:0=创建,10=已处理
+    @ApiParam(value = "单位")
-     */
+    public String unit;
-    @Column(name="STATUS")
-    @ApiParam(value = "状态", example = "0")
-    public Integer status;
 
     @Column(name="SN")
     @ApiParam("条码")
     public String sn;
 
+    /**
+     * 状态:0=创建,10=已处理
+     */
+    @Column(name="ITEM_STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer itemStatus;
+
     @Column(name="REMARK")
     @ApiParam("备注")
     public String reMark;

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

@@ -859,9 +859,11 @@ public class WmsHqlPack {
      */
     public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster){
         StringBuffer result = new StringBuffer();
+
         HqlPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
         HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(),"id",result);
         getStringBuilderPack(wmsMoveMaster, result);
+
         return result.toString();
     }
 
@@ -872,9 +874,54 @@ public class WmsHqlPack {
      */
     public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster){
         StringBuffer result = new StringBuffer();
+
         HqlPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
         HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result);
         getStringBuilderPack(wmsMoveMaster, result);
+
+        return result.toString();
+    }
+
+    /**
+     * 内部单据：库存移动单明细表分页查询
+     * @param wmsMoveDetails
+     * @return
+     */
+    public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails){
+        StringBuffer result = new StringBuffer();
+
+        HqlPack.getStringLikerPack(wmsMoveDetails.getOrderNo(), "orderNo", result);
+        HqlPack.getNumEqualPack(wmsMoveDetails.getItem(), "item", result);
+        HqlPack.getStringLikerPack(wmsMoveDetails.getPartNo(), "partNo", result);
+        HqlPack.getStringLikerPack(wmsMoveDetails.getPartNameRdd(), "partNameRdd", result);
+        HqlPack.getStringLikerPack(wmsMoveDetails.getVendorNo(), "vendorNo", result);
+        HqlPack.getStringLikerPack(wmsMoveDetails.getCustNo(), "custNo", result);
+        HqlPack.getStringLikerPack(wmsMoveDetails.getUnit(), "unit", result);
+        HqlPack.getStringLikerPack(wmsMoveDetails.getWhNo(),"whNo",result);
+        HqlPack.getStringLikerPack(wmsMoveDetails.getZoneNo(),"zoneNo",result);
+        HqlPack.getStringLikerPack(wmsMoveDetails.getLocateNo(),"locateNo",result);
+        HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(),"itemStatus",result);
+        HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(),"refType",result);
+        HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(),"refSrc",result);
+        getStringBuilderPack(wmsMoveDetails, result);
+
+        return result.toString();
+    }
+
+    /**
+     * 内部单据：库存移动单条码信息分页查询
+     * @param wmsMoveSn
+     * @return
+     */
+    public static String packHqlWmsMoveSn(WmsMoveSn wmsMoveSn){
+        StringBuffer result = new StringBuffer();
+
+        HqlPack.getStringLikerPack(wmsMoveSn.getOrderNo(), "orderNo", result);
+        HqlPack.getNumEqualPack(wmsMoveSn.getItem(), "item", result);
+        HqlPack.getStringLikerPack(wmsMoveSn.getPartNo(), "partNo", result);
+        HqlPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result);
+        getStringBuilderPack(wmsMoveSn, result);
+
         return result.toString();
     }
 }