From 4fb06a58ed5df46f29af1e9fa65cfd40335263ad Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期六, 18 一月 2025 17:06:18 +0800 Subject: [PATCH] # 6. 大屏添加作业类型 (全盘,还是分拣 IOType) 10.平库出库时,当前平库ID是写死在Sql里,需修改 11.平库出库没有判断是否预约出库,且生成拣货单时没有锁定库存,需确认是否考虑回库问题 26. 已拣过货的任务明细,可以再次拣货,拣货明细需添加一个拣货状态 47. 确认发货前,需判断是否已绑定至集货区 48. CTU出库后,库位103不再删除原有库位信息 --- 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; + /** + * 骞充粨鍑哄簱鎷h揣鍗� + * @return + */ + @PostMapping("/pick/flat/page") + public R getOutFlatSheet(@RequestBody PageRequest params) { + IPage page = pickSheetService.getOutFlatSheet(params); + return R.ok(page.getRecords()); + } + /** + * 鑾峰彇鎷h揣鍗曟槑缁� + * @param pageRequest + * @return + */ + @PostMapping("/pick/flat/detl/page") + public R getSheetDetl(@RequestBody PageRequest pageRequest) { + IPage page = pickSheetService.getSheetDetl(pageRequest); + return R.ok(page.getRecords()); + } + + /** + * 鑾峰彇鎷h揣鍗曟槑缁� + * @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