From 2ab6b6860e4f7bee67a0f66831b9b1fb0f420710 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 22 四月 2026 10:45:01 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro

---
 src/main/resources/mapper/production/ProductionPlanMapper.xml |   98 +++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 83 insertions(+), 15 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductionPlanMapper.xml b/src/main/resources/mapper/production/ProductionPlanMapper.xml
index 3e3a683..fee9fcc 100644
--- a/src/main/resources/mapper/production/ProductionPlanMapper.xml
+++ b/src/main/resources/mapper/production/ProductionPlanMapper.xml
@@ -4,21 +4,89 @@
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <resultMap id="BaseResultMap" type="com.ruoyi.production.pojo.ProductionPlan">
-        <id column="id" property="id" />
-        <result column="mps_no" property="mpsNo" />
-        <result column="required_date" property="requiredDate" />
-        <result column="remark" property="remark" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-        <result column="create_user" property="createUser" />
-        <result column="update_user" property="updateUser" />
-        <result column="product_model_id" property="productModelId" />
-        <result column="qty_required" property="qtyRequired" />
-        <result column="state" property="state" />
-        <result column="issued" property="issued" />
-        <result column="source" property="source" />
-        <result column="is_audit" property="isAudit" />
-        <result column="promised_delivery_date" property="promisedDeliveryDate" />
+        <id column="id" property="id"/>
+        <result column="mps_no" property="mpsNo"/>
+        <result column="required_date" property="requiredDate"/>
+        <result column="remark" property="remark"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="create_user" property="createUser"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="product_model_id" property="productModelId"/>
+        <result column="qty_required" property="qtyRequired"/>
+        <result column="state" property="state"/>
+        <result column="issued" property="issued"/>
+        <result column="source" property="source"/>
+        <result column="is_audit" property="isAudit"/>
+        <result column="promised_delivery_date" property="promisedDeliveryDate"/>
     </resultMap>
 
+    <select id="listPage" resultType="com.ruoyi.production.bean.dto.ProductionPlanDto">
+        SELECT
+        pp.*,
+        pms.material_code AS materialCode,
+        pms.model,
+        pms.product_id AS productMaterialId,
+        pm.product_name AS productName,
+        pm.unit
+        FROM production_plan pp
+        left join product_material_sku pms on pp.product_material_sku_id = pms.id
+        left join product_material pm on pms.product_id = pm.id
+        WHERE 1 = 1
+        <if test="c.customerName != null and c.customerName != '' ">
+            AND pp.customer_name LIKE CONCAT('%',#{c.customerName},'%')
+        </if>
+        <if test="c.productName != null and c.productName != '' ">
+            AND pm.product_name LIKE CONCAT('%',#{c.productName},'%')
+        </if>
+        <if test="c.materialCode != null and c.materialCode != '' ">
+            AND pms.material_code LIKE CONCAT('%',#{c.materialCode},'%')
+        </if>
+        <if test="c.model != null and c.model != '' ">
+            AND pms.model LIKE CONCAT('%',#{c.model},'%')
+        </if>
+        <if test="c.status != null">
+            AND pp.status =#{c.status}
+        </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 &gt;= DATE_FORMAT(#{c.startDate},'%Y-%m-%d')
+        </if>
+        <if test="c.endDate != null">
+            AND pp.end_date &lt;= DATE_FORMAT(#{c.endDate},'%Y-%m-%d')
+        </if>
+        ORDER BY COALESCE(pp.form_modified_time, pp.id) DESC
+    </select>
+
+    <select id="selectWithMaterialByIds" resultType="com.ruoyi.production.bean.dto.ProductionPlanDto">
+        SELECT
+        pp.*,
+        pms.material_code AS materialCode,
+        pms.model,
+        pm.product_name AS productName,
+        pm.unit
+        FROM production_plan pp
+        LEFT JOIN product_material_sku pms ON pp.product_material_sku_id = pms.id
+        LEFT JOIN product_material pm ON pms.product_id = pm.id
+        WHERE pp.id IN
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+        ORDER BY pp.id ASC
+    </select>
+    <select id="selectProductionPlanDtoById" resultType="com.ruoyi.production.bean.dto.ProductionPlanDto">
+        SELECT
+        pp.*,
+        pms.material_code AS materialCode,
+        pms.model,
+        pms.product_id AS productMaterialId,
+        pm.product_name AS productName,
+        pm.unit
+        FROM production_plan pp
+        left join product_material_sku pms on pp.product_material_sku_id = pms.id
+        left join product_material pm on pms.product_id = pm.id
+        WHERE pp.id = #{productionPlanId}
+    </select>
 </mapper>

--
Gitblit v1.9.3