From bc227d6381b010be34c3eca11a4a2bc5cea4ab9f Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Wed, 15 Jan 2025 17:14:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E8=BD=A6=E9=A2=84?=
 =?UTF-8?q?=E6=8F=90=E6=8E=A8=E5=87=AD=E8=AF=8110?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusDeliveredApplyService.java             | 58 ++++++++++---------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
index 17228b15cb..9b514a846b 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
@@ -1371,36 +1371,38 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         }
         if (cjtx.compareTo(txdck) > 0) {
             BigDecimal pushMoney = cjtx.subtract(txdck);
-            CostAdjustmentsBill costAdjustmentsBill = new CostAdjustmentsBill();
-            costAdjustmentsBill.setBussDate(DateUtil.formatDate(new Date()));
-            List<CostAdjustmentsBill.CostAdjustmentsBillDetailDto> resultDetails = new ArrayList<>();
-            String useOrgCode = "";
-            if (StringUtils.isNotBlank(busDeliveredApply.getUseOrgSid())) {
-                String useOrgSid = busDeliveredApply.getUseOrgSid();
-                SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
-                if (null != organizationVo) {
-                    costAdjustmentsBill.setUseOrgCode(organizationVo.getOrgCode());
-                    useOrgCode = organizationVo.getOrgCode();
+            if (pushMoney.compareTo(BigDecimal.ZERO) != 0) {
+                CostAdjustmentsBill costAdjustmentsBill = new CostAdjustmentsBill();
+                costAdjustmentsBill.setBussDate(DateUtil.formatDate(new Date()));
+                List<CostAdjustmentsBill.CostAdjustmentsBillDetailDto> resultDetails = new ArrayList<>();
+                String useOrgCode = "";
+                if (StringUtils.isNotBlank(busDeliveredApply.getUseOrgSid())) {
+                    String useOrgSid = busDeliveredApply.getUseOrgSid();
+                    SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+                    if (null != organizationVo) {
+                        costAdjustmentsBill.setUseOrgCode(organizationVo.getOrgCode());
+                        useOrgCode = organizationVo.getOrgCode();
+                    }
                 }
-            }
-            for (BusDeliveredApplyDetails d : detailsList) {
-                BaseVehicle vehicle = baseVehicleFeign.fetchBySid(d.getVinSid()).getData();
-                if (null != vehicle) {
-                    costAdjustmentsBill.setCommUnit(vehicle.getManufacturerCode());
-                    String vinCode = "";
-                    String deptCode = "";
-                    SysOrganizationVo data = sysOrganizationFeign.fetchBySid(vehicle.getPurchaseSystemSid()).getData();
-                    if (null != data) {
-                        deptCode = data.getOrgCode();
+                for (BusDeliveredApplyDetails d : detailsList) {
+                    BaseVehicle vehicle = baseVehicleFeign.fetchBySid(d.getVinSid()).getData();
+                    if (null != vehicle) {
+                        costAdjustmentsBill.setCommUnit(vehicle.getManufacturerCode());
+                        String vinCode = "";
+                        String deptCode = "";
+                        SysOrganizationVo data = sysOrganizationFeign.fetchBySid(vehicle.getPurchaseSystemSid()).getData();
+                        if (null != data) {
+                            deptCode = data.getOrgCode();
+                        }
+                        vinCode = vehicle.getVinNo().substring(vehicle.getVinNo().length() - 8);
+                        //添加成本调整单
+                        CostAdjustmentsBill.CostAdjustmentsBillDetailDto dto = new CostAdjustmentsBill.CostAdjustmentsBillDetailDto();
+                        dto.setCompanyCode(useOrgCode);
+                        dto.setMaterialID(vinCode);
+                        dto.setDeptCode(deptCode);
+                        dto.setAmount(pushMoney.negate().toString());
+                        resultDetails.add(dto);
                     }
-                    vinCode = vehicle.getVinNo().substring(vehicle.getVinNo().length() - 8);
-                    //添加成本调整单
-                    CostAdjustmentsBill.CostAdjustmentsBillDetailDto dto = new CostAdjustmentsBill.CostAdjustmentsBillDetailDto();
-                    dto.setCompanyCode(useOrgCode);
-                    dto.setMaterialID(vinCode);
-                    dto.setDeptCode(deptCode);
-                    dto.setAmount(pushMoney.negate().toString());
-                    resultDetails.add(dto);
                 }
             }
             if (!resultDetails.isEmpty()) {