From ecb663ceb1717c8893a8312a02684b3ec3c598a9 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Mon, 13 Feb 2023 10:48:37 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B4=A8=E9=87=8F=E6=96=B9=E6=A1=88?=
 =?UTF-8?q?=E5=9B=9E=E9=80=80=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AbnormalBillController.java    | 15 +++++++++++
 .../anomaly/mapper/AbnormalBillMapper.java    |  1 +
 .../anomaly/service/AbnormalBillService.java  |  6 +++++
 .../service/impl/AbnormalBillServiceImpl.java | 27 ++++++++++++++++---
 .../resources/mapper/AbnormalBillMapper.xml   |  4 ++-
 5 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
index 95486e2e..0fa8ae3c 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
@@ -723,6 +723,21 @@ public class AbnormalBillController {
         }
     }
 
+    /**
+     * 方案回退
+     * @param abnormalBill
+     * @return
+     */
+    @GetMapping("/rollbackProcessing")
+    public R rollbackProcessing(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose){
+        try{
+            abnormalBillService.rollbackProcessing(abnormalBill,abnormalBillDispose);
+            return R.ok();
+        }catch(Exception e){
+            return R.failed("方案回退失败:"+e.getMessage());
+        }
+    }
+
     /**
      * 方案确认
      * @param abnormalBill
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java
index 0da39ec1..7ddd6d08 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java
@@ -57,4 +57,5 @@ public interface AbnormalBillMapper extends BaseMapper<AbnormalBill> {
 
     Map<String, String> findReplaceMessageResrce(@Param("abnormalBill")AbnormalBill abnormalBill);
 
+    int rollbackProcessing(@Param("abnormalBill")AbnormalBill abnormalBill);
 }
\ No newline at end of file
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java
index 0b049f75..ab56a473 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java
@@ -183,4 +183,10 @@ public interface AbnormalBillService extends IService<AbnormalBill> {
 
 
     boolean deviceRepairComplete( List<AbnormalBill> abnormalBills);
+
+    /**
+     * 方案回退
+     * @param abnormalBill
+     */
+    void rollbackProcessing(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose);
 }
\ No newline at end of file
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
index 6d75c8b0..a27eb1fb 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
@@ -11,10 +11,7 @@ import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDto;
 import com.foreverwin.mesnac.anomaly.mapper.AbnormalBillDisposeMapper;
 import com.foreverwin.mesnac.anomaly.mapper.AbnormalBillMapper;
 import com.foreverwin.mesnac.anomaly.mapper.UploadPicturesMapper;
-import com.foreverwin.mesnac.anomaly.model.AbnormalBill;
-import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose;
-import com.foreverwin.mesnac.anomaly.model.AbnormalNcCode;
-import com.foreverwin.mesnac.anomaly.model.UploadPictures;
+import com.foreverwin.mesnac.anomaly.model.*;
 import com.foreverwin.mesnac.anomaly.service.*;
 import com.foreverwin.mesnac.anomaly.utils.YunBpmApiRes;
 import com.foreverwin.mesnac.common.constant.Constants;
@@ -54,6 +51,7 @@ import com.foreverwin.modular.core.exception.BusinessException;
 import com.foreverwin.modular.core.meext.MEServices;
 import com.foreverwin.modular.core.util.CommonMethods;
 import com.foreverwin.modular.core.util.FrontPage;
+import com.foreverwin.modular.core.util.SpringUtil;
 import com.sap.me.nonconformance.*;
 import com.sap.me.production.SplitSerializeServiceInterface;
 import com.sap.me.production.SplitSfcRequest;
@@ -593,6 +591,27 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
 //        this.anomalyCreatedAndSendMessage(abnormalBillMapper.selectById(abnormalBill.getHandle()), null);
     }
 
+    @Override
+    public void rollbackProcessing(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose) {
+        String site = CommonMethods.getSite();
+        String commonUser = CommonMethods.getUser();
+
+        //异常单是否已生成新的订单号
+        ShopOrderDto shopOrderBo = SpringUtil.getBean(ShopOrderService.class).findByShopOrderBo(abnormalBill.getAbnormalNo());
+        if (Optional.ofNullable(shopOrderBo).isPresent()){
+            throw BusinessException.build("该异常单已生成新的订单号:" + abnormalBill.getAbnormalNo() + "，无法回退方案");
+        }
+        //计划已处理的不通过
+         AbnormalPlan abnormalPlan = SpringUtil.getBean(AbnormalPlanService.class).getById(HandleEnum.ABNORMAL_PLAN.getHandle(site, abnormalBill.getAbnormalNo()));
+        if (Optional.ofNullable(abnormalPlan).isPresent() && abnormalPlan.getStatus().equals("PR")){
+                throw BusinessException.build("该异常单计划已处理:" + abnormalBill.getAbnormalNo() + "，无法回退方案");
+            }
+        int i = abnormalBillMapper.rollbackProcessing(abnormalBill);
+        //保存操作日志
+        StringUtil.saveOperLog("MES方案回退操作日志handle："  + abnormalBill.getHandle(),"rollbackProcessing",
+                    "sfc:" + abnormalBill.getSfc() + "，操作人:" +  commonUser + "，回退方案原因:" + abnormalBill.getCancelReason(),"修改成功条数:" + i,null);
+    }
+
     @Override
     public void programConfirm(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose) {
         String site = CommonMethods.getSite();
diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
index a0cce824..2bde6a51 100644
--- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
+++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
@@ -1606,5 +1606,7 @@
         ZNU.FULL_NAME,zab.NC_CODE,zab.PB_DESCRIPTION,ZAB.CORRECTION,ZAB.PROGRAM,ZAB.STATUS,ZAB.USER_CON_TIME,ZAB.USER_IS_CON
         ORDER BY zab.CREATED_DATE_TIME DESC
     </select>
-
+    <update id="rollbackProcessing" >
+        UPDATE Z_ABNORMAL_BILL SET STATUS = 'X' , PROGRAM = NULL WHERE HANDLE = #{abnormalBill.handle}
+    </update>
 </mapper>