diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java index cbd595f..f52608a 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java @@ -357,6 +357,7 @@ public class BirCenterRateServiceImpl implements BirCenterRateService { try { this.buildCustomerCenterTargetData(centerType, centerId, costCenter, supplierCode); } catch (Exception e) { + e.printStackTrace(); log.error("[{}]创建客户成本中心的费率出现异常:{}",supplierCode,e.getMessage()); } } @@ -394,7 +395,8 @@ public class BirCenterRateServiceImpl implements BirCenterRateService { supplierCode4Group.add(supplierCode); LambdaQueryWrapper supplierLqw = new LambdaQueryWrapper<>(); supplierLqw.eq(BmsSupplier::getCode,supplierCode); - BmsSupplier supplier = supplierMapper.selectOne(supplierLqw); + List suppliers = supplierMapper.selectList(supplierLqw); + BmsSupplier supplier = suppliers.get(0); if(supplier.getComRegionCode()!=null){ LambdaQueryWrapper supplierLqw4Group = new LambdaQueryWrapper<>(); supplierLqw4Group.select(BmsSupplier::getCode); diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsSaleOrderController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsSaleOrderController.java index b4d9bf5..3bf47bc 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsSaleOrderController.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsSaleOrderController.java @@ -177,7 +177,7 @@ public class OmsSaleOrderController { public R> getPage(OmsSaleOrder param){ PageUtil.startPage(); LambdaQueryWrapper orderWrapper = new LambdaQueryWrapper<>(param); - orderWrapper.orderByDesc(OmsSaleOrder::getId); + orderWrapper.orderByDesc(OmsSaleOrder::getUserCreateTime); if(param.getCheckStartTime()!=null){ orderWrapper.ge(OmsSaleOrder::getCheckTime,param.getCheckStartTime().atStartOfDay()); diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java index fdd2678..b826d8c 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java @@ -136,6 +136,9 @@ public class OmsSaleOrder implements Serializable { @Length(max = 255,message = "制单人手机号长度不能超过255字") private String userPhone; + private LocalDateTime userCreateTime; + private LocalDateTime userSubmitTime; + /** 发票类型：0->普通发票；1->增值税发票； */ private Integer billType; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java index ef903c7..daf21af 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java @@ -99,6 +99,7 @@ public class OmsSaleOrderPart1ServiceImpl implements OmsSaleOrderPart1Service { order.setUserCode(user.getCode()); order.setUserName(user.getName()); order.setUserPhone(user.getMobile()); + order.setUserCreateTime(LocalDateTime.now()); order.setCheckState(0); order.setOrderErpId(null); order.setStatus(0); diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java index 8719cdd..de7f811 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java @@ -357,7 +357,7 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl attachList; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java index 3be9b1f..3e0c969 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java @@ -207,7 +207,7 @@ public class TbsBudgetApplicationService { //所有满足条件的考核期，用于加载历史核销费用 List scheduleItemList = this.loadScheduleBudgetAndSetting(activityList, budgetIds, noBudgetActivityIds,costSortWrapper); this.checkPointBudgetId(pointBudgetId, budgetIds,"未满足预算考核期"); - List centerIds = activityCenterList.stream().map(TbsActivityCenter::getCenterId).collect(Collectors.toList()); + List centerCodes = activityCenterList.stream().map(TbsActivityCenter::getCenterCode).collect(Collectors.toList()); List subjectIds = activitySubjects.stream().map(TbsActivitySubject::getSubjectId).collect(Collectors.toList()); //通过模板限制，选中指定的预算 List limitBudgetIds = new ArrayList<>(); @@ -234,7 +234,7 @@ public class TbsBudgetApplicationService { budgetLqw.and(qw->qw.eq(TbsBudget::getSubjectId,0).or(qw2->qw2.in(TbsBudget::getSubjectId,subjectIds))); //排除随货编码 //budgetLqw.ne(TbsBudget::getSubjectCode,"FYMC05"); - budgetLqw.in(TbsBudget::getCenterId,centerIds); + budgetLqw.in(TbsBudget::getCenterCode,centerCodes); budgetLqw.eq(TbsBudget::getBudgetState,1); //科目限制>品类之间>时间区间 budgetLqw.orderByDesc(TbsBudget::getSubjectId); diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java index 643b290..523a02d 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java @@ -811,7 +811,7 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService getRequestService().testConnection(); TbsCostApply costApply = costApplyService.getById(affairCommit.getCostApplyId()); if(!costApply.getChargeState().equals(TbsCostApplyState.State_1_apply.getCode())){ - Assert.throwEx("费用申请处于未非审批状态"); + Assert.throwEx("单据状态已更新，请刷新当前页面"); } String syFormId = costApply.getSyFormId(); String templateCode = getTemplateCode(); @@ -879,7 +879,7 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService public String getSyFormIdByTargetInfo(TbsAffairCommitBo affairCommit) { TbsCostApply costApply = costApplyService.getById(affairCommit.getCostApplyId()); if(!costApply.getChargeState().equals(TbsCostApplyState.State_1_apply.getCode())){ - Assert.throwEx("费用申请处于未非审批状态"); + Assert.throwEx("费用状态已更新，请刷新当前页面"); } return costApply.getSyFormId(); } diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplication4CostServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplication4CostServiceImpl.java index 844fcca..740c633 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplication4CostServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplication4CostServiceImpl.java @@ -71,6 +71,12 @@ public class TzcRebateApplication4CostServiceImpl implements TzcRebateApplicatio // 默认延迟半个月 preCheckDays = 15; } + // 自动核销日期类型：0-手动设置；1-自然月；2-自然周 + if (rebate.getCheckAutoDateType().equals(1)){ + preCheckDays = 30; + }else if (rebate.getCheckAutoDateType().equals(2)){ + preCheckDays = 7; + } // 总返利金额 BigDecimal totalAllAmount = maxLevelsAmount.multiply(new BigDecimal(periodList.size())); @@ -90,7 +96,6 @@ public class TzcRebateApplication4CostServiceImpl implements TzcRebateApplicatio tbsActivitySubjectService.remove(delQw); } - // 转化为费用申请 TbsCostApply costApply = new TbsCostApply(); costApply.setRebateId(rebateId); @@ -136,6 +141,9 @@ public class TzcRebateApplication4CostServiceImpl implements TzcRebateApplicatio activity.setPreStartDate(period.getPeriodStartDate().plusDays(preCheckDays)); activity.setPreEndDate(period.getPeriodEndDate().plusDays(preCheckDays)); activity.setPreCheckDate(period.getPeriodEndDate().plusDays(preCheckDays)); + // 核销模式：0-人工复核；1-自动核销 + // 活动状态自动核销状态:0-无需自动核销；1-需自动核销；2-已自动核销 + activity.setAutoCheckState(rebate.getCheckModel()); activity.setTotalAmount(maxLevelsAmount); tbsActivityService.save(activity); Long activityId = activity.getId(); diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java index e365ea2..f3e7dc0 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java @@ -212,6 +212,11 @@ public class VtbVerification implements Serializable { /** 实际发货金额(申请时) */ private BigDecimal finalDispatchAmtRecord; + /** + * 自动核销状态:0-无需自动核销；1-需自动核销； + */ + private Integer autoCheckState; + @TableField(exist = false) private List attachList;