From 4031cede20c17c15772d8c4f17064dbc1f90234f Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 20 四月 2026 21:43:23 +0800
Subject: [PATCH] 1.12天入库体积统计
---
src/main/java/com/zy/asrs/controller/OpenController.java | 65 ++++++++++++++++++--------------
1 files changed, 37 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 8f859d0..3d148c3 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -535,7 +535,7 @@
}
log.info("[outOrder] cache: {}", JSON.toJSONString(params));
request.setAttribute("cache", params);
- Map<String, List<OutTaskParam>> linesByBatch = new LinkedHashMap<>();
+ Map<String, List<OutTaskParam>> linesByBatchSeq = new LinkedHashMap<>();
for (OutTaskParam outTaskParam : params) {
if (Cools.isEmpty(outTaskParam) || Cools.isEmpty(outTaskParam.getOrderId())) {
return R.error("鍑哄簱鍗曞彿涓嶈兘涓虹┖");
@@ -546,10 +546,10 @@
if (Cools.isEmpty(outTaskParam.getStationId())) {
return R.error("鎵樼洏銆�" + outTaskParam.getPalletId() + "銆嶅嚭搴撳彛缂栫爜涓嶈兘涓虹┖");
}
- linesByBatch.computeIfAbsent(outTaskParam.getBatchSeq(), k -> new ArrayList<>()).add(outTaskParam);
+ linesByBatchSeq.computeIfAbsent(outTaskParam.getBatchSeq(), k -> new ArrayList<>()).add(outTaskParam);
}
- for (Map.Entry<String, List<OutTaskParam>> entry : linesByBatch.entrySet()) {
+ for (Map.Entry<String, List<OutTaskParam>> entry : linesByBatchSeq.entrySet()) {
List<OutTaskParam> lines = entry.getValue();
OutTaskParam head = lines.get(0);
String oid = head.getOrderId();
@@ -584,8 +584,13 @@
}
}
+ List<OutTaskParam> groupedParams = new ArrayList<>(params.size());
+ for (List<OutTaskParam> lines : linesByBatchSeq.values()) {
+ groupedParams.addAll(lines);
+ }
+
Set<String> seenPallet = new LinkedHashSet<>();
- for (OutTaskParam outTaskParam : params) {
+ for (OutTaskParam outTaskParam : groupedParams) {
String pid = outTaskParam.getPalletId();
String palletKey = pid == null ? "" : pid;
if (!seenPallet.add(palletKey)) {
@@ -614,7 +619,7 @@
List<OutTaskParam> missingStock = Lists.newArrayList();
List<OutTaskParam> missingLoc = Lists.newArrayList();
- for (OutTaskParam outTaskParam : params) {
+ for (OutTaskParam outTaskParam : groupedParams) {
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", outTaskParam.getPalletId()));
if (countLoc == 0) {
missingStock.add(outTaskParam);
@@ -642,7 +647,7 @@
return R.error("娌℃湁鎵惧埌鎵樼洏鐮佸搴斿簱浣嶏細" + String.join("锛�", badPalletIds)).add(missingLoc);
}
- return openService.outOrderBatch(params);
+ return openService.outOrderBatch(linesByBatchSeq);
}
/**
@@ -692,6 +697,15 @@
private String buildOutOrderBatchKey(OutTaskParam param) {
return param.getOrderId() + "#" + param.getBatchSeq();
+ }
+
+ /**
+ * 鎺ㄨ崘鍑哄簱绔欑偣
+ */
+ @PostMapping("/pakoutStaNo")
+ public synchronized R pakoutStaNo(@RequestBody List<String> barcodes) {
+ String StaNo = "1,2,3,4,5";
+ return R.ok().add(StaNo);
}
@@ -765,9 +779,7 @@
AxisBean cube5 = new AxisBean();
cube5.setName("鍏ュ簱浣撶Н");
- AxisBean cube15 = new AxisBean();
- cube15.setName("鍑哄簱浣撶Н");
- List<WorkCubeTotalAxis> workCubeTotalAxes = reportQueryMapper.getCubeTotal();
+ List<WorkCubeTotalAxis> workCubeTotalAxes = reportQueryMapper.getInboundCubeTotal();
Map<String, WorkCubeTotalAxis> cubeMap = new HashMap<String, WorkCubeTotalAxis>();
if (workCubeTotalAxes != null) {
for (WorkCubeTotalAxis w : workCubeTotalAxes) {
@@ -777,7 +789,6 @@
}
}
ArrayList<Number> data4 = new ArrayList<Number>();
- ArrayList<Number> data5 = new ArrayList<Number>();
SimpleDateFormat sfCube = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendarCube = Calendar.getInstance();
calendarCube.add(Calendar.DATE, -12);
@@ -786,15 +797,10 @@
String str = sfCube.format(calendarCube.getTime());
WorkCubeTotalAxis cubeAxis = cubeMap.get(str);
data4.add(cubeAxis == null || cubeAxis.getCube5Total() == null ? 0 : cubeAxis.getCube5Total());
- data5.add(cubeAxis == null || cubeAxis.getCube15Total() == null ? 0 : cubeAxis.getCube15Total());
}
Number[] array4 = new Number[data4.size()];
cube5.setData(data4.toArray(array4));
list.add(cube5);
- Number[] array5 = new Number[data5.size()];
- cube15.setData(data5.toArray(array5));
- list.add(cube15);
-
}
map.put("rows",list);
return R.ok(map);
@@ -839,8 +845,8 @@
if (w.getYmd() != null && key.equals(w.getYmd().trim())) {
inV = w.getInqty();
outV = w.getOutqty();
- inC = w.getCube_inqty();
- outC = w.getCube_outqty();
+ inC = w.getCubeInqty();
+ outC = w.getCubeOutqty();
break;
}
}
@@ -863,18 +869,21 @@
outqty.setData(data2.toArray(array2));
list.add(outqty);
- AxisBean cubeInqty = new AxisBean();
- cubeInqty.setName("鍏ュ簱浣撶Н");
- Integer[] array3 = new Integer[data3.size()];
- cubeInqty.setData(data3.toArray(array3));
- list.add(cubeInqty);
+ if (data3.size() >0) {
+ AxisBean cubeInqty = new AxisBean();
+ cubeInqty.setName("鍏ュ簱浣撶Н");
+ Integer[] array3 = new Integer[data3.size()];
+ cubeInqty.setData(data3.toArray(array3));
+ list.add(cubeInqty);
+ }
- AxisBean cubeOutqty = new AxisBean();
- cubeOutqty.setName("鍑哄簱浣撶Н");
- Integer[] array4 = new Integer[data4.size()];
- cubeOutqty.setData(data4.toArray(array4));
- list.add(cubeOutqty);
-
+ if (data3.size() >0) {
+ AxisBean cubeOutqty = new AxisBean();
+ cubeOutqty.setName("鍑哄簱浣撶Н");
+ Integer[] array4 = new Integer[data4.size()];
+ cubeOutqty.setData(data4.toArray(array4));
+ list.add(cubeOutqty);
+ }
map.put("categories", categories);
map.put("rows", list);
return R.ok(map);
--
Gitblit v1.9.1