From ae8ba1c2a784875041c4bad1709e8617ee7ee3ac Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Fri, 6 Feb 2026 18:19:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=A1=E6=81=AF=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aqgqj/business/backstage/entity/OutPlanVo.java  |  2 +-
 .../mappers/business/backstage/PurchaseMapper.xml   | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/bonus/aqgqj/business/backstage/entity/OutPlanVo.java b/src/main/java/com/bonus/aqgqj/business/backstage/entity/OutPlanVo.java
index b00501f..5aadc2d 100644
--- a/src/main/java/com/bonus/aqgqj/business/backstage/entity/OutPlanVo.java
+++ b/src/main/java/com/bonus/aqgqj/business/backstage/entity/OutPlanVo.java
@@ -124,7 +124,7 @@ public class OutPlanVo extends ParentVo {
      */
     private String manager;
     /**
-     * 派车状态
+     * 派车状态 0 为派车 1已派车
      */
     private String outStatus;
 }
diff --git a/src/main/resources/mappers/business/backstage/PurchaseMapper.xml b/src/main/resources/mappers/business/backstage/PurchaseMapper.xml
index 89e6818..64fefd9 100644
--- a/src/main/resources/mappers/business/backstage/PurchaseMapper.xml
+++ b/src/main/resources/mappers/business/backstage/PurchaseMapper.xml
@@ -197,15 +197,22 @@
     <select id="getProApplyList" resultType="com.bonus.aqgqj.business.backstage.entity.OutPlanVo">
         SELECT spa.code planCode,spa.project_id proId,spa.need_time needTime,spa.creator,spa.remark,spa.id ,spa.edit_status as editStatus,
             if(spa.ck_num+spa.lk_num>0,'已发货','未发货') status,DATE_FORMAT(spa.create_time, '%Y-%m-%d') applyTime,spa.creator userName,
-        DATE_FORMAT(spa.create_time, '%Y-%m-%d') createTime ,spa.need_num needNum,spa.ck_num cgNum,spa.lk_num lkNum
+        DATE_FORMAT(spa.create_time, '%Y-%m-%d') createTime ,spa.need_num needNum,outDetails.ck_num cgNum,outDetails.lk_num lkNum
         from  st_plan_apply spa
+        left join(
+        SELECT sum(std.lk_num) lk_num,sum(std.cg_num) ck_num,sto.apply_id,std.model_id,std.`name`
+        from  st_plan_out  sto
+        left join  st_plan_out_details std on sto.id=std.out_id
+        where sto.apply_id=640
+        GROUP BY sto.apply_id,std.model_id
+        )outDetails  on  outDetails.apply_id=spa.id
         <where>
               spa.status_type=1
             <if test="proId!=null and proId!=''">
                 and spa.project_id=#{proId}
             </if>
             <if test="planCode!=null and planCode!=''">
-                and code like concat('%',#{planCode},'%')
+                and spa.code like concat('%',#{planCode},'%')
             </if>
             <if test="status!=null and status!=''">
                 <if test='status=="0"'>
@@ -242,7 +249,7 @@
                spd.need_day needDay,spd.type,spd.`name`,model,spd.unit,outDetail.lk_num lkNum
         from st_plan_details spd
          left join(
-            SELECT cg_num,lk_num ,plan_detail_id,spod.model_id
+            SELECT  SUM(cg_num) cg_num,sum(lk_num) lk_num ,plan_detail_id,spod.model_id
             from  st_plan_out_details spod
             GROUP BY plan_detail_id,spod.model_id
         )outDetail  on outDetail.plan_detail_id=spd.apply_id AND outDetail.model_id=spd.model_id