fix：订单拓展审批回调

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

@@ -87,6 +87,7 @@ public class BirActivityCenterGoodsController {
         List<TbsBudget> budgetList = tbsBudgetMapper.selectList(new LambdaQueryWrapper<TbsBudget>().eq(TbsBudget::getBudgetNumber,budgetCode));
         if(budgetList.size()==1){
             List<Long> costIds = tbsBudgetLogMapper.getBudgetCostIds(budgetList.get(0).getId());
+            //centerGoodsService.rebuildBir(Arrays.asList(costIds));
             if(CollectionUtil.isNotEmpty(costIds)){
                 for (Long costId : costIds) {
                     centerGoodsService.rebuildBir(Arrays.asList(costId));

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

@@ -111,7 +111,6 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl<BirActivityCe
             this.remove(rmCostId);
         }
 
-
         //过滤需要移除的ID
         costApplyIds = buildIds;
         if(CollectionUtil.isEmpty(costApplyIds)){

src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderOptionsServiceImpl.java

@@ -182,25 +182,8 @@ public class OmsOrderOptionsServiceImpl implements OmsOrderOptionsService {
                 totalOrderAmt, templateCode, saleBizNames, bizBizNames);
         newWayData.put("formmain_2206",mainTableData);
 
-        List<SeeYonOrderItemDTO> itemDTOList = orderItemList.stream().map(item->{
+        // 构建子表data
-            SeeYonOrderItemDTO dto = new SeeYonOrderItemDTO();
+        List<SeeYonOrderItemDTO> itemDTOList = getSeeYonOrderItemDTOS(orderItemList);
-            dto.setSpuCode(item.getSpuCode());
-            dto.setSkuTitle(item.getSkuTitle());
-            GoodsSpu goodsSpu = goodsSpuMapper.selectById(item.getSpuId());
-            GoodsSku goodsSku = goodsSkuMapper.selectById(item.getSkuId());
-            GoodsCategory goodsCategory = goodsCategoryMapper.selectById(goodsSpu.getCategoryLast());
-            dto.setSkuAddCode(goodsSku.getSkuAddCode());
-            dto.setSkuCode(item.getSkuCode());
-            dto.setBatchCode(item.getSkuBatchCode());
-            dto.setSkuCategories(goodsCategory.getLevelPathNames());
-            dto.setSpecVal(item.getSpecValues());
-            dto.setRemark(item.getRemark());
-            dto.setWeight(item.getWeight());
-            dto.setVolume(item.getVolume());
-            dto.setSalesPrice(item.getSalesPrice());
-            dto.setTotalPrice(item.getSalesPrice().multiply(new BigDecimal(item.getQuantity())));
-            return dto;
-        }).collect(Collectors.toList());
         newWayData.put("formson_2210",itemDTOList);
 
         OaFormMainProcess mainProcess = new OaFormMainProcess();
@@ -236,6 +219,29 @@ public class OmsOrderOptionsServiceImpl implements OmsOrderOptionsService {
         return R.ok();
     }
 
+    private List<SeeYonOrderItemDTO> getSeeYonOrderItemDTOS(List<OmsOrderItem> orderItemList) {
+        List<SeeYonOrderItemDTO> itemDTOList = orderItemList.stream().map(item->{
+            SeeYonOrderItemDTO dto = new SeeYonOrderItemDTO();
+            dto.setSpuCode(item.getSpuCode());
+            dto.setSkuTitle(item.getSkuTitle());
+            GoodsSpu goodsSpu = goodsSpuMapper.selectById(item.getSpuId());
+            GoodsSku goodsSku = goodsSkuMapper.selectById(item.getSkuId());
+            GoodsCategory goodsCategory = goodsCategoryMapper.selectById(goodsSpu.getCategoryLast());
+            dto.setSkuAddCode(goodsSku.getSkuAddCode());
+            dto.setSkuCode(item.getSkuCode());
+            dto.setBatchCode(item.getSkuBatchCode());
+            dto.setSkuCategories(goodsCategory.getLevelPathNames());
+            dto.setSpecVal(item.getSpecValues());
+            dto.setRemark(item.getRemark());
+            dto.setWeight(item.getWeight());
+            dto.setVolume(item.getVolume());
+            dto.setSalesPrice(item.getSalesPrice());
+            dto.setTotalPrice(item.getSalesPrice().multiply(new BigDecimal(item.getQuantity())));
+            return dto;
+        }).collect(Collectors.toList());
+        return itemDTOList;
+    }
+
     @Override
     public void syncToErp() {
         AuthContextUtils.setTenant("001");
@@ -245,6 +251,7 @@ public class OmsOrderOptionsServiceImpl implements OmsOrderOptionsService {
                 .in(OmsOrder::getStatus,0,1)
                 .eq(OmsOrder::getOrderCheckState,OmsOrderCheckState.Finished.getCode())
         );
+        log.warn("临期品同步到ERP，数量：{}",omsOrders.size());
         for (OmsOrder omsOrder : omsOrders) {
             BmsSupplierAddress supplierAddress = bmsSupplierAddressService.getById(omsOrder.getSupplierAddrId());
             List<OmsOrderItem> orderItemList = omsOrderItemService.listByOrderId(omsOrder.getId());

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

@@ -675,6 +675,18 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         R<String> flowIdResult = null;
         if(tbsCostApply.getContractFlag().equals(1)){
             List<OaUploadFile> uploadFileList = new ArrayList<>();
+            for (TbsActivity activity : activityList) {
+                if(CollectionUtil.isNotEmpty(activity.getAttachIds())){
+                    List<SysAttach> attachList = sysAttachService.listByIds(Arrays.asList(activity.getAttachIds()));
+                    for (SysAttach sysAttach : attachList) {
+                        OaUploadFile uploadFile = new OaUploadFile();
+                        uploadFile.setField("file");
+                        uploadFile.setName("活动附件"+sysAttach.getName());
+                        uploadFile.setUrl("https://qsjslservice.oss-cn-guangzhou.aliyuncs.com/"+sysAttach.getRelativePath());
+                        uploadFileList.add(uploadFile);
+                    }
+                }
+            }
             if(CollectionUtil.isNotEmpty(oaAttachmentsIdList)){
                 List<SysAttach> attachList = sysAttachService.listByIds(oaAttachmentsIdList);
                 for (SysAttach sysAttach : attachList) {

src/main/java/com/qs/serve/modules/third/PortalFlowController.java

@@ -1,6 +1,7 @@
 package com.qs.serve.modules.third;
 
 import com.qs.serve.common.model.dto.R;
+import com.qs.serve.modules.oms.service.OmsOrderOptionsService;
 import com.qs.serve.modules.seeyon.service.SeeYonRequestService;
 import com.qs.serve.modules.sys.entity.SysSyncLog;
 import com.qs.serve.modules.sys.service.SysSyncLogService;
@@ -36,6 +37,7 @@ public class PortalFlowController {
     private final SysSyncLogService sysSyncLogService;
     private final SeeYonRequestService seeYonRequestService;
     private final VtbVerificationBatchOperationService vtbVerificationBatchOperationService;
+    private final OmsOrderOptionsService omsOrderOptionsService;
 
     @GetMapping("/compenstate/{flowCode}/{formId}")
     public R<?> compenstate(@PathVariable("flowCode")String flowCode,
@@ -82,6 +84,9 @@ public class PortalFlowController {
         }else if(TbsSeeYonConst.BatchCostCheckConf.Code().equals(flowCode)){
             //核销 批量申请
             vtbVerificationBatchOperationService.runCompensate(targetId);
+        }else if(TbsSeeYonConst.ExpiredOrderConf.Code().equals(flowCode)){
+            //核销 批量申请
+            omsOrderOptionsService.runCompensate(targetId);
         }else {
             return R.error("业务["+flowCode+"]未被收录");
         }