优化

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -167,6 +167,7 @@ import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherp
 import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicyFeign;
 import com.yxt.anrui.scm.api.scmpurchasechannel.ScmPurchaseChannelDto;
 import com.yxt.anrui.scm.api.scmpurchasechannel.ScmPurchaseChannelFeign;
+import com.yxt.anrui.scm.api.scmpurchasechannel.ScmPurchaseChannelPush;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
 import com.yxt.common.base.config.component.DocPdfComponent;
@@ -5238,24 +5239,23 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 //-----------------推送车款款项结束
                 //推送采购渠道待选择
                 if ("3".equals(busSalesOrder.getType())) {
-                    ScmPurchaseChannelDto scmPurchaseChannelDto = new ScmPurchaseChannelDto();
-                    scmPurchaseChannelDto.setSaleOrderSid(busSalesOrder.getSid());
-                    scmPurchaseChannelDto.setSaleOrderNo(busSalesOrder.getBillNo());
-                    SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(busSalesOrder.getStaffSid()).getData();
-                    scmPurchaseChannelDto.setApplyPeoSid(sysUserVo.getSid());
-                    scmPurchaseChannelDto.setApplyPeoName(busSalesOrder.getStaffName());
-                    scmPurchaseChannelDto.setApplyDeptSid(busSalesOrder.getOrgSid());
-                    scmPurchaseChannelDto.setApplyDeptName(busSalesOrder.getOrgName());
+                    ScmPurchaseChannelPush scmPurchaseChannelPush = new ScmPurchaseChannelPush();
+                    scmPurchaseChannelPush.setSaleOrderSid(busSalesOrder.getSid());
+                    scmPurchaseChannelPush.setSaleOrderNo(busSalesOrder.getBillNo());
+                    scmPurchaseChannelPush.setApplyPeoSid(busSalesOrder.getCreateBySid());
+                    scmPurchaseChannelPush.setApplyPeoName(busSalesOrder.getStaffName());
+                    scmPurchaseChannelPush.setApplyDeptSid(busSalesOrder.getOrgSid());
+                    scmPurchaseChannelPush.setApplyDeptName(busSalesOrder.getOrgName());
                     BusSalesOrderModel busSalesOrderModel = busSalesOrderModelService.selectByOrderSid(busSalesOrder.getSid());
-                    scmPurchaseChannelDto.setModelSid(busSalesOrderModel.getModelSid());
-                    scmPurchaseChannelDto.setModelName(busSalesOrderModel.getModelName());
-                    scmPurchaseChannelDto.setConfigSid(busSalesOrderModel.getModelConfigSid());
-                    scmPurchaseChannelDto.setConfigName(busSalesOrderModel.getModelConfig());
-                    scmPurchaseChannelDto.setUseOrgSid(busSalesOrder.getUseOrgSid());
-                    scmPurchaseChannelDto.setSaleOrderApproDate(DateUtil.format(new Date(), "yyyy-MM-dd"));
+                    scmPurchaseChannelPush.setModelSid(busSalesOrderModel.getModelSid());
+                    scmPurchaseChannelPush.setModelName(busSalesOrderModel.getModelName());
+                    scmPurchaseChannelPush.setConfigSid(busSalesOrderModel.getModelConfigSid());
+                    scmPurchaseChannelPush.setConfigName(busSalesOrderModel.getModelConfig());
+                    scmPurchaseChannelPush.setUseOrgSid(busSalesOrder.getUseOrgSid());
+                    scmPurchaseChannelPush.setSaleOrderApproDate(DateUtil.format(new Date(), "yyyy-MM-dd"));
                     BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(busSalesOrder.getSid());
-                    scmPurchaseChannelDto.setNum(busSalesOrderPrice.getQuantity().toString());
-                    scmPurchaseChannelFeign.save(scmPurchaseChannelDto);
+                    scmPurchaseChannelPush.setNum(busSalesOrderPrice.getQuantity().toString());
+                    scmPurchaseChannelFeign.push(scmPurchaseChannelPush);
                 }
 
             }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@@ -545,8 +545,8 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             FlowTaskDto flowTask = new FlowTaskDto();
             Map<String, Object> processVariables = task.getProcessVariables();
             flowTask.setProcessVariables(processVariables);
