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

拆分推送金蝶财务分公司

master
God 2 years ago
parent
0912ce9364
commit
66fda491f2
18 changed files with 311 additions and 112 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. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeign.java
  2. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeignFallback.java
  3. 48
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
  4. 84
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
  5. 14
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java
  6. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
  7. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java
  8. 31
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.xml
  9. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java
  10. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java
  11. 2
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
  12. 2
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java
  13. 4
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java
  14. 20
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
  15. 17
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  16. 66
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java
  17. 44
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
  18. 64
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeign.java
View File

@ -81,6 +81,11 @@ public interface BasePurchaseSystemFeign {
@ResponseBody
public ResultBean<List<BasePurchaseSystemDetailsVo>> fetchDetailsByUseOrgSid(@PathVariable("useOrgSid") String useOrgSid);
@ApiOperation("根据分公司sid查询采购系统财务分公司编码")
@GetMapping("/fetchOrgCodeByUseOrgSid/{useOrgSid}")
@ResponseBody
public ResultBean<List<BasePurchaseSystemDetailsVo>> fetchOrgCodeByUseOrgSid(@PathVariable("useOrgSid") String useOrgSid);
@ApiOperation("根据部门sid查询采购系统名称")
@GetMapping("/fetchDetailsByDeptSid/{deptSid}")
@ResponseBody

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeignFallback.java
View File

@ -75,6 +75,11 @@ public class BasePurchaseSystemFeignFallback implements BasePurchaseSystemFeign
return null;
}
@Override
public ResultBean<List<BasePurchaseSystemDetailsVo>> fetchOrgCodeByUseOrgSid(String useOrgSid) {
return null;
}
@Override
public ResultBean<BasePurchaseSystemDetailsVo> fetchDetailsByDeptSid(String deptSid) {
return null;

48
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
View File

@ -446,7 +446,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
baseInternalPurchaseVehicleService.updateIsAccadj(purchaseSid, "1");
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(purchaseSid);
baseVehicleService.updateVehicleState(VehicleState.StockEnum.NX_STOCK.getCode(), VehicleState.StockEnum.NX_STOCK.getRemarks(), baseInternalPurchaseVehicle.getVinNo(), callOutOrgSid);
baseVehicleService.updateSalePrice(baseInternalPurchaseVehicle.getWitPinMoney(),baseInternalPurchaseVehicle.getVinNo(), callOutOrgSid);
baseVehicleService.updateSalePrice(baseInternalPurchaseVehicle.getWitPinMoney(), baseInternalPurchaseVehicle.getVinNo(), callOutOrgSid);
baseVehicleService.updateVehicleState(VehicleState.StockEnum.STOCK.getCode(), VehicleState.StockEnum.STOCK.getRemarks(), baseInternalPurchaseVehicle.getVinNo(), callInOrgSid);
baseVehicleService.updateConAndCostPrice(baseInternalPurchaseVehicle.getWitPinMoney(), baseInternalPurchaseVehicle.getVinNo(), callInOrgSid);
}
@ -480,11 +480,11 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicles2.get(0);
BasePurchaseSystemDetailsVo data2 = basePurchaseSystemService.fetchDetailsByDeptSid(baseInternalPurchaseVehicle1.getCallInBuyerOrgSid()).getData();
ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallInOrgSid());
if (data2 != null){
if (data2 != null) {
stkInStock.setFPurchaseOrgId(data2.getOrgCode());
//分配目标组织:TOrgId (必填项)
stkInStock.setTOrgId(data2.getOrgCode());
}else {
} else {
if (sysOrganizationVoResultBean.getSuccess()) {
SysOrganizationVo vo = sysOrganizationVoResultBean.getData();
if (vo != null) {
@ -544,18 +544,32 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
stkInStock.setFInStockEntry(fInStockEntry);
finKingDeeFeign.draftStkInStock(stkInStock);
//推送财务供应商信息
BdSupplier bdSupplier = new BdSupplier();
ResultBean<SysOrganizationVo> sysOrganizationVoResultBean1 = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallOutOrgSid());
if (sysOrganizationVoResultBean1.getSuccess()) {
List<BasePurchaseSystemDetailsVo> data1 = basePurchaseSystemService.fetchOrgCodeByUseOrgSid(baseAccadjApply.getCallOutOrgSid()).getData();
if (data1 != null){
for (BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo : data1) {
BdSupplier bdSupplier = new BdSupplier();
ResultBean<SysOrganizationVo> sysOrganizationVoResultBean1 = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallOutOrgSid());
SysOrganizationVo vo = sysOrganizationVoResultBean1.getData();
if (vo != null) {
bdSupplier.setFName(vo.getName());
bdSupplier.setFLocMobile("13333333333");
bdSupplier.setFNumber(vo.getOtherCode());
}
bdSupplier.setFUseOrgId(basePurchaseSystemDetailsVo.getOrgCode());
finKingDeeFeign.draftBdSupplier(bdSupplier);
}
}else {
BdSupplier bdSupplier = new BdSupplier();
ResultBean<SysOrganizationVo> sysOrganizationVoResultBean1 = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallOutOrgSid());
SysOrganizationVo vo = sysOrganizationVoResultBean1.getData();
if (vo != null) {
bdSupplier.setFName(vo.getName());
bdSupplier.setFLocMobile("13333333333");
bdSupplier.setFNumber(vo.getOtherCode());
}
bdSupplier.setFUseOrgId(sysOrganizationVoResultBean.getData().getOrgCode());
finKingDeeFeign.draftBdSupplier(bdSupplier);
}
bdSupplier.setFUseOrgId(sysOrganizationVoResultBean.getData().getOrgCode());
finKingDeeFeign.draftBdSupplier(bdSupplier);
}
} catch (Exception e) {
e.printStackTrace();
@ -571,7 +585,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
SalOutStock salOutStock = new SalOutStock();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = new Date();
List<String> stringList = baseAccadjApplyeVehService.fetchByAccSidAndCallOutOrgSid(baseAccadjApply.getSid(),baseAccadjApply.getCallOutOrgSid());
List<String> stringList = baseAccadjApplyeVehService.fetchByAccSidAndCallOutOrgSid(baseAccadjApply.getSid(), baseAccadjApply.getCallOutOrgSid());
List<BaseAccadjApplyToJDRu> baseAccadjApplyToJDRus = new ArrayList<>();
for (String s : stringList) {
List<BaseVehicle> baseVehicles = baseInternalPurchaseVehicleService.fetchByAccSidAndPurchaseSystemSid(baseAccadjApply.getSid(), s);
@ -583,7 +597,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
for (BaseAccadjApplyToJDRu accadjApplyToJDRus : baseAccadjApplyToJDRus) {
String callInBuyerOrgSid = accadjApplyToJDRus.getCallInBuyerOrgSid();
List<BaseVehicle> baseVehicles = accadjApplyToJDRus.getBaseVehicles();
//日期:FDate (必填项)
//日期:FDate (必填项)
salOutStock.setFDate(DateUtil.today());
//项目类别:F_PAEZ_Assistant (必填项) 集团内部调车 034
@ -603,9 +617,9 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
//销售组织:FSaleOrgId (必填项)
//分公司id
BasePurchaseSystemDetailsVo data1 = basePurchaseSystemService.fetchDetailsByDeptSid(vo.getSid()).getData();
if (data1 != null){
if (data1 != null) {
salOutStock.setFSaleOrgId(data1.getOrgCode());
}else {
} else {
ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallOutOrgSid());
if (resultBean.getSuccess()) {
SysOrganizationVo vo1 = resultBean.getData();
@ -630,10 +644,10 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
bdCustomer.setTOrgIds(sysOrganizationVo.getOtherCode());
bdCustomer.setFName(sysOrganizationVo.getName() + baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8));
String FNumber1 = HanZiConverterPinYin.getPinYinFirst(sysOrganizationVo.getName()) + baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
if (FNumber1.length() > 30){
FNumber1 = FNumber1.substring(0,30);
if (FNumber1.length() > 30) {
FNumber1 = FNumber1.substring(0, 30);
bdCustomer.setFNumber(FNumber1);
}else {
} else {
bdCustomer.setFNumber(FNumber1);
}
bdCustomers.add(bdCustomer);
@ -670,7 +684,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
return salOutStock;
}
public ResultBean InitiatorToAnswer(BusinessVariables bv,List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles) {
public ResultBean InitiatorToAnswer(BusinessVariables bv, List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles) {
ResultBean rb = ResultBean.fireFail();
BaseAccadjApply baseAccadjApply = fetchBySid(bv.getBusinessSid());
List<String> purchaseSidss = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
@ -776,7 +790,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
}
}
public ResultBean companyToFinancialCenter(BusinessVariables bv,List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles) {
public ResultBean companyToFinancialCenter(BusinessVariables bv, List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles) {
ResultBean rb = ResultBean.fireFail();
BaseAccadjApply baseAccadjApply = fetchBySid(bv.getBusinessSid());
List<String> purchaseSidss = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());

84
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
View File

@ -11,9 +11,11 @@ import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo;
import com.yxt.anrui.base.api.basemanufacturerfinance.BaseManufacturerFinance;
import com.yxt.anrui.base.api.basemanufacturerfinance.BaseManufacturerFinanceDto;
import com.yxt.anrui.base.api.basemanufacturerfinance.BaseManufacturerFinanceVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService;
import com.yxt.anrui.base.biz.basemanufacturerfinance.BaseManufacturerFinanceService;
import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService;
import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.bdsupplier.BdSupplier;
@ -65,6 +67,8 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
private BaseVehicleBrandService baseVehicleBrandService;
@Resource
private FinKingDeeFeign finKingDeeFeign;
@Autowired
private BasePurchaseSystemService basePurchaseSystemService;
/**
* 供应厂商分页列表
@ -336,6 +340,38 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
ResultBean<List<SysOrganizationVo>> orgList = sysOrganizationFeign.selectOrgSidList();
List<SysOrganizationVo> list = orgList.getData();
for (SysOrganizationVo sysOrganizationVo : list) {
List<BasePurchaseSystemDetailsVo> data = basePurchaseSystemService.fetchOrgCodeByUseOrgSid(sysOrganizationVo.getSid()).getData();
if (data != null){
for (BasePurchaseSystemDetailsVo datum : data) {
BdSupplier bdSupplier = new BdSupplier();
bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
bdSupplier.setFUseOrgId(datum.getOrgCode());
bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
finKingDeeFeign.draftBdSupplier(bdSupplier);
}
}else {
BdSupplier bdSupplier = new BdSupplier();
bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
bdSupplier.setFUseOrgId(sysOrganizationVo.getOrgCode());
bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
finKingDeeFeign.draftBdSupplier(bdSupplier);
}
}
}else if (StringUtils.isNotBlank(baseManufacturerDto.getCreateOrg())){
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseManufacturerDto.getCreateOrg()).getData();
List<BasePurchaseSystemDetailsVo> data = basePurchaseSystemService.fetchOrgCodeByUseOrgSid(sysOrganizationVo.getSid()).getData();
if (data != null){
for (BasePurchaseSystemDetailsVo datum : data) {
BdSupplier bdSupplier = new BdSupplier();
bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
bdSupplier.setFUseOrgId(datum.getOrgCode());
bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
finKingDeeFeign.draftBdSupplier(bdSupplier);
}
}else {
BdSupplier bdSupplier = new BdSupplier();
bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
@ -343,14 +379,6 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
finKingDeeFeign.draftBdSupplier(bdSupplier);
}
}else if (StringUtils.isNotBlank(baseManufacturerDto.getCreateOrg())){
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseManufacturerDto.getCreateOrg()).getData();
BdSupplier bdSupplier = new BdSupplier();
bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
bdSupplier.setFUseOrgId(sysOrganizationVo.getOrgCode());
bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
finKingDeeFeign.draftBdSupplier(bdSupplier);
}
return rb.success().setMsg("操作成功");
}
@ -464,6 +492,38 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
ResultBean<List<SysOrganizationVo>> orgList = sysOrganizationFeign.selectOrgSidList();
List<SysOrganizationVo> list = orgList.getData();
for (SysOrganizationVo sysOrganizationVo : list) {
List<BasePurchaseSystemDetailsVo> data = basePurchaseSystemService.fetchOrgCodeByUseOrgSid(sysOrganizationVo.getSid()).getData();
if (data != null){
for (BasePurchaseSystemDetailsVo datum : data) {
BdSupplier bdSupplier = new BdSupplier();
bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
bdSupplier.setFUseOrgId(datum.getOrgCode());
bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
finKingDeeFeign.updateBdSupplier(bdSupplier);
}
}else {
BdSupplier bdSupplier = new BdSupplier();
bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
bdSupplier.setFUseOrgId(sysOrganizationVo.getOrgCode());
bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
finKingDeeFeign.updateBdSupplier(bdSupplier);
}
}
}else if (StringUtils.isNotBlank(baseManufacturerDto.getCreateOrg())){
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseManufacturerDto.getCreateOrg()).getData();
List<BasePurchaseSystemDetailsVo> data = basePurchaseSystemService.fetchOrgCodeByUseOrgSid(sysOrganizationVo.getSid()).getData();
if (data != null){
for (BasePurchaseSystemDetailsVo datum : data) {
BdSupplier bdSupplier = new BdSupplier();
bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
bdSupplier.setFUseOrgId(datum.getOrgCode());
bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
finKingDeeFeign.updateBdSupplier(bdSupplier);
}
}else {
BdSupplier bdSupplier = new BdSupplier();
bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
@ -471,14 +531,6 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
finKingDeeFeign.updateBdSupplier(bdSupplier);
}
}else if (StringUtils.isNotBlank(baseManufacturerDto.getCreateOrg())){
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseManufacturerDto.getCreateOrg()).getData();
BdSupplier bdSupplier = new BdSupplier();
bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
bdSupplier.setFUseOrgId(sysOrganizationVo.getOrgCode());
bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
finKingDeeFeign.updateBdSupplier(bdSupplier);
}
return rb.success().setMsg("修改成功");
}

14
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java
View File

@ -32,9 +32,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVeh;
import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehDetailsVo;
import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehDto;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehicle.ExiCarConfigDetailVo;
import com.yxt.anrui.base.biz.basemanufacturerretwareveh.BaseManufacturerRetwareVehService;
import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService;
import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.enums.VehicleState;
@ -96,6 +98,9 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
private FileUploadComponent fileUploadComponent;
@Resource
private FinKingDeeFeign finKingDeeFeign;
@Autowired
private BasePurchaseSystemService basePurchaseSystemService;
private QueryWrapper<BaseManufacturerRetware> createQueryWrapper(BaseManufacturerRetwareQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@ -282,8 +287,13 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
private STKInStockPushPurmrb createPush(BaseVehicle baseVehicle) {
STKInStockPushPurmrb push=new STKInStockPushPurmrb();
push.setFMaterialId(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8));
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseVehicle.getUseOrgSid()).getData();
push.setUseOrdSid(sysOrganizationVo.getOrgCode());
BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
if (data != null){
push.setUseOrdSid(data.getOrgCode());
}else {
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseVehicle.getUseOrgSid()).getData();
push.setUseOrdSid(sysOrganizationVo.getOrgCode());
}
return push;
}

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
View File

@ -846,9 +846,9 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
BaseOutsourcingApplicationDto booad = baseMapper.getBySid(flowTaskVo.getBusinessSid());
if (!flowTaskVo.getUserSid().equals(booad.getCreateBySid())){
/*if (!flowTaskVo.getUserSid().equals(booad.getCreateBySid())){
return ResultBean.fireFail().setMsg("操作失败，当前操作人不是发起人，不可终止!");
}
}*/
String businessTaskid = booad.getTaskId();
if (businessTaskid.equals(flowTaskVo.getTaskId())) { //只有数据一致的时候才能进行下一步
BeanUtil.copyProperties(flowTaskVo, fl);

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java
View File

@ -72,4 +72,6 @@ public interface BasePurchaseSystemMapper extends BaseMapper<BasePurchaseSystem>
@Select("select * from base_purchase_system where deptSid = #{deptSid} and sid != #{sid}")
BasePurchaseSystemDetailsVo fetchDetailsByDeptSidAndSid(@Param("deptSid") String deptSid,@Param("sid") String sid);
List<BasePurchaseSystemDetailsVo> fetchOrgCodeByUseOrgSid(String useOrgSid);
}

31
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.xml
View File

@ -1,13 +1,26 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemVo">
SELECT * FROM base_purchase_system <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemVo">
SELECT * FROM base_purchase_system <where> ${ew.sqlSegment} </where>
</select>
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemVo">
SELECT * FROM base_purchase_system
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemVo">
SELECT * FROM base_purchase_system
<where>
${ew.sqlSegment}
</where>
</select>
<select id="fetchOrgCodeByUseOrgSid"
resultType="com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo">
SELECT DISTINCT orgCode
FROM base_purchase_system
WHERE useOrgSid = #{useOrgSid}
</select>
</mapper>

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java
View File

@ -101,6 +101,11 @@ public class BasePurchaseSystemRest implements BasePurchaseSystemFeign {
return basePurchaseSystemService.fetchDetailsByUseOrgSid(useOrgSid);
}
@Override
public ResultBean<List<BasePurchaseSystemDetailsVo>> fetchOrgCodeByUseOrgSid(String useOrgSid) {
return basePurchaseSystemService.fetchOrgCodeByUseOrgSid(useOrgSid);
}
@Override
public ResultBean<BasePurchaseSystemDetailsVo> fetchDetailsByDeptSid(String deptSid) {
return basePurchaseSystemService.fetchDetailsByDeptSid(deptSid);

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java
View File

@ -140,4 +140,10 @@ public class BasePurchaseSystemService extends MybatisBaseService<BasePurchaseSy
BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = baseMapper.fetchDetailsByDeptSid(deptSid);
return rb.success().setData(basePurchaseSystemDetailsVo);
}
public ResultBean<List<BasePurchaseSystemDetailsVo>> fetchOrgCodeByUseOrgSid(String useOrgSid) {
ResultBean rb = ResultBean.fireFail();
List<BasePurchaseSystemDetailsVo> basePurchaseSystemDetailsVos = baseMapper.fetchOrgCodeByUseOrgSid(useOrgSid);
return rb.success().setData(basePurchaseSystemDetailsVos);
}
}

2
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
View File

@ -57,7 +57,7 @@ public interface CrmCustomerTempFeign {
@ApiOperation("推送财务客户-否")
@PostMapping("/sendFinCustomer")
public ResultBean sendFinCustomer(@RequestBody String[] customerSids);
public ResultBean sendFinCustomer(@RequestBody String[] customerSids,@RequestParam("orgCode") String orgCode);
@ApiOperation("推送财务客户-是")
@PostMapping("/sendFinCustomerTrue")

2
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java
View File

@ -37,7 +37,7 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign {
}
@Override
public ResultBean sendFinCustomer(String[] customerSids) {
public ResultBean sendFinCustomer(String[] customerSids,String orgCode) {
return null;
}

4
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java
View File

@ -73,8 +73,8 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
}
@Override
public ResultBean sendFinCustomer(String[] customerSids) {
return crmCustomerTempService.sendFinCustomer(customerSids);
public ResultBean sendFinCustomer(String[] customerSids,String orgCode) {
return crmCustomerTempService.sendFinCustomer(customerSids,orgCode);
}
@Override

20
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
View File

@ -3,6 +3,10 @@ package com.yxt.anrui.crm.biz.crmcustomertemp;
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.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.commonappendix.*;
import com.yxt.anrui.crm.api.crmbusiness.AppCrmBusinessInfoVo;
import com.yxt.anrui.crm.api.crmbusiness.CrmBusinessDto;
@ -104,6 +108,10 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private FinKingDeeFeign finKingDeeFeign;
@Autowired
private BaseVehicleFeign baseVehicleFeign;
@Autowired
private BasePurchaseSystemFeign basePurchaseSystemFeign;
public PagerVo<CrmCustomerTemp> listPage(PagerQuery<CrmCustomerTempQuery> pq) {
@ -1137,7 +1145,7 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
return rb.success().setData(list);
}
public ResultBean sendFinCustomer(String[] customerSids) {
public ResultBean sendFinCustomer(String[] customerSids,String orgCode) {
ResultBean rb = ResultBean.fireFail();
List<BdCustomer> bdCustomers = new ArrayList<>();
for (String customerSid : customerSids) {
@ -1145,7 +1153,7 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
CrmCustomerTemp crmCustomerTemp = fetchBySid(customerSid);
String createOrgSid = crmCustomerTemp.getCreateOrgSid();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
bdCustomer.setTOrgIds(orgCode);
bdCustomer.setFName(crmCustomerTemp.getName() + crmCustomerTemp.getMobile());
bdCustomer.setFNumber(crmCustomerTemp.getCustomerNo());
bdCustomers.add(bdCustomer);
@ -1162,8 +1170,14 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
String createOrgSid = crmCustomerTemp.getCreateOrgSid();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
for (CrmCustomerTempToFin crmCustomerTempToFin : crmCustomerTempToFins) {
BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(crmCustomerTempToFin.getVinNo(), createOrgSid).getData();
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
if (data != null){
bdCustomer.setTOrgIds(data.getOrgCode());
}else {
bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
}
bdCustomer.setFName(crmCustomerTemp.getName() + crmCustomerTempToFin.getVinNo().substring(crmCustomerTempToFin.getVinNo().length() - 8));
String FNumber = HanZiConverterPinYin.getPinYinFirst(crmCustomerTemp.getName()) + crmCustomerTempToFin.getVinNo().substring(crmCustomerTempToFin.getVinNo().length() - 8);
if (FNumber.length() > 30) {

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

@ -29,6 +29,8 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
@ -142,6 +144,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
private BdCustomerService bdCustomerService;
@Autowired
private CrmCustomerTempFeign crmCustomerTempFeign;
@Autowired
private BasePurchaseSystemFeign basePurchaseSystemFeign;
private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -1292,10 +1296,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款组织
ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(confirmation.getUseOrgSid());
if (resultBean.getSuccess()) {
SysOrganizationVo vo = resultBean.getData();
if (vo != null) {
arReceivebill.setFPAYORGID(vo.getOrgCode());
BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(confirmation.getCreateDeptSid()).getData();
if (data != null){
arReceivebill.setFPAYORGID(data.getOrgCode());
}else {
if (resultBean.getSuccess()) {
SysOrganizationVo vo = resultBean.getData();
if (vo != null) {
arReceivebill.setFPAYORGID(vo.getOrgCode());
}
}
}
//销售部门

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

@ -28,6 +28,8 @@ package com.yxt.anrui.fin.biz.finmanufacturerbank;
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.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageQuery;
import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo;
import com.yxt.anrui.fin.api.finmanufacturerbank.*;
@ -74,6 +76,8 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
private CNBankcntService cnBankcntService;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private BasePurchaseSystemFeign basePurchaseSystemFeign;
public PagerVo<FinManufacturerBankVo> listPageVo(PagerQuery<FinManufacturerBankQuery> pq) {
FinManufacturerBankQuery query = pq.getParams();
@ -118,15 +122,28 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
return rb.setMsg("该公司已存在该银行账号的数据");
}
baseMapper.insert(finManufacturerBank);
CNBankacnt cnBankacnt = new CNBankacnt();
String useOrgSid = finManufacturerBank.getUseOrgSid();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
cnBankacnt.setFCreateOrgId(sysOrganizationVo.getOrgCode());
cnBankacnt.setBankName(finManufacturerBank.getDepositBank());
cnBankacnt.setFNumber(finManufacturerBank.getBankAccount());
cnBankacnt.setFBANKID(finManufacturerBank.getDepositBankKey());
cnBankacnt.setFName(finManufacturerBank.getAccountName());
cnBankcntService.draftCNBankcnt(cnBankacnt);
List<BasePurchaseSystemDetailsVo> data = basePurchaseSystemFeign.fetchOrgCodeByUseOrgSid(finManufacturerBank.getUseOrgSid()).getData();
if (data != null){
for (BasePurchaseSystemDetailsVo datum : data) {
CNBankacnt cnBankacnt = new CNBankacnt();
cnBankacnt.setFCreateOrgId(datum.getOrgCode());
cnBankacnt.setBankName(finManufacturerBank.getDepositBank());
cnBankacnt.setFNumber(finManufacturerBank.getBankAccount());
cnBankacnt.setFBANKID(finManufacturerBank.getDepositBankKey());
cnBankacnt.setFName(finManufacturerBank.getAccountName());
cnBankcntService.draftCNBankcnt(cnBankacnt);
}
}else {
CNBankacnt cnBankacnt = new CNBankacnt();
String useOrgSid = finManufacturerBank.getUseOrgSid();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
cnBankacnt.setFCreateOrgId(sysOrganizationVo.getOrgCode());
cnBankacnt.setBankName(finManufacturerBank.getDepositBank());
cnBankacnt.setFNumber(finManufacturerBank.getBankAccount());
cnBankacnt.setFBANKID(finManufacturerBank.getDepositBankKey());
cnBankacnt.setFName(finManufacturerBank.getAccountName());
cnBankcntService.draftCNBankcnt(cnBankacnt);
}
return rb.success().setMsg("保存成功");
} else {
FinManufacturerBank finManufacturerBank = fetchBySid(sid);
@ -139,15 +156,28 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
}
BeanUtil.copyProperties(dto, finManufacturerBank);
baseMapper.updateById(finManufacturerBank);
CNBankacnt cnBankacnt = new CNBankacnt();
String useOrgSid = finManufacturerBank.getUseOrgSid();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
cnBankacnt.setFCreateOrgId(sysOrganizationVo.getOrgCode());
cnBankacnt.setBankName(finManufacturerBank.getDepositBank());
cnBankacnt.setFNumber(finManufacturerBank.getBankAccount());
cnBankacnt.setFBANKID(finManufacturerBank.getDepositBankKey());
cnBankacnt.setFName(finManufacturerBank.getAccountName());
cnBankcntService.updateCNBankacnt(cnBankacnt);
List<BasePurchaseSystemDetailsVo> data = basePurchaseSystemFeign.fetchOrgCodeByUseOrgSid(finManufacturerBank.getUseOrgSid()).getData();
if (data != null){
for (BasePurchaseSystemDetailsVo datum : data) {
CNBankacnt cnBankacnt = new CNBankacnt();
cnBankacnt.setFCreateOrgId(datum.getOrgCode());
cnBankacnt.setBankName(finManufacturerBank.getDepositBank());
cnBankacnt.setFNumber(finManufacturerBank.getBankAccount());
cnBankacnt.setFBANKID(finManufacturerBank.getDepositBankKey());
cnBankacnt.setFName(finManufacturerBank.getAccountName());
cnBankcntService.updateCNBankacnt(cnBankacnt);
}
}else {
CNBankacnt cnBankacnt = new CNBankacnt();
String useOrgSid = finManufacturerBank.getUseOrgSid();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
cnBankacnt.setFCreateOrgId(sysOrganizationVo.getOrgCode());
cnBankacnt.setBankName(finManufacturerBank.getDepositBank());
cnBankacnt.setFNumber(finManufacturerBank.getBankAccount());
cnBankacnt.setFBANKID(finManufacturerBank.getDepositBankKey());
cnBankacnt.setFName(finManufacturerBank.getAccountName());
cnBankcntService.updateCNBankacnt(cnBankacnt);
}
return rb.success().setMsg("修改成功");
}
}

44
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
View File

@ -34,6 +34,8 @@ import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufUpdateDto;
import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionFeign;
import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo;
import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo;
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
@ -118,7 +120,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
@Autowired
private FlowTaskFeign flowTaskFeign;
@Autowired
private DocPdfComponent docPdfComponent;
private BasePurchaseSystemFeign basePurchaseSystemFeign;
public PagerVo<FinPaymentrecordVo> listPageVo(PagerQuery<FinPaymentrecordQuery> pq) {
FinPaymentrecordQuery query = pq.getParams();
@ -152,14 +154,14 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
IPage<FinPaymentrecordVo> pagging = baseMapper.selectPageVo(page, qw);
List<FinPaymentrecordVo> list = pagging.getRecords();
list.removeAll(Collections.singleton(null));
if(!list.isEmpty()){
for (FinPaymentrecordVo vv : list){
if (!list.isEmpty()) {
for (FinPaymentrecordVo vv : list) {
String payFile = vv.getPayFile();
if(StringUtils.isNotBlank(payFile)){
if (StringUtils.isNotBlank(payFile)) {
List<String> strings = Arrays.asList(payFile.split(","));
for (int i =0;i<strings.size();i++){
if(!strings.get(i).contains(fileUploadComponent.getUrlPrefix())){
strings.set(i,fileUploadComponent.getUrlPrefix()+strings.get(i));
for (int i = 0; i < strings.size(); i++) {
if (!strings.get(i).contains(fileUploadComponent.getUrlPrefix())) {
strings.set(i, fileUploadComponent.getUrlPrefix() + strings.get(i));
}
}
vv.setPayFiles(strings);
@ -204,7 +206,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
FinPaymentrecord finPaymentrecord = fetchBySid(sids.get(i));
BeanUtil.copyProperties(dto, finPaymentrecord, "sid");
List<String> payFiles = dto.getPayFiles();
if(payFiles.size()>0){
if (payFiles.size() > 0) {
String payFile = payFiles.stream().map(v -> v.replace(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.joining(","));
finPaymentrecord.setPayFile(payFile);
}
@ -245,24 +247,30 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
// apPayBill.setFRECTUNIT("010001");
apPayBill.setFRECTUNIT(finPaymentrecord.getPayCode());
apPayBill.setFREMARK(finPaymentrecord.getPayRemark());
//采购组织
//根据使用组织查询采购组织的编码
ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(finPaymentrecord.getCreateOrgSid());
if (resultBean.getSuccess()) {
SysOrganizationVo vo = resultBean.getData();
if (vo != null) {
apPayBill.setFPURCHASEORGID(vo.getOrgCode());
}
}
// apPayBill.setFPURCHASEORGID("101");
//采购部门
SysOrganizationVo vo = new SysOrganizationVo();
ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.selectByPSid(finPaymentrecord.getCreateOrgSid(), "销售支持部");
if (resultBean1.getSuccess()) {
SysOrganizationVo vo = resultBean1.getData();
vo = resultBean1.getData();
if (vo != null) {
apPayBill.setFPURCHASEDEPTID(vo.getOrgCode());
}
}
//采购组织
BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(vo.getSid()).getData();
if (data != null) {
apPayBill.setFPURCHASEORGID(data.getOrgCode());
} else {
//根据使用组织查询采购组织的编码
ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(finPaymentrecord.getCreateOrgSid());
if (resultBean.getSuccess()) {
SysOrganizationVo vo1 = resultBean.getData();
if (vo1 != null) {
apPayBill.setFPURCHASEORGID(vo1.getOrgCode());
}
}
}
// apPayBill.setFPURCHASEDEPTID("05.04");
//应付类别默认005定金
/* 001整车、002外采、005定金、010牵引系列、011自卸系列、012载货系列、013搅拌车系列、014起重机系列、015专用车系列、016欧马可系列、017LNG系列 022大客户系列

64
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java
View File

@ -3,6 +3,8 @@ package com.yxt.anrui.scm.biz.scmwarehouse;
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.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.bdstock.BDStock;
import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
@ -45,6 +47,8 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
private FinKingDeeFeign finKingDeeFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private BasePurchaseSystemFeign basePurchaseSystemFeign;
public PagerVo<ScmWarehouse> listPage(PagerQuery<ScmWarehouseQuery> pq) {
ScmWarehouseQuery query = pq.getParams();
@ -114,23 +118,45 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
dto.fillEntity(entity);
this.saveOrUpdate(entity);
//推送金蝶仓库
if ("ARZTCK".equals(dto.getGressionCode())){
BDStock bdStock1 = new BDStock();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData();
//推送在途仓库
bdStock1.setFCreateOrgId(sysOrganizationVo.getOrgCode());
bdStock1.setFName("在途仓库");
bdStock1.setFNumber("ARZTCK");
BDStock bdStock2 = new BDStock();
//推送正式仓库
bdStock2.setFCreateOrgId(sysOrganizationVo.getOrgCode());
bdStock2.setFName("正式仓库");
bdStock2.setFNumber("ARZSCK");
try {
finKingDeeFeign.drafBDtStock(bdStock1);
finKingDeeFeign.drafBDtStock(bdStock2);
} catch (Exception e) {
e.printStackTrace();
if ("ARZTCK".equals(dto.getGressionCode())) {
List<BasePurchaseSystemDetailsVo> data = basePurchaseSystemFeign.fetchOrgCodeByUseOrgSid(dto.getUseOrgSid()).getData();
if (data != null) {
for (BasePurchaseSystemDetailsVo datum : data) {
BDStock bdStock1 = new BDStock();
//推送在途仓库
bdStock1.setFCreateOrgId(datum.getOrgCode());
bdStock1.setFName("在途仓库");
bdStock1.setFNumber("ARZTCK");
BDStock bdStock2 = new BDStock();
//推送正式仓库
bdStock2.setFCreateOrgId(datum.getOrgCode());
bdStock2.setFName("正式仓库");
bdStock2.setFNumber("ARZSCK");
try {
finKingDeeFeign.drafBDtStock(bdStock1);
finKingDeeFeign.drafBDtStock(bdStock2);
} catch (Exception e) {
e.printStackTrace();
}
}
} else {
BDStock bdStock1 = new BDStock();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData();
//推送在途仓库
bdStock1.setFCreateOrgId(sysOrganizationVo.getOrgCode());
bdStock1.setFName("在途仓库");
bdStock1.setFNumber("ARZTCK");
BDStock bdStock2 = new BDStock();
//推送正式仓库
bdStock2.setFCreateOrgId(sysOrganizationVo.getOrgCode());
bdStock2.setFName("正式仓库");
bdStock2.setFNumber("ARZSCK");
try {
finKingDeeFeign.drafBDtStock(bdStock1);
finKingDeeFeign.drafBDtStock(bdStock2);
} catch (Exception e) {
e.printStackTrace();
}
}
}
}
@ -173,9 +199,9 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
ResultBean<List<AppScmWarehouseVo>> rb = ResultBean.fireFail();
String orgPath = appScmWarehouseQuery.getOrgPath();
String userSid = appScmWarehouseQuery.getUserSid();
if(StringUtils.isBlank(orgPath)){
if (StringUtils.isBlank(orgPath)) {
orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
}else{
} else {
orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
}
List<AppScmWarehouseVo> list = baseMapper.selectWarehouseByUserSid(orgPath);

Write Preview
Loading…
Cancel
Save