From 7f2257bc2fd1d19e834f652d33ef80251da9ac8b Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Wed, 11 Dec 2024 08:40:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=88=A9=E5=87=AD=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fin/biz/kingdee/voucher/data_FEntity.json | 6 + .../scm/api/scmvehrebate/ScmVehRebate.java | 8 ++ .../ScmVehRebateWithApplyService.java | 10 ++ .../AsBillSettelApplyDetailsVo.java | 2 +- .../AsBillSettelApplyService.java | 109 ++++++++++++++++++ .../SmsBillSettleApplyRest.java | 71 ++++++++++++ 6 files changed, 205 insertions(+), 1 deletion(-) create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/SmsBillSettleApplyRest.java diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_FEntity.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_FEntity.json index 810ef2973b..954f8d85b9 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_FEntity.json +++ b/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" } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java index 08627f6519..5eddf70577 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java +++ b/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; + + + + } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java index 0fa3a943af..9c59a6e3fd 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java +++ b/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 beanToMap) { diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/AsBillSettelApplyDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/AsBillSettelApplyDetailsVo.java index d6e179d15d..916bc6a15b 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/AsBillSettelApplyDetailsVo.java +++ b/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; /** diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java index 3ef032f14e..e35733fed4 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java @@ -457,6 +457,7 @@ public class AsBillSettelApplyService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean 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 getFlowOperateTitleSms(SettleFlowableQuery query) { + ResultBean rb = ResultBean.fireFail(); + //0 上一环节 1下一环节 + int next = query.getNext(); + SettleNodeQuery getNodeQuery = new + SettleNodeQuery(); + BeanUtil.copyProperties(query, getNodeQuery); + String data = ""; + if (next == 0) { + ResultBean> 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> 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(); //新增初始化 diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/SmsBillSettleApplyRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/SmsBillSettleApplyRest.java new file mode 100644 index 0000000000..3ed503269a --- /dev/null +++ b/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 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); + } +}