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-18 17:48:43 +08:00
parent f94ddb433d
commit 264ca0e407
59 changed files with 8181 additions and 603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="customerId" column="customer_id"/>
<result property="company" column="company"/>
<result property="salesManager" column="sales_manager"/>
<result property="salesmanId" column="salesman_id"/>
<result property="orderStatus" column="order_status"/>
<result property="tradeType" column="trade_type"/>
<result property="remark" column="remark"/>
@@ -20,14 +21,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by"/>
<result property="taxAmount" column="tax_amount"/>
<result property="noTaxAmount" column="no_tax_amount"/>
<result property="contractExcelOssIds" column="contract_excel_oss_ids"/>
</resultMap>
<select id="selectVoPlusPage" resultType="com.gear.oa.domain.vo.GearOrderVo">
select o.order_id,
o.order_code,
o.customer_id,
o.company,
o.sales_manager,
o.order_status,
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.remark,
o.del_flag,
o.create_time,
@@ -36,9 +52,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
o.update_by,
o.tax_amount,
o.no_tax_amount,
c.name as customerName
o.contract_excel_oss_ids as contractExcelOssIds,
c.name as customerName,
(SELECT MAX(CAST(so.status AS SIGNED))
FROM gear_shipping_order so
WHERE so.order_id = o.order_id
AND so.del_flag = '0') AS shippingMaxStatus,
(CASE
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 0
END) AS shippedFlag,
(SELECT MAX(so.ship_time)
FROM gear_shipping_order so
WHERE so.order_id = o.order_id
AND so.del_flag = '0'
AND CAST(so.status AS SIGNED) >= 2) AS lastShipTime
from gear_order o
left join gear_customer c on o.customer_id = c.customer_id and c.del_flag = 0
left join gear_salesman s on o.salesman_id = s.salesman_id and s.del_flag = 0
${ew.customSqlSegment}
</select>
<select id="selectVoPagePlus" resultType="com.gear.oa.domain.vo.GearOrderVo">
@@ -46,8 +81,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
o.order_code,
o.customer_id,
o.company,
o.sales_manager,
o.order_status,
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.remark,
o.del_flag,
o.create_time,
@@ -56,9 +105,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
o.update_by,
o.tax_amount,
o.no_tax_amount,
c.name as customerName
o.contract_excel_oss_ids as contractExcelOssIds,
c.name as customerName,
(SELECT MAX(CAST(so.status AS SIGNED))
FROM gear_shipping_order so
WHERE so.order_id = o.order_id
AND so.del_flag = '0') AS shippingMaxStatus,
(CASE
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 0
END) AS shippedFlag,
(SELECT MAX(so.ship_time)
FROM gear_shipping_order so
WHERE so.order_id = o.order_id
AND so.del_flag = '0'
AND CAST(so.status AS SIGNED) >= 2) AS lastShipTime
from gear_order o
left join gear_customer c on o.customer_id = c.customer_id and c.del_flag = 0
left join gear_salesman s on o.salesman_id = s.salesman_id and s.del_flag = 0
${ew.customSqlSegment}
</select>