From b5ef11d9dd995dd37beb83f53e55ca672e051f9b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 21 八月 2025 09:27:57 +0800
Subject: [PATCH] 单据删除操作
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 295 insertions(+), 5 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 f8c7c5d..20d0dd0 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.R;
@@ -12,10 +13,10 @@
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.OrderType;
+import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.service.*;
-import com.vincent.rsf.server.manager.service.impl.LocAreaServiceImpl;
import com.vincent.rsf.server.manager.service.impl.MatnrServiceImpl;
+import com.vincent.rsf.server.manager.service.impl.TransferItemServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.entity.Fields;
import com.vincent.rsf.server.system.service.FieldsItemService;
@@ -29,6 +30,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @author Ryan
@@ -69,6 +71,19 @@
private WarehouseAreasService warehouseAreasService;
@Autowired
private WarehouseService warehouseService;
+ @Autowired
+ private CompanysService companysService;
+ @Autowired
+ private TransferService transferService;
+ @Autowired
+ private TransferItemService transferItemService;
+ @Autowired
+ private LocReviseService locReviseService;
+ @Autowired
+ private ReviseLogService reviseLogService;
+ @Autowired
+ private ReviseLogItemService reviseLogItemService;
+
/**
* @author Ryan
@@ -193,7 +208,7 @@
@Override
public R queryOrderStatus(QueryOrderParam queryParams) {
WkOrder wkOrders = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
- .eq(WkOrder::getCode, queryParams.getOrderNo())
+ .in(WkOrder::getCode, queryParams.getOrderNo())
.eq(WkOrder::getType, queryParams.getType()));
if (Objects.isNull(wkOrders)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
@@ -216,7 +231,7 @@
public R syncLocsDetl(PageParam<Loc, BaseParam> pageParam, QueryWrapper<Loc> wrapper) {
Page<Object> page = new Page<>();
page.setCurrent(pageParam.getCurrent()).setSize(pageParam.getSize());
- IPage<LocStockDto> locStocks = locService.getLocDetls(page);
+ IPage<LocStockDto> locStocks = locService.getLocDetls(page);
return R.ok().add(locStocks);
}
@@ -286,7 +301,7 @@
BeanUtils.copyProperties(param, locArea);
WarehouseAreas warehouseAreas = warehouseAreasService
.getOne(new LambdaQueryWrapper<WarehouseAreas>()
- .eq(WarehouseAreas::getName, param.getName()));
+ .eq(WarehouseAreas::getName, param.getName()));
if (!Objects.isNull(warehouseAreas)) {
locArea.setWarehouseId(warehouseAreas.getId());
}
@@ -320,4 +335,279 @@
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();
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/8/19
+ * @description: 璋冩嫈鍗曟嵁鍚屾
+ * @version 1.0
+ */
+ @Override
+ @Transactional(timeout = 60, rollbackFor = Exception.class)
+ public R syncTransfer(SyncTransferParams transferParams) {
+ Transfer transfer = new Transfer();
+ WarehouseAreas warehouseAreas = warehouseAreasService
+ .getOne(new LambdaQueryWrapper<WarehouseAreas>()
+ .eq(WarehouseAreas::getName, transfer.getOrgAreaName()));
+ if (Objects.isNull(warehouseAreas)) {
+ throw new CoolException("鍘熷簱鍖轰笉瀛樺湪锛侊紒");
+ }
+
+ WarehouseAreas warehouseAreas1 = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>()
+ .eq(WarehouseAreas::getName, transfer.getTarAreaName()));
+ if (Objects.isNull(warehouseAreas1)) {
+ throw new CoolException("鐩爣搴撳尯涓嶅瓨鍦紒锛�");
+ }
+
+ transfer.setOrgAreaName(warehouseAreas.getName())
+ .setOrgAreaId(warehouseAreas.getId())
+ .setOrgWareName(warehouseAreas.getWarehouseId$())
+ .setOrgWareId(warehouseAreas.getWarehouseId())
+ .setTarWareName(warehouseAreas1.getWarehouseId$())
+ .setTarAreaName(warehouseAreas1.getName())
+ .setTarAreaId(warehouseAreas1.getId())
+ .setTarWareName(warehouseAreas1.getWarehouseId$())
+ .setTarWareId(warehouseAreas1.getWarehouseId())
+ .setSource(OrderSourceType.ORDER_SOURCE_TYPE_ERP.val);
+
+ if (!transferService.save(transfer)) {
+ throw new CoolException("璋冩嫈鍗曟嵁淇濆瓨澶辫触锛侊紒");
+ }
+
+ transferParams.getItems().forEach(item -> {
+ TransferItem transferItem = new TransferItem();
+ BeanUtils.copyProperties(item, transferItem);
+ Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, item.getMatnrCode()));
+ if (Objects.isNull(matnr)) {
+ throw new CoolException("鐗╂枡涓嶅瓨鍦紒锛�");
+ }
+ transferItem.setMatnrId(matnr.getId())
+ .setTransferId(transfer.getId())
+ .setTransferCode(transfer.getCode());
+
+ if (!transferItemService.save(transferItem)) {
+ throw new CoolException("璋冩嫈鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�");
+ }
+ });
+
+ return R.ok();
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/8/20
+ * @description: 搴撳瓨璋冩暣鍗曞悓姝�
+ * @version 1.0
+ */
+ @Override
+ @Transactional(timeout = 60, rollbackFor = Exception.class)
+ public R syncLocRevise(SyncLocReviseParams reviseParams) {
+ LocRevise locRevise = new LocRevise();
+ if (Objects.isNull(reviseParams.getAreaName())) {
+ throw new CoolException("搴撳尯涓嶈兘涓虹┖锛侊紒");
+ }
+ WarehouseAreas warehouseAreas = warehouseAreasService
+ .getOne(new LambdaQueryWrapper<WarehouseAreas>()
+ .eq(WarehouseAreas::getName, reviseParams.getAreaName()));
+ if (Objects.isNull(warehouseAreas)) {
+ throw new CoolException("搴撳尯涓嶅瓨鍦紒锛�");
+ }
+ locRevise.setAreaName(locRevise.getAreaName())
+ .setAreaId(warehouseAreas.getId());
+ locRevise.setCode(SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LOC_REVISE_CODE, null));
+
+ if (!locReviseService.save(locRevise)) {
+ throw new CoolException("搴撳瓨璋冩暣鍗曚繚瀛樺け璐ワ紒锛�");
+ }
+
+ reviseParams.getItems().forEach(revise -> {
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, revise.getLocCode()));
+ ReviseLog reviseLog = new ReviseLog();
+ BeanUtils.copyProperties(loc, reviseLog);
+ reviseLog.setReviseId(locRevise.getId()).setReviseCode(locRevise.getCode());
+ if (!reviseLogService.save(reviseLog)) {
+ throw new CoolException("搴撳瓨璋冩暣鍗曚笉鑳戒负绌猴紒锛�");
+ }
+ revise.getItems().forEach(reviseItem -> {
+ ReviseLogItem logItem = new ReviseLogItem();
+ BeanUtils.copyProperties(reviseItem, logItem);
+ logItem.setLocId(loc.getId())
+ .setLocCode(loc.getCode())
+ .setId(null)
+ .setReviseQty(reviseItem.getAnfme());
+
+ if (!reviseLogItemService.save(logItem)) {
+ throw new CoolException("璋冩暣搴撳瓨鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ });
+ });
+
+ return R.ok();
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/8/20
+ * @description: 鍗曟嵁淇敼--鏀惰揣閫氱煡鍗�/鍑哄簱鍗�/鐩樼偣鍗�
+ * @version 1.0
+ */
+ @Override
+ @Transactional(timeout = 60, rollbackFor = Exception.class)
+ public R syncOrderUpdate(SyncOrderParams orders) {
+ //鍏ュ簱鍗曚慨鏀�
+ if (orders.getType().equals(OrderType.ORDER_IN.type)) {
+ orders.getItems().forEach(orderItem -> {
+ WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getType, OrderType.ORDER_IN.type)
+ .eq(WkOrder::getCode, orderItem.getOrderCode()));
+ if (Objects.isNull(order)) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+
+ if (!asnOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getOrderCode, orderItem.getOrderCode())
+ .eq(WkOrderItem::getMatnrCode, orderItem.getMatnrCode())
+ .eq(WkOrderItem::getSplrBatch, orderItem.getBatch())
+ .set(WkOrderItem::getAnfme, orderItem.getAnfme()))) {
+ throw new CoolException("鍗曟嵁淇敼澶辫触锛侊紒");
+ }
+
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getOrderId, order.getId()));
+ if (orderItems.isEmpty()) {
+ throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+
+ Double summed = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
+ order.setAnfme(summed);
+
+ if (!asnOrderService.updateById(order)) {
+ throw new CoolException("鍗曟嵁淇敼澶辫触锛侊紒");
+ }
+ });
+ } else {
+
+ }
+ return null;
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/8/21
+ * @description: 鍒犻櫎鍗曟嵁
+ * @version 1.0
+ */
+ @Override
+ @Transactional(timeout = 60, rollbackFor = Exception.class)
+ public R syncOrderDelete(List<SyncOrderParams> orders) {
+ orders.forEach(order -> {
+ order.getItems().forEach(orderItem -> {
+ WkOrder wkOrder = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getType, order.getType())
+ .in(WkOrder::getExceStatus, Arrays.asList(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val))
+ .eq(WkOrder::getId, orderItem.getOrderId()));
+ if (Objects.isNull(wkOrder)) {
+ throw new CoolException("璁㈠崟锛�" + orderItem.getOrderCode() + "锛屽綋鍓嶇姸鎬侊紝涓嶅彲鎵ц鍒犻櫎鎿嶄綔锛侊紒");
+ }
+ if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getMatnrId, orderItem.getMatnrId())
+ .eq(WkOrderItem::getSplrBatch, orderItem.getBatch())
+ .eq(WkOrderItem::getOrderCode, orderItem.getOrderCode()))) {
+ throw new CoolException("鍗曟嵁鏄庣粏鍒犻櫎澶辫触锛侊紒");
+ }
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, orderItem.getOrderId()));
+ if (orderItems.isEmpty()) {
+ if (!asnOrderService.removeById(orderItem.getOrderId())) {
+ throw new CoolException("鍗曟嵁鍒犻櫎澶辫触锛侊紒");
+ }
+ }
+ });
+ });
+ return R.ok();
+ }
}
--
Gitblit v1.9.1