From 97aea7e059c7cb6c9c19402b423a8bca39eca017 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 27 三月 2025 15:43:32 +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/controller/MatnrController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
index 3a49ec1..091cf4a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
@@ -108,6 +108,10 @@
Matnr matnr1 = matnrService.getById(matnr.getId());
if (!Objects.isNull(matnr1.getFieldsIndex())) {
params.put("fieldsIndex", matnr1.getFieldsIndex());
+ } else {
+ String uuid16 = CommonUtil.randomUUID16();
+ params.put("index", uuid16);
+ matnr.setFieldsIndex(uuid16);
}
FieldsUtils.updateFieldsValue(params);
}
@@ -202,14 +206,14 @@
} else {
matnrs = matnrService.list(new LambdaQueryWrapper<Matnr>().last("limit 1"));
}
- ExcelUtil.build(ExcelUtil.create(null, MatnrsTemplate.class, true), response);
+ ExcelUtil.build(ExcelUtil.create(matnrs, Matnr.class, true), response);
}
@PreAuthorize("hasAuthority('manager:matnr:list')")
@ApiOperation("涓嬭浇鐗╂枡妯℃澘")
@PostMapping("/matnr/template/download")
public void download(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(null, MatnrsTemplate.class, true), response);
+ ExcelUtil.build(ExcelUtil.create(null, MatnrsTemplate.class), response);
}
--
Gitblit v1.9.1