From 91d017a582ea781c5e9e7d6bbb4f9afed4763c79 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 29 三月 2025 10:08:16 +0800
Subject: [PATCH] #修改 扫码收货字段优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 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 d192832..60e27ce 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
@@ -11,6 +11,7 @@
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.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;
@@ -76,19 +77,6 @@
}
- @PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
- @ApiOperation("鑾峰彇ASN鍗曟槑缁嗕俊鎭�")
- @PostMapping("/asnOrderItem/all/list")
- public R listByAsnId(@RequestBody Map<String, Object> map) {
- if (Objects.isNull(map)) {
- throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
- }
- return R.ok();
-// return asnOrderItemService.listByAsnId(map);
- }
-
-
-
@PreAuthorize("hasAuthority('manager:asnOrderItem:update')")
@OperationLog("Update ASN鍗曟嵁")
@PostMapping("/asnOrderItem/update")
@@ -135,14 +123,31 @@
ExcelUtil.build(ExcelUtil.create(list, AsnOrderTemplate.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);
+ }
+
+ @PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
+ @ApiOperation("鑾峰彇璁㈠崟鐗╂枡鏄庣粏")
+ @GetMapping("/asnOrderItem/trackCode/{code}")
+ public R getItemByTrackCode(@PathVariable String code) {
+ return R.ok(asnOrderItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getTrackCode, code)));
+ }
/**
* ASN鍗曟嵁鏄庣粏瀵煎叆
* @param file
* @return
*/
- @PostMapping("/asnOrder/import")
+ @PostMapping("/asnOrderItem/import")
@ApiOperation("ASN瀵煎叆鎺ュ彛")
- @PreAuthorize("hasAuthority('manager:asnOrder:update')")
+ @PreAuthorize("hasAuthority('manager:asnOrderItem:update')")
public R importExcel(@RequestParam(value = "file") MultipartFile file, @RequestParam String asnId) throws Exception {
if (Objects.isNull(file)) {
throw new CoolException("鏂囦欢涓嶈兘涓虹┖锛侊紒");
--
Gitblit v1.9.1