From 9140aee230de0ef41de9682a9353fbd372e2bcaa Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期二, 03 三月 2026 13:43:22 +0800
Subject: [PATCH] 云仓WMS接口
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java | 112 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 79 insertions(+), 33 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
index 0bdd761..ebd6656 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
@@ -10,6 +10,8 @@
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.*;
+import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper;
+import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.StockItemServiceImpl;
import com.vincent.rsf.server.manager.service.impl.StockServiceImpl;
@@ -23,6 +25,8 @@
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
+import java.time.LocalDate;
+import java.time.ZoneId;
import java.util.*;
import java.util.stream.Collectors;
@@ -56,6 +60,10 @@
@Autowired
private ReportMsgService reportMsgService;
+ @Autowired
+ private AsnOrderMapper asnOrderMapper;
+ @Autowired
+ private AsnOrderItemMapper asnOrderItemMapper;
/**
* @param
@@ -64,7 +72,7 @@
* @description 鍒犻櫎宸插畬鎴愯鍗曞姞鍏og琛�
* @time 2025/3/19 19:09
*/
- @Scheduled(cron = "0 0 2 1 * ?")
+ @Scheduled(cron = "0 0 5 * * ?")
@Transactional(rollbackFor = Exception.class)
public void InStockToLog() {
List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
@@ -89,7 +97,7 @@
* @description 鍑哄簱鍗曞畬鎴愬悗锛岀姸鎬佷慨鏀�
* @time 2025/6/16 08:35
*/
- @Scheduled(cron = "0/15 * * * * ? ")
+ @Scheduled(cron = "0/25 * * * * ? ")
// @Scheduled(cron = "0 0 2 1 * ?")
@Transactional(rollbackFor = Exception.class)
public void outStockComplete() {
@@ -144,8 +152,9 @@
}
// if (order.getType().equals(OrderType.ORDER_OUT.type) && order.getReportOnce() >= 4) {
AsnOrderLog one = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, order.getCode()), false);
+ AsnOrderLog orderLog;
if (Objects.isNull(one)) {
- AsnOrderLog orderLog = new AsnOrderLog();
+ orderLog = new AsnOrderLog();
if (type.equals(OrderType.ORDER_OUT.type)) {
order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
order.setQty(order.getWorkQty());
@@ -153,28 +162,41 @@
BeanUtils.copyProperties(order, orderLog);
orderLog.setId(null);
orderLog.setAsnId(order.getId());
-
if (!asnOrderLogService.save(orderLog)) {
throw new CoolException("涓诲崟鍘嗗彶妗ｆ坊鍔犲け璐ワ紒锛�");
}
-
- List<AsnOrderItemLog> logs = new ArrayList<>();
- List<WkOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
- .eq(WkOrderItem::getOrderId, order.getId()));
- items.forEach(item -> {
- AsnOrderItemLog itemLog = new AsnOrderItemLog();
- BeanUtils.copyProperties(item, itemLog);
- itemLog.setAsnItemId(itemLog.getId())
- .setId(null)
- .setMatnrId(item.getMatnrId())
- .setLogId(orderLog.getId())
- .setAsnId(item.getOrderId());
- logs.add(itemLog);
- });
-
- if (!asnOrderItemLogService.saveBatch(logs)) {
- throw new CoolException("鍗曟嵁鏄庣粏鍘嗗彶妗ｄ繚瀛樺け璐ワ紒锛�");
+ } else {
+ if (type.equals(OrderType.ORDER_OUT.type)) {
+ order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
+ order.setQty(order.getWorkQty());
}
+ long existingLogId = one.getId();
+ BeanUtils.copyProperties(order, one);
+ one.setId(existingLogId);
+ one.setAsnId(order.getId());
+ if (!asnOrderLogService.updateById(one)) {
+ throw new CoolException("涓诲崟鍘嗗彶妗ｆ洿鏂板け璐ワ紒锛�");
+ }
+ orderLog = one;
+ asnOrderItemLogService.remove(new LambdaQueryWrapper<AsnOrderItemLog>().eq(AsnOrderItemLog::getLogId, existingLogId));
+ }
+
+ List<AsnOrderItemLog> logs = new ArrayList<>();
+ List<WkOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getOrderId, order.getId()));
+ items.forEach(item -> {
+ AsnOrderItemLog itemLog = new AsnOrderItemLog();
+ BeanUtils.copyProperties(item, itemLog);
+ itemLog.setAsnItemId(item.getId())
+ .setId(null)
+ .setMatnrId(item.getMatnrId())
+ .setLogId(orderLog.getId())
+ .setAsnId(item.getOrderId());
+ logs.add(itemLog);
+ });
+ if (!asnOrderItemLogService.saveBatch(logs)) {
+ throw new CoolException("鍗曟嵁鏄庣粏鍘嗗彶妗ｄ繚瀛樺け璐ワ紒锛�");
+ }
//鏇存柊PO/DO鍗曟墽琛岀姸鎬�
if (type.equals(OrderType.ORDER_IN.type)) {
@@ -200,7 +222,8 @@
.set(Transfer::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val))) {
throw new CoolException("璋冩嫈鍗曠姸鎬佷慨鏀瑰け璐ワ紒锛�");
}
- return;
+ removeOriginalOrderAndItems(order);
+ continue;
} else {
if (!Objects.isNull(order.getPoId())) {
purchaseService.update(new LambdaUpdateWrapper<Purchase>()
@@ -215,7 +238,8 @@
throw new CoolException("鍗曟嵁鐘舵�佹洿鏂板け璐ワ紒锛�");
}
//濡傛灉涓鸿皟鎷斿崟鎹繚鐣�
- return;
+ removeOriginalOrderAndItems(order);
+ continue;
} else {
if (!Objects.isNull(order.getPoId())) {
deliveryService.update(new LambdaUpdateWrapper<Delivery>()
@@ -224,16 +248,38 @@
}
}
}
- }
-
-// if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
-// .eq(WkOrderItem::getOrderId, order.getId()))) {
-// throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
-// }
-// if (!this.asnOrderService.removeById(order.getId())) {
-// throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
-// }
-// }
+ // 杞叆鍘嗗彶鍚庡垹闄ゅ師鍗曞強鏄庣粏
+ removeOriginalOrderAndItems(order);
}
}
+
+ /** 鍒犻櫎鍘熷叆搴�/鍑哄簱閫氱煡鍗曞強鏄庣粏锛堣浆鍏ュ巻鍙插悗璋冪敤锛� */
+ private void removeOriginalOrderAndItems(WkOrder order) {
+ if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()))) {
+ throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
+ }
+ if (!asnOrderService.removeById(order.getId())) {
+ throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
+ }
+ }
+
+ /** 姣忔湀1鍙峰噷鏅ㄦ墽琛岋細鐗╃悊鍒犻櫎涓婁笂涓湀涔嬪墠宸茶閫昏緫鍒犻櫎鐨勫叆搴�/鍑哄簱閫氱煡鍗曞強鏄庣粏 */
+ @Scheduled(cron = "0 0 0 1 * ?")
+ @Transactional(rollbackFor = Exception.class)
+ public void physicalDeleteLogicDeletedOrders() {
+ LocalDate startOfTwoMonthsAgo = LocalDate.now().minusMonths(2).withDayOfMonth(1);
+ Date before = Date.from(startOfTwoMonthsAgo.atStartOfDay(ZoneId.systemDefault()).toInstant());
+ List<Long> ids = asnOrderMapper.selectLogicDeletedOrderIdsBefore(before);
+ if (ids == null || ids.isEmpty()) {
+ return;
+ }
+ final int batchSize = 500;
+ for (int i = 0; i < ids.size(); i += batchSize) {
+ int to = Math.min(i + batchSize, ids.size());
+ List<Long> batch = ids.subList(i, to);
+ asnOrderItemMapper.physicalDeleteByOrderIds(batch);
+ asnOrderMapper.physicalDeleteByIds(batch);
+ }
+ log.info("鐗╃悊鍒犻櫎涓婁笂涓湀涔嬪墠宸查�昏緫鍒犻櫎鐨勫師鍗曞強鏄庣粏锛岃鍗曟暟锛歿}", ids.size());
+ }
}
--
Gitblit v1.9.1