From c81fc5e2a4f4153be2bb8602ed14a0743e6ecd29 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期四, 05 三月 2026 11:14:50 +0800
Subject: [PATCH] RCS对接优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java | 270 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 207 insertions(+), 63 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 919628f..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
@@ -1,26 +1,33 @@
package com.vincent.rsf.server.manager.schedules;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.manager.entity.WkOrder;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
-import com.vincent.rsf.server.manager.entity.AsnOrderItemLog;
-import com.vincent.rsf.server.manager.entity.AsnOrderLog;
-import com.vincent.rsf.server.manager.enums.AsnExceStatus;
-import com.vincent.rsf.server.manager.enums.OrderType;
-import com.vincent.rsf.server.manager.service.AsnOrderItemLogService;
-import com.vincent.rsf.server.manager.service.AsnOrderItemService;
-import com.vincent.rsf.server.manager.service.AsnOrderLogService;
-import com.vincent.rsf.server.manager.service.AsnOrderService;
+import com.vincent.rsf.server.api.controller.erp.params.ReportDataParam;
+import com.vincent.rsf.server.api.controller.erp.params.ReportParams;
+import com.vincent.rsf.server.api.service.ReportMsgService;
+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;
+import com.vincent.rsf.server.system.entity.User;
+import com.vincent.rsf.server.system.service.UserService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -30,112 +37,249 @@
* @description
* @create 2025/3/19 19:07
*/
+@Slf4j
@Component
public class AsnOrderLogSchedule {
@Autowired
+ private PurchaseService purchaseService;
+ @Autowired
+ private DeliveryService deliveryService;
+ @Autowired
private AsnOrderService asnOrderService;
@Autowired
private AsnOrderItemService asnOrderItemService;
-
@Autowired
private AsnOrderLogService asnOrderLogService;
-
@Autowired
private AsnOrderItemLogService asnOrderItemLogService;
+ @Autowired
+ private TransferService transferService;
+
+ @Autowired
+ private ReportMsgService reportMsgService;
+
+ @Autowired
+ private AsnOrderMapper asnOrderMapper;
+ @Autowired
+ private AsnOrderItemMapper asnOrderItemMapper;
+
/**
- * @author Ryan
- * @description 鍒犻櫎宸插畬鎴愯鍗曞姞鍏og琛�
* @param
* @return
+ * @author Ryan
+ * @description 鍒犻櫎宸插畬鎴愯鍗曞姞鍏og琛�
* @time 2025/3/19 19:09
*/
- @Scheduled(cron = "0 0/05 * * * ? ")
+ @Scheduled(cron = "0 0 5 * * ?")
@Transactional(rollbackFor = Exception.class)
- public void moveOrderToLog() {
+ public void InStockToLog() {
List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
- .eq(WkOrder::getType, OrderType.ORDER_IN.type)
+ .eq(WkOrder::getType, OrderType.ORDER_IN.type)
+ .isNotNull(WkOrder::getPoCode)
+ .ne(WkOrder::getPoCode, "")
.eq(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val));
if (wkOrders.isEmpty()) {
return;
}
- moveOrderToLog(wkOrders, OrderType.ORDER_IN.type);
+ try {
+ moveOrderToLog(wkOrders, OrderType.ORDER_IN.type);
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
}
-
/**
- * @author Ryan
- * @description 鍑哄簱鍗曞畬鎴愬悗锛岀姸鎬佷慨鏀�
- * @param
- * @return
- * @time 2025/6/16 08:35
- */
-// @Scheduled(cron = "0/30 * * * * ? ")
+ * @param
+ * @return
+ * @author Ryan
+ * @description 鍑哄簱鍗曞畬鎴愬悗锛岀姸鎬佷慨鏀�
+ * @time 2025/6/16 08:35
+ */
+ @Scheduled(cron = "0/25 * * * * ? ")
+// @Scheduled(cron = "0 0 2 1 * ?")
@Transactional(rollbackFor = Exception.class)
public void outStockComplete() {
List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
- .eq(WkOrder::getType, OrderType.ORDER_OUT.type)
- .apply("anfme = work_qty")
- );
+ .eq(WkOrder::getType, OrderType.ORDER_OUT.type)
+ .isNotNull(WkOrder::getPoCode)
+ .ne(WkOrder::getPoCode, "")
+ .eq(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val));
if (wkOrders.isEmpty()) {
return;
}
- moveOrderToLog(wkOrders, OrderType.ORDER_OUT.type);
+ try {
+ moveOrderToLog(wkOrders, OrderType.ORDER_OUT.type);
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
}
+
/**
* @param
* @param type
* @return
* @author Ryan
- * @description 娣诲姞鍘嗗彶鍗曟嵁
+ * @description 娣诲姞鍘嗗彶鍗曟嵁, 浜т笂鎶RP
* @time 2025/6/16 08:56
*/
- private void moveOrderToLog(List<WkOrder> wkOrders, String type) {
+ @Transactional(rollbackFor = Exception.class)
+ public void moveOrderToLog(List<WkOrder> wkOrders, String type) {
Set<Long> longSet = wkOrders.stream().map(WkOrder::getId).collect(Collectors.toSet());
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getAsnId, longSet));
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .in(WkOrderItem::getOrderId, longSet));
if (orderItems.isEmpty()) {
throw new CoolException("鏀惰揣鏄庣粏涓虹┖锛侊紒");
}
for (WkOrder order : wkOrders) {
- AsnOrderLog orderLog = new AsnOrderLog();
- if (type.equals(OrderType.ORDER_OUT.type)) {
- order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
- order.setQty(order.getWorkQty());
+ if (order.getType().equals(OrderType.ORDER_OUT.type)) {
+ try {
+ //涓婃姤娆℃暟闄愬畾
+ if (order.getReportOnce() < 4) {
+ //涓婃姤宸插畬鎴愯鍗曡嚦ERP銆丮ES绛変笁鏂圭郴缁�
+ reportMsgService.reportOrders(order);
+ order.setReportOnce(order.getReportOnce() + 1);
+ if (!asnOrderService.updateById(order)) {
+ log.error(order.getCode() + "锛屽崟鎹笂浼犳鏁颁慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ }
}
- BeanUtils.copyProperties(order, orderLog);
- orderLog.setId(null);
- orderLog.setAsnId(order.getId());
+// 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)) {
+ orderLog = new AsnOrderLog();
+ if (type.equals(OrderType.ORDER_OUT.type)) {
+ order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
+ order.setQty(order.getWorkQty());
+ }
+ BeanUtils.copyProperties(order, orderLog);
+ orderLog.setId(null);
+ orderLog.setAsnId(order.getId());
+ if (!asnOrderLogService.save(orderLog)) {
+ 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));
+ }
- 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(item.getId())
+ .setId(null)
+ .setMatnrId(item.getMatnrId())
+ .setLogId(orderLog.getId())
+ .setAsnId(item.getOrderId());
+ logs.add(itemLog);
+ });
+ if (!asnOrderItemLogService.saveBatch(logs)) {
+ throw new CoolException("鍗曟嵁鏄庣粏鍘嗗彶妗ｄ繚瀛樺け璐ワ紒锛�");
+ }
- List<AsnOrderItemLog> logs = new ArrayList<>();
- List<AsnOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
- items.forEach(item -> {
- AsnOrderItemLog itemLog = new AsnOrderItemLog();
- BeanUtils.copyProperties(item, itemLog);
- itemLog.setAsnItemId(itemLog.getId())
- .setLogId(orderLog.getId())
- .setAsnId(item.getAsnId());
- logs.add(itemLog);
- });
-
- if (!asnOrderItemLogService.saveBatch(logs)) {
- throw new CoolException("鍗曟嵁鏄庣粏鍘嗗彶妗ｄ繚瀛樺け璐ワ紒锛�");
- }
+ //鏇存柊PO/DO鍗曟墽琛岀姸鎬�
+ if (type.equals(OrderType.ORDER_IN.type)) {
+ if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type)) {
+ order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
+ if (!asnOrderService.updateById(order)) {
+ throw new CoolException("鍗曟嵁鐘舵�佹洿鏂板け璐ワ紒锛�");
+ }
+// List<TransferOrder> orders = transferOrderService.list(new LambdaQueryWrapper<TransferOrder>().eq(TransferOrder::getTransferId, order.getPoId()));
+// if (orders.isEmpty()) {
+// throw new CoolException("鏁版嵁閿欒锛氬叧鑱旇〃淇℃伅涓嶅瓨鍦紒锛�");
+// }
+// Set<Long> orderIds = orders.stream().map(TransferOrder::getOrd erId).collect(Collectors.toSet());
+// if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
+// .in(WkOrderItem::getOrderId, orderIds))) {
+// throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
+// }
+// if (!this.asnOrderService.removeByIds(orderIds)) {
+// throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
+// }
+ if (!transferService.update(new LambdaUpdateWrapper<Transfer>()
+ .eq(Transfer::getId, order.getPoId())
+ .set(Transfer::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val))) {
+ throw new CoolException("璋冩嫈鍗曠姸鎬佷慨鏀瑰け璐ワ紒锛�");
+ }
+ removeOriginalOrderAndItems(order);
+ continue;
+ } else {
+ if (!Objects.isNull(order.getPoId())) {
+ purchaseService.update(new LambdaUpdateWrapper<Purchase>()
+ .set(Purchase::getExceStatus, POExceStatus.PO_EXCE_STATUS_ALL_DONE.val)
+ .eq(Purchase::getId, order.getPoId()));
+ }
+ }
+ } else {
+ if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type)) {
+ order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
+ if (!asnOrderService.updateById(order)) {
+ throw new CoolException("鍗曟嵁鐘舵�佹洿鏂板け璐ワ紒锛�");
+ }
+ //濡傛灉涓鸿皟鎷斿崟鎹繚鐣�
+ removeOriginalOrderAndItems(order);
+ continue;
+ } else {
+ if (!Objects.isNull(order.getPoId())) {
+ deliveryService.update(new LambdaUpdateWrapper<Delivery>()
+ .eq(Delivery::getId, order.getPoId())
+ .set(Delivery::getExceStatus, POExceStatus.PO_EXCE_STATUS_ALL_DONE.val));
+ }
+ }
+ }
+ // 杞叆鍘嗗彶鍚庡垹闄ゅ師鍗曞強鏄庣粏
+ removeOriginalOrderAndItems(order);
}
+ }
- if (!asnOrderItemService.remove(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getAsnId, longSet))) {
+ /** 鍒犻櫎鍘熷叆搴�/鍑哄簱閫氱煡鍗曞強鏄庣粏锛堣浆鍏ュ巻鍙插悗璋冪敤锛� */
+ private void removeOriginalOrderAndItems(WkOrder order) {
+ if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()))) {
throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
}
- if (!this.asnOrderService.removeByIds(longSet)) {
+ 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