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

10
gear-oa/src/main/resources/mapper/oa/GearOrderDetailMapper.xml
View File

@@ -18,6 +18,8 @@
<result property="updateBy" column="update_by"/>
<result property="taxPrice" column="tax_price"/>
<result property="noTaxPrice" column="no_tax_price"/>
<result property="spec" column="spec"/>
<result property="model" column="model"/>
</resultMap>
<select id="selectVoListByOrderId" resultType="com.gear.oa.domain.vo.GearOrderDetailVo">
SELECT
@@ -25,8 +27,8 @@
COALESCE(p.product_name, mp.product_name) AS productName,
COALESCE(p.product_code, CAST(mp.product_id AS CHAR)) AS productCode,
COALESCE(p.type, mp.product_type) AS productType,
mp.spec AS spec,
mp.model AS model,
COALESCE(d.spec, mp.spec) AS spec,
COALESCE(d.model, mp.model) AS model,
mp.unit_price AS unitPrice
FROM gear_order_detail d
LEFT JOIN gear_product p ON d.product_id = p.product_id
@@ -39,8 +41,8 @@
COALESCE(p.product_name, mp.product_name) AS productName,
COALESCE(p.product_code, CAST(mp.product_id AS CHAR)) AS productCode,
COALESCE(p.type, mp.product_type) AS productType,
mp.spec AS spec,
mp.model AS model,
COALESCE(d.spec, mp.spec) AS spec,
COALESCE(d.model, mp.model) AS model,
mp.unit_price AS unitPrice
FROM gear_order_detail d
LEFT JOIN gear_product p ON d.product_id = p.product_id

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,