From 01f39fcb06b8713901975153d0a893e86eca6a88 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 七月 2025 19:42:26 +0800
Subject: [PATCH] 33.订单历史管理里面增加单据类型选项按钮、单据类型选项按钮 34.单据管理里面增加单据状态选项按钮 35.入库订单全部都入好了，单据状态还是作业中，现在作业中的单据是可以删除的，我不小心把这个单据删除了，怎么恢复？ 36.每个界面点下一页都没反应，点第二页是有变化的，之后点任何页面都没反应 37.订单明细点开后的界面改大一点 38.新增出库订单的时候可以输入客户信息（客户名称、收件人、地址、电话等），现在拣货完成后连发给谁都不知道 39.大屏播种界面对应的数量和开单数量不一致
---
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..beb6d84 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().add(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