From 6f234aad9e5171b5c2285e95bed0da49dbddc657 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 12 三月 2026 17:32:40 +0800
Subject: [PATCH] Merge branch 'dev_宁夏_中盛建材' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_宁夏_中盛建材
---
src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml b/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
index 83fc71c..a7c1b84 100644
--- a/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
+++ b/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
@@ -40,6 +40,7 @@
pp.*,
pms.material_code AS materialCode,
pms.specification AS specification,
+ pms.material_id AS productMaterialId,
pm.material_name AS productName,
pm.base_unit
FROM production_plan pp
@@ -58,6 +59,9 @@
<if test="c.specification != null and c.specification != '' ">
AND pms.specification LIKE CONCAT('%',#{c.specification},'%')
</if>
+ <if test="c.applyNo != null and c.applyNo != '' ">
+ AND pp.apply_no LIKE CONCAT('%',#{c.applyNo},'%')
+ </if>
<if test="c.startDate != null">
AND pp.start_date >= DATE_FORMAT(#{c.startDate},'%Y-%m-%d')
</if>
--
Gitblit v1.9.3