From 01e1749bb356da4577771464d1a14107f9762dec Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期二, 03 二月 2026 16:00:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 27 +++++++++++++++++++++++----
src/main/java/com/zy/asrs/entity/param/QueryCombParam.java | 10 ++++++++++
2 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index ed79c41..a01cf91 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -9,10 +9,7 @@
import com.zy.asrs.domain.dto.AxisBean;
import com.zy.asrs.domain.dto.WorkChartAxis;
import com.zy.asrs.domain.vo.LocChartPie;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.service.*;
@@ -54,6 +51,8 @@
private LocDetlService locDetlService;
@Autowired
private MatService matService;
+ @Autowired
+ private WaitPakinService waitPakinService;
/**
* 浠诲姟鏌ヨ鎺ュ彛
@@ -81,6 +80,26 @@
}
/**
+ * 缁勬墭鏌ヨ鎺ュ彛
+ */
+ @PostMapping("/queryComb")
+ public synchronized R queryComb(@RequestBody QueryCombParam param) {
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getBarcode())) {
+ return R.error("鎵樼洏鐮乕barcode]涓嶈兘涓虹┖");
+ }
+
+ List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
+
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("barcode", param.getBarcode());
+ map.put("combDetls", waitPakins);
+ return R.ok().add(map);
+ }
+
+ /**
* 搴撳瓨淇℃伅鏌ヨ鎺ュ彛
*/
@GetMapping("/queryLoc")
diff --git a/src/main/java/com/zy/asrs/entity/param/QueryCombParam.java b/src/main/java/com/zy/asrs/entity/param/QueryCombParam.java
new file mode 100644
index 0000000..4dfdfec
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/QueryCombParam.java
@@ -0,0 +1,10 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class QueryCombParam {
+
+ private String barcode;
+
+}
--
Gitblit v1.9.1