From 645da5e4e48dd94b760ea4dcbf80e22bf2a3f33c Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期六, 11 一月 2025 17:20:08 +0800 Subject: [PATCH] #添加播种站点功能 --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java | 79 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java index cc07a96..2e8116c 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java @@ -1,20 +1,28 @@ package com.zy.asrs.wms.asrs.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zy.asrs.common.domain.CodeRes; import com.zy.asrs.common.domain.enums.LoginSystemType; import com.zy.asrs.framework.annotations.ManagerAuth; import com.zy.asrs.framework.common.Cools; import com.zy.asrs.framework.common.R; +import com.zy.asrs.framework.exception.CoolException; +import com.zy.asrs.wms.asrs.entity.CacheSite; import com.zy.asrs.wms.asrs.entity.Loc; import com.zy.asrs.wms.asrs.entity.Order; import com.zy.asrs.wms.asrs.entity.WaitPakin; import com.zy.asrs.wms.asrs.entity.dto.OrderInfoDto; +import com.zy.asrs.wms.asrs.entity.dto.PickSheetDetlDto; import com.zy.asrs.wms.asrs.entity.param.BatchMergeOrdersParam; +import com.zy.asrs.wms.asrs.entity.param.PageRequest; import com.zy.asrs.wms.asrs.entity.param.PakinOnShelvesParams; import com.zy.asrs.wms.asrs.service.MobileService; import com.zy.asrs.wms.asrs.service.OrderService; import com.zy.asrs.wms.asrs.service.WaitPakinService; +import com.zy.asrs.wms.common.domain.BaseParam; import com.zy.asrs.wms.system.controller.BaseController; import com.zy.asrs.wms.system.entity.Host; import com.zy.asrs.wms.system.entity.User; @@ -178,4 +186,75 @@ } } + /** + * 鑾峰彇鎷h揣鏄庣粏 + * @return + */ + @GetMapping("/pick/detl/{code}") + public R pickDetlByPickNo(@PathVariable String code) { + if (StringUtil.isNullOrEmpty(code)) { + return R.error("鎷h揣鍗曟嵁缂栫爜涓嶈兘涓虹┖锛侊紒"); + } + PickSheetDetlDto pickSheetDetls = mobileService.outFlatSheet(code); + + return R.ok(pickSheetDetls); + } + + /** + * 鎷h揣鍗曠‘璁ゅ嚭搴� + * @param code + * @return + */ + @GetMapping("/pick/confirm/{code}") + public R confirmOutFlatSheet(@PathVariable String code) { + if (StringUtil.isNullOrEmpty(code)) { + return R.error("鎷h揣鍗曟嵁缂栫爜涓嶈兘涓虹┖锛侊紒"); + } + if (!mobileService.confirmFlatSheet(code)) { + return R.error("鍑哄簱澶辫触锛侊紒"); + } + return R.ok("鍑哄簱鎴愬姛锛侊紒"); + } + + + /** + * 鑾峰彇鎾浣� + * @return + */ + @GetMapping("/pick/seed/locs") + public R seedLocs() { + List<CacheSite> sites = mobileService.getSeedLocs(); + return R.ok(sites); + } + + /** + * 璁㈠崟缁戝畾绔欑偣 + * @param param + * @return + */ + @PostMapping("/pick/seed/bind") + public R bindLoc(@RequestBody Map<String, Object> param) { + if (Objects.isNull(param)) { + throw new CoolException("璇锋眰鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + if (Objects.isNull(param.get("barcode"))) { + throw new CoolException("瀹瑰櫒缂栫爜涓嶈兘涓虹┖"); + } + if (Objects.isNull(param.get("orderNo"))) { + throw new CoolException("璁㈠崟缂栧彿涓嶈兘涓虹┖锛侊紒"); + } + if (Objects.isNull(param.get("siteNo"))) { + throw new CoolException("鎾绔欑偣涓嶈兘涓虹┖锛侊紒"); + } + if (Objects.isNull(param.get("type"))) { + throw new CoolException("鍙傛暟绫诲瀷涓嶈兘涓虹┖锛侊紒"); + } + boolean result = mobileService.bindOrderBySite(param); + if (result) { + return R.ok("缁戝畾鎴愬姛锛侊紒"); + } else { + return R.error("缁戝畾澶辫触锛侊紒"); + } + } + } -- Gitblit v1.9.1