From 23e5035547b997430a8a3e71cee44782011664dc Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期三, 26 三月 2025 09:50:26 +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 | 17 +++++------------
1 files changed, 5 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..991e021 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
@@ -92,35 +92,28 @@
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 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())
+// .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