From 78286a5422d2180df5cd66a85570a7a3cd2f4d71 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 18 三月 2026 10:36:21 +0800
Subject: [PATCH] fix: 新增工艺路线与子集去除绑定产品,改为工序与产品类型

---
 src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml |   49 +++++++++++++++++++++++++++----------------------
 1 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml b/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
index faa92ae..4205a15 100644
--- a/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
+++ b/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
@@ -28,7 +28,6 @@
         <result property="modifierName" column="modifier_name"/>
         <result property="formCreatedTime" column="form_created_time"/>
         <result property="formModifiedTime" column="form_modified_time"/>
-        <result property="dataSyncType" column="data_sync_type"/>
         <result property="dataSourceType" column="data_source_type"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
@@ -39,25 +38,25 @@
         SELECT
         pp.*,
         pms.material_code AS materialCode,
-        pms.specification AS specification,
-        pms.material_id AS productMaterialId,
-        pm.material_name AS productName,
-        pm.base_unit
+        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.material_id = pm.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.material_name LIKE CONCAT('%',#{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.specification != null and c.specification != '' ">
-            AND pms.specification LIKE CONCAT('%',#{c.specification},'%')
+        <if test="c.model != null and c.model != '' ">
+            AND pms.model LIKE CONCAT('%',#{c.model},'%')
         </if>
         <if test="c.applyNo != null and c.applyNo != '' ">
             AND pp.apply_no LIKE CONCAT('%',#{c.applyNo},'%')
@@ -68,52 +67,58 @@
         <if test="c.endDate != null">
             AND pp.end_date &lt;= DATE_FORMAT(#{c.endDate},'%Y-%m-%d')
         </if>
-        ORDER BY pp.id DESC
+        ORDER BY COALESCE(pp.form_modified_time, pp.id) DESC
     </select>
 
     <select id="selectSummaryByProductType" resultType="com.ruoyi.productionPlan.dto.ProductionPlanSummaryDto">
         SELECT
-        sku.material_code,
-        pm.material_name AS product_name,
-        sku.specification AS product_spec,
+        sku.material_code AS materialCode,
+        pm.product_name AS productName,
+        sku.model,
         pp.length,
         pp.width,
         pp.height,
+        pm.unit AS unit,
         COALESCE(SUM(pp.quantity),0) AS quantity,
         COALESCE(SUM(pp.volume),0) AS volume
         FROM production_plan pp
         LEFT JOIN product_material_sku sku
         ON pp.product_material_sku_id = sku.id
         LEFT JOIN product_material pm
-        ON sku.material_id = pm.id
+        ON sku.product_id = pm.id
         <where>
             <if test="materialCode != null and materialCode != ''">
                 AND sku.material_code LIKE CONCAT('%', #{materialCode}, '%')
             </if>
 
             <if test="productName != null and productName != ''">
-                AND pm.material_name LIKE CONCAT('%', #{productName}, '%')
+                AND pm.product_name LIKE CONCAT('%', #{productName}, '%')
+            </if>
+
+            <if test="model != null and model != ''">
+                AND sku.model LIKE CONCAT('%', #{model}, '%')
             </if>
         </where>
         GROUP BY
         sku.material_code,
-        pm.material_name,
-        sku.specification,
+        pm.product_name,
+        sku.model,
         pp.length,
         pp.width,
-        pp.height
+        pp.height,
+        pm.unit
     </select>
 
     <select id="selectWithMaterialByIds" resultType="com.ruoyi.productionPlan.dto.ProductionPlanDto">
         SELECT
         pp.*,
         pms.material_code AS materialCode,
-        pms.specification AS specification,
-        pm.material_name AS productName,
-        pm.base_unit
+        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.material_id = pm.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}

--
Gitblit v1.9.3