From 4cb12d21253d754152b7591fe49fa131fed1b3c8 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 14:37:28 +0800
Subject: [PATCH] refactor(production): 移除销售台账关联逻辑并优化生产订单创建流程

---
 src/main/resources/mapper/production/ProductionOrderMapper.xml |   50 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductionOrderMapper.xml b/src/main/resources/mapper/production/ProductionOrderMapper.xml
index c52e291..b2d1cb6 100644
--- a/src/main/resources/mapper/production/ProductionOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderMapper.xml
@@ -5,7 +5,6 @@
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <resultMap id="BaseResultMap" type="com.ruoyi.production.pojo.ProductionOrder">
         <id column="id" property="id" />
-        <result column="sales_ledger_id" property="salesLedgerId" />
         <result column="production_plan_ids" property="productionPlanIds" />
         <result column="product_model_id" property="productModelId" />
         <result column="nps_no" property="npsNo" />
@@ -16,9 +15,56 @@
         <result column="complete_quantity" property="completeQuantity" />
         <result column="start_time" property="startTime" />
         <result column="end_time" property="endTime" />
-        <result column="sale_ledger_product_id" property="saleLedgerProductId" />
         <result column="create_user" property="createUser" />
         <result column="dept_id" property="deptId" />
     </resultMap>
 
+    <select id="selectProgressOrders" resultType="com.ruoyi.home.dto.ProductionProgressOrderDto">
+        select po.nps_no,
+               sl.sales_contract_no,
+               sl.project_name,
+               sl.customer_name,
+               p.product_name as productCategory,
+               pm.model as specificationModel,
+               tr.process_route_code as processRouteCode,
+               po.quantity,
+               ifnull(po.complete_quantity, 0) as completeQuantity,
+               round(ifnull(po.complete_quantity, 0) / nullif(po.quantity, 0) * 100, 2) as completionStatus,
+               tb.bom_no,
+               datediff(sl.delivery_date, curdate()) as deliveryDaysDiff,
+               sl.delivery_date,
+               false as isFh
+        from production_order po
+                 left join sales_ledger sl on po.sales_ledger_id = sl.id
+                 left join product_model pm on po.product_model_id = pm.id
+                 left join product p on pm.product_id = p.id
+                 left join technology_routing tr on po.technology_routing_id = tr.id
+                 left join technology_bom tb on tr.bom_id = tb.id
+        where po.create_time between #{startTime} and #{endTime}
+        order by po.create_time desc
+    </select>
+
+    <select id="countCreated" resultType="java.lang.Integer">
+        select count(1)
+        from production_order
+        where create_time &gt;= #{startDate}
+          and create_time &lt;= #{endDate}
+    </select>
+
+    <select id="countCompleted" resultType="java.lang.Integer">
+        select count(1)
+        from production_order
+        where end_time &gt;= #{startDate}
+          and end_time &lt;= #{endDate}
+          and ifnull(complete_quantity, 0) &gt;= quantity
+    </select>
+
+    <select id="countPending" resultType="java.lang.Integer">
+        select count(1)
+        from production_order
+        where create_time &gt;= #{startDate}
+          and create_time &lt;= #{endDate}
+          and ifnull(complete_quantity, 0) &lt; quantity
+    </select>
+
 </mapper>

--
Gitblit v1.9.3