From 2ab6b6860e4f7bee67a0f66831b9b1fb0f420710 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 22 四月 2026 10:45:01 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/resources/mapper/production/ProductionOrderMapper.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionOrderMapper.xml b/src/main/resources/mapper/production/ProductionOrderMapper.xml
index c52e291..3c26d4e 100644
--- a/src/main/resources/mapper/production/ProductionOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderMapper.xml
@@ -21,4 +21,52 @@
<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 >= #{startDate}
+ and create_time <= #{endDate}
+ </select>
+
+ <select id="countCompleted" resultType="java.lang.Integer">
+ select count(1)
+ from production_order
+ where end_time >= #{startDate}
+ and end_time <= #{endDate}
+ and ifnull(complete_quantity, 0) >= quantity
+ </select>
+
+ <select id="countPending" resultType="java.lang.Integer">
+ select count(1)
+ from production_order
+ where create_time >= #{startDate}
+ and create_time <= #{endDate}
+ and ifnull(complete_quantity, 0) < quantity
+ </select>
+
</mapper>
--
Gitblit v1.9.3