From 0a3a59432a0ff8d4169ad7484250a0a0d5bed1f9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 09 一月 2025 19:50:58 +0800
Subject: [PATCH] # 1. 波次预览重复问题 2. PDA组拖超过3个物料后，组拖按钮被遮挡 3. 平库入库物料ID为空 4. PDA出库成功后，界面数据重置，避免重复操作 5. 入库单历史档，按时间倒序排列
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/PickSheetController.java | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/PickSheetController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/PickSheetController.java
index 33d7a25..66012e8 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/PickSheetController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/PickSheetController.java
@@ -1,14 +1,55 @@
package com.zy.asrs.wms.asrs.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.asrs.entity.PickSheetDetl;
+import com.zy.asrs.wms.asrs.entity.param.PageRequest;
+import com.zy.asrs.wms.asrs.service.PickSheetService;
import com.zy.asrs.wms.system.controller.BaseController;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
-@RequestMapping("/pick")
+@RequestMapping("/api")
@RestController
public class PickSheetController extends BaseController {
+ @Autowired
+ private PickSheetService pickSheetService;
+ /**
+ * 骞充粨鍑哄簱鎷ｈ揣鍗�
+ * @return
+ */
+ @PostMapping("/pick/flat/page")
+ public R getOutFlatSheet(@RequestBody PageRequest params) {
+ IPage page = pickSheetService.getOutFlatSheet(params);
+ return R.ok(page.getRecords());
+ }
+ /**
+ * 鑾峰彇鎷ｈ揣鍗曟槑缁�
+ * @param pageRequest
+ * @return
+ */
+ @PostMapping("/pick/flat/detl/page")
+ public R getSheetDetl(@RequestBody PageRequest pageRequest) {
+ IPage page = pickSheetService.getSheetDetl(pageRequest);
+ return R.ok(page.getRecords());
+ }
+
+ /**
+ * 鑾峰彇鎷ｈ揣鍗曟槑缁�
+ * @param id
+ * @return
+ */
+ @GetMapping("/pick/flat/remove/{id}")
+ public R getRemoveSheet(@PathVariable String id) {
+ int result = pickSheetService.removePickSheet(Long.valueOf(id));
+ if (result > 0) {
+ return R.ok("鍒犻櫎鎴愬姛锛侊紒");
+ } else {
+ return R.error("鍒犻櫎澶辫触锛侊紒");
+ }
+ }
}
--
Gitblit v1.9.1