From f695b59337121fb6c93251e73bdfb3fc8e847cc8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 25 七月 2025 17:07:09 +0800
Subject: [PATCH] 调拔单功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java
index 2cb928b..0890885 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java
@@ -1,5 +1,6 @@
package com.vincent.rsf.server.manager.controller;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,9 +11,9 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.ExcelUtil;
-import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
-import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
+import com.vincent.rsf.server.manager.controller.params.*;
import com.vincent.rsf.server.manager.entity.WkOrder;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.excel.CheckOrderTemplate;
import com.vincent.rsf.server.manager.enums.CheckExceStatus;
import com.vincent.rsf.server.manager.enums.OrderType;
@@ -161,7 +162,6 @@
return checkOrderService.saveCheckOrder(params, getLoginUserId());
}
-
@ApiOperation("鐩樼偣鍗曚俊鎭慨鏀�")
@PostMapping("/check/items/update")
@PreAuthorize("hasAuthority('manager:check:update')")
@@ -172,18 +172,32 @@
return checkOrderService.updateOrderItem(params, getLoginUserId());
}
- @PostMapping("/outStock/order/getOutTaskItems")
+ @PostMapping("/check/order/items")
@ApiOperation("鐩樼偣鍑哄簱棰勮")
- @PreAuthorize("hasAuthority('manager:outStock:list')")
+ @PreAuthorize("hasAuthority('manager:check:list')")
public R getOrderOutTaskItem(@RequestBody OrderOutTaskParam param) {
if (Cools.isEmpty(param)) {
return R.error("鍙傛暟涓嶈兘涓虹┖");
}
-
return checkOrderService.genCheckPreview(param);
}
+ /**
+ * 鐩樼偣鍗曠敓鎴愬嚭搴撲换鍔�
+ * @param params
+ * @return
+ */
+ @PostMapping("/check/generate/tasks")
+ @ApiOperation("鐢熸垚鐩樼偣鍑哄簱浠诲姟")
+ @PreAuthorize("hasAuthority('manager:outStock:list')")
+ public R genCheckOutTask( @RequestBody List<CheckOrderParams> params) {
+ if (Cools.isEmpty()) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+
+ return checkOrderService.genCheckOutTask(params, getLoginUserId());
+ }
/**
* 鑾峰彇鍑哄簱绔欑偣
@@ -197,6 +211,17 @@
}
+ @ApiOperation("鑾峰彇鍦ㄥ簱鐗╂枡鍒楄〃")
+ @PostMapping("/check/locs")
+ @PreAuthorize("hasAuthority('manager:check:list')")
+ public R getAllLocByMatnr(@RequestBody CheckLocQueryParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return checkOrderService.getAllLocByMatnr(params);
+ }
+
+
/**
* @author Ryan
* @description 涓嬭浇妯℃澘
--
Gitblit v1.9.1