From c5e5befb594587bd0c5144695ec59503333a6b9b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 31 三月 2025 17:05:05 +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/AsnOrderController.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
index 0f8d3ec..37fef45 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
@@ -147,19 +147,9 @@
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
public R getListByMatnr(@RequestBody Map<String, String> params){
if (Objects.isNull(params)) {
- throw new CoolException("鏌ヨ鏉′欢涓嶈兘涓虹┖锛侊紒");
+ return R.error("鏌ヨ鏉′欢涓嶈兘涓虹┖锛侊紒");
}
return R.ok(asnOrderService.getListByMatnr(params));
- }
-
- @PostMapping("/asnOrder/generate/barcode")
- @ApiOperation("鐢熸垚ASN鏍囩")
- @PreAuthorize("hasAuthority('manager:asnOrder:list')")
- public R generateBarcode(@RequestBody List<AsnOrder> orders) {
- if (orders.isEmpty()) {
- return R.error("鍗曟嵁涓嶈兘涓虹┖!!");
- }
- return asnOrderService.generateBarcode(orders);
}
@@ -168,8 +158,18 @@
@PreAuthorize("hasAuthority('manager:asnOrder:save')")
public R orderAndItem(@RequestBody AsnOrderAndItemsParams params) {
if (Objects.isNull(params)) {
- throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
return asnOrderService.saveOrderAndItems(params);
}
+
+ @ApiOperation("鍗曟嵁淇℃伅淇敼")
+ @PostMapping("/asnOrder/items/update")
+ @PreAuthorize("hasAuthority('manager:asnOrder:update')")
+ public R orderAndrItemUpdate(@RequestBody AsnOrderAndItemsParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return asnOrderService.updateOrderItem(params);
+ }
}
--
Gitblit v1.9.1