From 9ae429f52f9909945ab4bf424bc3facfcdb5300c Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Tue, 5 Nov 2024 11:08:19 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=B7=A5=E5=8D=95=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E7=94=A8=E6=88=B7=E8=81=9A=E5=90=88=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ProdPlanExecuteUserMapper.java     |  8 ++++
 .../impl/ProdPlanExecuteUserServiceImpl.java  |  2 +-
 .../mapper/mes/prod/ProdOrderDetailMapper.xml |  1 +
 .../mapper/mes/prod/ProdOrderInfoMapper.xml   |  1 +
 .../mes/prod/ProdPlanExecuteUserMapper.xml    | 45 +++++++++++++++++++
 5 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/os-mes/src/main/java/com/os/mes/prod/mapper/ProdPlanExecuteUserMapper.java b/os-mes/src/main/java/com/os/mes/prod/mapper/ProdPlanExecuteUserMapper.java
index 9d1e4e9..65f3d7d 100644
--- a/os-mes/src/main/java/com/os/mes/prod/mapper/ProdPlanExecuteUserMapper.java
+++ b/os-mes/src/main/java/com/os/mes/prod/mapper/ProdPlanExecuteUserMapper.java
@@ -58,4 +58,12 @@ public interface ProdPlanExecuteUserMapper {
      * @return 结果
      */
     public int deleteProdPlanExecuteUserByObjIds(Long[] objIds);
+
+    /**
+     * 查询生产工单聚合执行用户列表
+     *
+     * @param prodPlanExecuteUser 生产工单执行用户
+     * @return 生产工单聚合执行用户集合
+     */
+    List<ProdPlanExecuteUser> selectAggProdPlanExecuteUserList(ProdPlanExecuteUser prodPlanExecuteUser);
 }
