From c94f07bfb91ce9d75e3dc848f92c1f40511c10ff Mon Sep 17 00:00:00 2001 From: Yen Date: Wed, 21 Aug 2024 09:59:02 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=AE=A2=E5=8D=95=E6=8B=93?= =?UTF-8?q?=E5=B1=95=E5=AE=A1=E6=89=B9=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BirActivityCenterGoodsController.java | 1 + .../BirActivityCenterGoodsServiceImpl.java | 1 - .../impl/OmsOrderOptionsServiceImpl.java | 45 +++++++++++-------- .../service/impl/TbsCostApplyServiceImpl.java | 12 +++++ .../modules/third/PortalFlowController.java | 5 +++ 5 files changed, 44 insertions(+), 20 deletions(-) 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 19b3e45a..32ae9f5f 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,6 +87,7 @@ public class BirActivityCenterGoodsController { List budgetList = tbsBudgetMapper.selectList(new LambdaQueryWrapper().eq(TbsBudget::getBudgetNumber,budgetCode)); if(budgetList.size()==1){ List 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)); diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java index b51d4b3d..46f5988a 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java @@ -111,7 +111,6 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl 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()); + // 构建子表data + List itemDTOList = getSeeYonOrderItemDTOS(orderItemList); newWayData.put("formson_2210",itemDTOList); OaFormMainProcess mainProcess = new OaFormMainProcess(); @@ -236,6 +219,29 @@ public class OmsOrderOptionsServiceImpl implements OmsOrderOptionsService { return R.ok(); } + private List getSeeYonOrderItemDTOS(List orderItemList) { + List 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 orderItemList = omsOrderItemService.listByOrderId(omsOrder.getId()); diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index 57070b12..e063bfbf 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -675,6 +675,18 @@ public class TbsCostApplyServiceImpl extends ServiceImpl flowIdResult = null; if(tbsCostApply.getContractFlag().equals(1)){ List uploadFileList = new ArrayList<>(); + for (TbsActivity activity : activityList) { + if(CollectionUtil.isNotEmpty(activity.getAttachIds())){ + List 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 attachList = sysAttachService.listByIds(oaAttachmentsIdList); for (SysAttach sysAttach : attachList) { diff --git a/src/main/java/com/qs/serve/modules/third/PortalFlowController.java b/src/main/java/com/qs/serve/modules/third/PortalFlowController.java index 5061fa43..16d265b8 100644 --- a/src/main/java/com/qs/serve/modules/third/PortalFlowController.java +++ b/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+"]未被收录"); }