From dfe8dff347916be46691fc5d956c45880c4446de Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期一, 10 三月 2025 11:44:52 +0800
Subject: [PATCH] fix:规则子项
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/ScheduleJobs.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
similarity index 86%
rename from rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/ScheduleJobs.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
index aceb1c9..e811c81 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/ScheduleJobs.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
@@ -1,15 +1,19 @@
-package com.vincent.rsf.server.manager.utils;
+package com.vincent.rsf.server.manager.schedules;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.common.config.SysStockProperties;
import com.vincent.rsf.server.common.utils.DateUtils;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.system.utils.SerialRuleUtils;
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 javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -38,6 +42,9 @@
@Autowired
private AsnOrderItemService asnOrderItemService;
+
+ @Resource
+ private SysStockProperties flowProperties;
/**
* @author Ryan
* @description 鏍规嵁PO鍗曟嵁鐢熸垚ASN鍗�,鑷姩鐢熸垚ASN鍗曚负鍏ㄩ噺鐢熸垚
@@ -48,6 +55,10 @@
@Scheduled(cron = "0 0/30 * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void genAsnOrder() {
+ //鍒ゆ柇鏄惁寮�鍚嚜鍔ㄧ敓鎴怉SN鍗曟嵁
+ if (!flowProperties.getFlagAutoAsn()) {
+ return;
+ }
//鑾峰彇鏈敓鎴怉SN鍗曟嵁
List<Purchase> purchases = purchaseService.list(new LambdaQueryWrapper<Purchase>().eq(Purchase::getStatus, 0));
//閲囪喘鍗曚负绌猴紝鐩存帴璺冲嚭褰撳墠浠诲姟
@@ -67,7 +78,10 @@
throw new CoolException("瀛愬垪琛ㄦ暟鎹负绌猴紝璇锋煡璇O鍗曟槸鍚︽纭綍鍏ワ紒锛�");
}
AsnOrder order = new AsnOrder();
+ //鏍规嵁缂栫爜瑙勫垯鐢熸垚ASN鍗曞彿
+ String code = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, purchase);
order.setAnfme(purchase.getAnfme())
+ .setCode(code)
.setArrTime(purchase.getPreArr())
.setQty(purchase.getQty())
.setPoId(purchase.getId())
--
Gitblit v1.9.1