feat: 关联bir触发

src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java

@@ -106,12 +106,6 @@ public class BirActivityCenterGoodsController {
         return costIds.size()<100;
     }
 
-    @GetMapping("/toSyncBir")
-    public R<?> syncBir(Long costId){
-        centerGoodsService.rebuildBir(Arrays.asList(costId));
-        return R.ok();
-    }
-
     /**
      * 翻页
      * @param param

src/main/java/com/qs/serve/modules/bir/entity/BirBaseActivity.java

@@ -28,7 +28,7 @@ public class BirBaseActivity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /** 编号 */
-    @TableId(type = IdType.AUTO)
+    @TableId(type = IdType.INPUT)
     private Long id;
 
     /** 键值(日期数) */

src/main/java/com/qs/serve/modules/bir/mapper/BirActivityCenterGoodsMapper.java

@@ -3,6 +3,7 @@ package com.qs.serve.modules.bir.mapper;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qs.serve.common.model.consts.DSName;
 import com.qs.serve.modules.bir.entity.BirActivityCenterGoods;
 import com.qs.serve.modules.bir.entity.so.BirMonthCusCenterSo;
 import com.qs.serve.modules.bir.entity.vo.BirActivityCenterGoodsMonthVo;
@@ -19,7 +20,7 @@ import java.util.List;
  * @author YenHex
  * @date 2023-07-06
  */
-@DS("erp_stand_ds")
+@DS(DSName.QiSheng)
 public interface BirActivityCenterGoodsMapper extends BaseMapper<BirActivityCenterGoods> {
 
     //List<BirActivityCenterGoods> selectErrorBir();

src/main/java/com/qs/serve/modules/bir/mapper/BirBaseActivityMapper.java

@@ -3,6 +3,7 @@ package com.qs.serve.modules.bir.mapper;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qs.serve.common.model.consts.DSName;
 import com.qs.serve.modules.bir.entity.BirBaseActivity;
 import com.qs.serve.modules.bir.entity.dto.UnMatchBirRecord;
 import com.qs.serve.modules.tbs.entity.TbsActivity;
@@ -17,7 +18,7 @@ import java.util.List;
  * @author YenHex
  * @date 2023-06-05
  */
-@DS("erp_stand_ds")
+@DS(DSName.QiSheng)
 public interface BirBaseActivityMapper extends BaseMapper<BirBaseActivity> {
 
     //List<TbsActivity> selectByBirActivity(@Param("startDate") LocalDate startDate, @Param("endDate")LocalDate endDate);

src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.qs.serve.modules.bir.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -216,7 +217,10 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl<BirActivityCe
                 }
             }
             if(bacgList.size()>0){
-                this.saveBatch(bacgList);
+                for (BirActivityCenterGoods bir : bacgList) {
+                    bir.setId(IdUtil.getSnowflakeNextId());
+                    super.getBaseMapper().insert(bir);
+                }
             }
         }
     }

src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java

@@ -1,5 +1,6 @@
 package com.qs.serve.modules.bir.service.impl;
 
+import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qs.serve.common.model.dto.DateSplitDTO;
@@ -52,7 +53,7 @@ public class BirBaseActivityServiceImpl extends ServiceImpl<BirBaseActivityMappe
                 .map(TbsActivity::getId).collect(Collectors.toList());
         LambdaQueryWrapper<BirBaseActivity> birBaseActivityLqw = new LambdaQueryWrapper<>();
         birBaseActivityLqw.in(BirBaseActivity::getActivityId,ids);
-        this.remove(birBaseActivityLqw);
+        super.baseMapper.delete(birBaseActivityLqw);
 
         LambdaQueryWrapper<TbsActivity> activityLqw = new LambdaQueryWrapper<>();
         activityLqw.in(TbsActivity::getId,ids);
@@ -173,7 +174,10 @@ public class BirBaseActivityServiceImpl extends ServiceImpl<BirBaseActivityMappe
 
         }
         //保存
-        this.saveBatch(birBaseActivities);
+        for (BirBaseActivity baseActivity : birBaseActivities) {
+            baseActivity.setId(IdUtil.getSnowflakeNextId());
+            super.getBaseMapper().insert(baseActivity);
+        }
     }
 
     @Override

src/main/java/com/qs/serve/modules/goods/controller/GoodsRuleController.java

