From d64fbf9b6297d13472c920ccdb7eea4d5e98babe Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 21 四月 2026 14:28:59 +0800
Subject: [PATCH] refactor(database): 移除投机交易名称字段

---
 src/main/resources/mapper/production/ProductWorkOrderMapper.xml |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index 2e9aca1..ecf0143 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -26,7 +26,11 @@
         pm.unit,
         p.product_name AS productName,
         po.nps_no AS productOrderNpsNo,
-        ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus
+        ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus,
+        CASE
+        WHEN pwo.work_order_no LIKE 'FG%' THEN '杩斿伐杩斾慨'
+        ELSE '姝e父'
+        END AS work_order_type
         FROM
         product_work_order pwo
         LEFT JOIN product_process_route_item ppri ON ppri.id = pwo.product_process_route_item_id
@@ -34,16 +38,18 @@
         LEFT JOIN product_process pp ON pp.id = ppri.process_id
         LEFT JOIN product_model pm ON pm.id = ppri.product_model_id
         LEFT JOIN product p ON p.id = pm.product_id
-        where 1=1
+        <where>
             <if test="c.workOrderNo != null and c.workOrderNo != ''">
-               and pwo.work_order_no like concat('%',#{c.workOrderNo},'%')
+                and pwo.work_order_no like concat('%',#{c.workOrderNo},'%')
             </if>
             <if test="c.planStartTime != null and c.planEndTime != null">
                 and DATE(pwo.create_time) between #{c.planStartTime} and #{c.planEndTime}
             </if>
-            <if test="c.productOrderId != null and c.productOrderId != ''">
-               and pwo.product_order_id = #{c.productOrderId}
+            <if test="c.productOrderNpsNo != null and c.productOrderNpsNo != ''">
+                and po.nps_no like concat('%',#{c.productOrderNpsNo},'%')
             </if>
+        </where>
+        order by pwo.id desc
     </select>
     <select id="getProductWorkOrderFlowCard" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
         SELECT
@@ -71,6 +77,7 @@
                 pm.unit,
                 p.product_name,
                 po.nps_no
+        order by pwo.id desc
     </select>
     <select id="selectWorkOrderStartStats" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
         SELECT
@@ -83,4 +90,12 @@
             actual_start_time &gt;= #{startDate}
             AND actual_start_time &lt;= #{endDate}
     </select>
+    <select id="selectMax" resultType="com.ruoyi.production.pojo.ProductWorkOrder">
+        SELECT SUBSTRING(work_order_no, 3) as work_order_no
+        FROM product_work_order
+        WHERE SUBSTRING(work_order_no, 3) like concat(#{datePrefix},'%')
+        order by work_order_no  desc
+        limit 1
+        ;
+    </select>
 </mapper>

--
Gitblit v1.9.3