From ca67c90ea61e62657688f123aeaf341d162092f5 Mon Sep 17 00:00:00 2001
From: ligaode <ligaode>
Date: Thu, 7 Nov 2024 14:45:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AsBusrepairBillService.java               | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
index 2d0ee638f8..ee2b0697d6 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
@@ -191,6 +191,28 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         for (String sid : sids) {
             //修改维修工单出厂状态为已出厂
             baseMapper.updateOutDoorState(sid);
+            //推送回访单
+            AsBusrepairBill asBusrepairBill = fetchBySid(sid);
+            AsTrackBillDto asTrackBillDto = new AsTrackBillDto();
+            asTrackBillDto.setCreateBySid(asBusrepairBill.getCreateBySid());
+            asTrackBillDto.setSourceBillSid(asBusrepairBill.getSid());
+            asTrackBillDto.setSourceBillNo(asBusrepairBill.getBillNo());
+            FmsReceivesettle fmsReceivesettle = fmsReceivesettleFeign.fetchBySourceSid(asBusrepairBill.getSid()).getData();
+            asTrackBillDto.setSettleDate(DateUtil.formatDate(fmsReceivesettle.getSettleTime()));
+            asTrackBillDto.setWaitorSid(asBusrepairBill.getWaitorSid());
+            asTrackBillDto.setWaitorName(asBusrepairBill.getWaitorName());
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(fmsReceivesettle.getSettleTime());
+            calendar.add(Calendar.DAY_OF_MONTH, 3);
+            asTrackBillDto.setReserveDate(DateUtil.formatDate(calendar.getTime()));
+            asTrackBillDto.setDeptSid(asBusrepairBill.getDeptSid());
+            asTrackBillDto.setDeptName(asBusrepairBill.getDeptName());
+            asTrackBillDto.setUseOrgSid(asBusrepairBill.getUseOrgSid());
+            asTrackBillDto.setUseOrgName(asBusrepairBill.getUseOrgName());
+            asTrackBillDto.setCreateOrgSid(asBusrepairBill.getCreateOrgSid());
+            asTrackBillDto.setCreateOrgName(asBusrepairBill.getCreateOrgName());
+            asTrackBillDto.setReason("01");
+            asTrackBillService.saveOrUpdateDto(asTrackBillDto);
         }
     }
 
@@ -1615,26 +1637,6 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                 billNode.setCreateBySid(dto.getOperatorSid());
                 billNode.setNodeCode("6");
                 asBusrepairBillNodeService.insert(billNode);
-                AsTrackBillDto asTrackBillDto = new AsTrackBillDto();
-                asTrackBillDto.setCreateBySid(asBusrepairBill.getCreateBySid());
-                asTrackBillDto.setSourceBillSid(asBusrepairBill.getSid());
-                asTrackBillDto.setSourceBillNo(asBusrepairBill.getBillNo());
-                FmsReceivesettle fmsReceivesettle = fmsReceivesettleFeign.fetchBySourceSid(asBusrepairBill.getSid()).getData();
-                asTrackBillDto.setSettleDate(DateUtil.formatDate(fmsReceivesettle.getSettleTime()));
-                asTrackBillDto.setWaitorSid(asBusrepairBill.getWaitorSid());
-                asTrackBillDto.setWaitorName(asBusrepairBill.getWaitorName());
-                Calendar calendar = Calendar.getInstance();
-                calendar.setTime(fmsReceivesettle.getSettleTime());
-                calendar.add(Calendar.DAY_OF_MONTH, 3);
-                asTrackBillDto.setReserveDate(DateUtil.formatDate(calendar.getTime()));
-                asTrackBillDto.setDeptSid(asBusrepairBill.getDeptSid());
-                asTrackBillDto.setDeptName(asBusrepairBill.getDeptName());
-                asTrackBillDto.setUseOrgSid(asBusrepairBill.getUseOrgSid());
-                asTrackBillDto.setUseOrgName(asBusrepairBill.getUseOrgName());
-                asTrackBillDto.setCreateOrgSid(asBusrepairBill.getCreateOrgSid());
-                asTrackBillDto.setCreateOrgName(asBusrepairBill.getCreateOrgName());
-                asTrackBillDto.setReason("01");
-                asTrackBillService.saveOrUpdateDto(asTrackBillDto);
             }
         }
         return rb.success();