From 9461f95f963ff56fc2f3a8c24f6d465c7f4d7aba Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 27 三月 2025 17:09:41 +0800
Subject: [PATCH] 采购单添加生成跟踪码逻辑
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 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 cf99f59..a317004 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;
@@ -92,35 +93,33 @@
throw new CoolException("ASN鍗曟嵁淇濆瓨澶辫触锛侊紒");
}
List<AsnOrderItem> orderItems = new ArrayList<>();
- String uuid16 = CommonUtil.randomUUID16();
items.forEach(item -> {
AsnOrderItem orderItem = new AsnOrderItem();
Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, item.getMatnrCode()));
if (Objects.isNull(matnr)) {
throw new CoolException("鏁版嵁閿欒锛氬綋鍓嶇墿鏂欎笉瀛樺湪!!");
}
- //TODO barcode鐢熸垚绛栫暐
- String barcode = code + matnr.getCode();
+// //TODO barcode鐢熸垚绛栫暐
+ 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)
+// .setBarcode(barcode)
.setPoCode(purchase.getCode())
.setPurQty(item.getAnfme())
.setPurUnit(item.getUnit())
- .setMatnk(matnr.getName())
+ .setMaktx(matnr.getName())
.setMatnrId(matnr.getId() + "");
- //鍒ゆ柇PO鍗曟槸鍚﹀凡璁剧疆鍔ㄦ�佸瓧娈电储寮�
- if (Objects.isNull(item.getFieldsIndex())) {
- orderItem.setFieldsIndex(uuid16);
- } else {
- orderItem.setFieldsIndex(item.getFieldsIndex());
- }
orderItems.add(orderItem);
});
if (!asnOrderItemService.saveBatch(orderItems)) {
--
Gitblit v1.9.1