From 3d019bb7f4c1644be61d6fe089eb2bfe9732bf0b Mon Sep 17 00:00:00 2001
From: judy <278197488@qq.com>
Date: Fri, 30 Aug 2024 10:55:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=B5=8B=E8=AF=95=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/service/IBusinStockInvService.java    | 21 +++++++++++--------
 .../java/com/shkj/wms/vo/BusinStockInvVo.java |  5 ++++-
 .../mapper/wms/BusinStockInvMapper.xml        |  2 +-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/IBusinStockInvService.java b/shkj-wms/src/main/java/com/shkj/wms/service/IBusinStockInvService.java
index d8fac55..f58214b 100644
--- a/shkj-wms/src/main/java/com/shkj/wms/service/IBusinStockInvService.java
+++ b/shkj-wms/src/main/java/com/shkj/wms/service/IBusinStockInvService.java
@@ -20,13 +20,14 @@ import java.util.List;
  * @author lch
  * @date 2022-06-10
  */
-public interface IBusinStockInvService extends IService<BusinStockInv> { /**
- * 查询列表
- *
- * @param bo
- * @return
- */
-List<BusinStockInvVo> queryList(BusinStockInvQueryBo bo);
+public interface IBusinStockInvService extends IService<BusinStockInv> {
+    /**
+     * 查询列表
+     *
+     * @param bo
+     * @return
+     */
+    List<BusinStockInvVo> queryList(BusinStockInvQueryBo bo);
 
     /**
      * 通过商品分组查询盘点列表
@@ -54,7 +55,6 @@ List<BusinStockInvVo> queryList(BusinStockInvQueryBo bo);
     Result<Boolean> invFinish(Long invId);
 
 
-
     /**
      * 查询需要盘点的货位信息
      *
@@ -65,15 +65,16 @@ List<BusinStockInvVo> queryList(BusinStockInvQueryBo bo);
 
     /**
      * 设置为货位
+     *
      * @param locationId
      * @return
      */
     Result<Boolean> setEmptyLocation(Long locationId);
 
 
-
     /**
      * 设置为空托
+     *
      * @param locationId
      * @return
      */
@@ -81,6 +82,7 @@ List<BusinStockInvVo> queryList(BusinStockInvQueryBo bo);
 
     /**
      * 标记差异
+     *
      * @param locationId
      * @return
      */
@@ -88,6 +90,7 @@ List<BusinStockInvVo> queryList(BusinStockInvQueryBo bo);
 
     /**
      * 下发任务
+     *
      * @param locationId
      * @return
      */
diff --git a/shkj-wms/src/main/java/com/shkj/wms/vo/BusinStockInvVo.java b/shkj-wms/src/main/java/com/shkj/wms/vo/BusinStockInvVo.java
index 3e6dcdb..882de8d 100644
--- a/shkj-wms/src/main/java/com/shkj/wms/vo/BusinStockInvVo.java
+++ b/shkj-wms/src/main/java/com/shkj/wms/vo/BusinStockInvVo.java
@@ -53,6 +53,9 @@ public class BusinStockInvVo {
      */
     private String goodQty;
 
-
+    /**
+     * 盘点单号
+     */
+    private String invOrderNo;
 
 }
diff --git a/shkj-wms/src/main/resources/mapper/wms/BusinStockInvMapper.xml b/shkj-wms/src/main/resources/mapper/wms/BusinStockInvMapper.xml
index 84c51fa..2e91480 100644
--- a/shkj-wms/src/main/resources/mapper/wms/BusinStockInvMapper.xml
+++ b/shkj-wms/src/main/resources/mapper/wms/BusinStockInvMapper.xml
@@ -39,7 +39,7 @@
     <select id="queryList" resultType="com.shkj.wms.vo.BusinStockInvVo"
             parameterType="com.shkj.wms.bo.BusinStockInvQueryBo">
         SELECT
-        si.id as invId, loc.id as locationId,loc.location_code,goods.vehiche_model,goods.color,loc.location_status, sum(case when stock.goods_no is null then 0 else 1 end ) as goodQty
+        si.id as invId, loc.id as locationId,loc.location_code,goods.vehiche_model,goods.color,loc.location_status, sum(case when stock.goods_no is null then 0 else 1 end ) as goodQty,inv_order_no
         FROM
         busin_stock_inv si
         JOIN base_location loc ON si.location_id = loc.id