From becc33ce9681fcc75d26eb2b8fbe650d53cb1f89 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 七月 2025 14:55:26 +0800
Subject: [PATCH] 1. 调拔单功能优化 2. 7.30问题及bug修复
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java | 106 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 60 insertions(+), 46 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 5ad4d08..ffb2dd6 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,17 +1,13 @@
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.exception.CoolException;
-import com.vincent.rsf.server.manager.entity.WkOrder;
-import com.vincent.rsf.server.manager.entity.WkOrderItem;
-import com.vincent.rsf.server.manager.entity.AsnOrderItemLog;
-import com.vincent.rsf.server.manager.entity.AsnOrderLog;
+import com.vincent.rsf.server.manager.entity.*;
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.manager.enums.POExceStatus;
+import com.vincent.rsf.server.manager.service.*;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -20,6 +16,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
@@ -34,69 +31,66 @@
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;
/**
- * @author Ryan
- * @description 鍒犻櫎宸插畬鎴愯鍗曞姞鍏og琛�
* @param
* @return
+ * @author Ryan
+ * @description 鍒犻櫎宸插畬鎴愯鍗曞姞鍏og琛�
* @time 2025/3/19 19:09
*/
- @Scheduled(cron = "0 0/05 * * * ? ")
+ @Scheduled(cron = "0/35 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void moveOrderToLog() {
List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
- .eq(WkOrder::getType, OrderType.ORDER_IN.type)
+ .eq(WkOrder::getType, OrderType.ORDER_IN.type)
.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/30 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void outStockComplete() {
List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
- .eq(WkOrder::getType, OrderType.ORDER_OUT.type)
- .eq(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val)
+ .eq(WkOrder::getType, OrderType.ORDER_OUT.type)
+ .eq(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val)
.apply("anfme = work_qty")
);
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());
+ }
}
-
-// /**
-// * @author Ryan
-// * @date 2025/7/30
-// * @description: 鏇存柊璋冩嫈鍗曠姸鎬�
-// * @version 1.0
-// */
-// @Scheduled(cron = "0/30 * * * * ? ")
-// @Transactional(rollbackFor = Exception.class)
-// public void updateTransferExc() {
-//
-// }
-
/**
@@ -107,7 +101,8 @@
* @description 娣诲姞鍘嗗彶鍗曟嵁
* @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) throws Exception{
Set<Long> longSet = wkOrders.stream().map(WkOrder::getId).collect(Collectors.toSet());
List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
.in(WkOrderItem::getOrderId, longSet));
@@ -145,15 +140,34 @@
if (!asnOrderItemLogService.saveBatch(logs)) {
throw new CoolException("鍗曟嵁鏄庣粏鍘嗗彶妗ｄ繚瀛樺け璐ワ紒锛�");
}
+
+ //鏇存柊PO/DO鍗曟墽琛岀姸鎬�
+ if (type.equals(OrderType.ORDER_IN.type)) {
+ if (!Objects.isNull(order.getPoId())) {
+ if (!purchaseService.update(new LambdaUpdateWrapper<Purchase>()
+ .set(Purchase::getExceStatus, POExceStatus.PO_EXCE_STATUS_ALL_DONE.val)
+ .eq(Purchase::getId, order.getPoId()))) {
+ throw new CoolException("PO鍗曟洿鏂扮姸鎬佹洿鏂板け璐ワ紒锛�");
+ }
+ }
+ } else {
+ if (!Objects.isNull(order.getPoId())) {
+ if (!deliveryService.update(new LambdaUpdateWrapper<Delivery>()
+ .eq(Delivery::getId, order.getPoId())
+ .set(Delivery::getExceStatus, POExceStatus.PO_EXCE_STATUS_ALL_DONE.val))) {
+ throw new CoolException("DO鍗曟洿鏂扮姸鎬佹洿鏂板け璐�");
+ }
+ }
+ }
}
- if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
- .in(WkOrderItem::getOrderId, longSet))) {
- throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
- }
- if (!this.asnOrderService.removeByIds(longSet)) {
- throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
- }
+// if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
+// .in(WkOrderItem::getOrderId, longSet))) {
+// throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
+// }
+// if (!this.asnOrderService.removeByIds(longSet)) {
+// throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
+// }
}
--
Gitblit v1.9.1