From bed735aae42b6e0c75bf3fd63d9cd0996fba9355 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 21 五月 2025 14:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
index 92480e9..22ee73d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
@@ -134,6 +134,7 @@
.setMemo(template.getMemo())
.setArrTime(date)
.setUpdateBy(loginUserId)
+ .setLogisNo(template.getLogicNo())
.setCreateBy(loginUserId)
.setType(OrderType.getTypeVal(template.getType()))
.setWkType(OrderWorkType.getWorkType(template.getWkType()));
@@ -171,6 +172,9 @@
.setIsptResult(QlyIsptResult.getDescVal(orderTemplate.getIsptResult()))
// .setTrackCode(trackCode)
.setBarcode(trackCode)
+ .setPlatOrderCode(orderTemplate.getPlatOrderCode())
+ .setPlatWorkCode(orderTemplate.getPlatWorkCode())
+ .setProjectCode(orderTemplate.getProjectCode())
.setPoCode(orderTemplate.getPoCode())
.setPurUnit(matnr.getUnit())
.setCreateBy(loginUserId)
@@ -248,9 +252,9 @@
// }
//淇濆瓨鎵╁睍瀛楁
try {
+ StringBuffer sb = new StringBuffer();
if (Objects.isNull(asnOrderItem.getFieldsIndex()) || StringUtils.isBlank(asnOrderItem.getFieldsIndex())) {
- StringBuffer sb = new StringBuffer();
- if (!asnOrderItem.getExtendFields().isEmpty()) {
+ if (!Objects.isNull(asnOrderItem.getExtendFields()) && !asnOrderItem.getExtendFields().isEmpty()) {
Map<String, String> fields = asnOrderItem.getExtendFields();
asnOrderItem.getExtendFields().keySet().forEach(key -> {
sb.append(fields.get(key));
@@ -260,10 +264,10 @@
//鑾峰彇16浣島uid
String uuid16 = Cools.md5Chinese(sb.toString());
asnOrderItem.setFieldsIndex(uuid16);
- if (FieldsUtils.saveFields(params, uuid16)) {
- asnOrderItem.setFieldsIndex(uuid16);
- }
+ params.put("index", uuid16);
}
+ //淇濆瓨鎴栨洿鏂板姩鎬佸瓧娈靛��
+ FieldsUtils.updateFieldsValue(params);
} catch (Exception e) {
throw new RuntimeException(e);
}
--
Gitblit v1.9.1