From 324cfa1bf2d33f79a4a066a7596a5569d19e8a07 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Wed, 14 Aug 2024 17:51:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=93=E7=AE=97=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AsBusrepairBillService.java               | 40 +++++++++----------
 1 file changed, 20 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 f13b207986..abb5a9da46 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
@@ -1384,28 +1384,28 @@ 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);
             }
         }
-        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();
     }