From e50fa16b6dbc4e7c50d5fbdbc04d2a556ca01c4e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:36 +0800
Subject: [PATCH] 补片流程卡调整

---
 north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml |   87 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 85 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
index 2257217..4d401ea 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -160,12 +160,95 @@
         from pp.optimize_project as p
                  left join pp.optimize_admin as a on p.creater = a.Id
         where (`p`.`state` > -(1))
-            and `p`.`create_time` &gt; #{startSelectTime}
-            and `p`.`create_time` &lt; #{endSelectTime}
+            and DATE (`p`.`create_time`) BETWEEN #{startSelectTime} AND #{endSelectTime}
         <if test="optimizeProjectMange.projectNumber != null and optimizeProjectMange.projectNumber != ''">
             and p.project_no regexp #{optimizeProjectMange.projectNumber}
         </if>
+        <if test="optimizeProjectMange.state!= null">
+            and p.state = #{optimizeProjectMange.state}
+        </if>
         order by `p`.`create_time` desc, `p`.`project_no`
     </select>
+    <!--淇敼宸ョ▼鐘舵��-->
+    <update id="updateProjectStateMp">
+        update pp.optimize_project as p
+        set p.state = #{state}
+        where p.project_no = #{projectNumber}
+    </update>
+
+    <!--鍒犻櫎宸ョ▼-->
+    <delete id="deleteProjectMp">
+        delete from pp.optimize_project
+        where project_no = #{projectNumber}
+    </delete>
+
+    <select id="getProjectListMp">
+        SELECT
+            p.id,
+            p.project_no,
+            p.project_name,
+            p.glass_type,
+            p.glass_thickness,
+            p.type,
+            p.state,
+            p.glass_total,
+            p.glass_total_area,
+            p.process_qty,
+            p.process_cards,
+            p.remark,
+            a.name,
+            p.create_time,
+            p.update_time
+        FROM
+            (
+                pp.optimize_project p
+                    LEFT JOIN pp.optimize_admin a ON ((
+                    p.creater = a.Id
+                    )))
+        WHERE
+            ( p.state = 1 )
+        ORDER BY
+            p.create_time DESC,
+            p.project_no
+    </select>
+
+    <!--妯℃嫙璁＄畻鏌ヨ-->
+    <select id="selectProjectComputeMp">
+        SELECT
+            fc.process_id,
+            fc.technology_number,
+            fc.project_no,
+            fcss.TotalFloors,
+            COUNT(fc.order_number)                                      AS TotalNumber,
+            SUM(fc.quantity)                                            AS quantity,
+            ROUND(SUM(od.width * od.height * fc.quantity / 1000000), 2) AS area,
+            o.project,
+            ogd.glass_child,
+            od.shape
+        FROM
+            pp.flow_card AS fc
+                LEFT JOIN sd.`order` AS o ON fc.order_id = o.order_id
+                LEFT JOIN sd.order_detail AS od ON od.order_id = fc.order_id AND od.order_number = fc.order_number
+                LEFT JOIN sd.order_glass_detail AS ogd
+                          ON ogd.order_id = fc.order_id AND ogd.order_number = fc.order_number AND
+                             ogd.technology_number = fc.technology_number
+                LEFT JOIN (
+                SELECT
+                    fcs.process_id,
+                    fcs.order_number,
+                    COUNT(DISTINCT fcs.technology_number) AS TotalFloors
+                FROM
+                    pp.flow_card AS fcs
+                GROUP BY
+                    fcs.process_id, fcs.order_number
+            ) AS fcss
+                          ON fcss.process_id = fc.process_id AND fcss.order_number = fc.order_number
+        WHERE
+            fc.project_no = #{projectNo}
+        GROUP BY
+            fc.process_id, fc.technology_number
+        ORDER BY
+            fc.process_id, fc.technology_number;
+    </select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0