From 83b51a5a0774ea8ecb9a06304af3b956a21307c8 Mon Sep 17 00:00:00 2001 From: pjb <123456> Date: 星期六, 08 三月 2025 09:06:55 +0800 Subject: [PATCH] CUT库条码T开头,截取后10位 --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 49 insertions(+), 1 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 a79aad7..2e98334 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 @@ -3,6 +3,8 @@ 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.entity.request.RfidSingalRequest; +import com.zy.asrs.wms.apis.wcs.entity.response.CommonReponse; 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; @@ -12,6 +14,9 @@ import java.util.Map; import java.util.Objects; +/** + * 澶у睆鎿嶄綔鍩烘湰鍔熻兘 + */ @RestController @RequestMapping("/wave") public class WaveManagentController extends BaseController { @@ -43,6 +48,12 @@ } + /** + * 澶у睆鑾峰彇浠诲姟鏄庣粏 + * 鑾峰彇褰撳墠鎾涓叿浣撲换鍔℃槑缁� + * @param param + * @return + */ @PostMapping("/task/detl/qutify") public R getTaskDetlQutify(@RequestBody Map<String, Object> param) { if (Objects.isNull(param)) { @@ -57,8 +68,18 @@ return waveManagentService.getTaskDetlQutify(taskNoStr); } + /** + * 鑾峰彇褰撳墠鎾澧欏簱浣嶄俊鎭� + * @return + */ + @GetMapping("/seed/locs") + public R getSeedLoc() { + return waveManagentService.AllSeedLocs(); + } + /*** * 澶у睆鑾峰彇鍑哄簱鍒楄〃 + * 鑾峰彇褰撳墠鎾涓墽琛屾暟鎹� * @return */ @GetMapping("/sow/tasks") @@ -67,12 +88,22 @@ } /** - * 瀹℃牳鎾鐘舵�佷换鍔� + * 娉㈡鎾 + * 鎾鏄庣粏鏁伴噺淇敼 * @param reviewParam * @return */ @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); } @@ -89,4 +120,21 @@ 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