From cf984315319d060fa55b1f35cd95403690a30762 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 27 三月 2026 17:56:27 +0800
Subject: [PATCH] feat:1.生产订单增加领用弹窗(数据输入和输出) 2.对应领用出库
---
src/main/resources/mapper/production/ProductOrderMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index fdcb54e..b01fdad 100644
--- a/src/main/resources/mapper/production/ProductOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -12,7 +12,11 @@
<result property="npsNo" column="nps_no"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
+ <result property="expectedSchedule" column="expected_schedule"/>
+ <result property="manufacturingTeam" column="manufacturing_team"/>
+ <result property="isEnd" column="is_end"/>
</resultMap>
+
<select id="pageProductOrder" resultType="com.ruoyi.production.dto.ProductOrderDto">
select po.*,
sl.sales_contract_no,
@@ -20,7 +24,9 @@
p.product_name as product_category,
pm.model as specification_model,
pm.unit,
+ pm.uid_no,
ppr.process_route_code,
+ pb.id as bomId,
pb.bom_no,
ROUND(po.complete_quantity / po.quantity * 100, 2) AS completionStatus,
DATEDIFF(sl.delivery_date, CURDATE()) AS delivery_days_diff,
@@ -41,7 +47,7 @@
) shipping_status_counts ON sl.id = shipping_status_counts.sales_ledger_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 sales_ledger_product slp on po.sale_ledger_product_id = slp.id
+ left join sales_ledger_product slp on po.sale_ledger_product_id = slp.id and slp.type = 1
left join product_process_route ppr on po.id = ppr.product_order_id
left join product_bom pb on pb.id = ppr.bom_id
<where>
--
Gitblit v1.9.3