From 838097d236e973ab8b22e67bd4144cdb566a82ce Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Wed, 18 May 2022 11:13:47 +0800
Subject: [PATCH] =?UTF-8?q?2022-05-18=20=E5=8F=96=E6=B6=88=E6=B4=BE?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=9A=84=E6=89=80=E6=9C=89=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../schedule/data/SearchScheduleData.java     |  9 ++++
 .../service/impl/ScheduleServiceImpl.java     | 48 +++++++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java
index 6ab0150..15784d7 100644
--- a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java
+++ b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java
@@ -148,6 +148,7 @@ public class SearchScheduleData extends BaseData {
     private String transType;//临时表的交易类型
     private String oriPartNo;//原物料编码
     private String status;//状态
+    private String userDisplay;//用户的名称
 
     private int rollCount;
 
@@ -1057,4 +1058,12 @@ public class SearchScheduleData extends BaseData {
     public void setStatus(String status) {
         this.status = status;
     }
+
+    public String getUserDisplay() {
+        return userDisplay;
+    }
+
+    public void setUserDisplay(String userDisplay) {
+        this.userDisplay = userDisplay;
+    }
 }
\ No newline at end of file
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 0078517..f99de1d 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
@@ -4162,6 +4162,13 @@ public class ScheduleServiceImpl implements ScheduleService {
     @Override
     @Transactional
     public R workbenchCancelallops(SearchScheduleData inData) {
+        //公共参数
+        String site = inData.getSite();
+        String orderNo = inData.getOrderNo();
+        Integer itemNo = inData.getItemNo();
+        String seqNo = inData.getSeqNo();
+        String username = inData.getUsername();
+        String userDisplay = inData.getUserDisplay();
         List<Object> list = new ArrayList<>();
         list.add(inData.getSite());
         list.add(inData.getOrderNo());
@@ -4171,9 +4178,50 @@ public class ScheduleServiceImpl implements ScheduleService {
         if ("400".equals(map.get("resultCode"))){
             throw new XJException(map.get("resultMsg").toString(), 400);
         }
+
+        //调用接口处理SI的transData
+        this.cancelScheduleallopsWithSITransData(site, orderNo, itemNo, seqNo, username, userDisplay);
+        //调用接口处理SIR的transData
+        this.cancelScheduleallopsWithSIRTransData(site, orderNo, itemNo, seqNo, username, userDisplay);
         return R.ok("操作成功!");
     }
 
+    /**
+     * TODO 调用接口处理SIR的transData
+     * @author LR
+     * @date 2022/5/18 9:19
+     * @Param [site, orderNo, itemNo, seqNo, username, userDisplay]
+     * @return void
+     **/
+    public void cancelScheduleallopsWithSIRTransData(String site, String orderNo, Integer itemNo, String seqNo, String username, String userDisplay) {
+        List<Object> params = new ArrayList<>();
+        params.add(site);
+        params.add(orderNo);
+        params.add(itemNo);
+        params.add(seqNo);
+        params.add(username);
+        params.add(userDisplay);
+       List<Map<String, Object>> resultList = procedureMapper.getProcedureData("cancelScheduleallopsWithSIRTransData", params);
+    }
+
+    /**
+     * TODO 调用接口处理SI的transData
+     * @author LR
+     * @date 2022/5/18 9:16
+     * @Param [site, orderNo, itemNo, seqNo, username, userDisplay]
+     * @return void
+     **/
+    public void cancelScheduleallopsWithSITransData(String site, String orderNo, Integer itemNo, String seqNo, String username, String userDisplay) {
+        List<Object> params = new ArrayList<>();
+        params.add(site);
+        params.add(orderNo);
+        params.add(itemNo);
+        params.add(seqNo);
+        params.add(username);
+        params.add(userDisplay);
+        List<Map<String, Object>> resultList = procedureMapper.getProcedureData("cancelScheduleallopsWithSITransData", params);
+    }
+
     @Override
     @Transactional
     public R soscheduleNewReinspectjob(SearchScheduleData inData) {