From b003a49794f49a329e2702918ecfc8d14b371d0d Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期三, 04 三月 2026 14:51:25 +0800
Subject: [PATCH] 云仓WMS接口流程
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java | 68 +++++++++++++++++++++++++++++++--
1 files changed, 63 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
index a464f60..f722a1b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
@@ -52,26 +52,58 @@
@PostMapping("/waitPakin/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
+ // 鍗曟嵁缁勬墭鎸夊崟鍙锋煡璇細鍗曞彿鍦ㄦ槑缁嗚〃 asn_code锛屼粠 map 鍙栧嚭骞剁Щ闄わ紝閬垮厤涓昏〃鏃犳瀛楁鎶ラ敊
+ String asnCode = null;
+ if (baseParam.getMap() != null && baseParam.getMap().containsKey("asnCode")) {
+ Object v = baseParam.getMap().get("asnCode");
+ if (v != null && StringUtils.isNotBlank(v.toString())) {
+ asnCode = v.toString().trim();
+ }
+ baseParam.getMap().remove("asnCode");
+ }
PageParam<WaitPakin, BaseParam> pageParam = new PageParam<>(baseParam, WaitPakin.class);
- return R.ok().add(waitPakinService.page(pageParam, pageParam.buildWrapper(true)));
+ com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<WaitPakin> qw = pageParam.buildWrapper(true);
+ if (StringUtils.isNotBlank(asnCode)) {
+ List<Long> pakinIds = waitPakinItemService.list(
+ new LambdaQueryWrapper<WaitPakinItem>()
+ .select(WaitPakinItem::getPakinId)
+ .like(WaitPakinItem::getAsnCode, asnCode))
+ .stream().map(WaitPakinItem::getPakinId).distinct().collect(Collectors.toList());
+ if (pakinIds.isEmpty()) {
+ qw.and(w -> w.apply("1 = 0"));
+ } else {
+ qw.in("id", pakinIds);
+ }
+ }
+ Page<WaitPakin> page = waitPakinService.page(pageParam, qw);
+ fillAsnCodes(page.getRecords());
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:waitPakin:list')")
@PostMapping("/waitPakin/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(waitPakinService.list());
+ List<WaitPakin> list = waitPakinService.list();
+ fillAsnCodes(list);
+ return R.ok().add(list);
}
@PreAuthorize("hasAuthority('manager:waitPakin:list')")
@PostMapping({"/waitPakin/many/{ids}", "/waitPakins/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(waitPakinService.listByIds(Arrays.asList(ids)));
+ List<WaitPakin> list = waitPakinService.listByIds(Arrays.asList(ids));
+ fillAsnCodes(list);
+ return R.ok().add(list);
}
@PreAuthorize("hasAuthority('manager:waitPakin:list')")
@GetMapping("/waitPakin/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(waitPakinService.getById(id));
+ WaitPakin one = waitPakinService.getById(id);
+ if (one != null) {
+ fillAsnCodes(Collections.singletonList(one));
+ }
+ return R.ok().add(one);
}
@PreAuthorize("hasAuthority('manager:waitPakin:save')")
@@ -143,7 +175,9 @@
@PreAuthorize("hasAuthority('manager:waitPakin:list')")
@PostMapping("/waitPakin/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(waitPakinService.list(), WaitPakin.class), response);
+ List<WaitPakin> list = waitPakinService.list();
+ fillAsnCodes(list);
+ ExcelUtil.build(ExcelUtil.create(list, WaitPakin.class), response);
}
@@ -160,4 +194,28 @@
return taskService.generateTasks(taskParams, getLoginUserId());
}
+ /**
+ * 鏍规嵁缁勬墭鏄庣粏濉厖涓绘。鐨勫叧鑱斿叆搴撻�氱煡鍗曞彿锛坅snCodes锛夛紝澶氫釜鍗曞彿閫楀彿鍒嗛殧
+ */
+ private void fillAsnCodes(List<WaitPakin> list) {
+ if (list == null || list.isEmpty()) {
+ return;
+ }
+ List<Long> pakinIds = list.stream().map(WaitPakin::getId).collect(Collectors.toList());
+ List<WaitPakinItem> items = waitPakinItemService.list(
+ new LambdaQueryWrapper<WaitPakinItem>()
+ .in(WaitPakinItem::getPakinId, pakinIds)
+ .select(WaitPakinItem::getPakinId, WaitPakinItem::getAsnCode));
+ Map<Long, String> asnCodesByPakinId = pakinIds.stream().collect(Collectors.toMap(
+ pid -> pid,
+ pid -> items.stream()
+ .filter(i -> pid.equals(i.getPakinId()) && i.getAsnCode() != null && !i.getAsnCode().trim().isEmpty())
+ .map(WaitPakinItem::getAsnCode)
+ .distinct()
+ .collect(Collectors.joining(","))));
+ for (WaitPakin p : list) {
+ p.setAsnCodes(asnCodesByPakinId.get(p.getId()));
+ }
+ }
+
}
--
Gitblit v1.9.1