Merge remote-tracking branch 'origin/master'

2 years ago · 485d328a06
29 changed files with 6308 additions and 46 deletions
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusApplyPushDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusApplyPushDto.java
@ -0,0 +1,61 @@
+package com.yxt.anrui.base.api.busvehicleapply;
+
+import com.yxt.anrui.base.api.busvehicleapplydetail.BusApplyDetailsPushDto;
+import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailDto;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/8/3
+ **/
+@Data
+public class BusApplyPushDto implements Dto {
+    private static final long serialVersionUID = -2239338527888329767L;
+
+    @ApiModelProperty("申请人sid")
+    private String createBySid;
+    @ApiModelProperty("申请日期")
+    private String applicationDate;
+    @ApiModelProperty("申请人姓名")
+    private String createByName;
+    @ApiModelProperty("采购原因:储备/临时/厂家任务")
+    private String schedulingType;
+    @ApiModelProperty(value = "采购原因key")
+    private String schedulingTypeKey;
+    @ApiModelProperty("车辆排产申请详情")
+    private List<BusApplyDetailsPushDto> busVehicleApplyDetailList;
+
+    @ApiModelProperty("销售订单sid 可为空，只有客户订单时才有")
+    private String salesSid;
+
+    @ApiModelProperty(value = "分公司sid")
+    private String createOrgSid;
+    @ApiModelProperty(value = "分公司名称")
+    private String createOrgName;
+
+    @ApiModelProperty("采购类型key")
+    private String applyTypeKey;
+    @ApiModelProperty("采购类型value")
+    private String applyType;
+
+    @ApiModelProperty("采购部门名称")
+    private String orgDeptName;
+    @ApiModelProperty("采购部门sid")
+    private String orgDeptSid;
+
+    @ApiModelProperty(value = "品牌sid")
+    private String carBrandSid;
+    @ApiModelProperty(value = "品牌名称")
+    private String carBrandName;
+
+    @ApiModelProperty("全组织路径sid")
+    private String orgSidPath;
+}
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java
@ -77,4 +77,6 @@ public class BusVehicleApplyDetailsVo implements Vo {
    private String supplierSid;
    @ApiModelProperty("附件信息")
    private List<CommonAppendixVo> commonAppendixs; //附件信息
+    @ApiModelProperty("销售订单sid")
+    private String salesSid;
 }
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java
@ -97,4 +97,8 @@ public interface BusVehicleApplyFeign {
   /* @ApiOperation(value = "分享厂家采购")
    @PostMapping(value = "/shareBusVehicleApply")
    ResultBean shareBusVehicleApply(@RequestBody ShareBusVehicleApplyQuery shareQuery);*/
+
+    @ApiOperation(value = "采购渠道推送厂家采购")
+    @PostMapping(value = "/pushApply")
+    ResultBean pushApply(@RequestBody BusApplyPushDto dto);
 }
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java
@ -106,4 +106,9 @@ public class BusVehicleApplyFeignFallback implements BusVehicleApplyFeign {
    public ResultBean abandonApply(String[] sids) {
        return null;
    }
+
+    @Override
+    public ResultBean pushApply(BusApplyPushDto dto) {
+        return null;
+    }
 }
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusApplyDetailsPushDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusApplyDetailsPushDto.java
@ -0,0 +1,39 @@
+package com.yxt.anrui.base.api.busvehicleapplydetail;
+
+import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySzDto;
+import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySzPushDto;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/8/3
+ **/
+@Data
+public class BusApplyDetailsPushDto implements Dto {
+    private static final long serialVersionUID = 6075692277267735345L;
+
+    @ApiModelProperty("车型sid")
+    private String vehicleSid;
+    @ApiModelProperty("车型名称")
+    private String vehicleName;
+    @ApiModelProperty("排产数量")
+    private String quantity;
+
+    @ApiModelProperty("常用配置sid")
+    private String configSid;
+    @ApiModelProperty("常用配置名称")
+    private String configName;
+
+    @ApiModelProperty("内部编码")
+    private String insideCode;
+
+    private BusVehicleApplySzPushDto busVehicleApplySzPushDto;
+
+    @ApiModelProperty("销售指导价")
+    private String saleGuPrice;
+
+
+}
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplysz/BusVehicleApplySzPushDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplysz/BusVehicleApplySzPushDto.java
@ -0,0 +1,18 @@
+package com.yxt.anrui.base.api.busvehicleapplysz;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/8/3
+ **/
+@Data
+public class BusVehicleApplySzPushDto implements Dto {
+
+    private static final long serialVersionUID = 3768658685711571725L;
+    @ApiModelProperty(value = "上装配置sid")
+    private String szSid;
+}
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java
@ -368,6 +368,7 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
        BaseManufacturerRetware baseManufacturerRetware = fetchBySid(cgtkdSid);
        pdfVo.setExitDate(baseManufacturerRetware.getAppluDate());
        pdfVo.setBillNo(baseManufacturerRetware.getApplyNo());
+        pdfVo.setMakeName(baseManufacturerRetware.getApplyName() + baseManufacturerRetware.getAppluDate());
        //查询相关车架号
        List<BaseManufacturerRetwareVehDetailsVo> vehVos = baseManufacturerRetwareVehService.fetchByMainSid(cgtkdSid);
        vehVos.removeAll(Collections.singleton(null));
