From 50f2f8945f1ab86c931fee6cf9d9bd88a122ae6e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 07 六月 2025 17:14:47 +0800
Subject: [PATCH] #单据出库
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java
index 8a4f749..83c1aaa 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java
@@ -3,9 +3,11 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.server.manager.controller.params.OrderOutTaskParam;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.common.annotation.OperationLog;
@@ -47,7 +49,10 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<AsnOrder, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrder.class);
- return R.ok().add(outStockService.page(pageParam, pageParam.buildWrapper(true)));
+ QueryWrapper<AsnOrder> queryWrapper = pageParam.buildWrapper(true);
+ List<String> list = Arrays.asList(OrderType.ORDER_OUT.type);
+ queryWrapper.in("type", list);
+ return R.ok().add(outStockService.page(pageParam, queryWrapper));
}
@PreAuthorize("hasAuthority('manager:outStock:list')")
@@ -194,7 +199,7 @@
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
List<Long> ids = (List<Long>) params.get("ids");
- return outStockService.genOutStock(ids);
+ return outStockService.genOutStock(ids, getLoginUserId());
}
@PreAuthorize("hasAuthority('manager:outStock:update')")
@@ -228,7 +233,13 @@
return outStockService.updateOrderItem(params, getLoginUserId());
}
+ @PostMapping("/outStock/order/getOutTaskItems")
+ @PreAuthorize("hasAuthority('manager:outStock:list')")
+ public R getOrderOutTaskItem(@RequestBody OrderOutTaskParam param){
+ if (Cools.isEmpty(param)){
+ return R.error("鍙傛暟涓嶈兘涓虹┖");
+ }
-
-
+ return outStockService.getOrderOutTaskItem(param);
+ }
}
--
Gitblit v1.9.1