From 002f6582beb9100638387eeb14a42bc97c422763 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 03 四月 2025 09:42:45 +0800
Subject: [PATCH] 添加任务置顶， 取消， 完成功能
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java | 13 +++++--------
1 files changed, 5 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 60e27ce..c04887e 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.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;
@@ -74,8 +75,8 @@
return R.error("Save Fail");
}
return R.ok("Save Success");
-
}
+
@PreAuthorize("hasAuthority('manager:asnOrderItem:update')")
@OperationLog("Update ASN鍗曟嵁")
@@ -134,12 +135,6 @@
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
@@ -150,13 +145,15 @@
@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("鏂囦欢涓嶈兘涓虹┖锛侊紒");
+ 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