Merge remote-tracking branch 'origin/master'

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,

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());

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();
     }