From d79db0da7de1c22e6803a45144ccdd9c931fbbc1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 29 三月 2025 08:58:37 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 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 bf9ce37..a44caf1 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
@@ -9,6 +9,7 @@
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.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -98,21 +99,25 @@
if (Objects.isNull(matnr)) {
throw new CoolException("鏁版嵁閿欒锛氬綋鍓嶇墿鏂欎笉瀛樺湪!!");
}
- //TODO barcode鐢熸垚绛栫暐
- String barcode = code + matnr.getCode();
+ String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, item);
+ if (StringUtils.isBlank(trackCode)) {
+ throw new CoolException("鍗曟嵁璺熻釜鐮佺敓鎴愬け璐ワ細璇锋鏌ャ�宻ys_asn_mantr_label銆嶆槸鍚﹂厤缃畬鎴愶紒锛�");
+ }
+// String barcode = code + matnr.getCode();
orderItem.setAnfme(item.getAnfme())
.setAsnId(order.getId())
.setQty(item.getQty())
.setSplrName(item.getSplrName())
.setAsnCode(code)
.setSplrCode(item.getSplrCode())
- .setMatnk(item.getMatnrName())
.setPoDetlId(item.getId())
- .setBarcode(barcode)
+ .setPlatItemId(item.getPlatItemId())
+ .setTrackCode(trackCode)
.setPoCode(purchase.getCode())
.setPurQty(item.getAnfme())
.setPurUnit(item.getUnit())
- .setMatnk(matnr.getName())
+ .setMatnrCode(matnr.getCode())
+ .setMaktx(matnr.getName())
.setMatnrId(matnr.getId() + "");
orderItems.add(orderItem);
});
@@ -130,4 +135,32 @@
});
}
+
+ /**
+ * 鐢熸垚鐗╂枡鏍囩
+ */
+ @Scheduled(cron = "0 0/05 * * * ? ")
+ @Transactional(rollbackFor = Exception.class)
+ public void generateMatnrLabel() {
+ List<AsnOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
+ .isNull(AsnOrderItem::getTrackCode)
+ .select(AsnOrderItem::getId));
+ if (Objects.isNull(list) || list.isEmpty()) {
+ return;
+ }
+ List<AsnOrderItem> items = new ArrayList<>();
+ list.forEach(item -> {
+ String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, item);
+ if (StringUtils.isBlank(trackCode)) {
+ throw new CoolException("鍗曟嵁璺熻釜鐮佺敓鎴愬け璐ワ細璇锋鏌ャ�宻ys_asn_mantr_label銆嶆槸鍚﹂厤缃畬鎴愶紒锛�");
+ }
+ item.setTrackCode(trackCode);
+ items.add(item);
+ });
+
+ if (!asnOrderItemService.updateBatchById(items)) {
+ throw new CoolException("鐢熸垚缂栫爜澶辫触锛侊紒");
+ }
+ }
+
}
--
Gitblit v1.9.1