优化工作

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java

@@ -168,4 +168,6 @@ public class BaseOutsourcingApplicationDetailsVo implements Vo {
 
     @ApiModelProperty("申请人组织路径")
     private String orgSidPath; // 申请人组织路径
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeign.java

@@ -69,6 +69,10 @@ public interface BaseOutsourcingApplicationFeign {
     @PostMapping("/saveOrUpdate")
     public ResultBean saveOrUpdate(@RequestBody BaseOutsourcingApplicationDto dto);
 
+    @ApiOperation("接收采购渠道推送保存")
+    @PostMapping("/receiveSave")
+    public ResultBean receiveSave(@RequestBody ReceiveSaveDto dto);
+
     @ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids);

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeignFallback.java

@@ -62,6 +62,11 @@ public class BaseOutsourcingApplicationFeignFallback implements BaseOutsourcingA
 		return ResultBean.fireFail().setMsg("接口anrui-base/baseoutsourcingapplication/saveOrUpdate无法访问");
 	}
 
+	@Override
+	public ResultBean receiveSave(ReceiveSaveDto dto) {
+		return null;
+	}
+
 	@Override
 	public ResultBean delBySids( String[] sids){
 		return ResultBean.fireFail().setMsg("接口anrui-base/baseoutsourcingapplication/delBySids无法访问");

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/ReceiveSaveDto.java

@@ -0,0 +1,182 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseoutsourcingapplication;
+
+
+import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleDto;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * Project: anrui-base(外采管理) <br/>
+ * File: BaseOutsourcingApplicationDto.java <br/>
+ * Class: com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDto <br/>
+ * Description: 外采申请表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-08 17:44:40 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+public class ReceiveSaveDto implements Dto {
+
+	@ApiModelProperty("外采申请单sid")
+	private String sid; // 外采申请单sid
+	@ApiModelProperty(value = "车辆型号")
+	private String vehMark;
+	@ApiModelProperty("创建人sid")
+	private String createBySid; // 创建人sid
+	@ApiModelProperty("用户sid")
+	private String userSid; // 用户sid
+	@ApiModelProperty("业务员sid")
+	private String staffSid; // 业务员sid
+	@ApiModelProperty("申请编号")
+    private String applicationCode; // 申请编号
+	@ApiModelProperty("申请人姓名")
+    private String createByName; // 申请人姓名
+	@ApiModelProperty("申请日期")
+    private String applicationDate; // 申请日期
+	@ApiModelProperty("外采类型key")
+    private String externalMiningTypeKey; // 外采类型key
+	@ApiModelProperty("外采类型value")
+    private String externalMiningTypeValue; // 外采类型value
+	@ApiModelProperty("外采供应商sid")
+    private String purchasingUnitSid; // 外采供应商sid
+	@ApiModelProperty("外采供应商名称")
+    private String purchasingUnitName; // 外采供应商名称
+	@ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+	@ApiModelProperty("车型名称")
+    private String modelName; // 车型名称
+	@ApiModelProperty("常用配置sid")
+	private String configSid; // 常用配置sid
+	@ApiModelProperty("常用配置名称")
+    private String configName; // 常用配置名称
+	@ApiModelProperty("采购价格")
+    private BigDecimal purchasePrice; // 采购价格
+	@ApiModelProperty("销售指导价")
+    private BigDecimal guidedPrice; // 销售指导价
+	@ApiModelProperty("厂家合同价")
+    private BigDecimal manufactorSettlementPrice; // 厂家合同价
+	@ApiModelProperty("订金开户银行")
+	private String modelBankName; // 订金开户银行
+	@ApiModelProperty("订金银行账号")
+	private String modelBankAccount; // 订金银行账号
+	@ApiModelProperty("订金收款账户名称")
+	private String modelAccountName; // 订金收款账户名称
+	@ApiModelProperty("车款开户银行")
+	private String depositBankName; // 车款开户银行
+	@ApiModelProperty("车款银行账号")
+	private String bankAccount; // 车款银行账号
+	@ApiModelProperty("车款账户名称")
+	private String accountName; // 车款账户名称
+	@ApiModelProperty("台数")
+    private Integer num; // 台数
+	@ApiModelProperty("订金")
+    private BigDecimal deposit; // 订金
+	@ApiModelProperty("费用名称")
+    private String expenseName; // 费用名称
+	@ApiModelProperty("费用金额合计")
+    private BigDecimal totalExpenseAmount; // 费用金额合计
+	@ApiModelProperty("部门sid")
+	private String orgSid; // 部门sid
+	@ApiModelProperty("流程定义的id")
+	private String procDefId;
+	@ApiModelProperty("环节定义的sid")
+	private String taskDefKey;
+	@ApiModelProperty("流程实例的sid")
+	private String procInstSid;
+
+	@ApiModelProperty(value = "节点状态")
+	private String nodeState;
+	@ApiModelProperty("任务id")
+	private String taskId;
+
+	@ApiModelProperty("分公司sid")
+	private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+	private String useOrgName; // 分公司名称
+	@ApiModelProperty("备注")
+	private String remarks; // 备注
+	@ApiModelProperty("内部编码")
+	private String insideCode; // 内部编码
+	@ApiModelProperty("是否先付款")
+	private String isBeforePayment; // 是否先付款
+
+	@ApiModelProperty("品牌sid")
+	private String carBrandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+	private String carBrandName; // 品牌名称
+	@ApiModelProperty("品牌code")
+	private String carBrandCode; // 品牌code
+	@ApiModelProperty("采购系统sid")
+	private String purchaseSystemSid; // 采购系统sid
+	@ApiModelProperty("采购系统名称")
+	private String purchaseSystemName; // 采购系统名称
+	@ApiModelProperty("采购系统code")
+	private String purchaseSystemCode; // 采购系统code
+	@ApiModelProperty("采购类型key")
+	private String manPurOrderTypeKey; // 采购类型key
+	@ApiModelProperty("供应商code")
+	private String supplierCode; // 供应商code
+	@ApiModelProperty("采购组织code")
+	private String orgCode; // 采购组织code
+	@ApiModelProperty("外采车辆类型key")
+	private String vehicleTypeKey; // 外采车辆类型key
+	@ApiModelProperty("订金使用规则key")
+	private String depositUseRuleKey; // 订金使用规则key
+	@ApiModelProperty("订金使用规则value")
+	private String depositUseRuleValue; // 订金使用规则value
+
+	@ApiModelProperty("是否销售组审批")
+	private String isSaleOrgApproval; // 是否销售组审批
+	@ApiModelProperty("销售经理sid")
+	private String approvalSid; // 销售经理sid
+	@ApiModelProperty("销售经理姓名")
+	private String approvalName; // 销售经理姓名
+
+	@ApiModelProperty("外采车辆列表")
+	private List<BaseOutsourcingApplicationVehicleDto> baseOutsourcingApplicationVehicleDtos; // 外采车辆列表
+	@ApiModelProperty("合同附件信息")
+	private CommonAppendix contract;
+
+	@ApiModelProperty("申请人组织路径")
+	private String orgSidPath; // 申请人组织路径
+	@ApiModelProperty("申请人组织路径")
+	private String orgPath; // 申请人组织路径
+	@ApiModelProperty("销售订单sid")
+	private String saleOrderSid;
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationRest.java

@@ -82,6 +82,11 @@ public class BaseOutsourcingApplicationRest implements BaseOutsourcingApplicatio
 		return baseOutsourcingApplicationService.saveOrUpdateDto(dto);
 	}
 
+	@Override
+	public ResultBean receiveSave(ReceiveSaveDto dto) {
+		return baseOutsourcingApplicationService.receiveSave(dto);
+	}
+
 	@Override
 	@ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -158,9 +158,9 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         if (StringUtils.isNotBlank(query.getModelName())) {
             qw.like("modelName", query.getModelName());
         }
-        if(StringUtils.isNotBlank(query.getOrgPath())){
+        if (StringUtils.isNotBlank(query.getOrgPath())) {
             String orgPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
-            qw.eq("useOrgSid",orgPath);
+            qw.eq("useOrgSid", orgPath);
         }
         qw.eq("createBySid", query.getUserSid());
         return qw;
@@ -178,9 +178,9 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
     public ResultBean saveOrUpdateDto(BaseOutsourcingApplicationDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String orgPath = "";
-        if (StringUtils.isNotBlank(dto.getOrgPath())){
+        if (StringUtils.isNotBlank(dto.getOrgPath())) {
             orgPath = dto.getOrgPath();
-        }else {
+        } else {
             //取组织架构的全路径sid
             SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(dto.getStaffSid()).getData();
             orgPath = sysStaffOrg.getOrgSidPath();
@@ -200,7 +200,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             BaseOutsourcingApplication entity = new BaseOutsourcingApplication();
             String billNo = getApplyCode(orgPath);
             dto.setApplicationCode(billNo);
-            BeanUtil.copyProperties(dto, entity,"sid");
+            BeanUtil.copyProperties(dto, entity, "sid");
             entity.setApplicationCode(billNo);
             entity.setApplicationDate(DateUtil.formatDate(new Date()));
             String staffSid = dto.getStaffSid();
@@ -402,12 +402,17 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             //判断是否有指定审批人
             String isSaleOrgApproval = dto.getIsSaleOrgApproval();
             Boolean isAdj = false;
-            if ("1".equals(isSaleOrgApproval)){
+            if ("1".equals(isSaleOrgApproval)) {
                 bv.setNextNodeUserSids(dto.getApprovalSid());
                 isAdj = true;
-                variables.put("isAdj",isAdj);
+                variables.put("isAdj", isAdj);
+            } else {
+                variables.put("isAdj", isAdj);
+            }
+            if (StringUtils.isNotBlank(baseOutsourcingApplication.getSaleOrderSid())){
+                variables.put("isSend", true);
             }else {
-                variables.put("isAdj",isAdj);
+                variables.put("isSend", false);
             }
             //=================添加app参数结束
             bv.setFormVariables(variables);
@@ -458,12 +463,17 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         //判断是否有指定审批人
         String isSaleOrgApproval = dto.getIsSaleOrgApproval();
         Boolean isAdj = false;
-        if ("1".equals(isSaleOrgApproval)){
+        if ("1".equals(isSaleOrgApproval)) {
             bv.setNextNodeUserSids(dto.getApprovalSid());
             isAdj = true;
-            variables.put("isAdj",isAdj);
+            variables.put("isAdj", isAdj);
+        } else {
+            variables.put("isAdj", isAdj);
+        }
+        if (StringUtils.isNotBlank(booad.getSaleOrderSid())){
+            variables.put("isSend", true);
         }else {
-            variables.put("isAdj",isAdj);
+            variables.put("isSend", false);
         }
         //=================添加app参数结束
         bv.setFormVariables(variables);
@@ -549,11 +559,16 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             //=================添加app相关参数
             Map<String, Object> appMap = new HashMap<>();
             appMap.put("sid", bv.getBusinessSid());
-            if("1".equals(booad.getIsSaleOrgApproval())){
+            if ("1".equals(booad.getIsSaleOrgApproval())) {
                 isAdj = true;
-                appMap.put("isAdj",isAdj);
+                appMap.put("isAdj", isAdj);
+            } else {
+                bv.getFormVariables().put("isAdj", isAdj);
+            }
+            if (StringUtils.isNotBlank(booad.getSaleOrderSid())){
+                appMap.put("isSend", true);
             }else {
-                bv.getFormVariables().put("isAdj",isAdj);
+                appMap.put("isSend", false);
             }
             bv.getFormVariables().put("app", appMap);
             //================添加app相关参数
@@ -893,11 +908,16 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         bv.setModelId(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId());
         bv.setTaskDefKey(dto.getTaskDefKey());
         Map<String, Object> map = BeanUtil.beanToMap(dto);
-        if("1".equals(booad.getIsSaleOrgApproval())){
+        if ("1".equals(booad.getIsSaleOrgApproval())) {
             isAdj = true;
-            map.put("isAdj",isAdj);
+            map.put("isAdj", isAdj);
+        } else {
+            map.put("isAdj", isAdj);
+        }
+        if (StringUtils.isNotBlank(booad.getSaleOrderSid())){
+            map.put("isSend", true);
         }else {
-            map.put("isAdj",isAdj);
+            map.put("isSend", false);
         }
         bv.setFormVariables(map);
         ResultBean<List<Map<String, Object>>> processCirculationNodesByMap = flowTaskFeign.getNextNodesForSubmit(bv);
@@ -947,4 +967,32 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
     public BaseOutsourcingApplication selectByNo(String warrantyCardNo) {
         return baseMapper.selectByNo(warrantyCardNo);
     }
+
+    public ResultBean receiveSave(ReceiveSaveDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseOutsourcingApplication entity = new BaseOutsourcingApplication();
+        String billNo = getApplyCode(dto.getOrgPath());
+        dto.setApplicationCode(billNo);
+        BeanUtil.copyProperties(dto, entity, "sid");
+        entity.setApplicationCode(billNo);
+        entity.setApplicationDate(DateUtil.formatDate(new Date()));
+        entity.setUseOrgSid(dto.getUseOrgSid());
+        entity.setUseOrgName(dto.getUseOrgName());
+        entity.setCreateBySid(dto.getCreateBySid());
+        entity.setNodeState("待提交");
+        String carBrandSid = dto.getCarBrandSid();
+        String brandCode = baseVehicleBrandService.fetchBySid(carBrandSid).getBrandCode();
+        entity.setCarBrandCode(brandCode);
+        String purchaseSystemSid = dto.getPurchaseSystemSid();
+        String purchaseSystemCode = sysOrganizationFeign.fetchBySid(purchaseSystemSid).getData().getOrgCode();
+        entity.setPurchaseSystemCode(purchaseSystemCode);
+        entity.setManPurOrderTypeKey("002");
+        String useOrgSid = dto.getUseOrgSid();
+        String orgCode = sysOrganizationFeign.fetchBySid(useOrgSid).getData().getOrgCode();
+        entity.setOrgCode(orgCode);
+        entity.setOrgSidPath(dto.getOrgPath());
+        entity.setSaleOrderSid(dto.getSaleOrderSid());
+        save(entity);
+        return rb.success().setMsg("添加成功").setData(entity.getSid());
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@@ -518,7 +518,12 @@
                        fsrd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0)
                        ) AS balance
         FROM fin_selected_receivables_detailed fsrd
-                     LEFT JOIN `fin_funds_carried_forward_veh` ffc
+                     LEFT JOIN (SELECT ffc.busSid,
+                                       ffc.thisUseMoney
+                                FROM fin_funds_carried_forward_veh ffc
+                                             JOIN `fin_funds_carried_forward_apply` fa
+                                        ON ffc.mainSid = fa.sid
+                                WHERE fa.`nodeState` != '终止') ffc
                 ON ffc.`busSid` = fsrd.`sid`
         WHERE fsrd.`sid` = #{busSid}
         GROUP BY fsrd.sid

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -32,7 +32,7 @@ public enum ProcDefEnum {
     SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"),
     SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"),
     SALESORDER("销售订单审批流程", "process_p5ils2rn:10:1250008"),
-    BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:722504"),
+    BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:7:3100008"),
     BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:8:1865012"),
     BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"),
     BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:4:1362508"),

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelVo.java

@@ -77,4 +77,8 @@ public class ScmPurchaseChannelVo implements Vo {
     private String procDefId;
     @ApiModelProperty("流程实例id")
     private String procInstId;
+    @ApiModelProperty("操作人")
+    private String operateName;
+    @ApiModelProperty("操作日期")
+    private String choiceDate;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelMapper.xml

@@ -8,7 +8,7 @@
                bso.procDefId,
                bso.procInstId
         FROM scm_purchase_channel bpc
-                 LEFT JOIN bus_sales_order bso
+                 LEFT JOIN anrui_buscenter.bus_sales_order bso
                            ON bpc.`saleOrderSid` = bso.`sid`
         <where>
             ${ew.sqlSegment}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelService.java

@@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDto;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign;
+import com.yxt.anrui.base.api.baseoutsourcingapplication.ReceiveSaveDto;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
@@ -75,15 +76,6 @@ public class ScmPurchaseChannelService extends MybatisBaseService<ScmPurchaseCha
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private BaseVehmodelConfigFeign baseVehmodelConfigFeign;
-    @Autowired
-    private BasePurchaseSystemFeign basePurchaseSystemFeign;
-
-    private QueryWrapper<ScmPurchaseChannel> createQueryWrapper(ScmPurchaseChannelQuery query) {
-        // todo: 这里根据具体业务调整查询条件
-        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-        QueryWrapper<ScmPurchaseChannel> qw = new QueryWrapper<>();
-        return qw;
-    }
 
     public PagerVo<ScmPurchaseChannelVo> listPageVo(PagerQuery<ScmPurchaseChannelQuery> pq) {
         ScmPurchaseChannelQuery query = pq.getParams();
@@ -195,26 +187,31 @@ public class ScmPurchaseChannelService extends MybatisBaseService<ScmPurchaseCha
         SysOrganizationVo sysOrganizationVoGs = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
         BaseVehmodelVo baseVehmodelVo = baseVehmodelConfigFeign.selectOne(scmPurchaseChannel.getModelSid(), scmPurchaseChannel.getConfigSid(), useOrgSid).getData();
-        BaseOutsourcingApplicationDto baseOutsourcingApplicationDto = new BaseOutsourcingApplicationDto();
+        ReceiveSaveDto receiveSaveDto = new ReceiveSaveDto();
-        baseOutsourcingApplicationDto.setCreateBySid(dto.getUserSid());
+        receiveSaveDto.setCreateBySid(dto.getUserSid());
-        baseOutsourcingApplicationDto.setCreateByName(sysUserVo.getName());
+        receiveSaveDto.setCreateByName(sysUserVo.getName());
-        baseOutsourcingApplicationDto.setUseOrgSid(useOrgSid);
+        receiveSaveDto.setUseOrgSid(useOrgSid);
-        baseOutsourcingApplicationDto.setUseOrgName(sysOrganizationVoGs.getName());
+        receiveSaveDto.setUseOrgName(sysOrganizationVoGs.getName());
-        baseOutsourcingApplicationDto.setApplicationDate(DateUtil.formatDate(new Date()));
+        receiveSaveDto.setApplicationDate(DateUtil.formatDate(new Date()));
-        baseOutsourcingApplicationDto.setModelSid(scmPurchaseChannel.getModelSid());
+        receiveSaveDto.setModelSid(scmPurchaseChannel.getModelSid());
-        baseOutsourcingApplicationDto.setModelName(scmPurchaseChannel.getModelName());
+        receiveSaveDto.setModelName(scmPurchaseChannel.getModelName());
-        baseOutsourcingApplicationDto.setConfigSid(scmPurchaseChannel.getConfigSid());
+        receiveSaveDto.setConfigSid(scmPurchaseChannel.getConfigSid());
-        baseOutsourcingApplicationDto.setConfigName(scmPurchaseChannel.getConfigName());
+        receiveSaveDto.setConfigName(scmPurchaseChannel.getConfigName());
-        baseOutsourcingApplicationDto.setCarBrandSid(baseVehmodelVo.getBrandSid());
+        receiveSaveDto.setCarBrandSid(baseVehmodelVo.getBrandSid());
-        baseOutsourcingApplicationDto.setCarBrandName(baseVehmodelVo.getBrandName());
+        receiveSaveDto.setCarBrandName(baseVehmodelVo.getBrandName());
-        baseOutsourcingApplicationDto.setGuidedPrice(new BigDecimal(baseVehmodelVo.getGuidedPrice()));
+        receiveSaveDto.setGuidedPrice(new BigDecimal(baseVehmodelVo.getGuidedPrice()));
-        baseOutsourcingApplicationDto.setNum(Integer.parseInt(scmPurchaseChannel.getNum()));
+        receiveSaveDto.setPurchasePrice(new BigDecimal(0));
-        baseOutsourcingApplicationDto.setInsideCode(baseVehmodelVo.getInsideCode());
+        receiveSaveDto.setNum(Integer.parseInt(scmPurchaseChannel.getNum()));
-        baseOutsourcingApplicationDto.setPurchaseSystemSid(appOrderDetailsVo.getPurchaseSystemSid());
+        receiveSaveDto.setInsideCode(baseVehmodelVo.getInsideCode());
-        baseOutsourcingApplicationDto.setPurchaseSystemName(appOrderDetailsVo.getPurchaseSystemName());
+        receiveSaveDto.setPurchaseSystemSid(appOrderDetailsVo.getPurchaseSystemSid());
-        baseOutsourcingApplicationDto.setOrgSidPath(dto.getOrgSidPath());
+        receiveSaveDto.setPurchaseSystemName(appOrderDetailsVo.getPurchaseSystemName());
-        baseOutsourcingApplicationDto.setSaleOrderSid(scmPurchaseChannel.getSaleOrderSid());
+        receiveSaveDto.setOrgPath(dto.getOrgSidPath());
-        baseOutsourcingApplicationFeign.saveOrUpdate(baseOutsourcingApplicationDto);
+        receiveSaveDto.setSaleOrderSid(scmPurchaseChannel.getSaleOrderSid());
+        receiveSaveDto.setStaffSid(sysUserVo.getStaffSid());
+        ResultBean resultBean = baseOutsourcingApplicationFeign.receiveSave(receiveSaveDto);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
         return rb.success();
     }
 }