From 18648905bd0fd3b0dd1cf39a88ff90ec77dc5e30 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 20 九月 2023 10:28:11 +0800
Subject: [PATCH] 修改   9.20

---
 inventory-server/src/main/resources/mapper/SaleMapper.xml |   17 ++++++++++++-----
 1 files changed, 12 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..0c674fa 100644
--- a/inventory-server/src/main/resources/mapper/SaleMapper.xml
+++ b/inventory-server/src/main/resources/mapper/SaleMapper.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yuanchu.mom.mapper.SaleMapper">
+    <!--鎵归噺鍒犻櫎-->
+    <update id="delAllSale">
+        update mom_ocean.sale
+        set state=0
+        where id in (${ids})
+    </update>
     <select id="selectSaleList" resultType="java.util.Map">
         select id,
         order_number,
@@ -28,7 +34,7 @@
 
     <!--鏌ヨ璁㈠崟BOM鍒楄〃-->
     <select id="selectAllOrder" resultType="java.util.Map">
-        select s.id ,
+        select sm.id,
         order_number,
         saleman,
         proname,
@@ -38,22 +44,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