From 50efd9f19463da742e8c7b751bb4ab2c97acbf61 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 01 七月 2024 13:13:15 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
index 6af7965..7d57445 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -3,6 +3,16 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.erp.mapper.sd.OrderMapper">
+
+ <select id="selectOrder">
+ select
+ count(*)
+ from
+ sd.`order` as o
+ where
+ o.quantity=#{order.quantity} and o.area=#{order.area} and o.project=#{order.project} and o.customer_id=#{order.customerId} and o.money=#{order.money}
+ </select>
+
<select id="selectMaxOrderId">
select
ifnull(SUBSTR(max(order_id) from 9),0)
@@ -37,7 +47,9 @@
o.money = ifnull(od.detailAmount,0)+ifnull(c.money,0),
o.quantity = od.b,
o.area = od.c,
- o.perimeter= od.aa
+ o.perimeter= od.aa,
+ o.other_money = ifnull(c.money,0),
+ o.other_remarks = (select group_concat( distinct edging_type) from order_detail where order_id = #{orderId} and edging_type is not null)
where
o.order_id = #{orderId}
@@ -46,7 +58,7 @@
<select id="getOrderList">
select
*,
- sum(fgi.quantity_available) as goodsQuantity
+ ifnull(sum(fgi.quantity_available),0) as goodsQuantity
from
`order` as o
left join mm.finished_goods_inventory as fgi
@@ -180,7 +192,16 @@
</select>
<update id="reviewOrderById">
- update `order` set order_review = #{status} where order_id = #{id}
+ update `order` set order_review = #{status},
+ verifier_id = #{userId},
+ verifier = #{userName}
+ where order_id = #{id}
+ </update>
+ <update id="reviewOrderByIds">
+ update `order` set order_review = #{status},process_review = #{status},
+ verifier_id = null,
+ verifier = null
+ where order_id = #{id}
</update>
<update id="reviewProcessById">
--
Gitblit v1.8.0