From 9b4dd6222e50e878327179261e7eb477548c2ece Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Fri, 3 Mar 2023 11:31:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=98=E7=9B=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../depository_manage/mapper/PlaceMapper.xml        | 13 +++++++++----
 .../depository_manage/mapper/PlaceMapper.xml        | 13 +++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
index 5db040f4..4b09f514 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
@@ -86,6 +86,7 @@
         <if test="did != null and did != ''">
             and ( p.did = #{did} or p.did = 0)
         </if>
+        and p.state != 3
     </select>
 
     <select id="findPlaceByDidAndCode" resultMap="placeMap" parameterType="map">
@@ -98,6 +99,7 @@
         <if test="did != '' and did != null">
            and p.did = #{did}
         </if>
+        and p.state != 3
     </select>
 
     <select id="findPlaceAndMaterialByDidAndMid" resultMap="MaterialAndPlaceForViewMap" parameterType="map">
@@ -110,6 +112,7 @@
         <if test="depositoryId != null and depositoryId != ''">
             and depository_id = #{depositoryId}
         </if>
+        and pstate != 3
     </select>
 
     <!-- 根据条件参数查询列表 -->
@@ -193,14 +196,14 @@
     <select id="findPlaceByDid" parameterType="int" resultMap="placeMap">
         SELECT
         <include refid="allColumns" />
-        FROM place p WHERE 1 = 1 and p.did = #{did}
+        FROM place p WHERE 1 = 1 and p.did = #{did} and p.state != 3
     </select>
 
 
     <select id="findPlaceByMid" parameterType="int" resultMap="placeMap">
         SELECT
         <include refid="allColumns" />
-        FROM materialandplace mp left join place p on p.id = mp.pid   WHERE 1 = 1 and mp.mid = #{mid}
+        FROM materialandplace mp left join place p on p.id = mp.pid   WHERE 1 = 1 and mp.mid = #{mid} and p.state != 3
     </select>
 
     <select id="findQuantityByMidAndPid" parameterType="map" resultType="int">
@@ -219,7 +222,7 @@
     <select id="findPlaceAndMaterialByPid" resultMap="materialAndPlaceMap" parameterType="int">
         SELECT
         <include refid="allColumnsByMaterialAndPlace" />
-        FROM materialandplace mp left join place p on p.id = mp.pid   WHERE 1 = 1 and p.id = #{id}
+        FROM materialandplace mp left join place p on p.id = mp.pid   WHERE 1 = 1 and p.id = #{id} and p.state != 3
     </select>
 
 
@@ -234,12 +237,13 @@
         <if test="pid != null">
             and mp.pid = #{pid}
         </if>
+        and p.state != 3
     </select>
     <select id="findPlaceAndMaterialById" resultMap="materialAndPlaceMap" parameterType="int">
         SELECT
         <include refid="allColumnsByMaterialAndPlace" />
         FROM materialandplace mp left join place p on p.id = mp.pid
-        where mp.id = #{id}
+        where mp.id = #{id} and p.state != 3
     </select>
 
 
@@ -382,6 +386,7 @@
         <if test="did != null and did != ''">
             and did = #{did}
         </if>
+
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
index 5db040f4..4b09f514 100644
--- a/target/classes/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
+++ b/target/classes/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml
@@ -86,6 +86,7 @@
         <if test="did != null and did != ''">
             and ( p.did = #{did} or p.did = 0)
         </if>
+        and p.state != 3
     </select>
 
     <select id="findPlaceByDidAndCode" resultMap="placeMap" parameterType="map">
@@ -98,6 +99,7 @@
         <if test="did != '' and did != null">
            and p.did = #{did}
         </if>
+        and p.state != 3
     </select>
 
     <select id="findPlaceAndMaterialByDidAndMid" resultMap="MaterialAndPlaceForViewMap" parameterType="map">
@@ -110,6 +112,7 @@
         <if test="depositoryId != null and depositoryId != ''">
             and depository_id = #{depositoryId}
         </if>
+        and pstate != 3
     </select>
 
     <!-- 根据条件参数查询列表 -->
@@ -193,14 +196,14 @@
     <select id="findPlaceByDid" parameterType="int" resultMap="placeMap">
         SELECT
         <include refid="allColumns" />
-        FROM place p WHERE 1 = 1 and p.did = #{did}
+        FROM place p WHERE 1 = 1 and p.did = #{did} and p.state != 3
     </select>
 
 
     <select id="findPlaceByMid" parameterType="int" resultMap="placeMap">
         SELECT
         <include refid="allColumns" />
-        FROM materialandplace mp left join place p on p.id = mp.pid   WHERE 1 = 1 and mp.mid = #{mid}
+        FROM materialandplace mp left join place p on p.id = mp.pid   WHERE 1 = 1 and mp.mid = #{mid} and p.state != 3
     </select>
 
     <select id="findQuantityByMidAndPid" parameterType="map" resultType="int">
@@ -219,7 +222,7 @@
     <select id="findPlaceAndMaterialByPid" resultMap="materialAndPlaceMap" parameterType="int">
         SELECT
         <include refid="allColumnsByMaterialAndPlace" />
-        FROM materialandplace mp left join place p on p.id = mp.pid   WHERE 1 = 1 and p.id = #{id}
+        FROM materialandplace mp left join place p on p.id = mp.pid   WHERE 1 = 1 and p.id = #{id} and p.state != 3
     </select>
 
 
@@ -234,12 +237,13 @@
         <if test="pid != null">
             and mp.pid = #{pid}
         </if>
+        and p.state != 3
     </select>
     <select id="findPlaceAndMaterialById" resultMap="materialAndPlaceMap" parameterType="int">
         SELECT
         <include refid="allColumnsByMaterialAndPlace" />
         FROM materialandplace mp left join place p on p.id = mp.pid
-        where mp.id = #{id}
+        where mp.id = #{id} and p.state != 3
     </select>
 
 
@@ -382,6 +386,7 @@
         <if test="did != null and did != ''">
             and did = #{did}
         </if>
+
     </select>
 
 </mapper>
\ No newline at end of file