返利凭证

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_FEntity.json

@@ -7,12 +7,18 @@
     "FDETAILID__FF100003": {
       "FNumber": "@KD_FF100003"
     },
+    "FDETAILID__FFLEX4": {
+      "FNumber": "@KD_FFLEX4"
+    },
     "FDETAILID__FFLEX5": {
       "FNumber": "@KD_FFLEX5"
     },
     "FDETAILID__FFLEX6": {
       "FNumber": "@KD_FFLEX6"
     },
+    "FDETAILID__FFLEX8": {
+      "FNumber": "@KD_FFLEX8"
+    },
     "FDETAILID__FF100002": {
       "FNumber": "@KD_FF100002"
     }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java

@@ -149,4 +149,12 @@ public class ScmVehRebate extends BaseEntity {
     private String createOrgName; // 创建组织名称
     @ApiModelProperty("组织全路径")
     private String orgPath;
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统")
+    private String purchaseSystemName;
+
+
+
+
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java

@@ -372,6 +372,16 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
 
         }
         return r;
+    }
+
+    /**
+     * 推送单车返利预提凭证
+     * @param sid
+     */
+    public void pushVehRebateWithVoucher(String sid) {
+
+
+
     }
 
     private int updateFlowFiled(Map<String, Object> beanToMap) {

yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/AsBillSettelApplyDetailsVo.java

@@ -55,7 +55,7 @@ import java.util.List;
 @ApiModel(value = "结算申请 视图数据详情", description = "结算申请 视图数据详情")
 public class AsBillSettelApplyDetailsVo implements Vo {
 
-
+    private String createBySid;
     private String settleTime;
     private String actualAmount;
     /**

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java

@@ -457,6 +457,7 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
                 vo.setProcInsId(entity.getProcInstId());
                 vo.setInstanceId(entity.getProcInstId());
             }
+            vo.setCreateBySid(entity.getCreateBySid());
             int sourceBill = entity.getSourceBillType().intValue();
             String sourceSid = entity.getSourceSid();
             if (sourceBill == 0) {
@@ -2387,6 +2388,114 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
         return rb.success();
     }
 
+
+    //--------------------------  销售单流程  ---------------------------------
+    public ResultBean agreeCreditInfoSms(CompleteSettleDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        //根据用户sid获取staffSid
+        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
+        if (!userVoResultBean.getSuccess()) {
+            return rb.setMsg(userVoResultBean.getMsg());
+        }
+        //根据staffSid获取用户的组织全路径
+        ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+        if (!staffOrgResultBean.getSuccess()) {
+            return rb.setMsg(staffOrgResultBean.getMsg());
+        }
+        //用户的组织全路径
+        String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+        SettleCompleteDto completeDto = new
+                SettleCompleteDto();
+        BeanUtil.copyProperties(dto, completeDto);
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(completeDto, bv);
+        bv.setModelId(ProcDefEnum.SALESBILLSETTLEAPPLY.getProDefId());
+        ResultBean resultBean = completeSales(bv);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+
+    public ResultBean rejectCreditInfoSms(AppSettleTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        SettleTaskQuery taskQuery = new
+                SettleTaskQuery();
+        BeanUtil.copyProperties(query, taskQuery);
+        ResultBean resultBean = rejectSales(taskQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean recallCreditInfoSms(AppSettleTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        SettleTaskQuery taskQuery = new
+                SettleTaskQuery();
+        BeanUtil.copyProperties(query, taskQuery);
+        ResultBean resultBean = revokeProcessSales(taskQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean stopCreditInfoSms(AppSettleTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        SettleTaskQuery taskQuery = new
+                SettleTaskQuery();
+        BeanUtil.copyProperties(query, taskQuery);
+        ResultBean resultBean = breakProcessSales(taskQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean<String> getFlowOperateTitleSms(SettleFlowableQuery query) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        //0 上一环节  1下一环节
+        int next = query.getNext();
+        SettleNodeQuery getNodeQuery = new
+                SettleNodeQuery();
+        BeanUtil.copyProperties(query, getNodeQuery);
+        String data = "";
+        if (next == 0) {
+            ResultBean<List<SettleNodeVo>> getPreviousNodesForReject = getPreviousNodesForRejectSales(getNodeQuery);
+            if (getPreviousNodesForReject.getSuccess()) {
+                getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
+                data = getPreviousNodesForReject.getData().get(0).getName();
+            } else {
+                return rb.setMsg(getPreviousNodesForReject.getMsg());
+            }
+        } else if (next == 1) {
+            ResultBean<List<SettleNodeVo>> getNextNodesForSubmit = getNextNodesForSubmitSales(getNodeQuery);
+            if (getNextNodesForSubmit.getSuccess()) {
+                getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
+                data = getNextNodesForSubmit.getData().get(0).getName();
+            } else {
+                return rb.setMsg(getNextNodesForSubmit.getMsg());
+            }
+        } else {
+            return rb.setMsg("参数错误：next");
+        }
+        return rb.success().setData(data);
+    }
+
+    public ResultBean delegate2Sms(AppSettleDelegateQuery delegateQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        SettleDelegateQuery delegateQuery1 = new
+                SettleDelegateQuery();
+        BeanUtil.copyProperties(delegateQuery, delegateQuery1);
+        ResultBean delegate = delegateProcessSales(delegateQuery1);
+        return rb.success();
+    }
+
+
+
+
     public AsBillSettelApplyDetailsVo busrepairbillInit(String sid, String userSid, String orgPath) {
         AsBillSettelApplyDetailsVo vo = new AsBillSettelApplyDetailsVo();
         //新增初始化

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/SmsBillSettleApplyRest.java

@@ -0,0 +1,71 @@
+package com.yxt.anrui.as.biz.asbillsettelapply;
+
+
+import com.yxt.anrui.as.api.asbillsettelapply.flow.app.AppSettleDelegateQuery;
+import com.yxt.anrui.as.api.asbillsettelapply.flow.app.AppSettleTaskQuery;
+import com.yxt.anrui.as.api.asbillsettelapply.flow.app.CompleteSettleDto;
+import com.yxt.anrui.as.api.asbillsettelapply.flow.app.SettleFlowableQuery;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+@Api(tags = "销售单结算申请")
+@RestController("com.yxt.anrui.as.biz.asbillsettelapply.SmsBillSettleApplyRest")
+@RequestMapping("v1/smsSettleaccounts")
+public class SmsBillSettleApplyRest {
+
+    @Autowired
+    private AsBillSettelApplyService asBillSettelApplyService;
+
+
+    @ApiOperation("办理")
+    @PutMapping("/agreeCreditInfo")
+    @ResponseBody
+    ResultBean agreeCreditInfo(@Valid @RequestBody CompleteSettleDto dto) {
+        return asBillSettelApplyService.agreeCreditInfoSms(dto);
+    }
+
+    @ApiOperation("驳回")
+    @PutMapping("/rejectCreditInfo")
+    @ResponseBody
+    ResultBean rejectCreditInfo(@Valid @RequestBody AppSettleTaskQuery query) {
+        return asBillSettelApplyService.rejectCreditInfoSms(query);
+    }
+
+
+    @ApiOperation("撤回")
+    @PutMapping("/recallCreditInfo")
+    @ResponseBody
+    ResultBean recallCreditInfo(@Valid @RequestBody AppSettleTaskQuery query) {
+        return asBillSettelApplyService.recallCreditInfoSms(query);
+    }
+
+
+    @ApiOperation("终止")
+    @PutMapping("/stopCreditInfo")
+    @ResponseBody
+    ResultBean stopCreditInfo(@Valid @RequestBody AppSettleTaskQuery query) {
+        return asBillSettelApplyService.stopCreditInfoSms(query);
+    }
+
+
+    @ApiOperation("获取流程操作标题")
+    @GetMapping("/getFlowOperateTitle")
+    @ResponseBody
+    ResultBean<String> getFlowOperateTitle(@Valid @SpringQueryMap SettleFlowableQuery query) {
+        return asBillSettelApplyService.getFlowOperateTitleSms(query);
+    }
+
+
+    @ApiOperation(value = "加签")
+    @PutMapping(value = "/delegate")
+    @ResponseBody
+    public ResultBean delegate(@RequestBody AppSettleDelegateQuery delegateQuery) {
+        return asBillSettelApplyService.delegate2Sms(delegateQuery);
+    }
+}