DeXun/GEAR-OA
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

销售发货，产品调整

Browse Source
This commit is contained in:
朱昊天
2026-05-21 14:22:42 +08:00
parent 264ca0e407
commit 7686d70e59
46 changed files with 3250 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gear-oa/src/main/resources/mapper/oa/GearOrderMapper.xml
View File

@@ -30,20 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
o.company,
o.salesman_id,
s.name as sales_manager,
(CASE
WHEN o.order_status = 3 THEN 3
WHEN EXISTS (SELECT 1
FROM gear_shipping_order so
WHERE so.order_id = o.order_id
AND so.del_flag = '0'
AND CAST(so.status AS SIGNED) >= 3) THEN 2
WHEN EXISTS (SELECT 1
FROM gear_shipping_order so
WHERE so.order_id = o.order_id
AND so.del_flag = '0'
AND CAST(so.status AS SIGNED) >= 2) THEN 1
ELSE o.order_status
END) AS order_status,
o.order_status AS order_status,
o.remark,
o.del_flag,
o.create_time,
@@ -83,20 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
o.company,
o.salesman_id,
s.name as sales_manager,
(CASE
WHEN o.order_status = 3 THEN 3
WHEN EXISTS (SELECT 1
FROM gear_shipping_order so
WHERE so.order_id = o.order_id
AND so.del_flag = '0'
AND CAST(so.status AS SIGNED) >= 3) THEN 2
WHEN EXISTS (SELECT 1
FROM gear_shipping_order so
WHERE so.order_id = o.order_id
AND so.del_flag = '0'
AND CAST(so.status AS SIGNED) >= 2) THEN 1
ELSE o.order_status
END) AS order_status,
o.order_status AS order_status,
o.remark,
o.del_flag,
o.create_time,