From fd80c03df8aa8261e4c8174b9ee0a91edb45d60c Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 28 八月 2026 23:08:57 +0800
Subject: [PATCH] fix: 客户档案查询领用人返回用户昵称

---
 src/main/resources/mapper/production/ProductionProductMainMapper.xml |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index f0dc39c..2403afe 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -34,6 +34,14 @@
                    else '鏈煡'
                    end as auditStatusName,
                pot.work_order_no as workOrderNo,
+               ifnull(pot.plan_quantity, 0) as schedulingNum,
+               cast(
+                   case
+                       when ifnull(pot.plan_quantity, 0) - ifnull(ppo.quantity, 0) &lt; 0 then 0
+                       else ifnull(pot.plan_quantity, 0) - ifnull(ppo.quantity, 0)
+                   end
+                   as decimal(18,4)
+               ) as pendingNum,
                case pot.status
                    when 1 then '寰呯‘璁�'
                    when 2 then '寰呯敓浜�'
@@ -131,6 +139,14 @@
                    else '鏈煡'
                    end as auditStatusName,
                pot.work_order_no as workOrderNo,
+               ifnull(pot.plan_quantity, 0) as schedulingNum,
+               cast(
+                   case
+                       when ifnull(pot.plan_quantity, 0) - ifnull(ppo.quantity, 0) &lt; 0 then 0
+                       else ifnull(pot.plan_quantity, 0) - ifnull(ppo.quantity, 0)
+                   end
+                   as decimal(18,4)
+               ) as pendingNum,
                p.product_name as productName,
                ifnull(p.standard_quantity, 0) as productStandardQuantity,
                pm.model as productModelName,
@@ -145,6 +161,17 @@
                ppm.repair_work_hour as repairWorkHour,
                cast(ifnull(ppm.work_hour, 0) as decimal(18,4)) as workHour,
                cast(ifnull(pa.work_hours, 0) as decimal(18,4)) as workHours,
+               cast(
+                   case
+                       when poro.type = 0 then ifnull(pa.work_hours, 0)
+                       else case
+                                when ifnull(too.standard_quantity, 0) = 0 then 0
+                                else ifnull(pa.finished_num, 0) / ifnull(too.standard_quantity, 0) * 8
+                            end
+                   end
+                   + ifnull(ppm.repair_work_hour, 0)
+                   as decimal(18,4)
+               ) as convertedWorkHours,
                cast(ifnull(pa.adjust_amount, 0) as decimal(18,4)) as adjustAmount,
                pa.adjust_remark as adjustRemark,
                cast(

--
Gitblit v1.9.3