From 2ae58a2f2d53c220c4b02d8e9f17770f63397b1e Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 26 二月 2026 10:40:18 +0800
Subject: [PATCH] 人力资源模块迁移
---
src/main/resources/mapper/production/ProductOrderMapper.xml | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index b47d5cf..4c2b1f8 100644
--- a/src/main/resources/mapper/production/ProductOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -15,15 +15,12 @@
</resultMap>
<select id="pageProductOrder" resultType="com.ruoyi.production.dto.ProductOrderDto">
select po.*,
- sl.sales_contract_no,
- sl.customer_name,
slp.product_category,
slp.specification_model,
ppr.process_route_code,
pb.bom_no,
ROUND(po.complete_quantity / po.quantity * 100, 2) AS completionStatus
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
left join product_process_route ppr on po.id = ppr.product_order_id
left join product_bom pb on pb.id = ppr.bom_id
@@ -34,19 +31,19 @@
<if test="c.salesContractNo != null and c.salesContractNo != ''">
and sl.sales_contract_no like concat('%',#{c.salesContractNo},'%')
</if>
- <if test="c.customerName != null and c.customerName != ''">
- and sl.customer_name like concat('%',#{c.customerName},'%')
- </if>
<if test="c.productCategory != null and c.productCategory != ''">
and slp.product_category like concat('%',#{c.productCategory},'%')
</if>
<if test="c.specificationModel != null and c.specificationModel != ''">
and slp.specification_model like concat('%',#{c.specificationModel},'%')
</if>
+ <if test="c.startTime != null and c.endTime != null">
+ and po.create_time between #{c.startTime} and #{c.endTime}
+ </if>
</where>
</select>
<select id="productMainByOrderId" resultType="com.ruoyi.production.dto.ProductOrderDto">
- select po.*,
+ select po.*,F
pwo.work_order_no,
pwo.report_work,
pwo.status,
--
Gitblit v1.9.3