From c8712bbf027d7c3db9c33f8b015abed1473d06a7 Mon Sep 17 00:00:00 2001
From: IZCD4L12RTSW0VZ\Administrator <skyouc>
Date: 星期一, 29 十二月 2025 15:13:33 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

---
 src/main/resources/mapper/OrderPakinMapper.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/OrderPakinMapper.xml b/src/main/resources/mapper/OrderPakinMapper.xml
index cec302e..f74704b 100644
--- a/src/main/resources/mapper/OrderPakinMapper.xml
+++ b/src/main/resources/mapper/OrderPakinMapper.xml
@@ -61,6 +61,7 @@
         where 1=1
         and settle = 4
         and status = 1
+        and doc_type != 7
         order by create_time asc
     </select>
 
@@ -74,7 +75,7 @@
     </select>
 
     <insert id="addToLogTable">
-        INSERT INTO man_order_log SELECT * FROM man_order_pakin WHERE id = #{id}
+        INSERT INTO man_order_log_pakin SELECT * FROM man_order_pakin WHERE id = #{id}
     </insert>
 
     <select id="selectorderNoL" resultMap="BaseResultMap">

--
Gitblit v1.9.1