From 08b4403ec8d6b69528d161cfcad80b5d64dea76c Mon Sep 17 00:00:00 2001 From: Administrator <876263681@qq.com> Date: 星期三, 02 七月 2025 15:12:43 +0800 Subject: [PATCH] #优化库位检索 --- src/main/java/com/zy/asrs/controller/OpenController.java | 57 ++++++++++++--------------------------------------------- 1 files changed, 12 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index cb34a46..a3bf4d4 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -4,7 +4,10 @@ import com.core.annotations.AppAuth; import com.core.common.*; import com.core.exception.CoolException; -import com.zy.asrs.entity.param.*; +import com.zy.asrs.entity.param.MatSyncParam; +import com.zy.asrs.entity.param.OpenOrderCompleteParam; +import com.zy.asrs.entity.param.OpenOrderPakinParam; +import com.zy.asrs.entity.param.OpenOrderPakoutParam; import com.zy.asrs.service.OpenService; import com.zy.common.model.DetlDto; import com.zy.common.web.BaseController; @@ -46,23 +49,6 @@ return R.ok(); } - /****************************************************************************/ - /********************************* 鎵撳寘涓婄嚎 **********************************/ - /****************************************************************************/ - -// @PostMapping("/order/pakin/new/package/v1") -// @AppAuth(memo = "鎵撳寘涓婄嚎鎺ュ彛") -// public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey, -// @RequestBody(required = false) PackParam param, -// HttpServletRequest request) { -// auth(appkey, param, request); -// if (Cools.isEmpty(param)) { -// return R.parse(BaseRes.PARAM); -// } -// openService.packageUp(param); -// return R.ok(); -// } - /** * 娣诲姞鍏ュ簱鍗� */ @@ -87,16 +73,6 @@ return R.ok(); } - /** - * 鍏ュ簱鍗曞洖鍐� - */ - @PostMapping("/order/pakin/complete/default/v1") - public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey, - @RequestBody(required = false) OpenOrderCompleteParam param, - HttpServletRequest request) { - auth(appkey, param, request); - return R.ok().add(openService.pakinOrderComplete(param)); - } /** * 娣诲姞鍑哄簱鍗� @@ -109,12 +85,6 @@ auth(appkey, param, request); if (Cools.isEmpty(param)) { return R.parse(BaseRes.PARAM); - } - if (Cools.isEmpty(param.getLgort())) { - return R.error("鍗曟嵁缂栧彿[lgort]涓嶈兘涓虹┖"); - } - if (!param.getLgort().equals("5006")) { - return R.ok(); } if (Cools.isEmpty(param.getOrderNo())) { return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖"); @@ -129,22 +99,12 @@ return R.ok(); } - /** - * 鍑哄簱鍗曞洖鍐� - */ - @PostMapping("/order/pakout/complete/default/v1") - public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey, - @RequestBody(required = false) OpenOrderCompleteParam param, - HttpServletRequest request) { - auth(appkey, param, request); - return R.ok().add(openService.pakoutOrderComplete(param)); - } /** * 搴撳瓨缁熻 */ - @RequestMapping("/stock/default/v1") + @PostMapping("/stock/default/v1") public R queryStock(@RequestHeader(required = false) String appkey, HttpServletRequest request) { auth(appkey, null, request); @@ -165,6 +125,13 @@ } } + /******************************************************* 鏁板瓧瀛敓 *******************************************************/ + + @PostMapping("/wrkdetl") + public R getInOutDetl(){ + return openService.getInOutDetl(); + } + public static void main(String[] args) { // 1 System.out.println("======================================"); -- Gitblit v1.9.1