From a2d34e4d2ca746b5f0d24c399370dc76bc8d9317 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Thu, 9 Mar 2023 16:17:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/bussalesorder/BusSalesOrderMapper.xml         |  2 +-
 .../biz/bussalesorder/BusSalesOrderService.java       | 11 +++++++++--
 .../bussalesordermodel/BusSalesOrderModelService.java |  7 +++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
index df2c44b0f5..a24f551d0a 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
@@ -54,7 +54,7 @@
                case bo.isInsurance
                    when 0 then '否'
                    when 1 then '是' end                as insuranceInfo,
-               if(bo.nodeState = '已办结', true, false)  as showContractBtn,
+<!--               if(bo.nodeState = '已办结', true, false)  as showContractBtn,-->
                bo.nodeState is null                   as showUpdateBtn,
                bo.nodeState is null                   as showDeleteBtn,
                0                                      as showFinancialBtn,
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index e3f9660c8d..a480cdc9f3 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -1559,6 +1559,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
 
             }
 
+            //查询销售订单的合同号是否存在，若存在则显示打印合同的按钮
+            if(StringUtils.isNotBlank(record.getContractId())){
+                record.setShowContractBtn(true);
+            }else{
+                record.setShowContractBtn(false);
+            }
+
 
         }
         PagerVo<AppBusSalesOrderVo> p = PagerUtil.pageToVo(pagging, null);
@@ -3471,14 +3478,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.ORDER_LOCK.getCode());
                     busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.ORDER_LOCK.getRemarks());
                     baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
-                } else {
+                } /*else {
                     int num = Integer.parseInt(vo.getPriceInfo().getNumber());
                     for (int i = 0; i < num; i++) {
                         BusSalesOrderVehicle busSalesOrderVehicle = new BusSalesOrderVehicle();
                         busSalesOrderVehicle.setSalesOrderSid(bv.getBusinessSid());
                         busSalesOrderVehicleService.insert(busSalesOrderVehicle);
                     }
-                }
+                }*/
                 //推送采购渠道待选择
                 BusPurchaseChannelDto busPurchaseChannelDto = new BusPurchaseChannelDto();
                 busPurchaseChannelDto.setSaleOrderSid(busSalesOrder.getSid());
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
index 9c21c86a83..046e46067b 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
@@ -744,6 +744,13 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
             busSalesOrderDepositService.updateBySalesOrderSid(depositSum, salesOrderSid, bigDecimalSum);
 
         }
+        if("3".equals(type)){
+            for (int i = 0; i < num; i++) {
+                BusSalesOrderVehicle busSalesOrderVehicle = new BusSalesOrderVehicle();
+                busSalesOrderVehicle.setSalesOrderSid(salesOrderSid);
+                busSalesOrderVehicleService.insert(busSalesOrderVehicle);
+            }
+        }
         return rb.success();
     }