From cbb0dfaec496d441bbf4287ca8ae85c2776e50ed Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 13 三月 2025 13:12:39 +0800
Subject: [PATCH] #修改 1. 收货通知单明细模板修改 2. 收货通知单添加动态扩展字段

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java |   62 +++++++++++++++++++++++++++----
 1 files changed, 54 insertions(+), 8 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 118c505..0b65aca 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
@@ -1,24 +1,41 @@
 package com.vincent.rsf.server.manager.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.vincent.rsf.framework.common.Cools;
 import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.common.utils.CommonUtil;
 import com.vincent.rsf.server.common.utils.ExcelUtil;
 import com.vincent.rsf.server.common.annotation.OperationLog;
 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.AsnOrderItemParams;
 import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
 import com.vincent.rsf.server.manager.service.AsnOrderItemService;
 import com.vincent.rsf.server.system.controller.BaseController;
+import com.vincent.rsf.server.system.entity.Fields;
+import com.vincent.rsf.server.system.entity.FieldsItem;
+import com.vincent.rsf.server.system.service.FieldsItemService;
+import com.vincent.rsf.server.system.service.FieldsService;
+import com.vincent.rsf.server.system.utils.SerialRuleUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
+import java.util.stream.Collectors;
 
+@Api(tags = "ASN鍗曟槑缁�")
 @RestController
 public class AsnOrderItemController extends BaseController {
 
@@ -54,15 +71,21 @@
     @PreAuthorize("hasAuthority('manager:asnOrderItem:save')")
     @OperationLog("Create ASN鍗曟嵁")
     @PostMapping("/asnOrderItem/save")
-    public R save(@RequestBody AsnOrderItem asnOrderItem) {
-        asnOrderItem.setCreateBy(getLoginUserId());
-        asnOrderItem.setCreateTime(new Date());
-        asnOrderItem.setUpdateBy(getLoginUserId());
-        asnOrderItem.setUpdateTime(new Date());
-        if (!asnOrderItemService.save(asnOrderItem)) {
+    public R save(@RequestBody Map<String, Object> params) {
+        if (Objects.isNull(params)) {
+            throw new CoolException("淇℃伅涓嶈兘涓虹┖锛侊紒");
+        }
+        params.put("createBy", getLoginUserId());
+        params.put("updateBy", getLoginUser());
+
+        if (!asnOrderItemService.fieldsSave(params)) {
             return R.error("Save Fail");
         }
-        return R.ok("Save Success").add(asnOrderItem);
+        return R.ok("Save Success");
+
+
+
+
     }
 
     @PreAuthorize("hasAuthority('manager:asnOrderItem:update')")
@@ -103,8 +126,31 @@
 
     @PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
     @PostMapping("/asnOrderItem/export")
+    @ApiOperation("鏀惰揣閫氱煡鍗曟槑缁�")
     public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
-        ExcelUtil.build(ExcelUtil.create(asnOrderItemService.list(), AsnOrderItem.class), response);
+        AsnOrderTemplate template = ExcelUtil.mockData(AsnOrderTemplate.class);
+        List<AsnOrderTemplate> list = new ArrayList<>();
+        list.add(template);
+        ExcelUtil.build(ExcelUtil.create(list, AsnOrderTemplate.class, true), response);
+    }
+
+    /**
+     * ASN鍗曟嵁鏄庣粏瀵煎叆
+     * @param file
+     * @return
+     */
+    @PostMapping("/asnOrder/import")
+    @ApiOperation("ASN瀵煎叆鎺ュ彛")
+    @PreAuthorize("hasAuthority('manager:asnOrder:update')")
+    public R importExcel(@RequestParam(value = "file") MultipartFile file, @RequestParam String asnId) throws Exception {
+        if (Objects.isNull(file)) {
+            throw new CoolException("鏂囦欢涓嶈兘涓虹┖锛侊紒");
+        }
+        HashMap<String, Object> hashMap = new HashMap<>();
+        if (!Objects.isNull(asnId)) {
+            hashMap.put("asnId", asnId);
+        }
+        return asnOrderItemService.excelImport(file, hashMap);
     }
 
 }

--
Gitblit v1.9.1