diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
index e85f01790b..f1ac567515 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
@@ -229,7 +229,7 @@
     </select>
     <select id="selectCarConfigSummary"
             resultType="com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo">
-        SELECT bmc.sid,
+        SELECT bmc.sid as configSid,
                bvm.sid          AS modelSid,
                bvm.vehicleAlias AS model,
                bvm.carBrand     AS brandSid,
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/common/BusSalesOrderConstantUtils.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/common/BusSalesOrderConstantUtils.java
new file mode 100644
index 0000000000..ad241f7b0d
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/common/BusSalesOrderConstantUtils.java
@@ -0,0 +1,58 @@
+package com.yxt.anrui.buscenter.api.common;
+
+import lombok.Getter;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/2/8 8:52
+ * @Description 销售订单常量等相关参数
+ */
+public class BusSalesOrderConstantUtils {
+    /**
+     * 销售部经理角色sid
+     */
+    public static String SALES_MANAGER_ROLESID = "f07e98d3-d179-48ee-a5ff-5928addead3f";
+    /**
+     * 总经理角色sid
+     */
+    public static String GENERAL_MANAGER_ROLESID = "135b4829-2928-4124-a5b3-7d4b1101a863";
+
+    /**
+     * 车辆临时状态
+     */
+    @Getter
+    public static enum TypeEnum {
+        /**
+         * 现车
+         */
+        EXISTING_CAR("1", "现车"),
+        /**
+         * 采购订单
+         */
+        PURCHASE_ORDER("2", "采购订单"),
+        /**
+         * 需采购
+         */
+        PRODUCTION_SCHEDULING("3", "排产");
+
+        /**
+         * code值
+         */
+        private final String code;
+        /**
+         * 备注
+         */
+        private final String remarks;
+
+        /**
+         * 构造器
+         *
+         * @param code    code值
+         * @param remarks 备注
+         */
+        private TypeEnum(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+}
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 2ff315da98..f4b5ff223d 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
@@ -98,6 +98,7 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDto;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrder;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDto;
+import com.yxt.anrui.buscenter.api.common.BusSalesOrderConstantUtils;
 import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
 import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
 import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService;
@@ -465,10 +466,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
             }
             if (StringUtils.isNotBlank(dto.getType())) {
-                if ("1".equals(dto.getType())) {
+                if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(dto.getType())) {
                     //现车车辆信息
                     busSalesOrderVehicleService.saveVehicle(list, sid);
-                } else if ("2".equals(dto.getType())) {
+                } else if (BusSalesOrderConstantUtils.TypeEnum.PURCHASE_ORDER.getCode().equals(dto.getType())) {
                     //采购订单信息
                     busSalesVehicleOrderService.saveOrder(vehicleList, sid);
                 }
@@ -981,23 +982,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         //计算总指导价-总成交价-总优惠包的价值
         bigDecimalOne = guildPriceAll.subtract(finalPriceAll).add(discountPrice);
-        List<String> vehicleList = new ArrayList<>();
-        //是否是现车//ToDo:暂去掉
-        /*if ("1".equals(busSalesOrder.getType())) {
-            //根据销售订单sid查询现车的sid集合
-            vehicleList = busSalesOrderVehicleService.selectVehicleSid(sid);
-            //根据现车去查询销售政策的总促销政策之和
-            if (vehicleList.size() > 0) {
-                for (int i = 0; i < vehicleList.size(); i++) {
-                    //根据sid去查询销售政策的sid，根据销售政策查询销售政策的金额
-                    ResultBean<List<String>> listResultBean = baseDiscountpackageFeign.getMoney(vehicleList.get(i), busSalesOrder.getUseOrgSid());
-                    if (listResultBean.getSuccess()) {
-                        List<String> stringList = listResultBean.getData();
-                        initBigDecimal = initBigDecimal.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add));
-                    }
-                }
-            }
-        }*/
         //查询返利金额
         BusSalesOrderSubmit busSalesOrderSubmit = busSalesOrderSubmitService.selectBySaleOrderSid(sid);
         if (busSalesOrderSubmit != null) {
@@ -1014,8 +998,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
         }
         //销售经理的角色sid
-//        String roleSid = "f0a79b5e-5338-435e-b0c6-08fc01048f55";
-        String roleSid = "f07e98d3-d179-48ee-a5ff-5928addead3f";
+//        String roleSid = "f07e98d3-d179-48ee-a5ff-5928addead3f";
+        String roleSid = BusSalesOrderConstantUtils.SALES_MANAGER_ROLESID;
         //查询销售部经理是否超权限
         BusSalesOrderModel busSalesOrderModel = busSalesOrderModelService.selectByOrderSid(sid);
         BaseBrandMitQuery baseBrandMitQuery = new BaseBrandMitQuery();
@@ -1043,8 +1027,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             isHavePower = true;
         }
         //总经理的角色sid
-//        roleSid = "135b4829-2928-4124-a5b3-7d4b1101a863";
-        roleSid = "135b4829-2928-4124-a5b3-7d4b1101a863";
+        roleSid = BusSalesOrderConstantUtils.GENERAL_MANAGER_ROLESID;
         //查询总经理审批是否超权限
         baseBrandMitQuery = new BaseBrandMitQuery();
         baseBrandMitQuery.setRoleSid(roleSid);
@@ -1293,7 +1276,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
                 ResultBean<AppOrderDetailsVo> details = getSaleOrderDetails(query.getBusinessSid());
                 AppOrderDetailsVo vo = details.getData();
-                if ("现车".equals(vo.getOrderType())) {
+                if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) {
                     //更新已选择的车架号的状态为未锁定
                     List<String> list = busSalesOrderVehicleService.selectVehicleSid(query.getBusinessSid());
                     BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
@@ -1302,7 +1285,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
                     baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
                 }
-                if ("采购订单".equals(vo.getOrderType())) {
+                if (BusSalesOrderConstantUtils.TypeEnum.PURCHASE_ORDER.getRemarks().equals(vo.getOrderType())) {
                     List<BusSalesVehicleOrder> list = busSalesVehicleOrderService.selectLinkSid(query.getBusinessSid());
                     for (BusSalesVehicleOrder b : list) {
                         String linkSid = b.getLinkSid();
@@ -1348,7 +1331,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 if ("销售订单申请".equals(nextName)) {
                     ResultBean<AppOrderDetailsVo> details = getSaleOrderDetails(query.getBusinessSid());
                     AppOrderDetailsVo vo = details.getData();
-                    if ("现车".equals(vo.getOrderType())) {
+                    if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) {
                         //更新已选择的车架号的状态为未锁定
                         List<String> list = busSalesOrderVehicleService.selectVehicleSid(query.getBusinessSid());
                         BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
@@ -1357,7 +1340,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
                         baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
                     }
-                    if ("采购订单".equals(vo.getOrderType())) {
+                    if (BusSalesOrderConstantUtils.TypeEnum.PURCHASE_ORDER.getRemarks().equals(vo.getOrderType())) {
                         List<BusSalesVehicleOrder> list = busSalesVehicleOrderService.selectLinkSid(query.getBusinessSid());
                         for (BusSalesVehicleOrder b : list) {
                             String linkSid = b.getLinkSid();
@@ -3919,7 +3902,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         //根据车辆sid分公司sid查询已办结的销售订单
         BusSaleOrderVehicleOutVo busSaleOrderVehicleOutVo = baseMapper.selectOrderOne(vinSid);
         if(busSaleOrderVehicleOutVo == null){
-           return rb;
+           return rb.success().setData(busSaleOrderVehicleOutVo);
         }
         //根据销售订单sid查询优惠价值
         //查询销售销售订单的单台销售折让
@@ -3943,6 +3926,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     busSaleOrderVehicleOutVo.setDiscountExplain(String.join(",",discountLists));
                 }
             }
+            busSaleOrderVehicleOutVo.setCarDiscountPrice(singleCarDiscountPrice);
         }
         if(StringUtils.isBlank(busSaleOrderVehicleOutVo.getIntermediaryName())){
             busSaleOrderVehicleOutVo.setDistributorPrice("");