From 6b4548fd6bcc0dfac797a4ef69402014f5fd9ac3 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Mon, 9 Feb 2026 15:53:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/backstage/PurchaseMapper.xml     | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/mappers/business/backstage/PurchaseMapper.xml b/src/main/resources/mappers/business/backstage/PurchaseMapper.xml
index e497b00..065e05f 100644
--- a/src/main/resources/mappers/business/backstage/PurchaseMapper.xml
+++ b/src/main/resources/mappers/business/backstage/PurchaseMapper.xml
@@ -124,13 +124,20 @@
 
 
     <select id="getProPurchaseList" resultType="com.bonus.aqgqj.business.backstage.entity.PurchaseVo">
-        select count(1) planNum,pro.name proName,bc.`NAME` as companyName,SUM(spa.need_num) needNum , SUM(ck_num) ckNum,sum(lk_num) lkNum ,
-               spa.project_id proId,spa.edit_status editStatus,
-               if(SUM(ck_num)+sum(lk_num)=0,'未发货',
-                  if(SUM(spa.need_num)-SUM(ck_num)-sum(lk_num)>0,'部分发货','全部发货'))
-                   status ,(if(SUM(spa.need_num)-SUM(ck_num)-sum(lk_num)>0,SUM(spa.need_num)-SUM(ck_num)-sum(lk_num),0) )dfhNum,( SUM(ck_num)+sum(lk_num)) fhNum,
-               ROUND((SUM(ck_num)+sum(lk_num))*100/ SUM(spa.need_num),2) progress
+        select count(1) planNum,pro.name proName,bc.`NAME` as companyName,SUM(spa.need_num) needNum , SUM(outDetail.ck_num) ckNum,sum(outDetail.lk_num) lkNum ,
+        spa.project_id proId,spa.edit_status editStatus,
+        if(SUM(outDetail.ck_num)+sum(outDetail.lk_num)=0,'未发货',
+        if(SUM(spa.need_num)-SUM(outDetail.ck_num)-sum(outDetail.lk_num)>0,'部分发货','全部发货'))
+        status ,(if(SUM(spa.need_num)-SUM(outDetail.ck_num)-sum(outDetail.lk_num)>0,SUM(spa.need_num)-SUM(outDetail.ck_num)-sum(outDetail.lk_num),0) )dfhNum,( SUM(outDetail.ck_num)+sum(outDetail.lk_num)) fhNum,
+        ROUND((SUM(outDetail.ck_num)+sum(outDetail.lk_num))*100/ SUM(spa.need_num),2) progress
         from st_plan_apply spa
+        left join(
+            SELECT  SUM(spod.cg_num) ck_num,sum(spod.lk_num) lk_num ,spo.apply_id plan_detail_id,spod.model_id,spod.id
+            from  st_plan_out spo
+            left join st_plan_out_details spod on spo.id=spod.out_id
+            GROUP BY plan_detail_id,spod.model_id
+        )outDetail  on outDetail.plan_detail_id=spa.id
+
         left join bm_project pro on pro.bid_id=spa.project_id
         LEFT JOIN bm_company bc on bc.ID=pro.COMPANY_ID
         where spa.status_type=1
@@ -245,7 +252,7 @@
                spo.remark,
                spo.apply_id,
                spa.creator,
-               spa.create_time,
+               spa.create_time as createTime,
                if(spo.apply_id is null, 0, 1) outStatus
         from st_plan_apply spa
                  left join tb_bid_project pro on pro.id = spa.project_id
@@ -258,8 +265,9 @@
                spd.need_day needDay,spd.type,spd.`name`,model,spd.unit,outDetail.lk_num lkNum,outDetail.id id
         from st_plan_details spd
          left join(
-            SELECT  SUM(cg_num) cg_num,sum(lk_num) lk_num ,plan_detail_id,spod.model_id,spod.id
-            from  st_plan_out_details spod
+            SELECT  SUM(spod.cg_num) cg_num,sum(spod.lk_num) lk_num ,spo.apply_id plan_detail_id,spod.model_id,spod.id
+            from  st_plan_out spo
+            left join st_plan_out_details spod on spo.id=spod.out_id
             GROUP BY plan_detail_id,spod.model_id
         )outDetail  on outDetail.plan_detail_id=spd.apply_id AND outDetail.model_id=spd.model_id
         where spd.apply_id=#{id}