@ -417,7 +418,6 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
            pdfVo.setManPurOrderType(scmApplyInboundQuery.getManPurOrderTypeValue());
            pdfVo.setOrgDeptName(scmApplyInboundQuery.getOrgDeptName());
            pdfVo.setManName(scmApplyInboundQuery.getManName());
-            pdfVo.setMakeName(scmApplyInboundQuery.getMakeListName() + scmApplyInboundQuery.getMakeListDate());
        }
        String filePath = "/template/";
        if (printerType.equals("针孔式打印机")) {
@ -432,7 +432,7 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf

    public String cgtkjgdy(WithdrawalPdfVo pdfVo) {
        Map<String, Object> dataMap = new HashMap<String, Object>();
-        dataMap.put("priceDate", pdfVo.getPriceDate());
+     //   dataMap.put("priceDate", pdfVo.getPriceDate());
        dataMap.put("exitDate", pdfVo.getExitDate());
        dataMap.put("manPurOrderType", pdfVo.getManPurOrderType());
        dataMap.put("billNo", pdfVo.getBillNo());
@ -445,13 +445,13 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
        dataMap.put("makeName", pdfVo.getMakeName());
        dataMap.put("confirmName", "");
        //获取模板
-        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/cgtkjgdy.ftl");
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/tkjg.ftl");
        //生成word文件名
        String targetPath = docPdfComponent.getUploadTemplateUrl();
        String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
        long seconds = System.currentTimeMillis();
        String typeName = dateStr + seconds + ".doc";
-        File file = new File(targetPath + "cgtkjgdy" + seconds + ".ftl");
+        File file = new File(targetPath + "tkjg" + seconds + ".ftl");
        File dir = new File(targetPath);
        WordConvertUtils.inputStreamToFile(inputStream, file);
        WordConvertUtils.creatWord1(dataMap, file, targetPath, typeName, dir);
@ -466,7 +466,7 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf

    public String cgtkzsdy(WithdrawalPdfVo pdfVo) {
        Map<String, Object> dataMap = new HashMap<String, Object>();
-        dataMap.put("priceDate", pdfVo.getPriceDate());
+     //   dataMap.put("priceDate", pdfVo.getPriceDate());
        dataMap.put("exitDate", pdfVo.getExitDate());
        dataMap.put("manPurOrderType", pdfVo.getManPurOrderType());
        dataMap.put("billNo", pdfVo.getBillNo());
@ -479,13 +479,13 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
        dataMap.put("makeName", pdfVo.getMakeName());
        dataMap.put("confirmName", "");
        //获取模板
-        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/cgtkzsdy.ftl");
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/tkzk.ftl");
        //生成word文件名
        String targetPath = docPdfComponent.getUploadTemplateUrl();
        String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
        long seconds = System.currentTimeMillis();
        String typeName = dateStr + seconds + ".doc";
-        File file = new File(targetPath + "cgtkzsdy" + seconds + ".ftl");
+        File file = new File(targetPath + "tkzs" + seconds + ".ftl");
        File dir = new File(targetPath);
        WordConvertUtils.inputStreamToFile(inputStream, file);
        WordConvertUtils.creatWord1(dataMap, file, targetPath, typeName, dir);
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java
@ -118,6 +118,11 @@ public class BusVehicleApplyRest implements BusVehicleApplyFeign {
        return busVehicleApplyService.abandonApply(sids);
    }

+    @Override
+    public ResultBean pushApply(BusApplyPushDto dto) {
+        return busVehicleApplyService.pushApply(dto);
+    }
+
 /*    @Override
    public ResultBean shareBusVehicleApply(ShareBusVehicleApplyQuery shareQuery) {
        return busVehicleApplyService.shareBusVehicleApply(shareQuery);
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
@ -9,6 +9,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionDto;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.busvehicleapply.*;
 import com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplyListVo;
@ -18,6 +19,7 @@ import com.yxt.anrui.base.api.busvehicleapply.flow.BusVehicleApplyTaskQuery;
 import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeQuery;
 import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo;
 import com.yxt.anrui.base.api.busvehicleapply.flow.SubmitBusVehicleApplyDto;
+import com.yxt.anrui.base.api.busvehicleapplydetail.BusApplyDetailsPushDto;
 import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetail;
 import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailDto;
 import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo;
@ -1039,6 +1041,36 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
        return baseMapper.getActualAndOrgDept(vehicleOrderSid, modelSid, configSid);
    }

+    public ResultBean pushApply(BusApplyPushDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        BusVehicleApply busVehicleApply = new BusVehicleApply();
+        BeanUtil.copyProperties(dto,busVehicleApply,"sid");
+        String billNo = getApplyCode(dto.getOrgSidPath());
+        busVehicleApply.setApplicationCode(billNo);
+        String manufacturerSid = baseVehicleBrandService.selectByManufacturerSid(dto.getCarBrandSid());
+        busVehicleApply.setManufacturerSid(manufacturerSid);
+        busVehicleApply.setSupplierSid(manufacturerSid);
+        List<BusApplyDetailsPushDto> busVehicleApplyDetailList = dto.getBusVehicleApplyDetailList();
+        for (BusApplyDetailsPushDto busVehicleApplyDetailDto : busVehicleApplyDetailList) {
+            BusVehicleApplyDetail busVehicleApplyDetail = new BusVehicleApplyDetail();
+            BeanUtil.copyProperties(busVehicleApplyDetailDto, busVehicleApplyDetail, "sid");
+            busVehicleApplyDetail.setApplySid(busVehicleApply.getSid());
+            //内部编码
+            BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(busVehicleApplyDetail.getVehicleSid());
+            busVehicleApplyDetail.setInsideCode(baseVehicleModel.getInsideCode());
+            busVehicleApplyDetailService.insert(busVehicleApplyDetail);
+            if (busVehicleApplyDetailDto.getBusVehicleApplySzPushDto() != null) {
+                BusVehicleApplySz busVehicleApplySz = new BusVehicleApplySz();
+                BeanUtil.copyProperties(busVehicleApplyDetailDto.getBusVehicleApplySzPushDto(), busVehicleApplySz);
+                busVehicleApplySz.setDetailsSid(busVehicleApplyDetail.getSid());
+                busVehicleApplySz.setApplySid(busVehicleApply.getSid());
+                busVehicleApplySzService.insert(busVehicleApplySz);
+            }
+        }
+        baseMapper.insert(busVehicleApply);
+        return rb.success();
+    }
+
  /*  public ResultBean shareBusVehicleApply(ShareBusVehicleApplyQuery shareQuery) {
        ResultBean rb = ResultBean.fireSuccess();
        log.info("分享功能，厂家采购参数：{}", JSONObject.toJSONString(shareQuery));
--- a/anrui-base/anrui-base-biz/src/main/resources/ftl/tkjg.ftl
+++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/tkjg.ftl
--- a/anrui-base/anrui-base-biz/src/main/resources/ftl/tkzk.ftl
+++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/tkzk.ftl
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrdersVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrdersVo.java
@ -1,5 +1,6 @@
 package com.yxt.anrui.buscenter.api.bussalesorder;

+import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.common.core.vo.Vo;
@ -19,4 +20,6 @@ public class BusSalesOrdersVo implements Vo {
    private BusSalesOrderModel busSalesOrderModel;

    private BusSalesOrderPrice busSalesOrderPrice;
+
+    private BusSalesOrderMakeup busSalesOrderMakeup;
 }
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeup.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeup.java
@ -111,4 +111,6 @@ public class BusSalesOrderMakeup extends BaseEntity {
    @ApiModelProperty("0主车带，1不是主车带")
    private int isMain;

+    private String topSid;
+
 }
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/app/AppBusSalesOrderMakeUpDto.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/app/AppBusSalesOrderMakeUpDto.java
@ -74,4 +74,6 @@ public class AppBusSalesOrderMakeUpDto implements Dto {
    private String buyTypeKey;
    private String buyTypeValue;

+    private String topSid;
+
 }
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/app/AppBusSalesOrderMakeUpVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/app/AppBusSalesOrderMakeUpVo.java
@ -77,4 +77,6 @@ public class AppBusSalesOrderMakeUpVo implements Vo {

    private String buyTypeKey;
    private String buyTypeValue;
+
+    private String topSid;
 }
--- 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
@ -471,7 +471,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                if(StringUtils.isNotBlank(entity.getNowCarUnknownVinNum())){
                    List<String> vinList = new ArrayList<>();
                    vinList.add("不确定车架号("+entity.getNowCarUnknownVinNum()+")");
-
+                    busSalesOrderModelDetailsVo.setVinNo(vinList);
                }else{
                    List<VinListsVo> vinLists = busSalesOrderVehicleService.selectLists(sid);
                    //包含采购系统的车架号
@ -5268,6 +5268,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                    scmPurchaseChannelPush.setConfigSid(busSalesOrderModel.getModelConfigSid());
                    scmPurchaseChannelPush.setConfigName(busSalesOrderModel.getModelConfig());
                    scmPurchaseChannelPush.setUseOrgSid(busSalesOrder.getUseOrgSid());
+                    scmPurchaseChannelPush.setUseOrgName(busSalesOrder.getUseOrgName());
                    scmPurchaseChannelPush.setSaleOrderApproDate(DateUtil.format(new Date(), "yyyy-MM-dd"));
                    BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(busSalesOrder.getSid());
                    scmPurchaseChannelPush.setNum(busSalesOrderPrice.getQuantity().toString());
@ -7052,6 +7053,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
        busSalesOrdersVo.setBusSalesOrder(busSalesOrder);
        busSalesOrdersVo.setBusSalesOrderModel(busSalesOrderModel);
        busSalesOrdersVo.setBusSalesOrderPrice(busSalesOrderPrice);
+        BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupService.selectBySid(sid);
+        busSalesOrdersVo.setBusSalesOrderMakeup(busSalesOrderMakeup);
        return rb.success().setData(busSalesOrdersVo);
    }
 }
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java
@ -88,4 +88,6 @@ public interface BusSalesOrderMakeupMapper extends BaseMapper<BusSalesOrderMakeu
    BusSalesOrderMakeup detailsss(String sid);

    List<BusSalesOrderMakeup> selectListByOrderSid(@Param("saleOrderSid") String saleOrderSid);
+
+    BusSalesOrderMakeup selectBySid(String sid);
 }
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml
@ -55,7 +55,8 @@
               bm.thicknessBottom,
               bm.thicknessEdge,
               bm.buyTypeKey,
-               bm.buyTypeValue
+               bm.buyTypeValue,
+               bm.topSid
        from bus_sales_order_makeup bm
                 left join bus_sales_order b on bm.salesOrderSid = b.sid
        where salesOrderSid = #{sid}
@ -104,4 +105,8 @@
            resultType="com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup">
        select * from bus_sales_order_makeup where salesOrderSid = #{saleOrderSid}
    </select>
+
+    <select id="selectBySid" resultType="com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup">
+        select * from bus_sales_order_makeup where salesOrderSid = #{sid}
+    </select>
 </mapper>
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java
@ -130,6 +130,8 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
            if("02".equals(busSalesOrderMakeup.getBuyTypeKey())){
                //如果为客户自购，将上装价格设置为0
                busSalesOrderMakeup.setTopPrice(BigDecimal.ZERO);
+            }else{
+                busSalesOrderMakeup.setTopSid(dto.getTopSid());
            }
            if (!dto.getContractImages().isEmpty()) {
                List<String> imgList = new ArrayList<>();
@ -263,4 +265,8 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
    public List<BusSalesOrderMakeup> selectListByOrderSid(String saleOrderSid) {
        return baseMapper.selectListByOrderSid(saleOrderSid);
    }
+
+    public BusSalesOrderMakeup selectBySid(String sid) {
+        return baseMapper.selectBySid(sid);
+    }
 }
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannel.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannel.java
@ -79,5 +79,7 @@ public class ScmPurchaseChannel extends BaseEntity {
    private String operateName;
    @ApiModelProperty("操作日期")
    private String choiceDate;
+    @ApiModelProperty("全组织路径sid")
+    private String orgSidPath;

 }
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelService.java
@ -37,11 +37,20 @@ import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
+import com.yxt.anrui.base.api.busvehicleapply.BusApplyPushDto;
+import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign;
+import com.yxt.anrui.base.api.busvehicleapplydetail.BusApplyDetailsPushDto;
+import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailDto;
+import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySzPushDto;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrdersVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelFeign;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@ -58,6 +67,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

@ -76,6 +86,10 @@ public class ScmPurchaseChannelService extends MybatisBaseService<ScmPurchaseCha
    private SysOrganizationFeign sysOrganizationFeign;
    @Autowired
    private BaseVehmodelConfigFeign baseVehmodelConfigFeign;
+    @Autowired
+    private BasePurchaseSystemFeign basePurchaseSystemFeign;
+    @Autowired
+    private BusVehicleApplyFeign busVehicleApplyFeign;

    public PagerVo<ScmPurchaseChannelVo> listPageVo(PagerQuery<ScmPurchaseChannelQuery> pq) {
        ScmPurchaseChannelQuery query = pq.getParams();
@ -119,7 +133,6 @@ public class ScmPurchaseChannelService extends MybatisBaseService<ScmPurchaseCha
        }
        BeanUtil.copyProperties(dto, scmPurchaseChannel, "sid");
        scmPurchaseChannel.setOperateSid(dto.getUserSid());
-        //ToDo:待完成
        baseMapper.updateById(scmPurchaseChannel);
        return rb.success();
    }
@ -144,12 +157,14 @@ public class ScmPurchaseChannelService extends MybatisBaseService<ScmPurchaseCha
                return rb.setMsg("该待选择的采购渠道不存在");
            }
            BeanUtil.copyProperties(scmPurchaseChannelDto, scmPurchaseChannel, "sid");
+            scmPurchaseChannel.setCreateBySid(scmPurchaseChannel.getApplyPeoSid());
            scmPurchaseChannel.setOperateSid(scmPurchaseChannelDto.getUserSid());
            scmPurchaseChannel.setState(2);
            ResultBean<SysUserVo> resultBean = sysUserFeign.fetchBySid(scmPurchaseChannel.getOperateSid());
-            if(resultBean.getData() != null){
+            if (resultBean.getData() != null) {
                scmPurchaseChannel.setOperateName(resultBean.getData().getName());
            }
+            scmPurchaseChannel.setOrgSidPath(scmPurchaseChannelDto.getOrgSidPath());
            scmPurchaseChannel.setChoiceDate(DateUtil.today());

            //ToDo:待完成
@ -160,6 +175,8 @@ public class ScmPurchaseChannelService extends MybatisBaseService<ScmPurchaseCha
                sendOutApplyDto.setUserSid(scmPurchaseChannelDto.getUserSid());
                sendOutApplyDto.setOrgSidPath(scmPurchaseChannelDto.getOrgSidPath());
                sendOutApply(sendOutApplyDto);
+            } else if ("001".equals(scmPurchaseChannelDto.getPurchaseOrderTypeKey()) || "004".equals(scmPurchaseChannelDto.getPurchaseOrderTypeKey())) {
+                pushApply(scmPurchaseChannelDto);
            }
        }
        return rb.success().setMsg("选择成功");
@ -179,6 +196,50 @@ public class ScmPurchaseChannelService extends MybatisBaseService<ScmPurchaseCha
        return rb.success();
    }

+    public void pushApply(ScmPurchaseChannelDto dto) {
+        BusApplyPushDto busApplyPushDto = new BusApplyPushDto();
+        ScmPurchaseChannel scmPurchaseChannel = fetchBySid(dto.getSid());
+        ResultBean<BusSalesOrdersVo> resultBean = busSalesOrderFeign.getSalesOrderOne(scmPurchaseChannel.getSaleOrderSid());
+        if (resultBean.getData() != null) {
+            BusSalesOrdersVo busSalesOrdersVo = resultBean.getData();
+            BusSalesOrder busSalesOrder = busSalesOrdersVo.getBusSalesOrder();
+            BusSalesOrderModel busSalesOrderModel = busSalesOrdersVo.getBusSalesOrderModel();
+            BusSalesOrderPrice busSalesOrderPrice = busSalesOrdersVo.getBusSalesOrderPrice();
+            busApplyPushDto.setCreateBySid(scmPurchaseChannel.getOperateSid());
+            busApplyPushDto.setApplicationDate(scmPurchaseChannel.getChoiceDate());
+            busApplyPushDto.setCreateByName(scmPurchaseChannel.getOperateName());
+            busApplyPushDto.setSchedulingType("客户订单");
+            busApplyPushDto.setSchedulingTypeKey("04");
+            busApplyPushDto.setSalesSid(scmPurchaseChannel.getSaleOrderSid());
+            busApplyPushDto.setCreateOrgSid(scmPurchaseChannel.getUseOrgSid());
+            busApplyPushDto.setCreateOrgName(scmPurchaseChannel.getUseOrgName());
+            busApplyPushDto.setApplyType(scmPurchaseChannel.getPurchaseOrderTypeValue());
+            busApplyPushDto.setApplyTypeKey(scmPurchaseChannel.getPurchaseOrderTypeKey());
+            busApplyPushDto.setOrgDeptName(busSalesOrder.getPurchaseSystemName());
+            busApplyPushDto.setOrgDeptSid(busSalesOrder.getPurchaseSystemSid());
+            busApplyPushDto.setCarBrandSid(busSalesOrderModel.getBrandSid());
+            busApplyPushDto.setCarBrandName(busSalesOrderModel.getBrandName());
+            busApplyPushDto.setOrgSidPath(dto.getOrgSidPath());
+            List<BusApplyDetailsPushDto> busApplyDetailsPushDtos = new ArrayList<>();
+            BusApplyDetailsPushDto busApplyDetailsPushDto = new BusApplyDetailsPushDto();
+            busApplyDetailsPushDto.setVehicleSid(busSalesOrderModel.getModelSid());
+            busApplyDetailsPushDto.setVehicleName(busSalesOrderModel.getModelName());
+            busApplyDetailsPushDto.setQuantity(busSalesOrderPrice.getQuantity().toString());
+            busApplyDetailsPushDto.setConfigSid(busSalesOrderModel.getModelConfigSid());
+            busApplyDetailsPushDto.setConfigName(busSalesOrderModel.getConfig());
+            busApplyDetailsPushDto.setSaleGuPrice(busSalesOrderModel.getFinalPrice().toString());
+            BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrdersVo.getBusSalesOrderMakeup();
+            if(busSalesOrderMakeup != null){
+                BusVehicleApplySzPushDto busVehicleApplySzPushDto = new BusVehicleApplySzPushDto();
+                busVehicleApplySzPushDto.setSzSid(busSalesOrderMakeup.getTopSid());
+                busApplyDetailsPushDto.setBusVehicleApplySzPushDto(busVehicleApplySzPushDto);
+            }
+            busApplyDetailsPushDtos.add(busApplyDetailsPushDto);
+            busApplyPushDto.setBusVehicleApplyDetailList(busApplyDetailsPushDtos);
+            busVehicleApplyFeign.pushApply(busApplyPushDto);
+        }
+    }
+
    public ResultBean sendOutApply(SendOutApplyDto dto) {
        ResultBean rb = ResultBean.fireFail();
        ScmPurchaseChannel scmPurchaseChannel = fetchBySid(dto.getSid());
--- a/anrui-scm/anrui-scm-ui/src/api/kucunguanli/changjiachuku.js
+++ b/anrui-scm/anrui-scm-ui/src/api/kucunguanli/changjiachuku.js
@ -50,5 +50,13 @@ export default {
      url: '/base/v1/basemanufacturerretware/fetchDetailsBySid/' + sid,
      method: 'get'
    })
+  },
+  // 下载
+  createPdf: function(data) {
+    return request({
+      url: '/base/v1/basemanufacturerretware/withdrawalPdf',
+      method: 'post',
+      params: data
+    })
  }
 }
--- a/anrui-scm/anrui-scm-ui/src/api/purchasingchannels/purchasingchannels.js
+++ b/anrui-scm/anrui-scm-ui/src/api/purchasingchannels/purchasingchannels.js
@ -4,7 +4,7 @@ export default {
  // 查询分页列表
  listPage: function(params) {
    return request({
-      url: '/buscenter/v1/buspurchasechannel/listPage',
+      url: '/scm/v1/scmpurchasechannel/listPage',
      method: 'post',
      data: params,
      headers: { 'Content-Type': 'application/json' }
@ -13,7 +13,7 @@ export default {
  // 保存修改记录
  choice: function(data) {
    return request({
-      url: '/buscenter/v1/buspurchasechannel/choice',
+      url: '/scm/v1/scmpurchasechannel/choice',
      method: 'post',
      data: data,
      headers: { 'Content-Type': 'application/json' }
--- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
+++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
@ -748,7 +748,7 @@ const codemenu = [
      title: '采购渠道'
    },
    children: [{
-      path: '/purchasingchannels',
+      path: '/purchasingchannels/caigouqudaotobeselected',
      component: () => import('@/views/purchasingchannels/caigouqudaotobeselected.vue'),
      name: 'caigouqudaotobeselected',
      meta: { title: '采购渠道', noCache: true }
--- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuguanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuguanli.vue
@ -34,9 +34,10 @@
          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
            <el-table-column width="50px" type="selection" align="center"/>
-            <el-table-column label="操作" width="150px" align="center">
+            <el-table-column label="操作" width="180" align="center">
              <template slot-scope="scope">
                <el-button type="primary" :disabled="scope.row.state == '已办理'" size="mini" @click="toEdit(scope.row)">办理</el-button>
+                <el-button type="primary" :disabled="scope.row.state !== '已办理'" size="mini" @click="handlePrint(scope.row)">下载</el-button>
                <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
              </template>
            </el-table-column>
@ -80,6 +81,27 @@
    </div>
    <changjiatuikuAdd v-show="viewState == 2" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
    <changjiatuikuInfo v-show="viewState == 3" ref="divInfo" @doback="resetState"/>
+    <el-dialog center :visible.sync="dialogVisible" width="40%">
+      <el-form class="formadd">
+        <el-row style="border-top: 1px solid #E0E3EB">
+          <el-col :span="6" class="tleftb">
+            <span>打印机类型</span>
+          </el-col>
+          <el-col :span="18">
+            <el-form-item>
+              <el-radio-group v-model="print">
+                <el-radio label="针孔式打印机">针孔式打印机</el-radio>
+                <el-radio label="激光打印机">激光打印机</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" type="primary" @click="handleConfirm">确定</el-button>
+        <el-button size="small" @click="dialogVisible = false">取消</el-button>
+      </span>
+    </el-dialog>
  </div>
 </template>

@ -91,6 +113,7 @@ import req from '@/api/kucunguanli/changjiachuku'
 import changjiatuikuAdd from './changjiatuikuAdd'
 import changjiatuikuInfo from './changjiatuikuInfo'
 import { getOrgSidByPath } from '@/api/cheliang/dictcommons'
+import {getStorage} from "@/utils/auth";

 export default {
  name: 'changjiatuikuguanli',
@ -103,6 +126,9 @@ export default {
  },
  data() {
    return {
+      dialogVisible: false,
+      printSid: '',
+      print: '',
      btndisabled: false,
      btnList: [
        {
@ -237,6 +263,39 @@ export default {
      this.viewState = 3
      this.$refs['divInfo'].showInfo(row)
    },
+    handlePrint(row) {
+      this.printSid = row.sid
+      this.print = ''
+      this.dialogVisible = true
+    },
+    handleConfirm() {
+      req.createPdf({ cgtkdSid: this.printSid, printerType: this.print }).then((resp) => {
+        if (resp.success && resp.data !== '') {
+          var xhr = new XMLHttpRequest()
+          xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data + '&outFileName=' + '退料单', true)
+          xhr.setRequestHeader('token', getStorage())
+          xhr.responseType = 'blob'
+          xhr.onload = function(e) {
+            // 如果请求执行成功
+            var blob = this.response
+            var filename = '退料单.pdf'
+            var a = document.createElement('a')
+            // blob.type="application/octet-stream";
+            // 创键临时url对象
+            var url = URL.createObjectURL(blob)
+            a.href = url
+            a.download = filename
+            a.click()
+            // 释放之前创建的URL对象
+            window.URL.revokeObjectURL(url)
+          }
+          // 发送请求
+          xhr.send()
+          this.dialogVisible = false
+          this.printSid = ''
+        }
+      })
+    },
    resetState() {
      this.viewState = 1
    },
--- a/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaoselected.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaoselected.vue
@ -45,15 +45,21 @@
          </div>
        </div>
        <div class="listtop">
-          <div class="tit">待选择列表</div>
+          <div class="tit">已选择列表</div>
          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="init"/>
        </div>
        <div class="">
-          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
+            <el-table-column fixed width="50" type="selection" align="center"/>
            <el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column label="采购渠道" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.purchaseOrderTypeValue }}</span>
+              </template>
+            </el-table-column>
            <el-table-column label="销售订单编号" align="center" width="150">
              <template slot-scope="scope">
-                <span>{{ scope.row.saleOrderNo }}</span>
+                <span class="bluezi" @click="lookSale(scope.row)">{{ scope.row.saleOrderNo }}</span>
              </template>
            </el-table-column>
            <el-table-column label="销售订单审批日期" align="center" width="150">
@ -96,6 +102,16 @@
                <span @click="flowRecord(scope.row)" class="bluezi">查看</span>
              </template>
            </el-table-column>
+            <el-table-column label="选择日期" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.choiceDate }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作人" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.operateName }}</span>
+              </template>
+            </el-table-column>
          </el-table>
        </div>
        <div class="pages">
@ -105,6 +121,33 @@
      </div>
    </div>
    <!-- End 列表页面 -->
+    <!-- 查看销售订单 -->
+    <saleOrder v-show="viewState == 2" ref="divSale" @doback="resetState"/>
+    <!-- 选择采购渠道 -->
+    <el-dialog :visible.sync="dialogVisible" width="50%">
+      <el-form ref="form_obj" :model="formobj" class="formadd">
+        <el-row style="border-top: 1px solid #E0E3EB">
+          <el-col :span="24">
+            <el-form-item>
+              <span>选择采购渠道</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item>
+              <el-select v-model="formobj.purchaseOrderTypeValue" placeholder="请选择" filterable clearable @change="changePurchaseOrderType">
+                <el-option v-for="item in purchaseOrderType_list" :disabled="item.dictValue == '挂车'" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="handleConfirm">确定</el-button>
+        <el-button @click="handleQuXiao">取消</el-button>
+      </span>
+    </el-dialog>
    <el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
      <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
    </el-dialog>
@ -116,15 +159,17 @@ import req from '@/api/purchasingchannels/purchasingchannels'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
-import { getPathSidByUserSid } from '@/api/cheliang/dictcommons'
+import { getPathSidByUserSid, selectOrgLists, typeValues } from '@/api/cheliang/dictcommons'
 import { getStorage } from '@/utils/auth'
+import saleOrder from '@/components/publicPage/saleOrder'

 export default {
  name: 'caigouqudaoselected',
  components: {
    Pagination,
    pageye,
-    ButtonBar
+    ButtonBar,
+    saleOrder
  },
  data() {
    return {
@ -132,8 +177,16 @@ export default {
      dialogHeight: '80%',
      centerDialogVisible: false,
      viewState: 1,
+      dialogVisible: false,
      btndisabled: false,
      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: '',
+          btnKey: 'tobeSelect',
+          btnLabel: '再次选择'
+        },
        {
          type: 'info',
          size: 'small',
@ -148,8 +201,13 @@ export default {
      tableKey: 0,
      list: [],
      orgDept_list: [],
+      purchaseOrderType_list: [],
      FormLoading: false,
      listLoading: false,
+      formobj: {
+        purchaseOrderTypeValue: '',
+        purchaseOrderTypeKey: ''
+      },
      listQuery: {
        params: {
          applyDeptSid: '',
@ -160,7 +218,7 @@ export default {
          saleOrderApproEndDate: '',
          saleOrderApproStartDate: '',
          saleOrderNo: '',
-          state: '',
+          state: '2',
          useOrgSid: ''
        },
        current: 1,
@ -217,6 +275,9 @@ export default {
    btnHandle(btnKey) {
      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
      switch (btnKey) {
+        case 'tobeSelect':
+          this.tobeSelect()
+          break
        case 'doClose':
          this.doClose()
          break
@ -225,6 +286,16 @@ export default {
      }
    },
    init() {
+      typeValues({ type: 'purchaseOrderType' }).then((resp) => {
+        if (resp.success) {
+          this.purchaseOrderType_list = resp.data
+        }
+      })
+      selectOrgLists({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+        if (res.success) {
+          this.orgDept_list = res.data
+        }
+      })
      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
        if (res.success) {
          this.listQuery.params.useOrgSid = res.data
@ -239,6 +310,19 @@ export default {
      var pageindex = index + 1 + pagestart
      return pageindex
    },
+    handleSelectionChange(row) {
+      const aa = []
+      row.forEach((element) => {
+        aa.push({
+          sid: element.sid,
+          userSid: window.sessionStorage.getItem('userSid'),
+          orgSidPath: window.sessionStorage.getItem('defaultOrgPath'),
+          purchaseOrderTypeKey: '',
+          purchaseOrderTypeValue: ''
+        })
+      })
+      this.sids = aa
+    },
    // 查询列表信息
    getList() {
      this.listLoading = true
@ -274,7 +358,7 @@ export default {
          saleOrderApproEndDate: '',
          saleOrderApproStartDate: '',
          saleOrderNo: '',
-          state: '',
+          state: '2',
          useOrgSid: ''
        },
        current: 1,
@ -283,6 +367,56 @@ export default {
      }
      this.init()
    },
+    tobeSelect() {
+      if (this.sids.length === 1) {
+        this.dialogVisible = true
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
+        return
+      }
+    },
+    changePurchaseOrderType(value) {
+      const choose = this.purchaseOrderType_list.filter((item) => item.dictValue === value)
+      this.formobj.purchaseOrderTypeKey = choose[0].dictKey
+    },
+    handleConfirm() {
+      if (this.formobj.purchaseOrderTypeValue === '') {
+        this.$message({ showClose: true, type: 'error', message: '选择采购渠道不能为空' })
+        return
+      }
+      for (var i = 0; i < this.sids.length; i++) {
+        this.sids[i].purchaseOrderTypeValue = this.formobj.purchaseOrderTypeValue
+        this.sids[i].purchaseOrderTypeKey = this.formobj.purchaseOrderTypeKey
+      }
+      const tip = '请确认采购渠道是否选择正确'
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        req.choice(this.sids).then((res) => {
+          if (res.success) {
+            this.$message({ showClose: true, type: 'success', message: '操作成功' })
+            this.handleQuXiao()
+            this.getList()
+          }
+        })
+      })
+    },
+    handleQuXiao() {
+      this.formobj = {
+        purchaseOrderTypeValue: '',
+        purchaseOrderTypeKey: ''
+      }
+      this.dialogVisible = false
+    },
+    lookSale(row) {
+      this.viewState = 2
+      this.$refs['divSale'].showInfo({ sid: row.saleOrderSid })
+    },
+    resetState() {
+      this.viewState = 1
+    },
    doClose() {
      this.$store.dispatch('tagsView/delView', this.$route)
      this.$router.go(-1)
--- a/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaotobeselected.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaotobeselected.vue
@ -2,7 +2,7 @@
  <div class="app-container">
    <!-- Start 列表页面 -->
    <div v-show="viewState == 1">
-      <button-bar view-title="车型报价" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <button-bar view-title="采购渠道选择" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
      <div class="main-content">
        <div class="switch_btn">
          <el-button :class="{btn_style:viewState === 1}">待选择</el-button>
@ -52,14 +52,9 @@
          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
            <el-table-column fixed width="50" type="selection" align="center"/>
            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
-            <el-table-column fixed width="100" label="操作" align="center">
-              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleSelect(scope.row)">选择</el-button>
-              </template>
-            </el-table-column>
            <el-table-column label="销售订单编号" align="center" width="150">
              <template slot-scope="scope">
-                <span>{{ scope.row.saleOrderNo }}</span>
+                <span class="bluezi" @click="lookSale(scope.row)">{{ scope.row.saleOrderNo }}</span>
              </template>
            </el-table-column>
            <el-table-column label="销售订单审批日期" align="center" width="150">
@ -111,7 +106,11 @@
      </div>
    </div>
    <!-- End 列表页面 -->
+    <!-- 已选择列表 -->
    <caigouqudaoselected v-show="viewState == 2" ref="divSelect" @doback="resetState"/>
+    <!-- 查看销售订单 -->
+    <saleOrder v-show="viewState == 3" ref="divSale" @doback="resetState"/>
+    <!-- 选择采购渠道 -->
    <el-dialog :visible.sync="dialogVisible" width="50%">
      <el-form ref="form_obj" :model="formobj" class="formadd">
        <el-row style="border-top: 1px solid #E0E3EB">
@ -125,7 +124,7 @@
          <el-col :span="24">
            <el-form-item>
              <el-select v-model="formobj.purchaseOrderTypeValue" placeholder="请选择" filterable clearable @change="changePurchaseOrderType">
-                <el-option v-for="item in purchaseOrderType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                <el-option v-for="item in purchaseOrderType_list" :disabled="item.dictValue == '挂车'" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
              </el-select>
            </el-form-item>
          </el-col>
@ -149,6 +148,7 @@ import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
 import caigouqudaoselected from './caigouqudaoselected'
+import saleOrder from '@/components/publicPage/saleOrder'
 import { getStorage } from '@/utils/auth'

 export default {
@ -157,7 +157,8 @@ export default {
    Pagination,
    pageye,
    ButtonBar,
-    caigouqudaoselected
+    caigouqudaoselected,
+    saleOrder
  },
  data() {
    return {
@ -173,7 +174,7 @@ export default {
          size: 'small',
          icon: '',
          btnKey: 'tobeSelect',
-          btnLabel: '批量选择'
+          btnLabel: '选择'
        },
        {
          type: 'info',
@ -207,7 +208,7 @@ export default {
          saleOrderApproEndDate: '',
          saleOrderApproStartDate: '',
          saleOrderNo: '',
-          state: '',
+          state: '1',
          useOrgSid: ''
        },
        current: 1,
@ -308,6 +309,8 @@ export default {
      row.forEach((element) => {
        aa.push({
          sid: element.sid,
+          userSid: window.sessionStorage.getItem('userSid'),
+          orgSidPath: window.sessionStorage.getItem('defaultOrgPath'),
          purchaseOrderTypeKey: '',
          purchaseOrderTypeValue: ''
        })
@ -331,19 +334,12 @@ export default {
      })
    },
    tobeSelect() {
-      if (this.sids.length === 0) {
-        this.$message({ showClose: true, type: 'error', message: '请至少选择一条记录进行批量选择的操作' })
+      if (this.sids.length === 1) {
+        this.dialogVisible = true
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
        return
      }
-      this.dialogVisible = true
-    },
-    handleSelect(row) {
-      this.sids.push({
-        sid: row.sid,
-        purchaseOrderTypeKey: '',
-        purchaseOrderTypeValue: ''
-      })
-      this.dialogVisible = true
    },
    changePurchaseOrderType(value) {
      const choose = this.purchaseOrderType_list.filter((item) => item.dictValue === value)
@ -368,6 +364,7 @@ export default {
          if (res.success) {
            this.$message({ showClose: true, type: 'success', message: '操作成功' })
            this.handleQuXiao()
+            this.getList()
          }
        })
      })
@ -378,7 +375,6 @@ export default {
        purchaseOrderTypeKey: ''
      }
      this.dialogVisible = false
-      this.getList()
    },
    handleClick() {
      this.viewState = 2
@ -400,7 +396,7 @@ export default {
          saleOrderApproEndDate: '',
          saleOrderApproStartDate: '',
          saleOrderNo: '',
-          state: '',
+          state: '1',
          useOrgSid: ''
        },
        current: 1,
@ -409,6 +405,10 @@ export default {
      }
      this.init()
    },
+    lookSale(row) {
+      this.viewState = 3
+      this.$refs['divSale'].showInfo({ sid: row.saleOrderSid })
+    },
    resetState() {
      this.viewState = 1
    },
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/topinfo/TopDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/topinfo/TopDto.java
@ -87,4 +87,7 @@ public class TopDto implements Dto {
    @JsonProperty("payType")
    private String buyTypeValue;

+    @ApiModelProperty("上装sid")
+    private String topSid;
+
 }
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/topinfo/TopVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/topinfo/TopVo.java
@ -75,4 +75,6 @@ public class TopVo implements Vo {
    private String buyTypeKey;
    @JsonProperty("payType")
    private String buyTypeValue;
+
+    private String topSid;
 }