From 47ba8c7abb611f4ab9c400f03841d8ae90f0ca1a Mon Sep 17 00:00:00 2001
From: Rui_Li <877258667@qq.com>
Date: Fri, 22 Apr 2022 15:37:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=88=86=E5=8D=B7=20?=
 =?UTF-8?q?=E5=88=86=E5=88=87=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ScheduleServiceImpl.java     | 23 +++++++++++++++++++
 .../mapper/schedule/SchedulingMapper.xml      |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
index 3ae91fc..04c0686 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
@@ -1619,6 +1619,9 @@ public class ScheduleServiceImpl implements ScheduleService {
             throw new RRException(produceMsg);
         }
 
+        //执行存储过程处理 调机SfdcTimeHist和SfdcRollOps
+        this.endTuningProcessSfdcTimeAndRollOps(site, orderNo, itemNo, seqNo, rollNo, operatorId, currentTime);
+
         //验证通过循环执行结束调机操作
         for (int i = 0; i < sfdcMaterialList.size(); i++) {
             SfdcMaterialData sfdcMaterialData = sfdcMaterialList.get(0);
@@ -1638,6 +1641,26 @@ public class ScheduleServiceImpl implements ScheduleService {
         this.startProduce(site, orderNo, itemNo, seqNo, rollNo, operatorId, currentTime);
     }
 
+    /**
+     * @Author LR
+     * @Description 调机SfdcTimeHist和SfdcRollOps
+     * @DateTime  2022/4/22 13:19
+     * @Param [site, orderNo, itemNo, seqNo, rollNo, operatorId, currentTime]
+     * @return void
+     **/
+    public void endTuningProcessSfdcTimeAndRollOps(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String operatorId, String currentTime) {
+        List<Object> params = new ArrayList<>();
+        params.add(site);
+        params.add(orderNo);
+        params.add(itemNo);
+        params.add(seqNo);
+        params.add(rollNo);
+        params.add(operatorId);
+        params.add(currentTime);
+        //执行存储过程
+        procedureMapper.execProduceData("endTuningProcessSfdcTimeAndRollOps", params);
+    }
+
     /**
      * TODO 添加注释
      *
diff --git a/src/main/resources/mapper/schedule/SchedulingMapper.xml b/src/main/resources/mapper/schedule/SchedulingMapper.xml
index 29d24f2..a24fd1d 100644
--- a/src/main/resources/mapper/schedule/SchedulingMapper.xml
+++ b/src/main/resources/mapper/schedule/SchedulingMapper.xml
@@ -243,7 +243,7 @@
             </if>
         </where>
         /*设置排序规则*/
-        ORDER BY RollSeqNo
+        ORDER BY RollNo DESC
     </select>