From 6732a988fe843cf59f12aae1460fc97fda5408dd Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 19:59:10 +0800
Subject: [PATCH] 新增asn单，修改asn单，添加动态字段修改功能
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
index 014c228..5dd2240 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
@@ -13,10 +13,10 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
-import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
+import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.Companys;
+import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.enums.CompanysType;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
@@ -49,7 +49,17 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<AsnOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrderItem.class);
- return R.ok().add(asnOrderItemService.listByAsnId(pageParam, pageParam.buildWrapper(true)));
+ /**鎷兼帴鎵╁睍瀛楁*/
+ PageParam<AsnOrderItem, BaseParam> page = asnOrderItemService.page(pageParam, pageParam.buildWrapper(true));
+ List<AsnOrderItem> records = page.getRecords();
+ for (AsnOrderItem record : records) {
+ if (!Objects.isNull(record.getFieldsIndex())) {
+ Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
+ record.setExtendFields(fields);
+ }
+ }
+ page.setRecords(records);
+ return R.ok(page);
}
@PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
@@ -80,7 +90,7 @@
params.put("createBy", getLoginUserId());
params.put("updateBy", getLoginUserId());
- if (!asnOrderItemService.fieldsSave(params)) {
+ if (!asnOrderItemService.fieldsSave(params, getLoginUserId())) {
return R.error("Save Fail");
}
return R.ok("Save Success");
@@ -171,9 +181,9 @@
@PostMapping("/asnOrderItem/import")
@ApiOperation("ASN瀵煎叆鎺ュ彛")
@PreAuthorize("hasAuthority('manager:asnOrderItem:update')")
- public R importExcel(@RequestParam(value = "file") MultipartFile file, @RequestParam String asnId) throws Exception {
+ public R importExcel(@RequestParam(value = "file") MultipartFile file) throws Exception {
if (Objects.isNull(file)) {
- R.error("鏂囦欢涓嶈兘涓虹┖锛侊紒");
+ return R.error("鏂囦欢涓嶈兘涓虹┖锛侊紒");
}
HashMap<String, Object> hashMap = new HashMap<>();
return asnOrderItemService.excelImport(file, hashMap, getLoginUserId());
--
Gitblit v1.9.1