From 25e1bcba7282b350011950cdf5006e11f1bb9ba5 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 13 一月 2025 20:38:43 +0800 Subject: [PATCH] # 大屏分拣拍灯功能开发 --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java | 74 +++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java index c6d896b..ce2cf7c 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java @@ -1,11 +1,16 @@ package com.zy.asrs.wms.apis.wcs.controller; +import com.mysql.cj.util.StringUtils; import com.zy.asrs.framework.common.R; +import com.zy.asrs.framework.exception.CoolException; import com.zy.asrs.wms.apis.wcs.services.WaveManagentService; import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam; import com.zy.asrs.wms.system.controller.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; + +import java.util.Map; +import java.util.Objects; @RestController @RequestMapping("/wave") @@ -24,6 +29,52 @@ } + /** + * 閫氳繃浠诲姟鍙锋媺鍙栦换鍔℃槑缁� + * @param taskNo + * @return + */ + @GetMapping("/sow/task/detl/{taskNo}") + public R getTaskDetl(@PathVariable String taskNo) { + if (StringUtils.isNullOrEmpty(taskNo)) { + throw new CoolException("浠诲姟缂栫爜涓嶈兘涓虹┖锛侊紒"); + } + return waveManagentService.getTaskDetl(taskNo); + } + + + /** + * 澶у睆鑾峰彇浠诲姟鏄庣粏 + * @param param + * @return + */ + @PostMapping("/task/detl/qutify") + public R getTaskDetlQutify(@RequestBody Map<String, Object> param) { + if (Objects.isNull(param)) { + throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + if (Objects.isNull(param.get("taskNo"))) { + throw new CoolException("璇锋眰鍙傛暟锛氫换鍔$紪鐮佷笉鑳戒负绌猴紒锛�"); + } + String taskNoStr = (String) param.get("taskNo"); +// Long matnr = Long.valueOf(taskNo.get("matnr").toString()); + + return waveManagentService.getTaskDetlQutify(taskNoStr); + } + + /** + * 鑾峰彇褰撳墠鎾澧欏簱浣嶄俊鎭� + * @return + */ + @GetMapping("/seed/locs") + public R getSeedLoc() { + return waveManagentService.AllSeedLocs(); + } + + /*** + * 澶у睆鑾峰彇鍑哄簱鍒楄〃 + * @return + */ @GetMapping("/sow/tasks") public R getTasks() { return waveManagentService.getTask(); @@ -36,6 +87,15 @@ */ @PostMapping("/sow/review") public R reviewSeeds(@RequestBody WaveSeedReviewParam reviewParam) { + if (Objects.isNull(reviewParam)) { + return R.error("鎾鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + if (Objects.isNull(reviewParam.getReviewNum())) { + return R.error("鎾鏁伴噺涓嶈兘涓虹┖锛侊紒"); + } + if (Objects.isNull(reviewParam.getWaveSeedId())) { + return R.error("鎾鏄庣粏鏍囪瘑涓嶈兘涓虹┖锛侊紒"); + } return waveManagentService.reviewSeeds(reviewParam); } @@ -52,4 +112,18 @@ return R.error("鍒犻櫎澶辫触锛侊紒"); } } + + /** + * 澶у睆鑾峰彇娉㈡鎵�鏈夎鍗曚俊鎭� + * @param waveNo + * @return + */ + @GetMapping("/orders/{waveNo}") + public R getWaveOrders(@PathVariable String waveNo) { + if (StringUtils.isNullOrEmpty(waveNo)) { + return R.error("娉㈡缂栫爜涓嶈兘涓虹┖锛侊紒锛�"); + } + return waveManagentService.getAllOrders(waveNo); + } + } -- Gitblit v1.9.1