From bc25523bd723e92e85f3463edca27f0fe18a7a71 Mon Sep 17 00:00:00 2001
From: DESKTOP-LMJ82IJ\Eno <creaycat@gmail.com>
Date: 星期日, 13 四月 2025 16:49:19 +0800
Subject: [PATCH] #修改 收货单据界面优化修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java | 74 ++++++++++++++++++++++++++++++++----
1 files changed, 65 insertions(+), 9 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..3ca24bd 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,33 @@
package com.vincent.rsf.server.manager.controller;
+
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.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.BatchUpdateParam;
+import com.vincent.rsf.server.manager.entity.AsnOrder;
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 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.HttpServletResponse;
import java.util.*;
+@Api(tags = "ASN鍗曟槑缁�")
@RestController
public class AsnOrderItemController extends BaseController {
@@ -26,11 +35,12 @@
private AsnOrderItemService asnOrderItemService;
@PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
+ @ApiOperation("鍒嗛〉鑾峰彇鍒楄〃")
@PostMapping("/asnOrderItem/page")
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.page(pageParam, pageParam.buildWrapper(true)));
+ return R.ok().add(asnOrderItemService.listByAsnId(pageParam, pageParam.buildWrapper(true)));
}
@PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
@@ -54,16 +64,19 @@
@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", getLoginUserId());
+
+ 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')")
@OperationLog("Update ASN鍗曟嵁")
@@ -103,8 +116,51 @@
@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);
+ List<AsnOrderItem> orderItems = new ArrayList<>();
+ if (!Objects.isNull(map.get("ids"))) {
+ orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getId, map.get("ids")).eq(AsnOrderItem::getStatus, 1));
+ } else {
+ orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>());
+ }
+
+ ExcelUtil.build(ExcelUtil.create(orderItems, AsnOrderItem.class, true), response);
}
+
+ @PostMapping("/asnOrderItem/generate/barcode")
+ @ApiOperation("鐢熸垚ASN鏍囩")
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ public R generateBarcode(@RequestBody List<Long> orders) {
+ if (orders.isEmpty()) {
+ return R.error("鍗曟嵁涓嶈兘涓虹┖!!");
+ }
+ return asnOrderItemService.generateBarcode(orders);
+ }
+
+ /**
+ * ASN鍗曟嵁鏄庣粏瀵煎叆
+ * @param file
+ * @return
+ */
+ @PostMapping("/asnOrderItem/import")
+ @ApiOperation("ASN瀵煎叆鎺ュ彛")
+ @PreAuthorize("hasAuthority('manager:asnOrderItem:update')")
+ public R importExcel(@RequestParam(value = "file") MultipartFile file, @RequestParam String asnId) throws Exception {
+ if (Objects.isNull(file)) {
+ R.error("鏂囦欢涓嶈兘涓虹┖锛侊紒");
+ }
+ HashMap<String, Object> hashMap = new HashMap<>();
+ if (!Objects.isNull(asnId)) {
+ hashMap.put("asnId", asnId);
+ }
+
+ return asnOrderItemService.excelImport(file, hashMap);
+ }
+
+
}
--
Gitblit v1.9.1