yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 2 years ago
parent
3027222699 a90375cc2e
commit
ea02b81f48
6 changed files with 66 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 31
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java
  2. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeign.java
  3. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeignFallback.java
  4. 31
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  5. 9
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankRest.java
  6. 9
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java

31
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java
View File

@ -136,26 +136,25 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
if (StringUtils.isNotBlank(dto.getOrgSidPath())){
orgPath = dto.getOrgSidPath();
}else {
}
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
}
//用户的组织全路径
orgPath = staffOrgResultBean.getData().getOrgSidPath();
}
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
List<BaseShuntingInvoicinApplyeVehDto> baseShuntingInvoicinApplyeVehs = dto.getBaseShuntingInvoicinApplyeVehs();
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {//新增
dto.setApplyDate(DateUtil.today());
dto.setNodeState("待提交");
dto.setOrgSidPath(orgSidPath);
dto.setOrgSidPath(orgPath);
String s = this.insertByDto(dto);
for (BaseShuntingInvoicinApplyeVehDto baseShuntingInvoicinApplyeVeh : baseShuntingInvoicinApplyeVehs) {
baseShuntingInvoicinApplyeVeh.setMainSid(s);
@ -167,10 +166,9 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
if (baseShuntingInvoicingApply == null) {
return rb.setMsg("该调车申请单不存在");
}
dto.setOrgSidPath(orgPath);
this.updateByDto(dto);
//List<BaseShuntingInvoicinApplyeVehDetailsVo> baseShuntingInvoicinApplyeVehDetailsVos = baseShuntingInvoicinApplyeVehService.fetchByMainSid(dtoSid);
baseShuntingInvoicinApplyeVehService.delByMainSid(dtoSid);
//for (BaseShuntingInvoicinApplyeVehDetailsVo baseShuntingInvoicinApplyeVehDetailsVo : baseShuntingInvoicinApplyeVehDetailsVos) {
for (BaseShuntingInvoicinApplyeVehDto baseShuntingInvoicinApplyeVeh : baseShuntingInvoicinApplyeVehs) {
BaseShuntingInvoicinApplyeVeh baseShuntingInvoicinApplyeVeh1 = new BaseShuntingInvoicinApplyeVeh();
String sid = baseShuntingInvoicinApplyeVeh1.getSid();
@ -179,7 +177,6 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
baseShuntingInvoicinApplyeVeh1.setMainSid(dtoSid);
baseShuntingInvoicinApplyeVehService.save(baseShuntingInvoicinApplyeVeh1);
}
// }
return rb.success().setMsg("修改成功").setData(dtoSid);
}

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeign.java
View File

@ -82,6 +82,11 @@ public interface FinManufacturerBankFeign {
@ResponseBody
public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(@PathVariable("userSid") String userSid);
@ApiOperation("获取该分公司下的开户账号:切换机构")
@GetMapping("/selectAccountByUseOrgSid")
@ResponseBody
public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(@RequestParam("userSid") String userSid,@RequestParam("orgPath")String orgPath);
@ApiOperation("获取该本分公司下的开户账号")
@GetMapping("/selAccountByOrgSid")
@ResponseBody

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeignFallback.java
View File

@ -75,6 +75,11 @@ public class FinManufacturerBankFeignFallback implements FinManufacturerBankFeig
return null;
}
@Override
public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(String userSid, String orgPath) {
return null;
}
@Override
public ResultBean<List<FinManufacturerVo>> selAccountByOrgSid(FinManufacturerOrgPathQuery query) {
return null;

31
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -1276,10 +1276,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
ARReceivebill arReceivebill = new ARReceivebill();
//业务日期
arReceivebill.setFDATE(DateUtil.today());
//收款组织
ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(confirmation.getUseOrgSid());
BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(confirmation.getCreateDeptSid()).getData();
BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(confirmation.getPurchaseSystemSid()).getData();
if (data != null){
arReceivebill.setFPAYORGID(data.getOrgCode());
}else {
@ -1323,6 +1322,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String customerMobile = customerList.get(i).getCustomerPhone();
String customerSid = customerList.get(i).getCustomerSid();
BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), customerName, customerMobile, customerSid, sid);
//推送金蝶客户，修改目标组织为采购系统对应的金蝶分公司code
if (data != null){
bdCustomer.setTOrgIds(data.getOrgCode());
}
ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer);
//往来单位
arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber());
@ -1396,6 +1399,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo = finSelectedReceivablesDetailedVos1.get(i);
//先推送客户
BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), finSelectedReceivablesDetailedVo.getCustomerName(), finSelectedReceivablesDetailedVo.getCustomerPhone(), finSelectedReceivablesDetailedVo.getCustomerSid(), sid);
//推送金蝶客户，修改目标组织为采购系统对应的金蝶分公司code
if (data != null){
bdCustomer.setTOrgIds(data.getOrgCode());
}
ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer);
//往来单位
arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber());
@ -1450,6 +1457,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String customerSid = customerList.get(i).getCustomerSid();
//先推送客户
BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), customerName, customerMobile, customerSid, sid);
//推送金蝶客户，修改目标组织为采购系统对应的金蝶分公司code
if (data != null){
bdCustomer.setTOrgIds(data.getOrgCode());
}
ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer);
//往来单位
arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber());
@ -1517,6 +1528,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo = finSelectedReceivablesDetailedVos2.get(i);
//先推送客户
BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), finSelectedReceivablesDetailedVo.getCustomerName(), finSelectedReceivablesDetailedVo.getCustomerPhone(), finSelectedReceivablesDetailedVo.getCustomerSid(), sid);
//推送金蝶客户，修改目标组织为采购系统对应的金蝶分公司code
if (data != null){
bdCustomer.setTOrgIds(data.getOrgCode());
}
ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer);
//往来单位
arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber());
@ -1559,6 +1574,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
for (int i = 0; i < finSelectedReceivablesDetailedVos1_1.size(); i++) {
FinSelectedReceivablesDetailedVo vvvv = finSelectedReceivablesDetailedVos1_1.get(i);
BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), vvvv.getVIN(), sid);
//推送金蝶客户，修改目标组织为采购系统对应的金蝶分公司code
if (data != null){
bdCustomer.setTOrgIds(data.getOrgCode());
}
ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer);
//往来单位
arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber());
@ -1608,6 +1627,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
FinSelectedReceivablesDetailedVo vvvv = finSelectedReceivablesDetailedVos2_1.get(i);
//先推送客户
BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), vvvv.getVIN(), sid);
//推送金蝶客户，修改目标组织为采购系统对应的金蝶分公司code
if (data != null){
bdCustomer.setTOrgIds(data.getOrgCode());
}
ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer);
//往来单位
arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber());
@ -1648,6 +1671,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//先推送客户
AppBusDepositBuscenterDetailVo busDeposit = busDepositFeign.getDepositInfoDetails(confirmation.getBusSid()).getData();
BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), busDeposit.getPayName(), busDeposit.getPhone(), "", sid);
//推送金蝶客户，修改目标组织为采购系统对应的金蝶分公司code
if (data != null){
bdCustomer.setTOrgIds(data.getOrgCode());
}
ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer);
log.info("客户推送：" + resultBeanMiddle.getMsg());
//往来单位

