Skip to content

B
bailuntec-datacenter
Commit bb3d571c by liyanlin
Options

fix

parent e1419cd8
Showing with 146 additions and 66 deletions
datacenter-job/datacenter-finance/finance-balance-sheet/src/main/java/com/bailuntec/interfaces/BalanceSheetController.java
......@@ -7,9 +7,12 @@ import com.bailuntec.job.service.BalanceSheetService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@RestController
......@@ -22,7 +25,28 @@ public class BalanceSheetController {
@GetMapping("/generate")
public String doScheduledTask(){
try{
balanceSheetService.generateBalanceSheet();
balanceSheetService.generateBalanceSheet(null);
}catch (Exception e){
e.printStackTrace();
logger.error(">>>>>生成资产负债表出错" + e.getMessage());
return "生成资产负债表出错";
}
return "生成资产负债表成功";
}
@PostMapping("/reload")
public String reload(@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate localDate){
try{
LocalDateTime localDateTime = localDate.atTime(23,59,59);
balanceSheetService.syncBankAccount(localDate);
balanceSheetService.syncWithdrawOnWaySummary(localDate);
balanceSheetService.syncPayPal(localDateTime);
balanceSheetService.syncShortBorrowBalance(localDate);
balanceSheetService.syncCost(localDate);
balanceSheetService.syncBuy(localDate);
balanceSheetService.syncSemiInventoryBalance(localDate);
balanceSheetService.generateBalanceSheet(localDate);
balanceSheetService.getSupplierTransaction(localDate);
}catch (Exception e){
e.printStackTrace();
logger.error(">>>>>生成资产负债表出错" + e.getMessage());
......
datacenter-job/datacenter-finance/finance-balance-sheet/src/main/java/com/bailuntec/job/BalanceSheetJob.java
......@@ -20,7 +20,7 @@ public class BalanceSheetJob {
public void syncBankAccount() {
try {
log.info("每天1点同步 银行帐号信息 开始");
balanceSheetService.syncBankAccount();
balanceSheetService.syncBankAccount(null);
log.info("每天1点同步 银行帐号信息 结束");
} catch (Exception ex) {
log.error("每天1点同步 银行帐号信息 异常:", ex);
......@@ -34,7 +34,7 @@ public class BalanceSheetJob {
public void syncWithdrawOnWaySummary() {
try {
log.info("每天1点 同步提现在途 开始");
balanceSheetService.syncWithdrawOnWaySummary();
balanceSheetService.syncWithdrawOnWaySummary(null);
log.info("每天1点 同步提现在途 结束");
} catch (Exception ex) {
log.error("每天1点 同步提现在途 异常:", ex);
......@@ -48,7 +48,7 @@ public class BalanceSheetJob {
public void syncPayPal() {
try {
log.info("每天1点 同步第三方余额 开始");
balanceSheetService.syncPayPal();
balanceSheetService.syncPayPal(null);
log.info("每天1点 同步第三方余额 结束");
} catch (Exception ex) {
log.error("每天1点 同步第三方余额 异常:", ex);
......@@ -64,7 +64,7 @@ public class BalanceSheetJob {
public void syncShortBorrowBalance() {
try {
log.info("每天1点 同步提现在途 开始");
balanceSheetService.syncShortBorrowBalance();
balanceSheetService.syncShortBorrowBalance(null);
log.info("每天1点 同步提现在途 结束");
} catch (Exception ex) {
log.error("每天1点 同步提现在途 异常:", ex);
......@@ -78,7 +78,7 @@ public class BalanceSheetJob {
public void syncCost() {
try {
log.info("每天1点 同步数据中心需要的费用单 开始");
balanceSheetService.syncCost();
balanceSheetService.syncCost(null);
log.info("每天1点 同步数据中心需要的费用单 结束");
} catch (Exception ex) {
log.error("每天1点 同步数据中心需要的费用单 异常:", ex);
......@@ -93,7 +93,7 @@ public class BalanceSheetJob {
public void syncBuy() {
try {
log.info("每天1点 同步费用系统采购单 开始");
balanceSheetService.syncBuy();
balanceSheetService.syncBuy(null);
log.info("每天1点 同步费用系统采购单 结束");
} catch (Exception ex) {
log.error("每天1点 同步费用系统采购单 异常:", ex);
......@@ -109,7 +109,7 @@ public class BalanceSheetJob {
public void syncSemiInventoryBalance() {
try {
log.info("每天 生成半成品数据 开始");
balanceSheetService.syncSemiInventoryBalance();
balanceSheetService.syncSemiInventoryBalance(null);
log.info("每天 生成半成品数据 结束");
} catch (Exception ex) {
log.error("每天 生成半成品数据 异常:", ex);
......@@ -143,7 +143,7 @@ public class BalanceSheetJob {
public void generateBalanceSheet() {
try {
log.info("每天3点 生成资产负债表 开始");
balanceSheetService.generateBalanceSheet();
balanceSheetService.generateBalanceSheet(null);
log.info("每天3点 生成资产负债表 结束");
} catch (Exception ex) {
log.error("每天3点 生成资产负债表 异常:", ex);
......@@ -154,7 +154,7 @@ public class BalanceSheetJob {
public void getSupplierTransaction() {
try {
log.info("每天4点 取供应商往来数据：应付账款和预付账款 开始");//
balanceSheetService.getSupplierTransaction();
balanceSheetService.getSupplierTransaction(null);
log.info("每天4点 取供应商往来数据：应付账款和预付账款 结束");
} catch (Exception ex) {
log.error("每天4点 取供应商往来数据：应付账款和预付账款 异常:", ex);
......@@ -174,7 +174,7 @@ public class BalanceSheetJob {
public void generateBalanceSheetNewResult() {
try {
log.info("每天7点 生成新资产负债结果表 开始");
balanceSheetService.generateBalanceSheetNewResult();
balanceSheetService.generateBalanceSheetNewResult(null);
log.info("每天7点 生成新资产负债结果表 结束");
} catch (Exception ex) {
log.error("每天7点 生成新资产负债结果表 异常:", ex);
......
datacenter-job/datacenter-finance/finance-balance-sheet/src/main/java/com/bailuntec/job/service/BalanceSheetService.java
......@@ -15,6 +15,8 @@ import com.bailuntec.api.bailuntec.mjcg.resp.MjcgResult;
import com.bailuntec.api.bailuntec.mjcg.resp.MjgysResult;
import com.bailuntec.api.bailuntec.mjcg.resp.SemiPurchaseDetailPageInfoDTO;
import com.bailuntec.api.bailuntec.mjcg.resp.SupofferLogResp;
import com.bailuntec.api.bailuntec.oa.OaApi;
import com.bailuntec.api.bailuntec.oa.response.ExchangeRate;
import com.bailuntec.api.bailuntec.purchase.PurchaseApi;
import com.bailuntec.api.bailuntec.purchase.resp.LogisticsSupplierTransactionDTO;
import com.bailuntec.api.bailuntec.purchase.resp.PurchaseResult;
......@@ -23,10 +25,10 @@ import com.bailuntec.application.*;
import com.bailuntec.common.BeanUtils;
import com.bailuntec.common.ListUtil;
import com.bailuntec.cost.api.BuyApi;
import com.bailuntec.cost.api.CostApi;
import com.bailuntec.cost.api.domain.BuyDomain;
import com.bailuntec.domain.*;
import com.bailuntec.infrastructure.mapper.*;
import com.bailuntec.infrastructure.util.enumerate.CurrencyType;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
......@@ -45,6 +47,8 @@ import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import static java.util.stream.Collectors.groupingBy;
/**
* <p>
*
......@@ -87,10 +91,10 @@ public class BalanceSheetService {
* 同步银行余额
*/
// @Transactional(rollbackFor = Exception.class)
public void syncBankAccount() {
public void syncBankAccount(LocalDate date) {
//DcJobConfig dcJobConfig = dcJobConfigMapper.selectByName(financeSyncBankAccount);
LocalDate date = LocalDate.now().minusDays(1);
if (date == null)
date = LocalDate.now().minusDays(1);
//从财务系统查询银行账户余额
List<BankAccountBalanceDTO> bankAccountBalanceDTOList = cwApi.getBankAccountSummary().getData();
......@@ -98,11 +102,12 @@ public class BalanceSheetService {
dcBankAccountBalanceService.remove(new LambdaQueryWrapper<DcBankAccountBalance>()
.eq(DcBankAccountBalance::getStatisticalTime, date));
//保存
LocalDate finalDate = date;
List<DcBankAccountBalance> dcBankAccountBalanceList = bankAccountBalanceDTOList.stream()
.map(bankAccountBalanceDTO -> {
DcBankAccountBalance dcBankAccountBalance = new DcBankAccountBalance();
BeanUtils.copyProperties(bankAccountBalanceDTO, dcBankAccountBalance);
dcBankAccountBalance.setStatisticalTime(date);
dcBankAccountBalance.setStatisticalTime(finalDate);
return dcBankAccountBalance;
}).collect(Collectors.toList());
......@@ -114,11 +119,12 @@ public class BalanceSheetService {
dcBankAccountBalanceNewService.remove(new LambdaQueryWrapper<DcBankAccountBalanceNew>()
.eq(DcBankAccountBalanceNew::getStatisticalTime, date));
//保存
LocalDate finalDate1 = date;
List<DcBankAccountBalanceNew> dcBankAccountBalanceNewList = bankAccountBalanceDTOList.stream()
.map(bankAccountBalanceDTO -> {
DcBankAccountBalanceNew dcBankAccountBalanceNew = new DcBankAccountBalanceNew();
BeanUtils.copyProperties(bankAccountBalanceDTO, dcBankAccountBalanceNew);
dcBankAccountBalanceNew.setStatisticalTime(date);
dcBankAccountBalanceNew.setStatisticalTime(finalDate1);
return dcBankAccountBalanceNew;
}).collect(Collectors.toList());
......@@ -142,11 +148,11 @@ public class BalanceSheetService {
* </p>
*/
@Transactional(rollbackFor = Exception.class)
public void syncWithdrawOnWaySummary() {
public void syncWithdrawOnWaySummary(LocalDate date) {
//DcJobConfig dcJobConfig = dcJobConfigMapper.selectByName(financeSyncWithdrawOnWaySummary);
if (date == null)
date = LocalDate.now().minusDays(1);
List<WithdrawOnWayDTO> withdrawOnWayDTOList = cwApi.getWithdrawOnWaySummary().getData();
LocalDate date = LocalDate.now().minusDays(1);
LambdaQueryWrapper<DcWithdrawOnWay> wrapper = new LambdaQueryWrapper<DcWithdrawOnWay>()
.eq(DcWithdrawOnWay::getStatisticalTime, date);
......@@ -162,11 +168,12 @@ public class BalanceSheetService {
.eq(DcWithdrawOnWay::getStatisticalTime, date));
//保存
LocalDate finalDate = date;
List<DcWithdrawOnWay> dcWithdrawOnWayList = withdrawOnWayDTOList.stream()
.map(withdrawOnWayDTO -> {
DcWithdrawOnWay dcWithdrawOnWay = new DcWithdrawOnWay();
BeanUtils.copyProperties(withdrawOnWayDTO, dcWithdrawOnWay);
dcWithdrawOnWay.setStatisticalTime(date);
dcWithdrawOnWay.setStatisticalTime(finalDate);
return dcWithdrawOnWay;
})
.collect(Collectors.toList());
......@@ -189,10 +196,11 @@ public class BalanceSheetService {
* 同步短期借款余额
*/
@Transactional(rollbackFor = Exception.class)
public void syncShortBorrowBalance() {
public void syncShortBorrowBalance(LocalDate date) {
//DcJobConfig dcJobConfig = dcJobConfigMapper.selectByName(financeSyncShortBorrowBalance);
//任务时间
LocalDate date = LocalDate.now().minusDays(1);
if (date == null)
date = LocalDate.now().minusDays(1);
List<BorrowBalanceDTO> borrowBalanceDTOList = cwApi.getBorrows().getData();
......@@ -201,11 +209,12 @@ public class BalanceSheetService {
.eq(DcShortTermBorrow::getStatisticalTime, date));
//新增
LocalDate finalDate = date;
List<DcShortTermBorrow> dcShortTermBorrowList = borrowBalanceDTOList.stream()
.map(borrowBalanceDTO -> {
DcShortTermBorrow dcShortTermBorrow = new DcShortTermBorrow();
BeanUtils.copyProperties(borrowBalanceDTO, dcShortTermBorrow);
dcShortTermBorrow.setStatisticalTime(date);
dcShortTermBorrow.setStatisticalTime(finalDate);
return dcShortTermBorrow;
})
.collect(Collectors.toList());
......@@ -216,8 +225,6 @@ public class BalanceSheetService {
}
@Resource
CostApi costApi;
@Resource
DcBaseCostMapper dcBaseCostMapper;
@Resource
IDcBaseCostService dcBaseCostService;
......@@ -228,10 +235,10 @@ public class BalanceSheetService {
* 同步数据中心需要的费用单
*/
@Transactional(rollbackFor = Exception.class)
public void syncCost() {
public void syncCost(LocalDate date) {
//DcJobConfig dcJobConfig = dcJobConfigMapper.selectByName(financeSyncCost);
LocalDate date = LocalDate.now().minusDays(1);
if (date == null)
date = LocalDate.now().minusDays(1);
// List<CostDto> costDtoList = costApi.balanceSheetCostList(dcJobConfig.getStartTimeStr(), dcJobConfig.getEndTimeStr()).getData();
// costDtoList.forEach(costDto -> {
......@@ -275,12 +282,13 @@ public class BalanceSheetService {
* @throws ParseException ex
*/
@Transactional(rollbackFor = Exception.class)
public void syncBuy() throws ParseException {
public void syncBuy(LocalDate date) throws ParseException {
//DcJobConfig dcJobConfig = dcJobConfigMapper.selectByName(financeSyncBuy);
LocalDate date = LocalDate.now().minusDays(1);
if (date == null)
date = LocalDate.now().minusDays(1);
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
List<BuyDomain> buyList = buyApi.balanceSheetBuyList(date.format(dtf), date.plusDays(1).format(dtf)).getData();
LocalDate finalDate = date;
buyList.forEach(buyDomain -> {
DcBaseBuy dcBaseBuy = dcBaseBuyMapper.selectByBuyNo(buyDomain.getBuyno());
......@@ -288,7 +296,7 @@ public class BalanceSheetService {
dcBaseBuy = new DcBaseBuy();
}
BeanUtils.copyProperties(buyDomain, dcBaseBuy, "id");
dcBaseBuy.setDay(date);
dcBaseBuy.setDay(finalDate);
dcBaseBuyService.saveOrUpdate(dcBaseBuy);
});
......@@ -305,7 +313,7 @@ public class BalanceSheetService {
@Resource
IDcPlatformBalanceService dcPlatformBalanceService;
// @Transactional(rollbackFor = Exception.class)
// @Transactional(rollbackFor = Exception.class)
// public void syncSemiInventoryBalance() {
// boolean isOk = true;
// String param = "?btime=" + DateTimeUtil.dateToString(date, DateTimeUtil.DATE_FORMAT) + "&etime=" + DateTimeUtil.dateToString(datePlusOne, DateTimeUtil.DATE_FORMAT);
......@@ -358,14 +366,40 @@ public class BalanceSheetService {
// dcSemiDailyStockMapper.insertSemiDailyStock(date);
// }
// }
@Resource
IDcExchangeRateService dcExchangeRateService;
@Resource
OaApi oaApi;
@Transactional(rollbackFor = Exception.class)
public void syncPayPal() {
public void syncPayPal(LocalDateTime dateTime) {
//DcJobConfig dcJobConfig = dcJobConfigMapper.selectByName(financeSyncPayPal);
LocalDateTime dateTime = LocalDateTime.now().minusDays(1);
if (dateTime == null)
dateTime = LocalDateTime.now().minusDays(1);
List<PayPalBalanceDTO> payPalBalanceDTOList = cwApi.getPayPalBalance();
if (ListUtil.isNotEmpty(payPalBalanceDTOList)) {
Set<String> currentCodeSet = payPalBalanceDTOList
.stream()
.map(dto -> dto.getCurrencyCode())
.collect(groupingBy(code -> code))
.keySet();
LocalDateTime finalDateTime = dateTime;
currentCodeSet.forEach(currentCode -> {
LocalDate recordTime = finalDateTime.toLocalDate();
ExchangeRate exchangeRate = oaApi.getExchangeRateByCurAndDate(currentCode, CurrencyType.CNY.value(), recordTime);
DcExchangeRate dcExchangeRate = new DcExchangeRate();
dcExchangeRate.setExchangeRate(exchangeRate.getRate());
dcExchangeRate.setInitCurreny(currentCode);
dcExchangeRate.setFinalCurreny(CurrencyType.CNY.value());
dcExchangeRate.setRecordTime(recordTime);
dcExchangeRateService.saveOrUpdate(dcExchangeRate,
new LambdaQueryWrapper<DcExchangeRate>()
.eq(DcExchangeRate::getInitCurreny, dcExchangeRate.getInitCurreny())
.eq(DcExchangeRate::getFinalCurreny, dcExchangeRate.getFinalCurreny())
.eq(DcExchangeRate::getRecordTime, dcExchangeRate.getRecordTime()));
});
LocalDateTime finalDateTime1 = dateTime;
List<DcPlatformBalance> dcPlatformBalanceList = payPalBalanceDTOList.stream()
.map(payPalBalanceDTO -> {
DcPlatformBalance dcPlatformBalance = new DcPlatformBalance();
......@@ -381,8 +415,8 @@ public class BalanceSheetService {
dcPlatformBalance.setAmountRmb(BigDecimal.ZERO);
dcPlatformBalance.setUserableAmountRmb(BigDecimal.ZERO);
dcPlatformBalance.setFreezeAmountRmb(BigDecimal.ZERO);
dcPlatformBalance.setDay(dateTime.toLocalDate());
dcPlatformBalance.setPuttime(dateTime);
dcPlatformBalance.setDay(finalDateTime1.toLocalDate());
dcPlatformBalance.setPuttime(finalDateTime1);
dcPlatformBalance.setDelstatus(0);
dcPlatformBalance.setFromsource("PayPal");
dcPlatformBalance.setCreatetime(LocalDateTime.now());
......@@ -490,14 +524,14 @@ public class BalanceSheetService {
* </p>
*/
@Transactional(rollbackFor = Exception.class)
public void generateBalanceSheet() {
public void generateBalanceSheet(LocalDate date) {
//DcJobConfig dcJobConfig = dcJobConfigMapper.selectByName(financeGenerateBalanceSheet);
Integer companyValue = 0;
String companyName = "百伦供应链";
LocalDate date = LocalDate.now().minusDays(1);
if (date == null)
date = LocalDate.now().minusDays(1);
//获取半成品在途
getSemiTransferAmount(date);
......@@ -510,25 +544,25 @@ public class BalanceSheetService {
DcBalanceSheet dcBalanceSheet = dcBalanceSheetMapper.selectOne(new LambdaQueryWrapper<DcBalanceSheet>()
.eq(DcBalanceSheet::getCompanyValue, companyValue)
.eq(DcBalanceSheet::getCompanyName, companyName)
.eq(DcBalanceSheet::getStatisticalTime, LocalDate.now().minusDays(1)));
.eq(DcBalanceSheet::getStatisticalTime, date));
DcBalanceSheetNew dcBalanceSheetNew = dcBalanceSheetNewMapper.selectOne(new LambdaQueryWrapper<DcBalanceSheetNew>()
.eq(DcBalanceSheetNew::getCompanyValue, companyValue)
.eq(DcBalanceSheetNew::getCompanyName, companyName)
.eq(DcBalanceSheetNew::getStatisticalTime, LocalDate.now().minusDays(1)));
.eq(DcBalanceSheetNew::getStatisticalTime, date));
if (dcBalanceSheet == null) {
dcBalanceSheet = new DcBalanceSheet();
dcBalanceSheet.setCompanyValue(companyValue);
dcBalanceSheet.setCompanyName(companyName);
dcBalanceSheet.setStatisticalTime(LocalDate.now().minusDays(1));
dcBalanceSheet.setStatisticalTime(date);
}
if (dcBalanceSheetNew == null) {
dcBalanceSheetNew = new DcBalanceSheetNew();
dcBalanceSheetNew.setCompanyValue(companyValue);
dcBalanceSheetNew.setCompanyName(companyName);
dcBalanceSheetNew.setStatisticalTime(LocalDate.now().minusDays(1));
dcBalanceSheetNew.setStatisticalTime(date);
}
//银行账户余额汇总
......@@ -691,17 +725,18 @@ public class BalanceSheetService {
DcLogisticsSupplierTransactionMapper dcLogisticsSupplierTransactionMapper;
/**
*取供应商往来数据：应付账款和预付账款
* 取供应商往来数据：应付账款和预付账款
*/
public void getSupplierTransaction(){
LocalDate date = LocalDate.now().minusDays(1);
public void getSupplierTransaction(LocalDate date) {
if (date == null)
date = LocalDate.now().minusDays(1);
try {
PurchaseResult<List<SupplierTransactionDTO>> result = purchaseApi.GetSupplierTransactionStatictis(date, null, null, "{}");
if (result.getIsSuccessed() && result.getData().size() > 0) {
dcSupplierTransactionMapper.insertOrUpdateSupplierTransaction(result.getData());
updateSuppliserTransactionOfBalanceSheet(date);
}
}catch (Exception ex){
} catch (Exception ex) {
log.error(ex.toString());
try {
throw new Exception("取供应商往来数据时发生异常");
......@@ -764,7 +799,6 @@ public class BalanceSheetService {
/**
* 获取物流供应商往来数据：应付账款和预付账款
*
*/
public void getLogisticsSupplierTransaction() {
LocalDate date = LocalDate.now();
......@@ -782,7 +816,7 @@ public class BalanceSheetService {
date = date.minusDays(2);
}
try {
PurchaseResult<List<LogisticsSupplierTransactionDTO>> result = purchaseApi.GetSupplierTransactionExpress(date,"{}");
PurchaseResult<List<LogisticsSupplierTransactionDTO>> result = purchaseApi.GetSupplierTransactionExpress(date, "{}");
if (result.getIsSuccessed() && result.getData().size() > 0) {
if (isWeek) {
for (LogisticsSupplierTransactionDTO logisticsSupplierTransactionDTO : result.getData()) {
......@@ -807,7 +841,7 @@ public class BalanceSheetService {
BigDecimal ncaDeferredTaxAssetsImport,
BigDecimal platformBalanceUpdate) throws ParseException {
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
LocalDate date = LocalDate.parse(dateStr,dtf);
LocalDate date = LocalDate.parse(dateStr, dtf);
// 生成资产负债表
DcBalanceSheet dcBalanceSheetInit = dcBalanceSheetMapper.getDcBalanceSheetInit(0, "百伦供应链", date);
if (dcBalanceSheetInit == null) {
......@@ -962,12 +996,14 @@ public class BalanceSheetService {
* </p>
*/
@Transactional(rollbackFor = Exception.class)
public void syncSemiInventoryBalance() {
public void syncSemiInventoryBalance(LocalDate now) {
//DcJobConfig dcJobConfig = dcJobConfigMapper.selectByName(baseSyncSemiStock);
boolean isOk = true;
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
String startDate = LocalDate.now().minusDays(1).format(dtf);
String endDate = LocalDate.now().format(dtf);
if (now == null)
now = LocalDate.now().minusDays(1);
String startDate = now.format(dtf);
String endDate = now.plusDays(1).format(dtf);
try {
MjgysResult<List<SupofferLogResp>> supofferLogs = mjgysApi.supofferLog(startDate, endDate);
if (supofferLogs.isSuccess() && supofferLogs.getData().size() > 0) {
......@@ -1007,7 +1043,7 @@ public class BalanceSheetService {
}
// 生成半成品每日存货
if (isOk) {
dcSemiDailyStockMapper.insertSemiDailyStock(LocalDate.now().minusDays(1));
dcSemiDailyStockMapper.insertSemiDailyStock(now);
}
//dcJobConfigMapper.updateById(dcJobConfig.refresh());
}
......@@ -1016,15 +1052,16 @@ public class BalanceSheetService {
MjcgApi mjcgApi;
@Resource
DcSemiPurchaseDetailMapper dcSemiPurchaseDetailMapper;
/**
* 获取半成品在途
*/
@Transactional(rollbackFor = Exception.class)
public void getSemiTransferAmount(LocalDate start){
public void getSemiTransferAmount(LocalDate start) {
boolean isOk = true;
int page = 1;
int row = 4000;
MjcgResult<SemiPurchaseDetailPageInfoDTO> result = mjcgApi.GetBuyDetailList(start,start.plusDays(1),page,row);
MjcgResult<SemiPurchaseDetailPageInfoDTO> result = mjcgApi.GetBuyDetailList(start, start.plusDays(1), page, row);
if (result.getResult() && result.getList().getTotalItems() > 0) {
dcSemiPurchaseDetailMapper.insertOrUpdateSemiPurchaseDetail(result.getList().getItems());
int totalPages = result.getList().getTotalPages();
......@@ -1032,7 +1069,7 @@ public class BalanceSheetService {
while (page < totalPages) {
page += 1;
try {
result = mjcgApi.GetBuyDetailList(start,start.plusDays(1),page,row);
result = mjcgApi.GetBuyDetailList(start, start.plusDays(1), page, row);
dcSemiPurchaseDetailMapper.insertOrUpdateSemiPurchaseDetail(result.getList().getItems());
result = null;
} catch (Exception e) {
......@@ -1053,14 +1090,14 @@ public class BalanceSheetService {
@Resource
DcBalanceSheetNewModifyMapper dcBalanceSheetNewModifyMapper;
public void generateBalanceSheetNewResult() {
public void generateBalanceSheetNewResult(LocalDate date) {
//DcJobConfig dcJobConfig = dcJobConfigMapper.selectByName(financeGenerateBalanceSheetNewResult);
Integer companyValue = 0;
String companyName = "百伦供应链";
LocalDate date = LocalDate.now().minusDays(1);
if (date == null)
date = LocalDate.now().minusDays(1);
this.setBalanceSheetNewResult(date);
//更新任务时间
......
datacenter-job/datacenter-finance/finance-balance-sheet/src/test/java/com/bailuntec/job/service/BalanceSheetServiceTest.java
......@@ -6,13 +6,14 @@ import com.bailuntec.infrastructure.mapper.DcJobConfigMapper;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.web.WebAppConfiguration;
import javax.annotation.Resource;
import java.text.ParseException;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
/**
......@@ -37,10 +38,10 @@ public class BalanceSheetServiceTest {
@Test
public void syncBankAccount() {
balanceSheetService.syncBankAccount();
//balanceSheetService.syncBankAccount();
}
@Test
/*@Test
public void syncWithdrawOnWaySummary() {
balanceSheetService.syncWithdrawOnWaySummary();
}
......@@ -73,9 +74,27 @@ public class BalanceSheetServiceTest {
@Test
@Rollback(value = false)
public void generateBalanceSheet() {
balanceSheetService.generateBalanceSheet();
balanceSheetService.getSupplierTransaction();
//LocalDate date = LocalDate.now().minusDays(1);
//balanceSheetService.getSupplierTransaction();
}*/
@Test
public void balanceSheetTest() throws ParseException {
for(long minus=4;minus>1;minus--) {
//long minus = 5;
LocalDate localDate = LocalDate.now().minusDays(minus);
LocalDateTime localDateTime = LocalDateTime.now().minusDays(minus);
balanceSheetService.syncBankAccount(localDate);
balanceSheetService.syncWithdrawOnWaySummary(localDate);
balanceSheetService.syncPayPal(localDateTime);
balanceSheetService.syncShortBorrowBalance(localDate);
balanceSheetService.syncCost(localDate);
balanceSheetService.syncBuy(localDate);
balanceSheetService.syncSemiInventoryBalance(localDate);
balanceSheetService.generateBalanceSheet(localDate);
balanceSheetService.getSupplierTransaction(localDate);
}
}
@Test
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment