From 0baa148746c4ed17679019a10a42e07db9f40dc7 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 3 Mar 2023 16:16:55 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/busvehicleapply/BusVehicleApplyService.java | 6 ++++++ .../biz/commoncontract/CommonContractService.java | 4 ++-- .../FinCollectionConfirmationDto.java | 2 ++ .../FinSelectedReceivablesDetailedDto.java | 3 +++ .../FinCollectionConfirmationRest.java | 3 ++- .../anrui/flowable/api/flow/FlowableFallback.java | 5 +++++ .../yxt/anrui/flowable/api/flow/FlowableFeign.java | 5 +++++ .../yxt/anrui/flowable/biz/flow/FlowableRest.java | 13 +++++++++++++ .../portal/biz/sysstaffinfo/SysStaffinfoMapper.xml | 2 +- .../yxt/anrui/portal/biz/sysuser/SysUserMapper.xml | 3 ++- .../vehicleApply/ShareVehicleApplyQuery.java | 2 ++ .../vehicleApply/VehicleApplyService.java | 12 ++++++++---- 12 files changed, 51 insertions(+), 9 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index 9288db77e0..8243392dab 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -1012,6 +1012,12 @@ public class BusVehicleApplyService extends MybatisBaseService> flowResultBean = flowableFeign.selectFlow(taskId); + if(flowResultBean.getData() != null){ + mfq.setModuleName(flowResultBean.getData().get("NAME_")); + mfq.setMsgTitle(flowResultBean.getData().get("NAME_")); + } ResultBean stringResultBean = messageFeign.pushMessageShare(mfq); log.info("分享成功-resultBean:{}", resultBean); if (!resultBean.getSuccess()) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 0b639150ee..ae1f74b945 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -1603,13 +1603,13 @@ public class CommonContractService extends MybatisBaseService finSelectedReceivablesDetaileds; // 已选应收款项明细 @ApiModelProperty("打款凭证附件") private List paymentVoucherAppendixs; // 打款凭证附件 diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java index 1fa7aff5dc..2a8aa4bba0 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java @@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; + /** * Project: anrui-fin(销售相关)
* File: FinSelectedReceivablesDetailedDto.java
@@ -73,6 +75,7 @@ public class FinSelectedReceivablesDetailedDto implements Dto { /* @ApiModelProperty("上次认款金额") private String lastSubscriptionMoney; // 上次认款金额*/ @ApiModelProperty("认款金额") + @NotBlank(message = "认款金额不能为空") private String subscriptionMoney; // 认款金额 @ApiModelProperty("认款申请日期") private String subscriptionDate; // 认款申请日期 diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java index de5a0c484a..087e7e682a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java @@ -40,6 +40,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; import java.util.List; /** @@ -82,7 +83,7 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF @Override @ApiOperation("提交新增保存") @PostMapping("/save") - public ResultBean save(@RequestBody FinCollectionConfirmationDto dto) { + public ResultBean save(@Valid @RequestBody FinCollectionConfirmationDto dto) { return finCollectionConfirmationService.saveAllDto(dto); } diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java index f0a644a648..6496943813 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java @@ -86,5 +86,10 @@ public class FlowableFallback implements FlowableFeign { return null; } + @Override + public ResultBean> selectFlow(String id) { + return null; + } + } diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java index d9582b1c5c..b6bae4ba9e 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java @@ -131,4 +131,9 @@ public interface FlowableFeign { @GetMapping(value = "/selectFlowVaributes") @ResponseBody ResultBean> selectFlowVaributes(@RequestParam("taskId")String taskId); + + @ApiOperation(value = "查询流程的信息") + @GetMapping(value = "/selectFlow") + @ResponseBody + ResultBean> selectFlow(@RequestParam("id")String id); } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index 96abf66f10..0d799834e8 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -605,4 +605,17 @@ public class FlowableRest implements FlowableFeign { Map processVariables = historicTaskInstance.getProcessVariables(); return rb.success().setData(processVariables); } + + @Override + public ResultBean> selectFlow(String taskId) { + ResultBean> rb = ResultBean.fireFail(); + HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery() + .includeProcessVariables().taskId(taskId).singleResult(); + Map process = processService.getProcessDefByDefId(historicTaskInstance.getProcessDefinitionId()); + log.info("分享-process:{}", process); + if (process == null) { + log.info("分享-process:{}", process); + } + return rb.success().setData(process); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml index 3eb322cd48..4dcbb28624 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml @@ -69,7 +69,7 @@ INNER JOIN sys_staffinfo staff ON org.staffSid = staff.sid LEFT JOIN sys_user user ON staff.sid = user.staffSid - WHERE org.orgSid = #{sid} + WHERE org.orgSid = #{sid} and staff.personTypeKey != '01' \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/ShareVehicleApplyQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/ShareVehicleApplyQuery.java index 4a0c62fe4b..be0b9ad151 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/ShareVehicleApplyQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/ShareVehicleApplyQuery.java @@ -20,4 +20,6 @@ public class ShareVehicleApplyQuery implements Query { private List members; @ApiModelProperty("部门") private List groups; + + private String userSid; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java index abf4eb94ae..0d14863555 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java @@ -3,6 +3,7 @@ package com.yxt.anrui.terminal.biz.supplychain.vehicleApply; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONObject; import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign; +import com.yxt.anrui.base.api.busvehicleapply.ShareBusVehicleApplyQuery; import com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplySzVo; import com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplyVo; import com.yxt.anrui.base.api.busvehicleapply.flow.BusVehicleApplyCompleteDto; @@ -13,7 +14,6 @@ import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo; import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; -import com.yxt.anrui.portal.api.sysuser.ShareUserQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.terminal.api.supplychain.vehicleApply.*; @@ -176,8 +176,12 @@ public class VehicleApplyService { public ResultBean shareMessage(ShareVehicleApplyQuery shareQuery) { ResultBean rb = ResultBean.fireFail(); - - - return null; + ShareBusVehicleApplyQuery shareBusVehicleApplyQuery = new ShareBusVehicleApplyQuery(); + BeanUtil.copyProperties(shareQuery,shareBusVehicleApplyQuery); + ResultBean resultBean = busVehicleApplyFeign.shareBusVehicleApply(shareBusVehicleApplyQuery); + if(!resultBean.getSuccess()){ + return rb.setMsg(resultBean.getMsg()); + } + return rb.success(); } } From 6acc95bb73421739d16771c70ebdd48799de0dc5 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 3 Mar 2023 17:40:58 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/portal/api/sysuser/SysUserVo.java | 2 ++ anrui-portal/anrui-portal-biz/pom.xml | 12 +++++++++++- .../yxt/anrui/portal/biz/sysuser/SysUserService.java | 12 ++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java index d28bcb9219..026a03663b 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java @@ -88,6 +88,8 @@ public class SysUserVo implements Vo { @ApiModelProperty("默认的组织机构名称全路径") private String defaultOrgPathName; + private String defaultDeptName; + @ApiModelProperty("是否需要更换密码") private Boolean needResetPsd; @ApiModelProperty("工号") diff --git a/anrui-portal/anrui-portal-biz/pom.xml b/anrui-portal/anrui-portal-biz/pom.xml index e043d17f45..5824406c84 100644 --- a/anrui-portal/anrui-portal-biz/pom.xml +++ b/anrui-portal/anrui-portal-biz/pom.xml @@ -2,11 +2,16 @@ - + + + com.yxt.anrui + anrui-portal + 0.0.1 4.0.0 @@ -41,6 +46,11 @@ com.yxt.anrui.scm 0.0.1-SNAPSHOT + + anrui-base-api + com.yxt.anrui + 0.0.1-SNAPSHOT + anrui-crm-api com.yxt.anrui diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index 1064310099..949404048b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -389,6 +389,7 @@ public class SysUserService extends MybatisBaseService { SysUserDefaultOrg sysUserDefaultOrg = sysUserDefaultOrgService.selectByUserSid(user.getSid()); if (sysUserDefaultOrg == null) { String orgNamePath = ""; + String defaultDeptName = ""; userInfoOneVo.setDefaultOrgPath(sysStaffOrg.getOrgSidPath()); if (StringUtils.isNotBlank(sysStaffOrg.getOrgSidPath())) { List split = Arrays.asList(sysStaffOrg.getOrgSidPath().split("/")); @@ -397,13 +398,16 @@ public class SysUserService extends MybatisBaseService { SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(split.size() - 2)); SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(split.get(split.size() - 1)); orgNamePath = sysOrganization.getName() + "/" + sysOrganization1.getName(); + defaultDeptName = sysOrganization1.getName(); } else { SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(0)); orgNamePath = sysOrganization.getName(); + defaultDeptName = sysOrganization.getName(); } } // userInfoOneVo.setDefaultOrgPathName(sysStaffOrg.getOrgNamePath()); userInfoOneVo.setDefaultOrgPathName(orgNamePath); + userInfoOneVo.setDefaultDeptName(defaultDeptName); } else { String orgNamePath = ""; List sysStaffOrgVos = sysStaffOrgService.selectByStaffS(user.getStaffSid()); @@ -413,6 +417,7 @@ public class SysUserService extends MybatisBaseService { sysUserDefaultOrgService.deleteByUserSid(user.getSid()); } userInfoOneVo.setDefaultOrgPath(sysUserDefaultOrg.getOrgSidPath()); + String defaultDeptName = ""; if (StringUtils.isNotBlank(sysUserDefaultOrg.getOrgSidPath())) { List split = Arrays.asList(sysUserDefaultOrg.getOrgSidPath().split("/")); if (split.size() > 1) { @@ -420,12 +425,15 @@ public class SysUserService extends MybatisBaseService { SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(split.size() - 2)); SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(split.get(split.size() - 1)); orgNamePath = sysOrganization.getName() + "/" + sysOrganization1.getName(); + defaultDeptName = sysOrganization1.getName(); } else { SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(0)); orgNamePath = sysOrganization.getName(); + defaultDeptName = sysOrganization.getName(); } } userInfoOneVo.setDefaultOrgPathName(orgNamePath); + userInfoOneVo.setDefaultDeptName(defaultDeptName); } } } @@ -443,6 +451,7 @@ public class SysUserService extends MybatisBaseService { orgList1.setOrgPath(vv.getOrgSidPath()); orgList1.setOrgName(vv.getOrgNamePath()); String orgName = ""; + String deptName = ""; if (StringUtils.isNotBlank(vv.getOrgSidPath())) { List split = Arrays.asList(vv.getOrgSidPath().split("/")); if(split.size()>1){ @@ -450,9 +459,11 @@ public class SysUserService extends MybatisBaseService { SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(split.size()-2)); SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(split.get(split.size()-1)); orgName = sysOrganization.getName()+"/"+sysOrganization1.getName(); + deptName = sysOrganization1.getName(); }else{ SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(0)); orgName = sysOrganization.getName(); + deptName = sysOrganization.getName(); } /*String[] split = vv.getOrgSidPath().split("/"); for (int i = 0; i < split.length; i++) { @@ -469,6 +480,7 @@ public class SysUserService extends MybatisBaseService { } }*/ orgList1.setOrgName(orgName); + orgList1.setDeptName(deptName); } orgList.add(orgList1); } From 2f3a84b14df92dfdccb5356bd40ccd389afc168d Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 3 Mar 2023 17:41:46 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java index 39509c80fe..b7e65fb53d 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java @@ -14,4 +14,6 @@ public class OrgList implements Vo { private String orgName; private String orgPath; + + private String deptName; } From a3038a51185abfe4eca855003746ed793d26def0 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 3 Mar 2023 18:02:14 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-portal/anrui-portal-biz/pom.xml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/anrui-portal/anrui-portal-biz/pom.xml b/anrui-portal/anrui-portal-biz/pom.xml index 5824406c84..d0a1caa733 100644 --- a/anrui-portal/anrui-portal-biz/pom.xml +++ b/anrui-portal/anrui-portal-biz/pom.xml @@ -2,17 +2,13 @@ - - - com.yxt.anrui - anrui-portal - 0.0.1 + 4.0.0 anrui-portal-biz From 154bc9bba9ab41897e21e4e5046f4390a2ef1720 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Sat, 4 Mar 2023 14:04:09 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/biz/busvehicleapply/BusVehicleApplyService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index 8243392dab..71b635a5f8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -1018,6 +1018,12 @@ public class BusVehicleApplyService extends MybatisBaseService stringResultBean = messageFeign.pushMessageShare(mfq); log.info("分享成功-resultBean:{}", resultBean); if (!resultBean.getSuccess()) { From d3a4f243ab71db944598a8667e7c5f336fccccbb Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 6 Mar 2023 11:18:37 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E9=94=80=E5=94=AE=E6=94=AF=E6=8C=81=E9=83=A8=E7=BB=8F=E7=90=86?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=90=8E=EF=BC=8C=E7=94=9F=E6=88=90=E5=90=88?= =?UTF-8?q?=E5=90=8C=E6=95=B0=E6=8D=AE=E5=92=8C=E5=BA=94=E6=94=B6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commoncontract/CommonContractFeign.java | 10 + .../CommonContractFeignFallback.java | 10 + .../commoncontract/CommonContractRest.java | 10 + .../commoncontract/CommonContractService.java | 48 +++- .../api/bussalesorder/OrderContractQuery.java | 19 ++ anrui-buscenter/anrui-buscenter-biz/pom.xml | 6 +- .../anrui/buscenter/BusCenterApplication.java | 2 +- .../bussalesorder/BusSalesOrderService.java | 205 ++++++++++++++++++ 8 files changed, 307 insertions(+), 3 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/OrderContractQuery.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java index c37dcb8494..653e4f90e3 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java @@ -224,4 +224,14 @@ public interface CommonContractFeign { @GetMapping("/getToDoNum") @ResponseBody public ResultBean getToDoNum(@SpringQueryMap CommonToDoNumQuery appToDoNumQuery); + + @ApiOperation("查询合同编号") + @GetMapping("/selectContractNo") + @ResponseBody + ResultBean selectContractNo(@RequestParam("userSid")String userSid,@RequestParam("modelSid")String modelSid); + + @ApiOperation("生成合同") + @PostMapping("/saveContract") + @ResponseBody + ResultBean saveContract(@RequestBody CommonContract commonContract); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java index d5ae8db70f..ddcddc9b6b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java @@ -237,4 +237,14 @@ public class CommonContractFeignFallback implements CommonContractFeign { public ResultBean getToDoNum(CommonToDoNumQuery appToDoNumQuery) { return null; } + + @Override + public ResultBean selectContractNo(String userSid, String modelSid) { + return null; + } + + @Override + public ResultBean saveContract(CommonContract commonContract) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java index eb88c65af5..a1b55141a3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java @@ -603,4 +603,14 @@ public class CommonContractRest implements CommonContractFeign { public ResultBean getToDoNum(CommonToDoNumQuery appToDoNumQuery) { return commonContractService.getToDoNum(appToDoNumQuery); } + + @Override + public ResultBean selectContractNo(String userSid, String modelSid) { + return commonContractService.selectContractNo(userSid,modelSid); + } + + @Override + public ResultBean saveContract(CommonContract commonContract) { + return commonContractService.saveContract(commonContract); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index ae1f74b945..1657d5a98d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -1891,7 +1891,6 @@ public class CommonContractService extends MybatisBaseService 0) { + //添加合同下载路径 + for (PrintConfirmVo vo : list) { + String str = vo.getDownloadUrl(); + String urlPrefix = docPdfComponent.getPrefixTemplateUrl(); + String uploadPath = docPdfComponent.getUploadTemplateUrl(); + CommonAppendix commonAppendix = new CommonAppendix(); + commonAppendix.setLinkSid(commonContract.getSid()); + commonAppendix.setAttachType(CommonAttachTypeEnum.CONTRACT_UPLOAD.getAttachType()); + String pathLoc = str.replace(urlPrefix, uploadPath); + pathLoc = pathLoc.replace("/", File.separator); + File file = new File(pathLoc); + String size = ""; + if (file != null) { + size = FileUploadComponent.getPrintSize(file.length()); + } + String suffix = str.substring(str.lastIndexOf(".") + 1); // 文件类型 + String fileName = str.substring(str.lastIndexOf("/") + 1, str.lastIndexOf(".")); // 文件名 + commonAppendix.setFileName(vo.getName()); + commonAppendix.setFileType(suffix); + commonAppendix.setFileSize(size); + commonAppendix.setFilePath(str.replace(urlPrefix, "")); + commonAppendix.setRemarks("合同下载"); + commonAppendixService.insert(commonAppendix); + } + } + + } if("2".equals(appOrderDetailsVo.getPayTypeKey())){ return rb.setMsg("贷款合同附件请线下处理").setCode("1000001"); @@ -2564,4 +2598,16 @@ public class CommonContractService extends MybatisBaseService selectContractNo(String userSid, String modelSid) { + ResultBean rb = ResultBean.fireFail(); + String contractNo = getApplyCode(userSid,modelSid); + return rb.success().setData(contractNo); + } + + public ResultBean saveContract(CommonContract commonContract) { + ResultBean rb = ResultBean.fireFail(); + baseMapper.insert(commonContract); + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/OrderContractQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/OrderContractQuery.java new file mode 100644 index 0000000000..0c719e01a7 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/OrderContractQuery.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.buscenter.api.bussalesorder; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2023/3/6 9:10 + * @Description + */ +@Data +public class OrderContractQuery implements Query { + private static final long serialVersionUID = -424321487107885097L; + @ApiModelProperty("销售订单sid") + private String sid; + @ApiModelProperty("用户sid") + private String userSid; +} diff --git a/anrui-buscenter/anrui-buscenter-biz/pom.xml b/anrui-buscenter/anrui-buscenter-biz/pom.xml index 49e6827af7..1dc37c9f20 100644 --- a/anrui-buscenter/anrui-buscenter-biz/pom.xml +++ b/anrui-buscenter/anrui-buscenter-biz/pom.xml @@ -61,6 +61,11 @@ anrui-fin-api 0.0.1-SNAPSHOT + + anrui-scm-api + com.yxt.anrui.scm + 0.0.1-SNAPSHOT + mysql @@ -134,7 +139,6 @@ true - diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/BusCenterApplication.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/BusCenterApplication.java index 3b6f2b253e..7b47105bd4 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/BusCenterApplication.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/BusCenterApplication.java @@ -16,7 +16,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; }) @EnableScheduling @EnableDiscoveryClient -@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.messagecenter","com.yxt.anrui.fin"}) +@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.messagecenter","com.yxt.anrui.fin","com.yxt.anrui.scm"}) public class BusCenterApplication { public static void main(String[] args) { diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 8c3d14518a..e3f9660c8d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -55,6 +55,7 @@ import com.yxt.anrui.base.api.commoncontract.CommonContractBuscenterVo; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractVo; import com.yxt.anrui.base.common.enums.BillTypeEnum; +import com.yxt.anrui.base.common.enums.CommonContractEnum; import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; import com.yxt.anrui.base.common.utils.Rule; @@ -117,6 +118,8 @@ import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; import com.yxt.anrui.crm.api.crmvehicledemand.CrmOrderVo; import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicleDemandOrderVo; import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandFeign; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.UnCollectionDto; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; @@ -135,6 +138,8 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; import com.yxt.anrui.portal.config.DictCommonType; +import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; +import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.DateUtils; @@ -242,6 +247,10 @@ public class BusSalesOrderService extends MybatisBaseService resultBean = getSaleOrderDetails(sid); + AppOrderDetailsVo appOrderDetailsVo = resultBean.getData(); + //查询销售订单的车型信息 + AppOrderModelInfoVo appOrderModelInfoVo = appOrderDetailsVo.getModelInfo(); + AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo(); + AppOrderDepositInfoVo depositInfo = appOrderDetailsVo.getDepositInfo(); + String modelSid = appOrderModelInfoVo.getModelSid(); + String finalContractNo = commonContractFeign.selectContractNo(userSid,modelSid).getData(); + //甲方 + String createOrgName = appOrderDetailsVo.getSalesOrg(); + //乙方 + String customerName = appOrderDetailsVo.getName(); + //联系电话 + String mobile = appOrderDetailsVo.getPhone(); + //车辆交付地点 + //根据存放地点查询 + ScmWarehouseVo scmWarehouseVo = scmWarehouseFeign.fetchBySid(priceInfo.getPlannedPickUpLocationKey()).getData(); + String finalAddress = ""; + if(scmWarehouseVo != null){ + finalAddress = scmWarehouseVo.getWarehouseAttribute(); + } + String depositTotal = depositInfo.getDepositTotal(); + //查询台数 + String num = priceInfo.getNumber(); + //单台成交价 + String transactionPrice = priceInfo.getSingleFinalPrice(); + //新增合同信息 + CommonContract commonContract = new CommonContract(); + //合同编号 + commonContract.setContractNo(finalContractNo); + //合同类型 + if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(appOrderDetailsVo.getOrderType())) { + commonContract.setContractTypeKey(CommonContractEnum.contractType.XC_CONTRACT.getCode()); + commonContract.setContractType(CommonContractEnum.contractType.XC_CONTRACT.getRemarks()); + } else { + commonContract.setContractTypeKey(CommonContractEnum.contractType.DC_CONTRACT.getCode()); + commonContract.setContractType(CommonContractEnum.contractType.DC_CONTRACT.getRemarks()); + } + //客户sid + commonContract.setCustomerSid(appOrderDetailsVo.getCustomerSid()); + //业务员sid、业务员 + commonContract.setStaffSid(appOrderDetailsVo.getStaffSid()); + commonContract.setCreateBySid(appOrderDetailsVo.getUserSid()); + commonContract.setStaffName(appOrderDetailsVo.getSellerName()); + //部门sid + commonContract.setOrgSid(appOrderDetailsVo.getOrgSid()); + //业务表sid + commonContract.setBusSid(sid); + //甲方名称、乙方名称、其他方名称、 + commonContract.setPartyA(createOrgName); + commonContract.setPartyB(customerName); + //签订日期、签订地点 + commonContract.setCreateDate(new Date()); + commonContract.setAddress(finalAddress); + //订金 + commonContract.setDeposit(new BigDecimal(depositTotal)); + //合同金额 + commonContract.setContractAmount(appOrderDetailsVo.getPriceInfo().getTotalPrice()); + //合同附件 + //身份证信息附件 + //车型sid + commonContract.setModelSid(appOrderModelInfoVo.getModelSid()); + //车型名称 + commonContract.setModelName(appOrderModelInfoVo.getModelName()); + commonContract.setConfigSid(appOrderModelInfoVo.getConfigSid()); + //车辆台数 + commonContract.setNum(Integer.valueOf(num).intValue()); + //车辆单价 + commonContract.setPrice(new BigDecimal(transactionPrice)); + //单台订金 + commonContract.setOneDeposit(new BigDecimal(depositInfo.getDeposit())); + commonContract.setCustomerType(appOrderDetailsVo.getCustomerType()); + commonContract.setCustomerTypeKey(appOrderDetailsVo.getCustomerKey()); + commonContractFeign.saveContract(commonContract); + baseMapper.updateContractNoBySid(commonContract.getContractNo(),sid); + saveFinSelect(appOrderDetailsVo,commonContract,userSid); + } + + public void saveFinSelect(AppOrderDetailsVo appOrderDetailsVo,CommonContract commonContract,String userSid){ + AppOrderModelInfoVo appOrderModelInfoVo = appOrderDetailsVo.getModelInfo(); + AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo(); + AppOrderDepositInfoVo depositInfo = appOrderDetailsVo.getDepositInfo(); + //查询销售订单的单台订金与单台成交价是否相等，若不相等，则推送车款为成交价减去订金的，推送订金的为单台订金的 + String singleFinalPrice = priceInfo.getSingleFinalPrice(); + String deposit = depositInfo.getDeposit(); + //查询台数 + String num = priceInfo.getNumber(); + //单台成交价 + String transactionPrice = priceInfo.getSingleFinalPrice(); + //单台成交价与单台订金相等 + if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款 + String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).toString(); + List vinList = appOrderModelInfoVo.getVinListsVos(); + for (int i = 0; i < vinList.size(); i++) { + UnCollectionDto unCollectionDto = new UnCollectionDto(); + //合同sid + unCollectionDto.setContractSid(commonContract.getSid()); + //合同编号 + unCollectionDto.setContractNo(commonContract.getContractNo()); + //客户名称 + unCollectionDto.setCustomerName(appOrderDetailsVo.getName()); + //客户sid + unCollectionDto.setCustomerSid(appOrderDetailsVo.getCustomerSid()); + //客户类型 + unCollectionDto.setCustomerClass(appOrderDetailsVo.getCustomerKey()); + //客户类型 + unCollectionDto.setCustomerClassKey(appOrderDetailsVo.getCustomerType()); + //客户头像 + unCollectionDto.setCustomerImage(appOrderDetailsVo.getCustomerImage()); + unCollectionDto.setReceivablesName("车款"); + unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone()); + unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid()); + unCollectionDto.setVinNo(vinList.get(i).getVinNo()); + unCollectionDto.setCurrentReceivableMoney(money); + unCollectionDto.setUserSid(userSid); + unCollectionDto.setReveivableMoney(money); + unCollectionDto.setBusVinSid(vinList.get(i).getSid()); + unCollectionDto.setPayType(appOrderDetailsVo.getPayType()); + unCollectionDto.setPayTypeKey(appOrderDetailsVo.getPayTypeKey()); + unCollectionDto.setPurchaseSystemName(appOrderDetailsVo.getPurchaseSystemName()); + unCollectionDto.setPurchaseSystemSid(appOrderDetailsVo.getPurchaseSystemSid()); + finUncollectedDetailedFeign.saveUnCollection(unCollectionDto); + } + } + //添加推送至款项确认的应收未收明细中 + List vinList = appOrderModelInfoVo.getVinListsVos(); + //更新销售订单的临时号 + if("2".equals(appOrderDetailsVo.getPayTypeKey())){//贷款 + for(int i = 0; i < vinList.size(); i++){ + //销售订单中车辆表的sid + String salesOrderVinSid = vinList.get(i).getSid(); + String temporaryNum = String.format("%02d", i + 1); + String temporaryNo = commonContract.getContractNo()+temporaryNum; + //更新临时号 + ResultBean busSalesOrderResultBean = busSalesOrderVehicleService.updateTemporaryNo(salesOrderVinSid,temporaryNo); + } + } + //查询是否是结转金额，如果是，则订金金额为补交金额/台数。若为现金则为单台订金 + String key = depositInfo.getDepositTypeKey(); + BigDecimal bigDecimalKeyAll = new BigDecimal("0"); + if ("02".equals(key)) { + String makeUpAll = depositInfo.getMakeUpDeposit(); + if (makeUpAll != null) { + bigDecimalKeyAll = bigDecimalKeyAll.add(new BigDecimal(makeUpAll).divide(new BigDecimal(num))); + } + } else { + bigDecimalKeyAll = bigDecimalKeyAll.add(new BigDecimal(depositInfo.getDeposit())); + } + if (bigDecimalKeyAll.compareTo(BigDecimal.ZERO) != 0) { + for (int i = 0; i < vinList.size(); i++) { + UnCollectionDto unCollectionDto = new UnCollectionDto(); + //合同sid + unCollectionDto.setContractSid(commonContract.getSid()); + //合同编号 + unCollectionDto.setContractNo(commonContract.getContractNo()); + //客户名称 + unCollectionDto.setCustomerName(appOrderDetailsVo.getName()); + //客户sid + unCollectionDto.setCustomerSid(appOrderDetailsVo.getCustomerSid()); + //客户类型 + unCollectionDto.setCustomerClass(appOrderDetailsVo.getCustomerKey()); + //客户类型 + unCollectionDto.setCustomerClassKey(appOrderDetailsVo.getCustomerType()); + //客户头像 + unCollectionDto.setCustomerImage(appOrderDetailsVo.getCustomerImage()); + unCollectionDto.setReceivablesName("订金"); + unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone()); + unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid()); + unCollectionDto.setVinNo(vinList.get(i).getVinNo()); + unCollectionDto.setCurrentReceivableMoney(bigDecimalKeyAll.toString()); + unCollectionDto.setUserSid(userSid); + unCollectionDto.setReveivableMoney(depositInfo.getDeposit()); + unCollectionDto.setBusVinSid(vinList.get(i).getSid()); + unCollectionDto.setPayType(appOrderDetailsVo.getPayType()); + unCollectionDto.setPayTypeKey(appOrderDetailsVo.getPayTypeKey()); + unCollectionDto.setPurchaseSystemName(appOrderDetailsVo.getPurchaseSystemName()); + unCollectionDto.setPurchaseSystemSid(appOrderDetailsVo.getPurchaseSystemSid()); + finUncollectedDetailedFeign.saveUnCollection(unCollectionDto); + } + } + } + /** * 办理 * @@ -3250,6 +3444,7 @@ public class BusSalesOrderService extends MybatisBaseService Date: Mon, 6 Mar 2023 11:46:31 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/api/basetrailer/BaseTrailer.java | 2 + .../base/api/basetrailer/BaseTrailerDto.java | 4 + .../api/basevehinstall/BaseVehinstall.java | 3 +- .../api/basevehinstall/BaseVehinstallDto.java | 4 + .../anrui/base/common/enums/BillTypeEnum.java | 2 + .../biz/basetrailer/BaseTrailerMapper.java | 2 + .../biz/basetrailer/BaseTrailerMapper.xml | 6 ++ .../biz/basetrailer/BaseTrailerService.java | 97 ++++++++++++++++++- .../basevehinstall/BaseVehinstallMapper.java | 2 + .../basevehinstall/BaseVehinstallMapper.xml | 86 +++++++++------- .../basevehinstall/BaseVehinstallRest.java | 96 +++++++++++++++++- .../basevehinstall/BaseVehinstallService.java | 4 + .../api/kingdee/stkinstock/StkInStock.java | 4 +- .../biz/kingdee/stkinstock/data_model.json | 1 + .../ScmApplyInboundQueryService.java | 2 +- 15 files changed, 273 insertions(+), 42 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailer.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailer.java index 5fb10fbccc..1ab7f4336c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailer.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailer.java @@ -85,4 +85,6 @@ public class BaseTrailer extends BaseEntity { private String useOrgSid; @ApiModelProperty("分公司名称") private String useOrgName; + @ApiModelProperty("单据编号") + private String billNo; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerDto.java index 903e7e5314..7cdb67100a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerDto.java @@ -54,6 +54,8 @@ import java.util.List; public class BaseTrailerDto implements Dto { private static final long serialVersionUID = -2327928474477683203L; + @ApiModelProperty("userSid") + private String userSid; @ApiModelProperty("挂车车型sid") private String trailerModelSid; @ApiModelProperty("挂车车架号") @@ -86,6 +88,8 @@ public class BaseTrailerDto implements Dto { private String useOrgSid; @ApiModelProperty("分公司名称") private String useOrgName; + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("部门sid") private String departmentSid; @ApiModelProperty("发票照片") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstall.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstall.java index ca50dc1610..c609d3a667 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstall.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstall.java @@ -80,5 +80,6 @@ public class BaseVehinstall extends BaseEntity { private String useOrgSid; // 使用组织 @ApiModelProperty("创建组织") private String createOrg; // 创建组织 - + @ApiModelProperty("单据编号") + private String billNo; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallDto.java index 3c1016bc55..6bdac811bd 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallDto.java @@ -51,6 +51,8 @@ public class BaseVehinstallDto implements Dto { private String sid; // sid + @ApiModelProperty("userSid") + private String userSid; @ApiModelProperty("上装配置sid") private String mainSid; // 上装配置sid @ApiModelProperty("品牌sid") @@ -83,4 +85,6 @@ public class BaseVehinstallDto implements Dto { private String createOrg; // 创建组织 @ApiModelProperty("部门sid") private String departmentSid; // 部门sid + @ApiModelProperty("单据编号") + private String billNo; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java index 834affb979..46cc32e531 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java @@ -23,6 +23,8 @@ public enum BillTypeEnum { XSDDHT("XSDDHT","销售订单合同"), XSDD("XSDD","销售订单"), SKD("SKD","款项确认"), + GCRK("GCRK","挂车入库"), + SZRK("SZRK","上装入库"), ; private String billType; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java index ca096c64ed..6b2508d28e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java @@ -86,4 +86,6 @@ public interface BaseTrailerMapper extends BaseMapper { BaseTrailerDetailsVo fetchByVehSid(String sid); String selectNum(String billNo); + + int selectNumGCRK(String bill); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml index 62d4b89549..7cd0db1fd6 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml @@ -63,4 +63,10 @@ order by billNo desc limit 1 + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java index 7e7e5e0d34..e272ad53cb 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java @@ -36,6 +36,7 @@ import com.yxt.anrui.base.api.basetrailer.*; import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModel; import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelDetailsVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate; import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut; @@ -57,8 +58,10 @@ import com.yxt.anrui.base.biz.basevehicleout.BaseVehicleOutService; import com.yxt.anrui.base.biz.basevehicleoutapply.BaseVehicleOutApplyService; import com.yxt.anrui.base.biz.basevehmodelannouncementmodel.BaseVehmodelAnnouncementmodelService; import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; +import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.base.common.utils.Rule; +import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; @@ -70,6 +73,13 @@ import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock; import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundVo; +import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDto; +import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeign; +import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDto; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; @@ -129,6 +139,12 @@ public class BaseTrailerService extends MybatisBaseService createQueryWrapper(BaseTrailerQuery query) { // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -247,6 +263,7 @@ public class BaseTrailerService extends MybatisBaseService resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); + ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); + String orgCode = resultBean1.getData().getOrgCode(); + BillNo b = new BillNo(); + b.setOrgCode(orgCode); + b.setBillType(BillTypeEnum.GCRK.getBillType()); + String bill = Rule.getBill(b); + int i = baseMapper.selectNumGCRK(bill); + String billNo = Rule.getBillNo(bill, i); + return billNo; + } + + /* + * 挂车入库推送业务采购入库单查询 + * */ + private String pushGCRKInBoundQuery(BaseTrailer baseTrailer) { + //推送车辆入库查询 + String vehSid = baseTrailer.getVehSid(); + //查询主车信息 + BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vehSid); + //查询挂车车型信息 + BaseTrailerModel baseTrailerModel = baseTrailerModelService.fetchBySid(baseTrailer.getTrailerModelSid()); + ScmApplyInboundQueryDto scmApplyInboundQueryDto = new ScmApplyInboundQueryDto(); + //挂车入库日期 + scmApplyInboundQueryDto.setOrgPriceDate(baseTrailer.getWarehousingDate()); + //挂车采购类型 + scmApplyInboundQueryDto.setManPurOrderTypeKey("002"); + scmApplyInboundQueryDto.setManPurOrderTypeValue("外采"); + //挂车入库编号 + scmApplyInboundQueryDto.setApplicationCode(baseTrailer.getBillNo()); + //挂车采购系统 + scmApplyInboundQueryDto.setOrgDeptSid(baseVehicle.getPurchaseSystemSid()); + SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.fetchBySid(baseVehicle.getPurchaseSystemSid()).getData(); + scmApplyInboundQueryDto.setOrgDeptName(sysOrganizationVoBM.getName()); + scmApplyInboundQueryDto.setPurchaseSystemCode(sysOrganizationVoBM.getOrgCode()); + BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData(); + scmApplyInboundQueryDto.setPurchaseSystemName(basePurchaseSystemDetailsVo.getPurchaseSystemName()); + scmApplyInboundQueryDto.setOrgCode(basePurchaseSystemDetailsVo.getOrgCode()); + //挂车供应商 + scmApplyInboundQueryDto.setManSid(baseTrailerModel.getManufacturerSid()); + scmApplyInboundQueryDto.setManName(baseTrailerModel.getManufacturerName()); + BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(baseTrailerModel.getManufacturerSid()); + scmApplyInboundQueryDto.setManCode(baseManufacturer.getManufacturerCode()); + //挂车制单人 + scmApplyInboundQueryDto.setMakeListSid(baseTrailer.getCreateBySid()); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(baseTrailer.getCreateBySid()).getData(); + scmApplyInboundQueryDto.setMakeListName(sysUserVo.getName()); + scmApplyInboundQueryDto.setMakeListDate(DateUtil.formatDate(new Date())); + scmApplyInboundQueryDto.setCreateOrgSid(baseTrailer.getUseOrgSid()); + scmApplyInboundQueryDto.setCreateOrgName(baseTrailer.getUseOrgName()); + scmApplyInboundQueryDto.setDownNum("0"); + List scmApplyInboundVehQuerys = new ArrayList<>(); + ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto = new ScmApplyInboundVehQueryDto(); + scmApplyInboundVehQueryDto.setVinNo(baseTrailer.getVinNo().substring(baseTrailer.getVinNo().length() - 8) + "G"); + scmApplyInboundVehQueryDto.setMgroupCode("99.02"); + scmApplyInboundVehQueryDto.setMgroupName("挂车"); + scmApplyInboundVehQueryDto.setVehicleTypeKey("61"); + scmApplyInboundVehQueryDto.setVehicleTypeValue("外采挂车"); + scmApplyInboundVehQueryDto.setIunit("辆"); + scmApplyInboundVehQueryDto.setNum("1"); + scmApplyInboundVehQueryDto.setSettleMoney(baseTrailer.getSettlementPrice().toString()); + scmApplyInboundVehQueryDto.setLocalName("在途仓库"); + scmApplyInboundVehQueryDto.setLocalCode("ARZTCK"); + scmApplyInboundVehQuerys.add(scmApplyInboundVehQueryDto); + scmApplyInboundQueryDto.setScmApplyInboundVehQueryList(scmApplyInboundVehQuerys); + String sid = scmApplyInboundQueryFeign.save(scmApplyInboundQueryDto).getData(); + return sid; + } + public ResultBean updateTrailer(BaseTrailerDto dto, String sid) { ResultBean rb = ResultBean.fireFail(); int count = updateBySid(dto, sid); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java index 09aa93c8a1..3ddb08ae03 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java @@ -70,4 +70,6 @@ public interface BaseVehinstallMapper extends BaseMapper { BaseVehinstallDetailsVo fetchByVinNoAndOrgSid(@Param("vinNo") String vinNo,@Param("createOrgSid") String createOrgSid); BaseVehinstall seletByVinAndUseOrg(@Param("vinNo") String vinNo, @Param("useOrgSid") String useOrgSid); + + int selectNumGCRK(String bill); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml index cc684df45e..4347901dd7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml @@ -1,42 +1,60 @@ - - - - - + + + + + + + - + select * + from base_vehinstall + where vinNo = #{vinNo} + and useOrgSid = #{useOrgSid} - + SELECT IFNULL(CAST(REPLACE(MAX(billNo), #{bill}, '') AS SIGNED), 0) CODE + from base_vehinstall + where billNo LIKE concat(#{bill}, '%') \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java index fa15f818fd..969543008a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java @@ -28,6 +28,8 @@ package com.yxt.anrui.base.biz.basevehinstall; import cn.hutool.core.date.DateUtil; import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; +import com.yxt.anrui.base.api.basetrailer.BaseTrailer; +import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModel; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehinstall.*; import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel; @@ -35,11 +37,20 @@ import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService; import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService; import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; import com.yxt.anrui.base.biz.basevehinstallmodel.BaseVehinstallmodelService; +import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.enums.VehicleState; +import com.yxt.anrui.base.common.utils.Rule; +import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDto; +import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeign; +import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDto; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -86,6 +97,12 @@ public class BaseVehinstallRest implements BaseVehinstallFeign { private BasePurchaseSystemService basePurchaseSystemService; @Autowired private BaseVehicleService baseVehicleService; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private ScmApplyInboundQueryFeign scmApplyInboundQueryFeign; @Override @ApiOperation("根据条件分页查询数据的列表") @@ -123,9 +140,14 @@ public class BaseVehinstallRest implements BaseVehinstallFeign { dto.setVehicleStateKey(VehicleState.StockEnum.STOCK.getCode()); dto.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks()); dto.setPriceDate(DateUtil.formatDate(new Date())); + String billNo = getGCRKApplyCode(dto.getUserSid()); + dto.setBillNo(billNo); baseVehinstallService.saveOrUpdateDto(dto); if (StringUtils.isBlank(dto.getSid())) { - StkInStock stkInStock = new StkInStock(); + String cgrkdSid = pushSZRKInBoundQuery(dto); + scmApplyInboundQueryFeign.ctcgykd(cgrkdSid); + /*StkInStock stkInStock = new StkInStock(); + stkInStock.setFBillNo(billNo); //入库日期:FDate (必填项) stkInStock.setFDate(DateUtil.formatDate(new Date())); //获取主车信息 @@ -171,11 +193,81 @@ public class BaseVehinstallRest implements BaseVehinstallFeign { finKingDeeFeign.draftStkInStock(stkInStock); } catch (Exception e) { e.printStackTrace(); - } + }*/ } return rb.success(); } + /* + * 上装入库推送业务采购入库单查询 + * */ + private String pushSZRKInBoundQuery(BaseVehinstallDto dto) { + //查询主车信息 + BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(dto.getVinNo(),dto.getCreateOrg()); + //查询上装车型信息 + BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(dto.getMainSid()); + ScmApplyInboundQueryDto scmApplyInboundQueryDto = new ScmApplyInboundQueryDto(); + //上装入库日期 + scmApplyInboundQueryDto.setOrgPriceDate(dto.getPriceDate()); + //上装采购类型 + scmApplyInboundQueryDto.setManPurOrderTypeKey("002"); + scmApplyInboundQueryDto.setManPurOrderTypeValue("外采"); + //上装入库编号 + scmApplyInboundQueryDto.setApplicationCode(dto.getBillNo()); + //上装采购系统 + scmApplyInboundQueryDto.setOrgDeptSid(baseVehicle.getPurchaseSystemSid()); + SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.fetchBySid(baseVehicle.getPurchaseSystemSid()).getData(); + scmApplyInboundQueryDto.setOrgDeptName(sysOrganizationVoBM.getName()); + scmApplyInboundQueryDto.setPurchaseSystemCode(sysOrganizationVoBM.getOrgCode()); + BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData(); + scmApplyInboundQueryDto.setPurchaseSystemName(basePurchaseSystemDetailsVo.getPurchaseSystemName()); + scmApplyInboundQueryDto.setOrgCode(basePurchaseSystemDetailsVo.getOrgCode()); + //上装供应商 + scmApplyInboundQueryDto.setManSid(baseVehinstallmodel.getRefitFactorySid()); + scmApplyInboundQueryDto.setManName(baseVehinstallmodel.getRefitFactory()); + BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(baseVehinstallmodel.getRefitFactorySid()); + scmApplyInboundQueryDto.setManCode(baseManufacturer.getManufacturerCode()); + //上装制单人 + scmApplyInboundQueryDto.setMakeListSid(dto.getUserSid()); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData(); + scmApplyInboundQueryDto.setMakeListName(sysUserVo.getName()); + scmApplyInboundQueryDto.setMakeListDate(DateUtil.formatDate(new Date())); + scmApplyInboundQueryDto.setCreateOrgSid(dto.getCreateOrg()); + String name = sysOrganizationFeign.fetchBySid(dto.getCreateOrg()).getData().getName(); + scmApplyInboundQueryDto.setCreateOrgName(name); + scmApplyInboundQueryDto.setDownNum("0"); + List scmApplyInboundVehQuerys = new ArrayList<>(); + ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto = new ScmApplyInboundVehQueryDto(); + scmApplyInboundVehQueryDto.setVinNo(dto.getVinNo().substring(dto.getVinNo().length() - 8) + "SZ"); + scmApplyInboundVehQueryDto.setMgroupCode("99.02"); + scmApplyInboundVehQueryDto.setMgroupName("挂车"); + scmApplyInboundVehQueryDto.setVehicleTypeKey("61"); + scmApplyInboundVehQueryDto.setVehicleTypeValue("外采挂车"); + scmApplyInboundVehQueryDto.setIunit("辆"); + scmApplyInboundVehQueryDto.setNum("1"); + scmApplyInboundVehQueryDto.setSettleMoney(dto.getCostPrice()); + scmApplyInboundVehQueryDto.setLocalName("在途仓库"); + scmApplyInboundVehQueryDto.setLocalCode("ARZTCK"); + scmApplyInboundVehQuerys.add(scmApplyInboundVehQueryDto); + scmApplyInboundQueryDto.setScmApplyInboundVehQueryList(scmApplyInboundVehQuerys); + String sid = scmApplyInboundQueryFeign.save(scmApplyInboundQueryDto).getData(); + return sid; + } + + public String getGCRKApplyCode(String userSid) { + //获取分公司sid + ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); + ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); + String orgCode = resultBean1.getData().getOrgCode(); + BillNo b = new BillNo(); + b.setOrgCode(orgCode); + b.setBillType(BillTypeEnum.SZRK.getBillType()); + String bill = Rule.getBill(b); + int i = baseVehinstallService.selectNumGCRK(bill); + String billNo = Rule.getBillNo(bill, i); + return billNo; + } + @Override @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java index fcd184b016..1bbd825e6e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java @@ -224,4 +224,8 @@ public class BaseVehinstallService extends MybatisBaseService scmApplyInboundVehQueryDetailsVos = scmApplyInboundVehQueryService.fetchByMainSid(cgrkdSid); try { StkInStock stkInStock = new StkInStock(); - //stkInStock.setFBillNo(scmApplyInboundQuery.getApplicationCode()); + stkInStock.setFBillNo(scmApplyInboundQuery.getApplicationCode()); //获取查询中财务分公司编码 String orgCode = scmApplyInboundQuery.getOrgCode(); stkInStock.setFPurchaseOrgId(orgCode);