From d8d107072cde858bdc4d23318c56d52e91f28c93 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期五, 21 七月 2023 09:47:13 +0800 Subject: [PATCH] #wrkmast==>sheetNo:徐工汉云拆垛标记 0: 未拆 1: 已拆 2:已处理可下一步(转历史档) --- src/main/java/com/zy/asrs/controller/OpenController.java | 49 ++++++++++++++++++++++++------------------------- 1 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index a8b9c0a..3005376 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -191,20 +191,7 @@ /*...........................寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐...........................*/ - - - /** - * 璐存爣鏈鸿创鏍囧畬鎴� - */ - @PostMapping("/labeller/complete/auth/v1") - @AppAuth(memo = "璐存爣鏈鸿创鏍囧畬鎴�") - public synchronized R labellerComplete(@RequestHeader(required = false) String appkey, - @RequestBody OpenOrderPakinParam param, - HttpServletRequest request) { - auth(appkey, param, request); - - return R.ok(); - } + /*............................Created by Monkey D. Luffy on 2023.07.19.............................*/ /** * 璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭� @@ -212,10 +199,22 @@ @PostMapping("/labeller/mat/auth/v1") @AppAuth(memo = "璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�") public synchronized R labellerMat(@RequestHeader(required = false) String appkey, - @RequestBody OpenOrderPakinParam param, + @RequestBody LabellerMatParam param, + HttpServletRequest request) { + auth(appkey, param, request); + return R.ok(openService.labellerMat(param)); + } + + /** + * 璐存爣鏈鸿创鏍囧畬鎴� + */ + @PostMapping("/labeller/complete/auth/v1") + @AppAuth(memo = "璐存爣鏈鸿创鏍囧畬鎴�") + public synchronized R labellerComplete(@RequestHeader(required = false) String appkey, + @RequestBody LabellerCompleteParam param, HttpServletRequest request) { auth(appkey, param, request); - + openService.labellerComplete(param); return R.ok(); } @@ -225,11 +224,11 @@ @PostMapping("/palletizing/complete/auth/v1") @AppAuth(memo = "涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�") public synchronized R palletizingComplete(@RequestHeader(required = false) String appkey, - @RequestBody OpenOrderPakinParam param, + @RequestBody PalletizingCompleteParam param, HttpServletRequest request) { auth(appkey, param, request); - - return R.ok(); + openService.palletizingComplete(param); + return R.ok(param); } @@ -239,11 +238,11 @@ @PostMapping("/single/unstacking/complete/auth/v1") @AppAuth(memo = "妗佹灦涓婁綅杞欢锛氬崟娆℃媶鍨涘畬鎴愰�氱煡") public synchronized R singleUnstackingComplete(@RequestHeader(required = false) String appkey, - @RequestBody OpenOrderPakoutParam param, + @RequestBody SingleUnstackingCompleteParam param, HttpServletRequest request) { auth(appkey, param, request); - - return R.ok(); + openService.singleUnstackingComplete(param); + return R.ok(param); } /** @@ -252,11 +251,11 @@ @PostMapping("/single/mount/unstacking/complete/auth/v1") @AppAuth(memo = "妗佹灦涓婁綅杞欢锛氬崟鎵樻媶鍨涘畬鎴愰�氱煡") public synchronized R singleMountUnstackingComplete(@RequestHeader(required = false) String appkey, - @RequestBody OpenOrderPakoutParam param, + @RequestBody SingleMountUnstackingCompleteParam param, HttpServletRequest request) { auth(appkey, param, request); - - return R.ok(); + openService.singleMountUnstackingComplete(param); + return R.ok(param); } -- Gitblit v1.9.1