From 2a34b52125d5fc356d65ee1e8912845dd601d4e3 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期五, 01 五月 2026 12:52:02 +0800
Subject: [PATCH] 多加入参数和修改规则
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 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 8e6ff49..5dfa878 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
@@ -13,6 +13,7 @@
import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
import com.vincent.rsf.server.manager.controller.params.OutStockToTaskParams;
import com.vincent.rsf.server.manager.entity.DeliveryItem;
+import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.enums.OrderType;
@@ -25,6 +26,7 @@
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
+import com.vincent.rsf.server.manager.service.CloudWmsNotifyLogService;
import com.vincent.rsf.server.manager.service.OutStockItemService;
import com.vincent.rsf.server.manager.service.OutStockService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -51,6 +53,16 @@
private OutStockService outStockService;
@Autowired
private OutStockItemService outStockItemService;
+ @Autowired
+ private CloudWmsNotifyLogService cloudWmsNotifyLogService;
+
+ @ApiOperation("鎵嬪姩瑙﹀彂浜戜粨鍥為锛堝嚭搴撻�氱煡鍗曪紝鏀捐鏆傜紦涓婃姤锛�")
+ @PostMapping("/outStock/cloudWmsReport/submit")
+ @PreAuthorize("hasAuthority('manager:outStock:list')")
+ public R submitCloudWmsReportOutbound(@RequestBody(required = false) Map<String, Object> body) {
+ String code = body != null && body.get("code") != null ? String.valueOf(body.get("code")).trim() : null;
+ return cloudWmsNotifyLogService.manualFlushToNotifyByOrderCode(code, false);
+ }
@PreAuthorize("hasAuthority('manager:outStock:list')")
@PostMapping("/outStock/page")
@@ -58,8 +70,8 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<WkOrder, BaseParam> pageParam = new PageParam<>(baseParam, WkOrder.class);
QueryWrapper<WkOrder> queryWrapper = pageParam.buildWrapper(true);
- List<String> list = Arrays.asList(OrderType.ORDER_OUT.type, OrderType.ORDER_TRANSFER.type);
- queryWrapper.in("type", list);
+// List<String> list = Arrays.asList(OrderType.ORDER_OUT.type);
+// queryWrapper.in("type", list);
return R.ok().add(outStockService.page(pageParam, queryWrapper));
}
@@ -91,6 +103,15 @@
@GetMapping("/outStock/{id}")
public R get(@PathVariable("id") Long id) {
return R.ok().add(outStockService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('manager:outStock:list')")
+ @PostMapping("/outStock/matnr/page")
+ @ApiOperation("鍑哄簱鍗曢�夌墿鏂欏垎椤碉紙鏀寔搴撲綅鐘舵�佺瓫閫夈�佸簱瀛樻暟閲忎笌搴撲綅鐘舵�佸睍绀猴級")
+ public R pageMatnr(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Matnr, BaseParam> pageParam = new PageParam<>(baseParam, Matnr.class);
+ return R.ok().add(outStockService.pageMatnrForOutStock(pageParam, map));
}
@PreAuthorize("hasAuthority('manager:outStock:save')")
@@ -256,6 +277,17 @@
return outStockService.saveOutStock(params, getLoginUserId());
}
+ @GetMapping("/outStock/complete/{id}")
+ @ApiOperation("瀹屾垚鍑哄簱鍗�")
+ @PreAuthorize("hasAuthority('manager:outStock:update')")
+ public R complete(@PathVariable Long id) {
+ if (Objects.isNull(id)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return outStockService.completeOutOrderById(id);
+ }
+
+
@ApiOperation("鍗曟嵁淇℃伅淇敼")
@PostMapping("/outStock/items/update")
@PreAuthorize("hasAuthority('manager:outStock:update')")
--
Gitblit v1.9.1