From b140f11c4744cd1e63b4a2409288f700d0f65175 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 12 五月 2025 10:59:56 +0800
Subject: [PATCH] #站点信息
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java | 51 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
index 86d45c9..ce3825f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
@@ -6,8 +6,13 @@
import com.vincent.rsf.server.common.utils.CommonUtil;
import com.vincent.rsf.server.common.utils.DateUtils;
import com.vincent.rsf.server.manager.entity.*;
+import com.vincent.rsf.server.manager.enums.AsnExceStatus;
+import com.vincent.rsf.server.manager.enums.PakinIOStatus;
import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.system.constant.GlobalConfigCode;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.system.entity.Config;
+import com.vincent.rsf.server.system.service.ConfigService;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
@@ -37,16 +42,12 @@
private PurchaseService purchaseService;
@Autowired
private PurchaseItemService purchaseItemService;
-
@Autowired
private AsnOrderService asnOrderService;
-
@Autowired
private MatnrService matnrService;
-
@Autowired
private AsnOrderItemService asnOrderItemService;
-
@Resource
private SysStockProperties flowProperties;
@Autowired
@@ -57,6 +58,35 @@
private WaitPakinLogService waitPakinLogService;
@Autowired
private WaitPakinItemLogService waitPakinItemLogService;
+ @Autowired
+ private ConfigService configService;
+
+
+ /**
+ * @author Ryan
+ * @date 2025/5/9
+ * @description: 鐩存帴缁勬墭寮�鍏充负true锛屽皢鏀惰揣鍗曠洿鎺ュ姞鍏ヤ复鏃跺簱瀛�
+ * @version 1.0
+ */
+ public synchronized void IgnoreReceipt() {
+ Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.DIRECT_WAIT_PAKIN));
+ if (Objects.isNull(config)) {
+ return;
+ }
+ if (!Boolean.getBoolean(config.getVal())) {
+ return;
+ }
+ List<AsnOrder> orders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val));
+ if (orders.isEmpty()) {
+ for (AsnOrder order : orders) {
+ List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
+
+
+ }
+ }
+
+ }
+
/**
@@ -167,7 +197,8 @@
if (StringUtils.isBlank(trackCode)) {
throw new CoolException("鍗曟嵁璺熻釜鐮佺敓鎴愬け璐ワ細璇锋鏌ャ�宻ys_asn_mantr_label銆嶆槸鍚﹂厤缃畬鎴愶紒锛�");
}
- item.setTrackCode(trackCode);
+// item.setTrackCode(trackCode);
+ item.setBarcode(trackCode);
items.add(item);
});
@@ -183,10 +214,12 @@
* @return
* @time 2025/3/29 12:36
*/
- @Scheduled(cron = "0/5 * * * * ?")
+ @Scheduled(cron = "0/25 * * * * ?")
@Transactional(rollbackFor = Exception.class)
public void pakinLog() {
- List<WaitPakin> pakinIds = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getIoStatus, 2).select(WaitPakin::getId));
+ List<WaitPakin> pakinIds = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>()
+ .eq(WaitPakin::getIoStatus, Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_TASK_DONE.val))
+ .select(WaitPakin::getId));
if (pakinIds.isEmpty()) {
return;
}
@@ -221,10 +254,10 @@
if (!waitPakinItemLogService.saveBatch(itemLogs)) {
throw new CoolException("鍘嗗彶鏄庣粏妗ｄ繚瀛樺け璐ワ紒锛�");
}
- if (!waitPakinService.removeByIds(pakins)) {
+ if (!waitPakinService.removeByIds(list)) {
throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
}
- if (!waitPakinItemService.removeByIds(pakinItems)) {
+ if (!waitPakinItemService.remove(new LambdaQueryWrapper<WaitPakinItem>().in(WaitPakinItem::getPakinId, list))) {
throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
}
}
--
Gitblit v1.9.1