diff --git a/os-mes/src/main/java/com/os/mes/prod/service/impl/ProdPlanExecuteUserServiceImpl.java b/os-mes/src/main/java/com/os/mes/prod/service/impl/ProdPlanExecuteUserServiceImpl.java
index d564a0e..e1fc347 100644
--- a/os-mes/src/main/java/com/os/mes/prod/service/impl/ProdPlanExecuteUserServiceImpl.java
+++ b/os-mes/src/main/java/com/os/mes/prod/service/impl/ProdPlanExecuteUserServiceImpl.java
@@ -38,7 +38,7 @@ public class ProdPlanExecuteUserServiceImpl implements IProdPlanExecuteUserServi
      */
     @Override
     public List<ProdPlanExecuteUser> selectProdPlanExecuteUserList(ProdPlanExecuteUser prodPlanExecuteUser) {
-        return prodPlanExecuteUserMapper.selectProdPlanExecuteUserList(prodPlanExecuteUser);
+        return prodPlanExecuteUserMapper.selectAggProdPlanExecuteUserList(prodPlanExecuteUser);
     }
 
     /**
diff --git a/os-mes/src/main/resources/mapper/mes/prod/ProdOrderDetailMapper.xml b/os-mes/src/main/resources/mapper/mes/prod/ProdOrderDetailMapper.xml
index 2c32d7b..845f06d 100644
--- a/os-mes/src/main/resources/mapper/mes/prod/ProdOrderDetailMapper.xml
+++ b/os-mes/src/main/resources/mapper/mes/prod/ProdOrderDetailMapper.xml
@@ -186,6 +186,7 @@
             <if test="EdgeBandingTotalArea != null ">and EdgeBandingTotalArea = #{EdgeBandingTotalArea}</if>
             <if test="WireropeBeltTotalArea != null ">and WireropeBeltTotalArea = #{WireropeBeltTotalArea}</if>
         </where>
+        order by SeqNo desc
     </select>
 
     <select id="selectProdOrderDetailByObjId" parameterType="Long" resultMap="ProdOrderDetailResult">
diff --git a/os-mes/src/main/resources/mapper/mes/prod/ProdOrderInfoMapper.xml b/os-mes/src/main/resources/mapper/mes/prod/ProdOrderInfoMapper.xml
index 29d9bf0..a109485 100644
--- a/os-mes/src/main/resources/mapper/mes/prod/ProdOrderInfoMapper.xml
+++ b/os-mes/src/main/resources/mapper/mes/prod/ProdOrderInfoMapper.xml
@@ -249,6 +249,7 @@
                 and pod.OrderDate between #{params.beginOrderDate} and #{params.endOrderDate}
             </if>
         </where>
+        order by poi.order_code desc
     </select>
 
     <select id="selectProdOrderInfoByObjId" parameterType="Long" resultMap="ProdOrderInfoResult">
diff --git a/os-mes/src/main/resources/mapper/mes/prod/ProdPlanExecuteUserMapper.xml b/os-mes/src/main/resources/mapper/mes/prod/ProdPlanExecuteUserMapper.xml
index 2e58a70..bbfa80f 100644
--- a/os-mes/src/main/resources/mapper/mes/prod/ProdPlanExecuteUserMapper.xml
+++ b/os-mes/src/main/resources/mapper/mes/prod/ProdPlanExecuteUserMapper.xml
@@ -91,6 +91,51 @@
         where obj_id = #{objId}
     </select>
 
+    <select id="selectAggProdPlanExecuteUserList" parameterType="ProdPlanExecuteUser" resultMap="ProdPlanExecuteUserResult">
+        SELECT ppeu.order_code,
+        ppeu.plan_code,
+        ppeu.process_code,
+        ppeu.station_code,
+        bpl.product_line_name AS station_name,
+        ppeu.complete_amount,
+        ppeu.plan_begin_date,
+        ppeu.plan_end_date,
+        ppeu.batch_number,
+        STUFF(
+        (SELECT DISTINCT ', ' + CAST(ppeu_inner.staff_id AS VARCHAR)
+        FROM prod_plan_execute_user ppeu_inner
+        WHERE ppeu_inner.plan_code = ppeu.plan_code
+        AND ppeu_inner.batch_number = ppeu.batch_number
+        FOR XML PATH('')), 1, 2, '') AS staff_id,
+        STUFF(
+        (SELECT DISTINCT ', ' + bsi.staff_name
+        FROM base_staff_info bsi
+        LEFT JOIN prod_plan_execute_user ppeu_inner ON ppeu_inner.staff_id = bsi.staff_id
+        WHERE ppeu_inner.plan_code = ppeu.plan_code
+        AND ppeu_inner.batch_number = ppeu.batch_number
+        FOR XML PATH('')), 1, 2, '') AS staff_name
+        FROM prod_plan_execute_user ppeu
+        LEFT JOIN base_product_line bpl ON bpl.product_line_code = ppeu.station_code
+        <where>
+            <if test="orderCode != null  and orderCode != ''">and ppeu.order_code = #{orderCode}</if>
+            <if test="planCode != null  and planCode != ''">and ppeu.plan_code = #{planCode}</if>
+            <if test="processCode != null  and processCode != ''">and ppeu.process_code = #{processCode}</if>
+            <if test="stationCode != null  and stationCode != ''">and ppeu.station_code = #{stationCode}</if>
+            <if test="staffId != null  and staffId != ''">and ppeu.staff_id = #{staffId}</if>
+            <if test="completeAmount != null ">and ppeu.complete_amount = #{completeAmount}</if>
+            <if test="planBeginDate != null ">and ppeu.plan_begin_date = #{planBeginDate}</if>
+            <if test="planEndDate != null ">and ppeu.plan_end_date = #{planEndDate}</if>
+            <if test="isFlag != null  and isFlag != ''">and ppeu.is_flag = #{isFlag}</if>
+            <if test="batchNumber != null  and batchNumber != ''">and ppeu.batch_number = #{batchNumber}</if>
+            <if test="params.beginOrderDate != null and params.beginOrderDate != '' and params.endOrderDate != null and params.endOrderDate != ''">
+                and FORMAT(ppeu.plan_end_date, 'yyyy-MM-dd') between #{params.beginOrderDate} and #{params.endOrderDate}
+            </if>
+        </where>
+        GROUP BY ppeu.order_code, ppeu.plan_code, ppeu.process_code, ppeu.station_code, bpl.product_line_name,
+        ppeu.complete_amount, ppeu.plan_begin_date, ppeu.plan_end_date, ppeu.batch_number
+        ORDER BY ppeu.order_code desc, ppeu.station_code, ppeu.batch_number
+    </select>
+
     <insert id="insertProdPlanExecuteUser" parameterType="ProdPlanExecuteUser" useGeneratedKeys="true"
             keyProperty="objId">
         insert into prod_plan_execute_user