From e5b06241af0b53cf48d032ee1f94ab47eca24815 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 09 一月 2026 16:35:33 +0800
Subject: [PATCH] 1.取消生产报工记录添加上生产时间字段
---
src/main/resources/mapper/production/ProductOrderMapper.xml | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index df9f8b8..d4ffc40 100644
--- a/src/main/resources/mapper/production/ProductOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -14,7 +14,7 @@
<result property="updateTime" column="update_time"/>
</resultMap>
<select id="pageProductOrder" resultType="com.ruoyi.production.dto.ProductOrderDto">
- select po.*,sl.sales_contract_no,sl.project_name,sl.customer_name,slp.product_category,slp.specification_model
+ select po.*,sl.sales_contract_no,sl.customer_name,slp.product_category,slp.specification_model
from product_order po
left join sales_ledger sl on po.sales_ledger_id = sl.id
left join sales_ledger_product slp on po.product_model_id = slp.id
@@ -26,9 +26,6 @@
<if test="c.salesContractNo != null and c.salesContractNo != ''">
and sl.sales_contract_no like concat('%',#{c.salesContractNo},'%')
</if>
- <if test="c.projectName != null and c.projectName != ''">
- and sl.project_name like concat('%',#{c.projectName},'%')
- </if>
<if test="c.customerName != null and c.customerName != ''">
and sl.customer_name like concat('%',#{c.customerName},'%')
</if>
@@ -40,6 +37,18 @@
</if>
</where>
</select>
+ <select id="productMainByOrderId" resultType="com.ruoyi.production.dto.ProductOrderDto">
+ select
+ po.*,
+ pwo.work_order_no,
+ pwo.report_work,
+ pwo.status,
+ pwo.quantity,
+ pwo.plan_quantity
+ from product_order po
+ left join product_work_order pwo on po.id = pwo.product_order_id
+ where po.id = #{c.id}
+ </select>
</mapper>
--
Gitblit v1.9.3