diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentInformation.js b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentInformation.js new file mode 100644 index 0000000000..d089cc3731 --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentInformation.js @@ -0,0 +1,38 @@ +import request from '@/utils/request' + +export default { + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/fin/v1/finpayment/listPage', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 保存修改记录 + saveOrUpdate: function(params) { + return request({ + url: '/fin/v1/finpayment/save', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 通过sid查询一条记录 + fetchBySid: function(sid) { + return request({ + url: '/fin/v1/finpayment/fetchDetailsBySid/' + sid, + method: 'get' + }) + }, + // 通过sid删除一条或多条记录 + delBySids: function(data) { + return request({ + url: '/fin/v1/finpayment/delBySids', + method: 'DELETE', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + } +} diff --git a/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js b/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js index 11bbc9a99b..8a70444d61 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js +++ b/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js @@ -124,6 +124,21 @@ const codemenu = [ meta: { title: '付款申请管理', noCache: true } }] }, + // 付款单位信息管理 + { + path: '/anruifinmanagement', + component: Layout, + redirect: '/anruifinmanagement', + meta: { + title: '款项结转申请' + }, + children: [{ + path: '/anruifinmanagement/paymentInformation', + component: () => import('@/views/anruifinmanagement/paymentInformation/paymentInformation.vue'), + name: 'PaymentInformation', + meta: { title: '付款信息管理', noCache: true } + }] + }, { path: '/anruifinmanagement', component: Layout, @@ -213,7 +228,7 @@ const codemenu = [ component: Layout, redirect: '/finginvoiceapply', meta: { - title: '欠款开票申请管理' + title: '欠款领票申请管理' }, children: [{ path: '/anruifinmanagement/finginvoiceapply/arrearscollection', @@ -222,7 +237,7 @@ const codemenu = [ meta: { title: '欠款领票申请管理', noCache: true } }] }, - // 欠款领票申请管理 + // 简易订单可用订金 { path: '/moneycarriedforward', component: Layout, @@ -237,7 +252,7 @@ const codemenu = [ meta: { title: '简易订单可用订金', noCache: true } }] }, - // 欠款领票申请管理 + // 未出库车辆已认款项 { path: '/moneycarriedforward', component: Layout, @@ -252,7 +267,7 @@ const codemenu = [ meta: { title: '未出库车辆已认款项', noCache: true } }] }, - // 欠款领票申请管理 + // 款项结转申请管理 { path: '/moneycarriedforward', component: Layout, diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentInformation/paymentInformation.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentInformation/paymentInformation.vue new file mode 100644 index 0000000000..e6c7031f36 --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentInformation/paymentInformation.vue @@ -0,0 +1,387 @@ + + + + diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java index bcc4c44d2c..44b56c2605 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java @@ -83,6 +83,10 @@ public interface FinKingDeeFeign { @ResponseBody ResultBean saveJRRebatePrepareVoucher(@RequestBody @Valid GeneralVoucher voucher); + @ApiOperation("保存金融贴息差异调整凭证") + @PostMapping("/saveJRAdjustVoucher") + @ResponseBody + ResultBean saveJRAdjustVoucher(@RequestBody @Valid GeneralVoucher voucher); @ApiOperation("保存单车返利核对凭证") @PostMapping("/saveRebateReviewVoucher") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java index ddf5fab785..d9bbea601b 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java @@ -59,6 +59,11 @@ implements FinKingDeeFeign{ return null; } + @Override + public ResultBean saveJRAdjustVoucher(@Valid GeneralVoucher voucher) { + return null; + } + @Override public ResultBean saveRebateReviewVoucher(@Valid GeneralVoucher voucher) { return null; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java index 83193370e3..25c7367741 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java @@ -312,6 +312,48 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { return voucherService.saveVoucher(newVoucher); } + @Override + public ResultBean saveJRAdjustVoucher(@Valid GeneralVoucher voucher) { + ResultBean rb = ResultBean.fireFail(); + Voucher newVoucher = new Voucher(); + List resultDetails = new ArrayList<>(); + if (StringUtils.isNotBlank(voucher.getUseOrgCode())) { + newVoucher.setAccountBook(voucher.getUseOrgCode()); + newVoucher.setVoucherNo(voucher.getUseOrgCode()); + } + if (StringUtils.isNotBlank(voucher.getBussDate())) { + newVoucher.setBussDate(voucher.getBussDate()); + } + List voucherDetails = voucher.getVoucherDetails(); + if (!voucherDetails.isEmpty()) { + for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) { + Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方 + Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方 + dto1.setSummary("客户承担金融贴息差额"); + dto2.setSummary("客户承担金融贴息差额"); + if (voucherDetail.getType().equals("上年")) { + dto1.setSubjectNo("1161.02.19"); + } else if (voucherDetail.getType().equals("本年")) { + dto1.setSubjectNo("1161.01.19"); + } + dto2.setSubjectNo("1133.10.00"); + dto1.setDimensionDept(voucherDetail.getDeptCode()); + dto1.setManufacturer(voucherDetail.getManufacturer()); + dto1.setDimensionCustom(voucherDetail.getCustomerCode()); + dto1.setMaterial(voucherDetail.getMaterial()); + dto2.setDimensionDept(voucherDetail.getDeptCode()); + dto2.setDimensionCustom(voucherDetail.getCustomerCode()); + dto1.setDebit(voucherDetail.getAmount().negate().toString()); + dto2.setDebit(voucherDetail.getAmount().toString()); + resultDetails.add(dto1); + resultDetails.add(dto2); + } + newVoucher.setResultDetails(resultDetails); + } + log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher)); + return voucherService.saveVoucher(newVoucher); + } + @Override public ResultBean saveRebateReviewVoucher(@Valid GeneralVoucher voucher) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/OrgVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/OrgVo.java similarity index 84% rename from anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/OrgVo.java rename to anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/OrgVo.java index 6329c6634c..83c43780ac 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/OrgVo.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/OrgVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.portal.api.sysstafforg; +package com.yxt.anrui.portal.api.sysorganization; import lombok.Data; diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java index 2e97d551d7..805c8205e5 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java @@ -230,4 +230,8 @@ public interface SysOrganizationFeign { @ApiOperation("当前分公司销售专员") ResultBean> selectStaffListByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid); + @GetMapping("/getOrgByPath") + @ResponseBody + @ApiOperation("根据组织全路径查询组织") + ResultBean getOrgByPath(@RequestParam("orgSidPath") String orgSidPath); } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java index c05fdcbe34..13d3897069 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java @@ -236,4 +236,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign { public ResultBean> selectStaffListByUseOrgSid(String useOrgSid) { return null; } + + @Override + public ResultBean getOrgByPath(String orgSidPath) { + return null; + } } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java index ebbce096c8..a3dc63584a 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java @@ -127,8 +127,5 @@ public interface SysStaffOrgFeign { @ApiOperation("根据组织全路径查询当前部门下的所有员工") ResultBean> selAllByOrgSidPath(@RequestParam("orgSidPath") String orgSidPath); - @GetMapping("/getOrgByPath") - @ResponseBody - @ApiOperation("根据组织全路径查询组织") - ResultBean getOrgByPath(@RequestParam("orgSidPath") String orgSidPath); + } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java index 2f5062ccca..094d29637b 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java @@ -1,5 +1,6 @@ package com.yxt.anrui.portal.api.sysstafforg; +import com.yxt.anrui.portal.api.sysorganization.OrgVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -51,7 +52,7 @@ public class SysStaffOrgFeignFallback implements SysStaffOrgFeign { public ResultBean save(SysStaffOrgDto dto){ return ResultBean.fireFail().setMsg("接口anrui_portal/sysstafforg/save无法访问"); } - + @Override public ResultBean update(SysStaffOrgDto dto,String sid){ return ResultBean.fireFail().setMsg("接口anrui_portal/sysstafforg/update无法访问"); @@ -115,11 +116,6 @@ public class SysStaffOrgFeignFallback implements SysStaffOrgFeign { return null; } - @Override - public ResultBean getOrgByPath(String orgSidPath) { - return null; - } - @Override public ResultBean selectAllByStaffSid(String staffSid) { return null; diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java index 36d243e1db..4f502ea096 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.portal.api.sysorganization.*; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo; +import com.yxt.anrui.portal.api.sysorganization.OrgVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.anrui.portal.api.sysuser.SysUser; @@ -505,4 +506,9 @@ public class SysOrganizationRest implements SysOrganizationFeign { List voList = sysOrganizationService.selectStaffListByUseOrgSid(useOrgSid); return rb.success().setData(voList); } + + @Override + public ResultBean getOrgByPath(String orgSidPath) { + return sysOrganizationService.getOrgByPath(orgSidPath); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java index 2265b61478..2e92bb5823 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java @@ -717,7 +717,7 @@ public class SysOrganizationService extends MybatisBaseService selectByOrgCodeAndPsid(String orgCode, String pSid) { - return baseMapper.selectByOrgCodeAndPsid(orgCode,pSid); + return baseMapper.selectByOrgCodeAndPsid(orgCode, pSid); } public List tranOne(String sid) { @@ -728,8 +728,8 @@ public class SysOrganizationService extends MybatisBaseService tranThree(String sid,String deptSid) { - return baseMapper.tranThree(sid,deptSid); + public List tranThree(String sid, String deptSid) { + return baseMapper.tranThree(sid, deptSid); } public List tranfour(String sid) { @@ -749,4 +749,26 @@ public class SysOrganizationService extends MybatisBaseService(); } + + public ResultBean getOrgByPath(String orgSidPath) { + ResultBean rb = ResultBean.fireFail(); + OrgVo orgVo = new OrgVo(); + String[] levels = orgSidPath.split("/"); // 将orgSidPath按'/'分割 + String orgSid = ""; + // 判断层级 + if (levels.length > 3) { + orgSid = levels[2]; // 第三层级的sid + } else { + orgSid = levels[levels.length - 2]; // 倒数第二层级的sid + } + SysOrganization sysOrganization = fetchBySid(orgSid); + orgVo.setUseOrgName(sysOrganization.getName()); + orgVo.setUseOrgSid(sysOrganization.getSid()); + orgVo.setOrgCode(sysOrganization.getOrgCode()); + String lastPart = levels[levels.length - 1]; + sysOrganization = fetchBySid(lastPart); + orgVo.setDeptName(sysOrganization.getName()); + orgVo.setDeptSid(sysOrganization.getSid()); + return rb.success().setData(orgVo); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java index 7988cc6b0d..84d1057e0f 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java @@ -1,5 +1,6 @@ package com.yxt.anrui.portal.biz.sysstafforg; +import com.yxt.anrui.portal.api.sysorganization.OrgVo; import com.yxt.anrui.portal.api.sysstafforg.*; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; @@ -160,8 +161,4 @@ public class SysStaffOrgRest implements SysStaffOrgFeign { return sysStaffOrgService.getPathSidByUserSid(applySid); } - @Override - public ResultBean getOrgByPath(String orgSidPath) { - return sysStaffOrgService.getOrgByPath(orgSidPath); - } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java index 24ddf33dfb..e39027de16 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java @@ -3,6 +3,7 @@ package com.yxt.anrui.portal.biz.sysstafforg; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.portal.api.sysorganization.OrgVo; import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysstafforg.*; import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo; @@ -341,25 +342,5 @@ public class SysStaffOrgService extends MybatisBaseService getOrgByPath(String orgSidPath) { - ResultBean rb = ResultBean.fireFail(); - OrgVo orgVo = new OrgVo(); - String[] levels = orgSidPath.split("/"); // 将orgSidPath按'/'分割 - String orgSid = ""; - // 判断层级 - if (levels.length > 3) { - orgSid = levels[2]; // 第三层级的sid - } else { - orgSid = levels[levels.length - 2]; // 倒数第二层级的sid - } - SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid); - orgVo.setUseOrgName(sysOrganization.getName()); - orgVo.setUseOrgSid(sysOrganization.getSid()); - orgVo.setOrgCode(sysOrganization.getOrgCode()); - String lastPart = orgSidPath.contains("/") ? orgSidPath.substring(orgSidPath.lastIndexOf("/") + 1) : orgSidPath; - sysOrganization = sysOrganizationService.fetchBySid(lastPart); - orgVo.setDeptName(sysOrganization.getName()); - orgVo.setDeptSid(sysOrganization.getSid()); - return rb.success().setData(orgVo); - } + } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/AdjustDetailsListVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/AdjustDetailsListVo.java index 435eb70867..4da284843e 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/AdjustDetailsListVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/AdjustDetailsListVo.java @@ -81,4 +81,7 @@ public class AdjustDetailsListVo { */ private String vinNo; + private String salesOrderSid; // 销售订单sid + private String checkApplySid; // 单车上传核对sid + } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/AdjustVehListVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/AdjustVehListVo.java index c559cfd546..24574cf5cc 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/AdjustVehListVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/AdjustVehListVo.java @@ -47,5 +47,6 @@ public class AdjustVehListVo { @ApiModelProperty("单车返利管理sid") private String rebateSid; // 单车返利管理sid private String salesOrderSid; // 销售订单sid + private String checkApplySid; // 单车上传核对sid } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeign.java index 54ddae8c55..ec605488c5 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeign.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.scm.api.scmfinanceadjustapply; +import com.yxt.anrui.scm.api.scmfinanceadjustapply.app.AppDetailsVo; import com.yxt.anrui.scm.api.scmfinanceadjustapply.flow.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -54,8 +55,8 @@ import java.util.List; */ @Api(tags = "金融贴息差异调整申请") @FeignClient( - contextId = "scm-ScmFinanceAdjustApply", - name = "scm", + contextId = "anrui-scm-ScmFinanceAdjustApply", + name = "anrui-scm", path = "v1/scmfinanceadjustapply", fallback = ScmFinanceAdjustApplyFeignFallback.class) public interface ScmFinanceAdjustApplyFeign { @@ -135,4 +136,20 @@ public interface ScmFinanceAdjustApplyFeign { @ApiOperation(value = "加签") @PostMapping(value = "/delegate") public ResultBean delegate(@RequestBody AdjustDelegateQuery distributorDelegateQuery); + + @ApiOperation(value = "转办") + @PutMapping(value = "/assignTask") + @ResponseBody + public ResultBean assignTask(@RequestBody AdjustDelegateQuery query); + + + + //----------------------------- app ---------------------------------- + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/getAppDetails/{sid}") + @ResponseBody + public ResultBean getAppDetails(@PathVariable("sid") String sid); + + } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeignFallback.java index acc9f84136..91a68808cb 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeignFallback.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.scm.api.scmfinanceadjustapply; +import com.yxt.anrui.scm.api.scmfinanceadjustapply.app.AppDetailsVo; import com.yxt.anrui.scm.api.scmfinanceadjustapply.flow.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -131,4 +132,14 @@ public class ScmFinanceAdjustApplyFeignFallback implements ScmFinanceAdjustApply public ResultBean delegate(AdjustDelegateQuery distributorDelegateQuery) { return null; } + + @Override + public ResultBean assignTask(AdjustDelegateQuery query) { + return null; + } + + @Override + public ResultBean getAppDetails(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppDetailsVo.java new file mode 100644 index 0000000000..d8fe46c4aa --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppDetailsVo.java @@ -0,0 +1,78 @@ +package com.yxt.anrui.scm.api.scmfinanceadjustapply.app; + +import lombok.Data; + +import java.util.List; + +@Data +public class AppDetailsVo { + + private String sid; + /** + * 调整方式 + */ + private String adjustWay; + /** + * 申请编号 + */ + private String billNo; + /** + * 申请人姓名 + */ + private String createByName; + /** + * 申请日期 + */ + private String createTime; + /** + * 附件 + */ + private List files; + /** + * 明细列表 + */ + private List list; + private String procInsId; + /** + * 分公司-部门 + */ + private String publishInfo; + /** + * 备注 + */ + private String remarks; + /** + * 销售经理 + */ + private String salesManage; + /** + * 销售专员 + */ + private String staffName; + private String taskId; + /** + * 差额 + */ + private String adjustmentMoneyTotal; + /** + * 已调整金额 + */ + private String alreadyMoneyTotal; + /** + * 订单贴息金额 + */ + private String estimateRebateTotal; + /** + * 本次调整金额 + */ + private String nowAdjustmentMoneyTotal; + /** + * 当前差额 + */ + private String nowDiffAmountTotal; + /** + * 上传贴息金额 + */ + private String uploadMoneyTotal; + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppListVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppListVo.java new file mode 100644 index 0000000000..214f4d0c78 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppListVo.java @@ -0,0 +1,64 @@ +package com.yxt.anrui.scm.api.scmfinanceadjustapply.app; + +import lombok.Data; + +@Data +public class AppListVo { + + + /** + * 差额 + */ + private String adjustmentMoney; + /** + * 已调整金额 + */ + private String alreadyMoney; + /** + * 品牌 + */ + private String brandName; + /** + * 合同号 + */ + private String contractNo; + /** + * 客户 + */ + private String customerName; + /** + * 订单贴息金额 + */ + private String estimateRebate; + /** + * 本次调整金额 + */ + private String nowAdjustmentMoney; + /** + * 当前差额 + */ + private String nowDiffAmount; + + /** + * 采购系统名称 + */ + private String purchaseSystemName; + /** + * 调整说明 + */ + private String remarks; + /** + * 上传贴息金额 + */ + private String uploadMoney; + /** + * 车型 + */ + private String vehModelName; + /** + * 车架号 + */ + private String vinNo; + + private String salesOrderSid; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustdetails/ScmFinanceAdjustDetails.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustdetails/ScmFinanceAdjustDetails.java index cc84e7c207..bae822fdba 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustdetails/ScmFinanceAdjustDetails.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustdetails/ScmFinanceAdjustDetails.java @@ -91,5 +91,6 @@ public class ScmFinanceAdjustDetails extends BaseEntity { @ApiModelProperty("单车返利管理sid") private String rebateSid; // 单车返利管理sid private String salesOrderSid; // 销售订单sid + private String checkApplySid; // 单车上传核对sid } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustdetails/ScmFinanceAdjustDetailsFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustdetails/ScmFinanceAdjustDetailsFeign.java index 4ddc615eb2..1d3ca25520 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustdetails/ScmFinanceAdjustDetailsFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustdetails/ScmFinanceAdjustDetailsFeign.java @@ -25,16 +25,14 @@ *********************************************************/ package com.yxt.anrui.scm.api.scmfinanceadjustdetails; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * Project: scm(金融贴息)
* File: ScmFinanceAdjustDetailsFeign.java
@@ -50,8 +48,8 @@ import java.util.List; */ @Api(tags = "金融贴息差异金额调整明细表") @FeignClient( - contextId = "scm-ScmFinanceAdjustDetails", - name = "scm", + contextId = "anrui-scm-ScmFinanceAdjustDetails", + name = "anrui-scm", path = "v1/scmfinanceadjustdetails", fallback = ScmFinanceAdjustDetailsFeignFallback.class) public interface ScmFinanceAdjustDetailsFeign { diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyMapper.xml index 66c95757a8..d503b9522e 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyMapper.xml @@ -50,6 +50,7 @@ END AS `state` FROM (SELECT + a.sid as checkApplySid, d.vehRebateSid as rebateSid, a.useOrgSid, d.purchaseSystemSid, @@ -73,7 +74,7 @@ LEFT JOIN scm_vehrebate_checkapply as a ON d.mainSid = a.sid LEFT JOIN scm_veh_rebate as r ON d.vehRebateSid = r.sid WHERE r.adjustmentMoney < 0 AND a.nodeState = '已办结' AND d.rebateTypeValue = '金融贴息') as n - INNER JOIN anrui_buscenter.bus_sales_order as bo ON n.orderSid = bo.sid + LEFT JOIN anrui_buscenter.bus_sales_order as bo ON n.orderSid = bo.sid ${ew.sqlSegment}