9
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankRest.java
View File

@ -26,13 +26,11 @@
package com.yxt.anrui.fin.biz.finmanufacturerbank;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo;
import com.yxt.anrui.fin.api.finmanufacturerbank.*;
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 org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
@ -88,7 +86,12 @@ public class FinManufacturerBankRest implements FinManufacturerBankFeign {
@Override
public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(String userSid) {
return finManufacturerBankService.selectAccountByUseOrgSid(userSid);
return finManufacturerBankService.selectAccountByUseOrgSid(userSid,"");
}
@Override
public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(String userSid, String orgPath) {
return finManufacturerBankService.selectAccountByUseOrgSid(userSid,orgPath);
}
@Override

9
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java
View File

@ -194,9 +194,14 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
return rb.success().setData(vo);
}
public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(String userSid) {
public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(String userSid,String orgPath) {
ResultBean<List<FinManufacturerVo>> rb = ResultBean.fireFail();
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
String useOrgSid = "";
if(StringUtils.isNotBlank(orgPath)){
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(userSid).getData();
}else{
useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
}
List<FinManufacturerVo> list = baseMapper.selectAccountByUseOrgSid(useOrgSid);
list.removeAll(Collections.singleton(null));
return rb.success().setData(list);

Write Preview
Loading…
Cancel
Save