From f84b3af27f34be7e22990c54612f3110559c7710 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 19 八月 2025 18:28:44 +0800 Subject: [PATCH] 盘点单、入库单、出库单同步接口 --- rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 149 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 147 insertions(+), 2 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java index 303f02b..fb49c49 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java @@ -12,7 +12,9 @@ import com.vincent.rsf.server.common.domain.PageParam; import com.vincent.rsf.server.manager.controller.dto.LocStockDto; import com.vincent.rsf.server.manager.entity.*; +import com.vincent.rsf.server.manager.enums.CompanysType; import com.vincent.rsf.server.manager.enums.OrderType; +import com.vincent.rsf.server.manager.enums.OrderWorkType; import com.vincent.rsf.server.manager.service.*; import com.vincent.rsf.server.manager.service.impl.MatnrServiceImpl; import com.vincent.rsf.server.system.constant.SerialRuleCode; @@ -28,6 +30,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.*; +import java.util.stream.Collectors; /** * @author Ryan @@ -64,6 +67,13 @@ private LocService locService; @Autowired private LocItemService locItemService; + @Autowired + private WarehouseAreasService warehouseAreasService; + @Autowired + private WarehouseService warehouseService; + @Autowired + private CompanysService companysService; + /** * @author Ryan @@ -222,7 +232,7 @@ * @version 1.0 */ @Override - @Transactional(timeout = 30, rollbackFor = Exception.class) + @Transactional(timeout = 60, rollbackFor = Exception.class) public R syncLocs(List<SyncLocsParams> locs) { List<Loc> syncLocs = new ArrayList<>(); locs.forEach(loc -> { @@ -244,7 +254,7 @@ * @version 1.0 */ @Override - @Transactional(timeout = 30, rollbackFor = Exception.class) + @Transactional(timeout = 60, rollbackFor = Exception.class) public R syncMatGroups(List<SyncMatGroupsParams> matGroupsParams) { List<MatnrGroup> syncMatGroups = new ArrayList<>(); matGroupsParams.forEach(matGroupsParam -> { @@ -266,4 +276,139 @@ } return R.ok(); } + + /** + * @author Ryan + * @date 2025/8/18 + * @description: 搴撳尯淇℃伅鍚屾 + * @version 1.0 + */ + @Override + @Transactional(timeout = 60, rollbackFor = Exception.class) + public R syncWarehouseAreas(List<LocAreasParams> areasParams) { + areasParams.forEach(param -> { + WarehouseAreas locArea = new WarehouseAreas(); + BeanUtils.copyProperties(param, locArea); + WarehouseAreas warehouseAreas = warehouseAreasService + .getOne(new LambdaQueryWrapper<WarehouseAreas>() + .eq(WarehouseAreas::getName, param.getName())); + if (!Objects.isNull(warehouseAreas)) { + locArea.setWarehouseId(warehouseAreas.getId()); + } + locArea.setName(param.getName()) + .setCode(param.getCode()) + .setId(null); + if (!warehouseAreasService.save(locArea)) { + throw new CoolException("搴撳尯淇濆瓨澶辫触锛侊紒"); + } + }); + return R.ok(); + } + + /** + * @author Ryan + * @date 2025/8/18 + * @description: 浠撳簱鍚屾 + * @version 1.0 + */ + @Override + @Transactional(timeout = 60, rollbackFor = Exception.class) + public R syncWarehouse(List<WarehouseParams> warehouses) { + warehouses.forEach(warehouse -> { + Warehouse ware = new Warehouse(); + BeanUtils.copyProperties(warehouse, ware); + ware.setId(null); + if (!warehouseService.save(ware)) { + throw new CoolException("浠撳簱鍚屾淇濆瓨澶辫触锛侊紒"); + } + }); + return R.ok(); + } + + /** + * @author Ryan + * @date 2025/8/19 + * @description: 鍚屾浼佷笟淇℃伅 + * @version 1.0 + */ + @Override + @Transactional(timeout = 60, rollbackFor = Exception.class) + public R syncCompanies(List<CompaniesParam> companyParams) { + companyParams.forEach(param -> { + Companys companys = new Companys(); + BeanUtils.copyProperties(param, companys); + if (Objects.isNull(companys.getCode())) { + throw new CoolException("浼佷笟缂栫爜涓嶈兘涓虹┖锛侊紒"); + } + Companys one = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getName, param.getName())); + if (Objects.isNull(one)) { + String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_COMPANYS_CODE, null); + companys.setCode(ruleCode); + } else { + throw new CoolException(one.getName() + "锛屼紒涓氬悕閲嶅锛侊紒"); + } + companys.setType(CompanysType.getCustomVal(param.getType())) + .setId(null); + if (!companysService.save(companys)) { + throw new CoolException("浼佷笟淇濆瓨澶辫触锛侊紒"); + } + }); + return R.ok(); + } + + + @Override + @Transactional(timeout = 60, rollbackFor = Exception.class) + public R syncCheckOrder(SyncOrderParams syncOrders, Long loginUserId) { + List<SyncOrdersItem> ordersItems = syncOrders.getItems(); + Map<String, List<SyncOrdersItem>> listMap = ordersItems.stream().collect(Collectors.groupingBy(SyncOrdersItem::getOrderCode)); + listMap.keySet().forEach(orderCode -> { + WkOrder wkOrder = new WkOrder(); + String ruleCode = null; + if (syncOrders.getType().equals(OrderType.ORDER_CHECK.type)) { + ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_CHECK_RULE_CODE, null); + } else if (syncOrders.getType().equals(OrderType.ORDER_IN.type)) { + ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, null); + } else if (syncOrders.getType().equals(OrderType.ORDER_OUT.type)) { + ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, null); + } else if (syncOrders.getType().equals(OrderType.ORDER_REVISE.type)) { + ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LOC_REVISE_CODE, null); + } else if (syncOrders.getType().equals(OrderType.ORDER_TRANSFER.type)) { + ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TRANSFER_ORDER_CODE, null); + } + + SyncOrdersItem ordersItem = listMap.get(orderCode).stream().findFirst().get(); + Double anfmes = listMap.get(orderCode).stream().mapToDouble(SyncOrdersItem::getAnfme).sum(); + wkOrder.setType(syncOrders.getType()) + .setWkType(OrderWorkType.getWorkType(ordersItem.getWkType())) + .setAnfme(anfmes) + .setPoCode(orderCode) + .setPoId(ordersItem.getId()) + .setCode(ruleCode) + .setId(null) + .setCreateTime(new Date()) + .setUpdateTime(new Date()) + .setCreateBy(loginUserId) + .setUpdateBy(loginUserId); + + if (!asnOrderService.save(wkOrder)) { + throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒"); + } + + listMap.get(orderCode).forEach(order -> { + WkOrderItem wkOrderItem = new WkOrderItem(); + BeanUtils.copyProperties(order, wkOrderItem); + wkOrderItem.setOrderCode(wkOrder.getCode()) + .setOrderId(wkOrder.getId()) + .setId(null); + + if (!asnOrderItemService.save(wkOrderItem)) { + throw new CoolException("鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒"); + } + }); + }); + + return R.ok(); + } + } -- Gitblit v1.9.1