From 4abcc3dfc43c5c9c58bdaf8bd85df129467a60ed Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期五, 01 五月 2026 15:35:48 +0800
Subject: [PATCH] 多加入参数和修改规则
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java
index 9be475a..320333a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java
@@ -21,6 +21,7 @@
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.AsnOrderService;
+import com.vincent.rsf.server.manager.service.CloudWmsNotifyLogService;
import com.vincent.rsf.server.manager.service.impl.PurchaseItemServiceImpl;
import com.vincent.rsf.server.manager.service.impl.PurchaseServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -48,6 +49,16 @@
private PurchaseServiceImpl purchaseService;
@Autowired
private PurchaseItemServiceImpl purchaseItemService;
+ @Autowired
+ private CloudWmsNotifyLogService cloudWmsNotifyLogService;
+
+ @ApiOperation("鎵嬪姩瑙﹀彂浜戜粨鍥為锛堝叆搴撻�氱煡鍗曪紝鏀捐鏆傜紦涓婃姤锛�")
+ @PostMapping("/asnOrder/cloudWmsReport/submit")
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ public R submitCloudWmsReportInbound(@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, true);
+ }
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping("/asnOrder/page")
@@ -57,8 +68,25 @@
QueryWrapper<WkOrder> queryWrapper = pageParam.buildWrapper(true);
List<String> asList = Arrays.asList(OrderType.ORDER_IN.type);
queryWrapper.in("type", asList);
- return R.ok().add(asnOrderService.page(pageParam, queryWrapper));
+ Page<WkOrder> pageResult = asnOrderService.page(pageParam, queryWrapper);
+ asnOrderService.fillPalletQty(pageResult.getRecords());
+ return R.ok().add(pageResult);
}
+
+ @ApiOperation("鑾峰彇棣栭〉琛ㄥご鏁版嵁")
+ @PostMapping("/asnOrder/dashbord/header")
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ public R getDashbord() {
+ return asnOrderService.getDashbord();
+ }
+
+ @ApiOperation("鑾峰彇鍑哄叆搴撹秼鍔垮浘")
+ @PostMapping("/asnOrder/stock/trand")
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ public R getStockTrand() {
+ return R.ok().add(asnOrderService.getStockTrand());
+ }
+
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping("/asnOrder/list")
@@ -69,14 +97,20 @@
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping({"/asnOrder/many/{ids}", "/asnOrders/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(asnOrderService.listByIds(Arrays.asList(ids)));
+ List<WkOrder> list = asnOrderService.listByIds(Arrays.asList(ids));
+ asnOrderService.fillPalletQty(list);
+ return R.ok().add(list);
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@OperationLog("琛ㄥ崟鏌ヨ")
@GetMapping("/asnOrder/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(asnOrderService.getById(id));
+ WkOrder order = asnOrderService.getById(id);
+ if (order != null) {
+ asnOrderService.fillPalletQty(Collections.singletonList(order));
+ }
+ return R.ok().add(order);
}
@PreAuthorize("hasAuthority('manager:asnOrder:save')")
--
Gitblit v1.9.1