|
@@ -19,11 +19,8 @@
|
|
|
c.spec,
|
|
c.spec,
|
|
|
su.name AS recipientAgent, su.id AS recipientAgentId, so.name AS recipientOffice,
|
|
su.name AS recipientAgent, su.id AS recipientAgentId, so.name AS recipientOffice,
|
|
|
d.id AS collectTypeId, d.name AS collectType,
|
|
d.id AS collectTypeId, d.name AS collectType,
|
|
|
- IFNULL(
|
|
|
|
|
- SUM(trade_number) - (b.collect_number / c.spec),
|
|
|
|
|
- SUM(trade_number)
|
|
|
|
|
- ) AS surplusNumber,
|
|
|
|
|
- a.is_return
|
|
|
|
|
|
|
+ a.current_inventory AS surplusNumber,
|
|
|
|
|
+ a.is_return
|
|
|
FROM psi_management_collect_detailed a
|
|
FROM psi_management_collect_detailed a
|
|
|
LEFT JOIN sys_user su
|
|
LEFT JOIN sys_user su
|
|
|
ON a.recipient_agent = su.id
|
|
ON a.recipient_agent = su.id
|