From 314aa78336438480a224e3979480457344b98553 Mon Sep 17 00:00:00 2001
From: qianhs <huasheng.qian@estsh.com>
Date: Thu, 21 Nov 2019 17:28:16 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=20=E9=87=87=E8=B4=AD=E6=97=A5?=
 =?UTF-8?q?=E7=A8=8B=E5=8D=95=E9=87=8C=E7=9A=84=E5=AF=84=E5=94=AE=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E9=80=89=E9=A1=B9=E6=98=AF0/1=EF=BC=8C=E5=BA=94?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=98=AF/=E5=90=A6=E3=80=91=E3=80=90bug6369?=
 =?UTF-8?q?=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/wms/bean/SwebProcurementPlanOrder.java      |  4 ++++
 .../estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java |  4 ++++
 .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 20 ++++++++++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java
index c54315e..a138300 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java
@@ -53,4 +53,8 @@ public class SwebProcurementPlanOrder extends BaseBean {
     @ApiParam(value = "是否寄售")
     private Integer consignment=2;
 
+    @Column(name = "organize_code")
+    @ApiParam(value = "组织代码")
+    private String organizeCode;
+
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java
index 67c14bc..8a6afd1 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java
@@ -99,6 +99,10 @@ public class WmsCSOrderMaster extends BaseBean {
     @ApiParam(value = "盘点库位清单")
     public String[] wmsCSLocates;
 
+    @ApiParam(value = "是否明盘 1-是 2-否")
+    @Column(name = "is_obvious")
+    private Integer isObvious;
+
     public Integer getIsInventoryVal() {
         return this.isInventory == null ? 0 :this.isInventory.intValue();
     }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index 76fbdbb..d94d784 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -153,6 +153,26 @@ public class WmsHqlPack {
     }
 
     /**
+     * 开口合同查询封装
+     *
+     * @param swebProcurementPlanOrder
+     * @return
+     */
+    public static DdlPackBean packSwebProcurementPlanOrder(SwebProcurementPlanOrder swebProcurementPlanOrder) {
+        DdlPackBean packBean = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getOrganizeCode(), "organizeCode", packBean);
+        DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getPartName(), "partName", packBean);
+        DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", packBean);
+        DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorName(), "vendorName", packBean);
+        DdlPreparedPack.getStringRightLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", packBean);
+        getStringBuilderPack(swebProcurementPlanOrder, packBean);
+        return packBean;
+    }
+
+    /**
      * 库存移动单查询封装
      *
      * @param wmsDocMovementMaster