@@ -55,6 +55,7 @@ public class GoodsRuleController {
     * @param param
     * @return
     */
+    @GetMapping("/modify")
     @SysLog(module = SystemModule.GOODS, title = "规则", biz = BizType.INSERT)
     public R<?> save(@RequestBody @Valid GoodsRuleBo param){
         goodsRuleService.modify(param);

src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java

@@ -3,9 +3,11 @@ import java.time.LocalDateTime;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qs.serve.common.util.Assert;
 import com.qs.serve.common.util.HttpUtil;
 import com.qs.serve.common.util.IdUtil;
 import com.qs.serve.common.util.JsonUtil;
+import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
 import com.qs.serve.modules.sys.entity.dto.CostDeletion;
@@ -47,8 +49,10 @@ public class SysDeleteLogServiceImpl extends ServiceImpl<SysDeleteLogMapper,SysD
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deleteCostApply(Long costApplyId,String remark) {
+
         TbsCostApply costApply = tbsCostApplyMapper.selectById(costApplyId);
         BmsSupplier supplier = supplierMapper.selectById(costApply.getSupplierId());
+
         String batchCode = System.currentTimeMillis()+"";
         List<SysDeleteLog> deleteLogList = new ArrayList<>();
         if(costApply!=null){
@@ -61,6 +65,19 @@ public class SysDeleteLogServiceImpl extends ServiceImpl<SysDeleteLogMapper,SysD
             deleteLogList.add(deleteLog);
         }
 
+        //远程删除ERP
+        String url = "http://59.37.164.96:2505/api/cms/cost/deletion";
+        CostDeletion costDeletion = new CostDeletion();
+        costDeletion.setEmpNo(costApply.getUserCode());
+        String bookCode = ThirtyVerification.getInitBookCode(supplier.getBookCode(),supplier.getCode());
+        costDeletion.setCacc(bookCode);
+        costDeletion.setVerificationCode(costApply.getCode());
+        String rs = HttpUtil.doPost(url, JsonUtil.objectToJson(costDeletion),null);
+
+        if(!rs.contains("200")){
+            Assert.throwEx("远程删除失败");
+        }
+
         tbsCostApplyRemoveMapper.tbs_cost_apply(costApplyId);
 
         tbsCostApplyRemoveMapper.tbs_activity(costApplyId);
@@ -120,15 +137,7 @@ public class SysDeleteLogServiceImpl extends ServiceImpl<SysDeleteLogMapper,SysD
         tbsCostApplyRemoveMapper.tbs_cost_todo(costApplyId);
         this.saveBatch(deleteLogList);
 
-        //远程删除ERP
+        BirActivityCenterGoodsUtil.buildBir(costApplyId);
-        String url = "http://59.37.164.96:2505/api/cms/cost/deletion";
-        CostDeletion costDeletion = new CostDeletion();
-        costDeletion.setEmpNo(costApply.getUserCode());
-        String bookCode = ThirtyVerification.getInitBookCode(supplier.getBookCode(),supplier.getCode());
-        costDeletion.setCacc(bookCode);
-        costDeletion.setVerificationCode(costApply.getCode());
-        HttpUtil.doPost(url, JsonUtil.objectToJson(costDeletion),null);
-
     }
 
 }

src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java

@@ -12,6 +12,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.BmsRegion2;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.service.BmsRegion2Service;
@@ -124,6 +125,7 @@ public class TbsCostApplyController {
     @DeleteMapping("/removeCostById/{id}")
     public R<?> removeCostById(@PathVariable("id") Long id){
         tbsCostApplyService.removeCostById(id);
+        BirActivityCenterGoodsUtil.buildBir(id);
         return R.ok();
     }
 

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java

@@ -8,6 +8,7 @@ import com.qs.serve.common.model.enums.BudgetLogOptFlag;
 import com.qs.serve.common.model.consts.BudgetLogRollbackFlag;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.util.*;
+import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil;
 import com.qs.serve.modules.data.entity.DataAffairCommit;
 import com.qs.serve.modules.data.mapper.DataAffairCommitMapper;
 import com.qs.serve.modules.seeyon.entity.CtpAffair;
@@ -823,6 +824,7 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService
             bo.setCostApplyId(costApply.getId());
             this.doFinished(bo);
         }
+        BirActivityCenterGoodsUtil.buildBir(costApply.getId());
         return null;
     }
 

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java

@@ -8,6 +8,7 @@ import com.qs.serve.common.util.Assert;
 import com.qs.serve.common.util.AuthContextUtils;
 import com.qs.serve.common.util.CodeGenUtil;
 import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil;
 import com.qs.serve.modules.bir.service.BirCenterRateService;
 import com.qs.serve.modules.bir.service.BirRoiRateService;
 import com.qs.serve.modules.bms.mapper.BmsRegion2Mapper;
@@ -176,6 +177,8 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service {
         orgCost.setChangeExtendId(costApply.getId());
         orgCost.setChangeActionTime(LocalDateTime.now());
         tbsCostApplyService.updateById(orgCost);
+        BirActivityCenterGoodsUtil.buildBir(costId);
+        BirActivityCenterGoodsUtil.buildBir(newCostApplyId);
         return costApply;
     }
 
@@ -222,6 +225,9 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service {
         tbsBudgetLogMapper.updateLogDelFlagCancelByCostApply(extCost.getChangeSourceId(),0);
         //删除当前的异动记录
         tbsBudgetLogMapper.updateLogDelFlagByCostApply(extCost.getId(),1);
+
+        BirActivityCenterGoodsUtil.buildBir(extCost.getChangeSourceId());
+        BirActivityCenterGoodsUtil.buildBir(extCost.getId());
     }
 
     /**

src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

@@ -9,6 +9,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.seeyon.entity.CtpAffair;
 import com.qs.serve.modules.seeyon.entity.CtpAffairQo;
 import com.qs.serve.modules.seeyon.entity.bo.CtpAddNodeParam;
@@ -460,7 +461,8 @@ public class VtbVerificationController {
     @LimitSubmit
     @PostMapping("/compensate/{id}")
     public R<?> compensate(@PathVariable("id") String id){
-        return vtbVerificationOperationService.runCompensate(id);
+        vtbVerificationOperationService.runCompensate(id);
+        return R.ok();
     }
 
 

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -603,6 +603,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         }else {
             Assert.throwEx("非释放的活动，无法操作");
         }
+        BirActivityCenterGoodsUtil.buildBir(activity.getCostApplyId());
     }
 
     @Override