diff --git a/src/main/java/com/qs/serve/modules/bir/consts/BirActivityCenterGoodsUtil.java b/src/main/java/com/qs/serve/modules/bir/consts/BirActivityCenterGoodsUtil.java index a2d28973..b5e79de1 100644 --- a/src/main/java/com/qs/serve/modules/bir/consts/BirActivityCenterGoodsUtil.java +++ b/src/main/java/com/qs/serve/modules/bir/consts/BirActivityCenterGoodsUtil.java @@ -26,14 +26,27 @@ public class BirActivityCenterGoodsUtil { } public static void buildBir(List costIds){ + TbsCostBirLogMapper birLogMapper = null; + try { + birLogMapper = SpringUtils.getBean(TbsCostBirLogMapper.class); + } catch (BeansException e) { + e.printStackTrace(); + } + if(birLogMapper==null){ + log.error("获取不到BEAN TbsCostBirLogMapper BirActivityCenterGoodsUtil "); + return; + } if(CollUtil.isEmpty(costIds)){ return; } for (Long costId : costIds) { - TbsCostBirLogMapper birLogMapper = SpringUtils.getBean(TbsCostBirLogMapper.class); - TbsCostBirLog birLog = new TbsCostBirLog(); - birLog.setCostId(costId); - birLogMapper.insert(birLog); + try { + TbsCostBirLog birLog = new TbsCostBirLog(); + birLog.setCostId(costId); + birLogMapper.insert(birLog); + } catch (BeansException e) { + e.printStackTrace(); + } } } diff --git a/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java b/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java index 780caef0..be334786 100644 --- a/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java +++ b/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java @@ -87,8 +87,10 @@ public class BirActivityCenterGoodsController { public R toSyncBirEcro(){ List costIds = tbsCostBirLogMapper.listCostIds(); if(CollectionUtil.isNotEmpty(costIds)){ - centerGoodsService.rebuildBir(costIds); - tbsCostBirLogMapper.delete(new LambdaQueryWrapper().in(TbsCostBirLog::getCostId,costIds)); + for (Long costId : costIds) { + centerGoodsService.rebuildBir(Arrays.asList(costId)); + tbsCostBirLogMapper.delete(new LambdaQueryWrapper().eq(TbsCostBirLog::getCostId,costId)); + } } return R.ok(); } diff --git a/src/main/java/com/qs/serve/modules/bir/entity/so/BirTbsVtbPayJoinSo.java b/src/main/java/com/qs/serve/modules/bir/entity/so/BirTbsVtbPayJoinSo.java index 05b8fdbf..f92c2a2e 100644 --- a/src/main/java/com/qs/serve/modules/bir/entity/so/BirTbsVtbPayJoinSo.java +++ b/src/main/java/com/qs/serve/modules/bir/entity/so/BirTbsVtbPayJoinSo.java @@ -124,4 +124,10 @@ public class BirTbsVtbPayJoinSo { private String orderType; + /** + * 费用类型:0->常规;1->协议类;2->进场费 + */ + private Integer contractFlag; + + } diff --git a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryServiceImpl.java b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryServiceImpl.java index a3ebbd1b..671aefef 100644 --- a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryServiceImpl.java @@ -79,6 +79,15 @@ public class GoodsCategoryServiceImpl extends ServiceImpl() + .eq(GoodsCategory::getName,category.getName()) + .ne(category.getId()!=null,GoodsCategory::getId,category.getId()) + ); + if(count>0){ + Assert.throwEx("名称被占用了"); + } + if(category.getId()==null){ this.save(category); } diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyCheckController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyCheckController.java index b91dbcd6..a8b59e80 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyCheckController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyCheckController.java @@ -10,6 +10,7 @@ import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.util.*; +import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil; import com.qs.serve.modules.bms.entity.BmsSupplier; import com.qs.serve.modules.bms.service.BmsSupplierService; import com.qs.serve.modules.seeyon.entity.CtpAffairQo; @@ -63,11 +64,12 @@ public class TbsCostApplyCheckController { * 测试接口(正式环境无法调用) * @return */ - @GetMapping("devDoFinished") + //@GetMapping("devDoFinished") public R devDoFinished(String costApplyId){ TbsAffairCommitBo commitBo = new TbsAffairCommitBo(); commitBo.setCostApplyId(Long.parseLong(costApplyId)); //tbsCostApplyOperationServiceImpl.doFinished(commitBo); + BirActivityCenterGoodsUtil.buildBir(Long.parseLong(costApplyId)); return R.ok(); } @@ -90,8 +92,9 @@ public class TbsCostApplyCheckController { @PostMapping("/commit/{id}") @SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.UPDATE) @PreAuthorize("hasRole('tbs:costApply:update')") - public R commit(@PathVariable("id") String id){ - tbsCostApplyService.commitApply(id); + public R commit(@PathVariable("id") Long id){ + tbsCostApplyService.commitApply(id+""); + BirActivityCenterGoodsUtil.buildBir(id); return R.ok(); } @@ -124,9 +127,10 @@ public class TbsCostApplyCheckController { @SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.DELETE) @PreAuthorize("hasRole('tbs:costApply:commit')") public R commitAffair(@RequestBody @Valid TbsAffairCommitBo affairCommit){ - return tbsCostApplyOperationServiceImpl.commitAffair(affairCommit); + tbsCostApplyOperationServiceImpl.commitAffair(affairCommit); //tbsCostApplyOperationServiceImpl.doFinished(affairCommit); - //return R.ok(); + BirActivityCenterGoodsUtil.buildBir(affairCommit.getCostApplyId()); + return R.ok(); } /** @@ -137,8 +141,10 @@ public class TbsCostApplyCheckController { @LimitSubmit @PostMapping("/compensate/{id}") @SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.UPDATE) - public R compensate(@PathVariable("id") String id){ - return tbsCostApplyOperationServiceImpl.runCompensate(id); + public R compensate(@PathVariable("id") Long id){ + tbsCostApplyOperationServiceImpl.runCompensate(id+""); + BirActivityCenterGoodsUtil.buildBir(id); + return R.ok(); } /** diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index 209f78e7..6fbba790 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -100,7 +100,7 @@ public class TbsCostApplyController { * @param id * @return */ - @PostMapping("/rebuildBudgetInit") + //@PostMapping("/rebuildBudgetInit") public R bu(Long id){ tbsCostApplyService.rebuildBudgetInit(id); return R.ok(); @@ -495,6 +495,7 @@ public class TbsCostApplyController { return R.ok("含活动数据无法删除"); } boolean result = tbsCostApplyService.removeById(id); + BirActivityCenterGoodsUtil.buildBir(id); return R.isTrue(result); } @@ -566,6 +567,7 @@ public class TbsCostApplyController { */ @GetMapping("removeByAdmin") public R removeByAdmin(Long costApplyId,String remark){ + BirActivityCenterGoodsUtil.buildBir(costApplyId); deleteLogService.deleteCostApply(costApplyId,remark); return R.ok(); } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java index 10b018f5..6b145cbe 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java @@ -71,6 +71,7 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service { costApply.setUserCode(sysUser.getCode()); costApply.setUserName(sysUser.getName()); costApply.setCode(newCostApplyCode); + costApply.setCheckState(null); costApply.setCreateBy(null); costApply.setCreateTime(null); costApply.setUpdateTime(null); diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index 4b0b3700..2bc51f2f 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -624,6 +624,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl subjectCenterBoList, TbsCostApply costApply, BmsSupplier supplier, List verificationSubjects, List verificationCenters, String verificationCode) { @@ -1418,6 +1420,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl + AND a.contract_flag = #{query.contractFlag} + AND a.code LIKE CONCAT('%', #{query.costApplyCode}, '%') diff --git a/src/main/resources/mapper/goods/GoodsSkuMapper.xml b/src/main/resources/mapper/goods/GoodsSkuMapper.xml index a0de6f96..b75d81d2 100644 --- a/src/main/resources/mapper/goods/GoodsSkuMapper.xml +++ b/src/main/resources/mapper/goods/GoodsSkuMapper.xml @@ -46,6 +46,7 @@ goods_sku.`sales_price`, goods_sku.`market_price`, goods_sku.`cost_price`, + goods_sku.`inv_unit_weight`, goods_sku.`spec_infos`, goods_sku.`stock`, goods_sku.`unit_id`,