From 640add74fe75427df3e9a9da3ffdf98ae3da3272 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期二, 24 三月 2026 17:29:25 +0800
Subject: [PATCH] Merge branch 'dev_长治_健齿齿科器材' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_长治_健齿齿科器材
---
src/main/resources/mapper/production/ProductOrderMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index fdcb54e..f1750da 100644
--- a/src/main/resources/mapper/production/ProductOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -12,6 +12,8 @@
<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"/>
</resultMap>
<select id="pageProductOrder" resultType="com.ruoyi.production.dto.ProductOrderDto">
select po.*,
@@ -41,7 +43,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