-            Map<String, Object> taskLocalVariables= task.getTaskLocalVariables();
-            System.out.println(JSON.toJSONString(taskLocalVariables));
+          /*  Map<String, Object> taskLocalVariables= task.getTaskLocalVariables();
+            System.out.println(JSON.toJSONString(taskLocalVariables));*/
             // 当前流程信息
             flowTask.setTaskId(task.getId());
             flowTask.setTaskDefKey(task.getTaskDefinitionKey());

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFallback.java

@@ -79,7 +79,7 @@ public class FlowableFallback implements FlowableFeign{
     }
 
     @Override
-    public ResultBean<Page<FlowTaskDto>> todoAllTaskList(String userSid, PagerQuery<FlowTaskAllQuery> pQuery) {
+    public ResultBean<PagerVo<FlowTaskDto>> todoAllTaskList(String userSid, PagerQuery<FlowTaskAllQuery> pQuery) {
         return null;
     }
 

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFeign.java

@@ -188,7 +188,7 @@ public interface FlowableFeign {
      */
     @ApiOperation(value = "总待办列表")
     @PostMapping("/todoAllTaskList/{userSid}")
-    public ResultBean<Page<FlowTaskDto>> todoAllTaskList(@ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid,
+    public ResultBean<PagerVo<FlowTaskDto>> todoAllTaskList(@ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid,
                                                          @ApiParam(value = "变量集合,json对象") @RequestBody PagerQuery<FlowTaskAllQuery> pQuery);
 
     @ApiOperation(value = "业务系统查询待办任务列表数量")

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java

@@ -277,8 +277,8 @@ public class FlowableRest implements FlowableFeign {
     }
 
     @Override
-    public ResultBean<Page<FlowTaskDto>> todoAllTaskList(String userSid, PagerQuery<FlowTaskAllQuery> pQuery) {//待办列表
-        SysUser sysUser = sysUserService.fetchBySid(userSid);
+    public ResultBean<PagerVo<FlowTaskDto>> todoAllTaskList(String userSid, PagerQuery<FlowTaskAllQuery> pQuery) {//待办列表
+       /* SysUser sysUser = sysUserService.fetchBySid(userSid);
         String staffSid = sysUser.getStaffSid();
         List<SysStaffOrgVo> sysStaffOrgListByStaffSid = sysStaffOrgService.getSysStaffOrgListByStaffSid(staffSid);
         StringBuilder sb = new StringBuilder();
@@ -289,14 +289,15 @@ public class FlowableRest implements FlowableFeign {
         if (sb.length() > 0) {
             sb.delete(sb.length() - 1, sb.length());
         }
-        pQuery.getParams().setOrgSid(sb.toString());
-        Page<FlowTaskDto> page = new Page<>();
+        pQuery.getParams().setOrgSid(sb.toString());*/
+       /* Page<FlowTaskDto> page = new Page<>();
 
         BeanUtil.copyProperties(flowableService.todoAllTaskList(userSid, pQuery).getData(),page);
 
         ResultBean< Page<FlowTaskDto>> success = new ResultBean< Page<FlowTaskDto>>().success();
         success.setData(page);
-        return success;
+        return success;*/
+        return flowableService.todoAllTaskList(userSid, pQuery);
     }
 
     @Override
@@ -321,7 +322,7 @@ public class FlowableRest implements FlowableFeign {
 
     @Override
     public ResultBean<Page<FlowTaskDto>> doneAllTaskList(String userSid, PagerQuery<FlowTaskAllQuery> pQuery) {//已办列表
-        ResultBean<Page<com.yxt.anrui.flowable.api.flowtask.FlowTaskDto>> pageResultBean = flowableService.doneAllTaskList(userSid, pQuery);
+        ResultBean<Page<FlowTaskDto>> pageResultBean = flowableService.doneAllTaskList(userSid, pQuery);
         Page<FlowTaskDto> page = new Page<>();
         BeanUtil.copyProperties(pageResultBean.getData(),page);
         ResultBean<Page<FlowTaskDto>> success = new ResultBean<Page<FlowTaskDto>>().success();

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java

@@ -32,7 +32,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yxt.anrui.flowable.api.flow.UserAndOrgPath;
 import com.yxt.anrui.flowable.api.flowdefinition.FlowDefinitionFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowRecordVo;
-import com.yxt.anrui.flowable.api.flowtask.FlowTaskDto;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
@@ -341,8 +340,8 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
     }
 
 
-    public ResultBean<Page<FlowTaskDto>> todoAllTaskList(String userSid, PagerQuery<FlowTaskAllQuery> pQuery) {
-        ResultBean<Page<FlowTaskDto>> rb = new ResultBean<Page<FlowTaskDto>>().fireFail();
+    public ResultBean<PagerVo<FlowTaskDto>> todoAllTaskList(String userSid, PagerQuery<FlowTaskAllQuery> pQuery) {
+        ResultBean<PagerVo<FlowTaskDto>> rb = ResultBean.fireFail();
         FlowTaskAllQuery params = pQuery.getParams();
         if (StringUtils.isBlank(userSid)) {
             return rb.setMsg("用户SID为空");
@@ -385,13 +384,13 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             taskParam.setValue(processDefinitionId);
             taskParamList.add(taskParam);
         }
-        if (StringUtils.isNotBlank(orgSid)) {
+        /*if (StringUtils.isNotBlank(orgSid)) {
             BusinessTaskParam taskParam = new BusinessTaskParam();
             taskParam.setField(BusinessVariables.ORGPATH);
             taskParam.setSqlOperationSymbol(SQLOperationSymbol.NONE);
             taskParam.setValue(orgSid);
             taskParamList.add(taskParam);
-        }
+        }*/
         if(StringUtils.isNotBlank(params.getStartUserSid())){
             BusinessTaskParam taskParam = new BusinessTaskParam();
             taskParam.setField("startUserSid");
@@ -402,7 +401,22 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
 
         taskQuery.setFields(taskParamList);
         taskQueryPagerQuery.setParams(taskQuery);
-        return flowTaskFeign.businessTodoList(userSid, taskQueryPagerQuery);
+//        return flowTaskFeign.businessTodoList(userSid, taskQueryPagerQuery);
+
+        ResultBean<Page<com.yxt.anrui.flowable.api.flowtask.FlowTaskDto>> resultBean = flowTaskFeign.businessTodoListForApp(userSid, taskQueryPagerQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg("流程错误");
+        }
+        PagerVo<FlowTaskDto> page = new PagerVo<>();
+        List<FlowTaskDto> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList());
+        voList.removeAll(Collections.singleton(null));
+        page.setRecords(voList);
+        page.setCurrent(resultBean.getData().getCurrent());
+        page.setSize(resultBean.getData().getSize());
+        page.setTotal(resultBean.getData().getTotal());
+        long pages = (resultBean.getData().getTotal() + resultBean.getData().getSize() -1) / resultBean.getData().getSize();
+        page.setPages(pages);
+        return rb.success().setData(page);
     }
 
     public ResultBean<Integer> getTodoNum(String userSid) {
@@ -421,7 +435,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
 
 
     public ResultBean<Page<FlowTaskDto>> doneAllTaskList(String userSid, PagerQuery<FlowTaskAllQuery> pQuery) {
-        ResultBean<Page<FlowTaskDto>> rb = new ResultBean<Page<FlowTaskDto>>().fireFail();
+        ResultBean<Page<FlowTaskDto>> rb = ResultBean.fireFail();
         FlowTaskAllQuery params = pQuery.getParams();
         if (StringUtils.isBlank(userSid)) {
             return rb.setMsg("用户SID为空");
@@ -545,7 +559,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         }*/
         taskQuery.setFields(taskParamList);
         taskQueryPagerQuery.setParams(taskQuery);
-        ResultBean<Page<FlowTaskDto>> resultBean = flowTaskFeign.businessTodoListForApp(userSid, taskQueryPagerQuery);
+        ResultBean<Page<com.yxt.anrui.flowable.api.flowtask.FlowTaskDto>> resultBean = flowTaskFeign.businessTodoListForApp(userSid, taskQueryPagerQuery);
         if (!resultBean.getSuccess()) {
             return rb.setMsg("流程错误");
         }
@@ -671,7 +685,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         }
         taskQuery.setFields(taskParamList);
         taskQueryPagerQuery.setParams(taskQuery);
-        ResultBean<Page<FlowTaskDto>> resultBean = flowTaskFeign.businessDoneListForApp(userSid, taskQueryPagerQuery);
+        ResultBean<Page<com.yxt.anrui.flowable.api.flowtask.FlowTaskDto>> resultBean = flowTaskFeign.businessDoneListForApp(userSid, taskQueryPagerQuery);
         if (!resultBean.getSuccess()) {
             return rb.setMsg("流程错误");
         }

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

@@ -37,8 +37,6 @@ import lombok.Data;
 public class ScmPurchaseChannel extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty("创建人接口")
-    private String createByName;
     @ApiModelProperty("销售订单sid")
     private String saleOrderSid;
     @ApiModelProperty("销售订单编号")
@@ -47,6 +45,8 @@ public class ScmPurchaseChannel extends BaseEntity {
     private String saleOrderApproDate;
     @ApiModelProperty("业务类型")
     private String businessType;
+    @ApiModelProperty("业务类型key")
+    private String businessTypeKey;
     @ApiModelProperty("申请部门sid")
     private String applyDeptSid;
     @ApiModelProperty("申请部门名称")
@@ -73,5 +73,11 @@ public class ScmPurchaseChannel extends BaseEntity {
     private String purchaseOrderTypeKey;
     @ApiModelProperty("采购渠道value")
     private String purchaseOrderTypeValue;
+    @ApiModelProperty("操作人sid")
+    private String operateSid;
+    @ApiModelProperty("操作人")
+    private String operateName;
+    @ApiModelProperty("操作日期")
+    private String choiceDate;
 
 }

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

@@ -37,43 +37,49 @@ import lombok.Data;
 public class ScmPurchaseChannelDto implements Dto {
 
     private static final long serialVersionUID = 4704549667731353652L;
-    private String sid; // sid
+    private String sid;
 
-	@ApiModelProperty("创建人接口")
-    private String createByName; // 创建人接口
-	@ApiModelProperty("销售订单sid")
-    private String saleOrderSid; // 销售订单sid
-	@ApiModelProperty("销售订单编号")
-    private String saleOrderNo; // 销售订单编号
-	@ApiModelProperty("销售订单审批日期")
-    private String saleOrderApproDate; // 销售订单审批日期
-	@ApiModelProperty("业务类型")
-    private String businessType; // 业务类型
-	@ApiModelProperty("申请部门sid")
-    private String applyDeptSid; // 申请部门sid
-	@ApiModelProperty("申请部门名称")
-    private String applyDeptName; // 申请部门名称
-	@ApiModelProperty("申请人sid")
-    private String applyPeoSid; // 申请人sid
-	@ApiModelProperty("申请人姓名")
-    private String applyPeoName; // 申请人姓名
-	@ApiModelProperty("车型sid")
-    private String modelSid; // 车型sid
-	@ApiModelProperty("车型名称")
-    private String modelName; // 车型名称
-	@ApiModelProperty("配置sid")
-    private String configSid; // 配置sid
-	@ApiModelProperty("配置名称")
-    private String configName; // 配置名称
-	@ApiModelProperty("数量")
-    private String num; // 数量
-	@ApiModelProperty("分公司sid")
-    private String useOrgSid; // 分公司sid
-	@ApiModelProperty("分公司名称")
-    private String useOrgName; // 分公司名称
-	@ApiModelProperty("采购渠道key")
-    private String purchaseOrderTypeKey; // 采购渠道key
-	@ApiModelProperty("采购渠道value")
-    private String purchaseOrderTypeValue; // 采购渠道value
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+
+    /* @ApiModelProperty("创建人接口")
+     private String createByName;
+     @ApiModelProperty("销售订单sid")
+     private String saleOrderSid;
+     @ApiModelProperty("销售订单编号")
+     private String saleOrderNo;
+     @ApiModelProperty("销售订单审批日期")
+     private String saleOrderApproDate;
+     @ApiModelProperty("业务类型")
+     private String businessType;
+     @ApiModelProperty("业务类型key")
+     private String businessTypeKey;
+     @ApiModelProperty("申请部门sid")
+     private String applyDeptSid;
+     @ApiModelProperty("申请部门名称")
+     private String applyDeptName;
+     @ApiModelProperty("申请人sid")
+     private String applyPeoSid;
+     @ApiModelProperty("申请人姓名")
+     private String applyPeoName;
+     @ApiModelProperty("车型sid")
+     private String modelSid;
+     @ApiModelProperty("车型名称")
+     private String modelName;
+     @ApiModelProperty("配置sid")
+     private String configSid;
+     @ApiModelProperty("配置名称")
+     private String configName;
+     @ApiModelProperty("数量")
+     private String num;
+     @ApiModelProperty("分公司sid")
+     private String useOrgSid;
+     @ApiModelProperty("分公司名称")
+     private String useOrgName;*/
+    @ApiModelProperty("采购渠道key")
+    private String purchaseOrderTypeKey;
+    @ApiModelProperty("采购渠道value")
+    private String purchaseOrderTypeValue;
 
 }

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

@@ -68,4 +68,10 @@ public interface ScmPurchaseChannelFeign {
     @ResponseBody
     public ResultBean choice(@RequestBody List<ScmPurchaseChannelDto> dto);
 
+
+    @ApiOperation("销售订单推送待选择采购渠道")
+    @PostMapping("/push")
+    @ResponseBody
+    public ResultBean push(@RequestBody ScmPurchaseChannelPush dto);
+
 }

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

@@ -61,4 +61,9 @@ public class ScmPurchaseChannelFeignFallback implements ScmPurchaseChannelFeign
     public ResultBean choice(List<ScmPurchaseChannelDto> dto) {
         return null;
     }
+
+    @Override
+    public ResultBean push(ScmPurchaseChannelPush dto) {
+        return null;
+    }
 }

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

@@ -0,0 +1,51 @@
+package com.yxt.anrui.scm.api.scmpurchasechannel;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/8/2
+ **/
+@Data
+public class ScmPurchaseChannelPush implements Dto {
+
+    private static final long serialVersionUID = 8346744643617074592L;
+
+    @ApiModelProperty("创建人接口")
+    private String createByName;
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
+    @ApiModelProperty("销售订单编号")
+    private String saleOrderNo;
+    @ApiModelProperty("销售订单审批日期")
+    private String saleOrderApproDate;
+    @ApiModelProperty("业务类型")
+    private String businessType;
+    @ApiModelProperty("业务类型key")
+    private String businessTypeKey;
+    @ApiModelProperty("申请部门sid")
+    private String applyDeptSid;
+    @ApiModelProperty("申请部门名称")
+    private String applyDeptName;
+    @ApiModelProperty("申请人sid")
+    private String applyPeoSid;
+    @ApiModelProperty("申请人姓名")
+    private String applyPeoName;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("车型名称")
+    private String modelName;
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    @ApiModelProperty("配置名称")
+    private String configName;
+    @ApiModelProperty("数量")
+    private String num;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+}

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

@@ -57,9 +57,7 @@ public class ScmPurchaseChannelRest implements ScmPurchaseChannelFeign {
     @ApiOperation("新增或修改")
     @PostMapping("/save")
     public ResultBean save(@RequestBody ScmPurchaseChannelDto dto) {
-        ResultBean rb = ResultBean.fireFail();
-        scmPurchaseChannelService.saveOrUpdateDto(dto);
-        return rb.success();
+        return scmPurchaseChannelService.saveOrUpdateDto(dto);
     }
 
     @Override
@@ -84,4 +82,9 @@ public class ScmPurchaseChannelRest implements ScmPurchaseChannelFeign {
     public ResultBean choice(List<ScmPurchaseChannelDto> dto) {
         return scmPurchaseChannelService.choice(dto);
     }
+
+    @Override
+    public ResultBean push(ScmPurchaseChannelPush dto) {
+        return scmPurchaseChannelService.push(dto);
+    }
 }

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

@@ -82,13 +82,17 @@ public class ScmPurchaseChannelService extends MybatisBaseService<ScmPurchaseCha
         return p;
     }
 
-    public void saveOrUpdateDto(ScmPurchaseChannelDto dto) {
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            this.insertByDto(dto);
-            return;
+    public ResultBean saveOrUpdateDto(ScmPurchaseChannelDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmPurchaseChannel scmPurchaseChannel = fetchBySid(dto.getSid());
+        if (scmPurchaseChannel == null) {
+            return rb.setMsg("该待选择的采购渠道不存在");
         }
-        this.updateByDto(dto);
+        BeanUtil.copyProperties(dto, scmPurchaseChannel, "sid");
+        scmPurchaseChannel.setOperateSid(dto.getUserSid());
+
+        baseMapper.updateById(scmPurchaseChannel);
+        return rb.success();
     }
 
     public void insertByDto(ScmPurchaseChannelDto dto) {
@@ -125,4 +129,18 @@ public class ScmPurchaseChannelService extends MybatisBaseService<ScmPurchaseCha
         }
         return rb.success().setMsg("选择成功");
     }
+
+    /**
+     * 销售订单推送待选择采购渠道
+     *
+     * @param dto
+     * @return
+     */
+    public ResultBean push(ScmPurchaseChannelPush dto) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmPurchaseChannel scmPurchaseChannel = new ScmPurchaseChannel();
+        BeanUtil.copyProperties(dto, scmPurchaseChannel, "sid");
+        baseMapper.insert(scmPurchaseChannel);
+        return rb.success();
+    }
 }