From 86412110dcf16ba962c1289bcd29629c0d31ff44 Mon Sep 17 00:00:00 2001
From: judy <278197488@qq.com>
Date: Thu, 18 Jul 2024 11:38:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E4=BD=8D=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/shkj/wms/vo/SysStockNumDetailVo.java   | 5 ++++-
 shkj-wms/src/main/resources/mapper/wms/SysStockMapper.xml    | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/shkj-wms/src/main/java/com/shkj/wms/vo/SysStockNumDetailVo.java b/shkj-wms/src/main/java/com/shkj/wms/vo/SysStockNumDetailVo.java
index ab33120..3d06e9f 100644
--- a/shkj-wms/src/main/java/com/shkj/wms/vo/SysStockNumDetailVo.java
+++ b/shkj-wms/src/main/java/com/shkj/wms/vo/SysStockNumDetailVo.java
@@ -93,6 +93,9 @@ public class SysStockNumDetailVo implements Serializable {
 	 */
 	private String type ;
 
-
+	/**
+	 * 删除状态
+	 */
+    private String isDel;
 
 }
diff --git a/shkj-wms/src/main/resources/mapper/wms/SysStockMapper.xml b/shkj-wms/src/main/resources/mapper/wms/SysStockMapper.xml
index decc2ec..9f974e2 100644
--- a/shkj-wms/src/main/resources/mapper/wms/SysStockMapper.xml
+++ b/shkj-wms/src/main/resources/mapper/wms/SysStockMapper.xml
@@ -173,7 +173,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 loc.tunnel,
                 loc.location_code,
                 con.container_code,
-                stock.batch
+                stock.batch,
+                loc.is_del
                 FROM
                 sys_stock_detail stock
                 LEFT JOIN base_goods_data item ON stock.goods_no = item.goods_no