From 6db5272e2df8a27942f10c03d93183fc9b01e22a Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 04 九月 2023 18:05:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inventory-server/src/main/resources/mapper/SaleMapper.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/inventory-server/src/main/resources/mapper/SaleMapper.xml b/inventory-server/src/main/resources/mapper/SaleMapper.xml
index 5d95a13..a67167e 100644
--- a/inventory-server/src/main/resources/mapper/SaleMapper.xml
+++ b/inventory-server/src/main/resources/mapper/SaleMapper.xml
@@ -28,7 +28,7 @@
<!--鏌ヨ璁㈠崟BOM鍒楄〃-->
<select id="selectAllOrder" resultType="java.util.Map">
- select s.id ,
+ select sm.id,
order_number,
saleman,
proname,
@@ -38,22 +38,23 @@
number,
DATE_FORMAT(s.create_time, '%Y-%m-%d') '涓嬪崟鏃ユ湡',
DATE_FORMAT(delTime, '%Y-%m-%d') '浜よ揣鏃ユ湡',
- bianzhi_state
+ sm.type
from mom_ocean.sale s ,mom_ocean.sale_material sm
where s.id=sm.sale_id
and s.state=1
- and bianzhi_state!=2
+ and s.type=1
<if test="orderCode!=null and orderCode!=''">
and order_number like concat('%',#{orderCode},'%')
</if>
<if test="name!=null and name!=''">
and sm.name like concat('%',#{name},'%')
</if>
- <if test="state!=null ">
- and bianzhi_state=#{state}
+ <if test="type!=null ">
+ and sm.type=#{type}
</if>
<if test="time!=null and time!=''">
and s.create_time=#{time}
</if>
+ order by delTime
</select>
</mapper>
--
Gitblit v1.9.3