From 5074c51d978a490a1d0e9dc116a874d33ddeb16c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 04 六月 2025 13:22:03 +0800
Subject: [PATCH] DO单excel导入功能 任务工作档优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 44c66d2..a24f52f 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
@@ -96,9 +96,6 @@
public synchronized R excelImport(MultipartFile file, HashMap<String, Object> hashMap, Long loginUserId) throws Exception {
ExcelImportResult result = ExcelImportUtil.importExcelMore(file.getInputStream(), AsnOrderTemplate.class, ExcelUtil.getDefaultImportParams());
if (result.getList().isEmpty()) {
- throw new CoolException("鐗╂枡瀵煎叆澶辫触锛侊紒");
- }
- if (result.getList().isEmpty()) {
throw new CoolException("琛ㄦ牸鍐呭涓嶈兘涓虹┖锛侊紒");
}
List<AsnOrderTemplate> resultList = result.getList();
@@ -134,6 +131,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 +169,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)
--
Gitblit v1.9.1