From 68f6642d4d1fff10c6bd898d69dd7bff27adbc16 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期日, 24 九月 2023 15:18:29 +0800
Subject: [PATCH] 修改2.0 9.24
---
inventory-server/src/main/resources/mapper/SaleMapper.xml | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/inventory-server/src/main/resources/mapper/SaleMapper.xml b/inventory-server/src/main/resources/mapper/SaleMapper.xml
index 5d95a13..5bcccc2 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,
@@ -8,7 +14,9 @@
name,
proname,
type,
- DATE_FORMAT(delTime, '%Y-%m-%d') '浜よ揣鏃ユ湡'
+ DATE_FORMAT(delTime, '%Y-%m-%d') '浜よ揣鏃ユ湡',
+ note,
+ order_type
from mom_ocean.sale
where state=1
<if test="orderNumber!=null and orderNumber!=''">
@@ -28,7 +36,7 @@
<!--鏌ヨ璁㈠崟BOM鍒楄〃-->
<select id="selectAllOrder" resultType="java.util.Map">
- select s.id ,
+ select sm.id,
order_number,
saleman,
proname,
@@ -36,24 +44,26 @@
specifications,
unit,
number,
+ note,
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