合并

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

@@ -491,7 +491,7 @@ public class WmsEnumUtil {
     }
 
     /**
-     * 外部单据：移库单业务类型
+     * 移库单业务类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum OUT_MOVEMENT_BUSI_TYPE {

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

@@ -37,16 +37,16 @@ public class WmsMoveMaster extends BaseBean {
      * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料,
      * MI=移库入库,MO=移库出库,SO=发运
      */
-    @Column(name="TYPE")
+    @Column(name="ORDER_TYPE")
     @ApiParam("业务类型")
-    public String type;
+    public String orderType;
 
     /**
      * 状态:0=创建,5=待处理,10=已处理
      */
-    @Column(name="STATUS")
+    @Column(name="ORDER_STATUS")
     @ApiParam(value = "状态", example = "0")
-    public Integer status;
+    public Integer orderStatus;
 
     @Column(name="REMARK")
     @ApiParam("备注")

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

@@ -832,4 +832,30 @@ public class WmsHqlPack {
         getStringBuilderPack(wmsTransQuan, result);
         return result.toString();
     }
+
+    /**
+     *内部单据：库存移动单主表唯一性查询
+     * @param wmsMoveMaster
+     * @return
+     */
+    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();
+    }
+
+    /**
+     * 内部单据：库存移动单主表分页查询
+     * @param wmsMoveMaster
+     * @return
+     */
+    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();
+    }
 }