From 40fb39d97d52ea1714d56107039bdfbdeb27a369 Mon Sep 17 00:00:00 2001 From: lsh <lsh> Date: 星期日, 26 五月 2024 08:31:53 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 1 + src/main/java/com/zy/asrs/controller/OpenController.java | 55 ++++++++++++++++++++++++++++++++++++++++++------------- src/main/java/com/zy/common/service/CommonService.java | 2 +- 3 files changed, 44 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index d420070..2cf1038 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -219,19 +219,6 @@ } /** - * 璐存爣鏈鸿创鏍囧畬鎴� - */ - @PostMapping("/small/containers/auth/v1") - @AppAuth(memo = "璐存爣鏈鸿创鏍囧畬鎴�") //old闇�瑕佷慨鏀� - public synchronized R smallContainers(@RequestHeader(required = false) String appkey, - @RequestBody LabellerCompleteParam param, - HttpServletRequest request) { - auth(appkey, param, request); - openService.labellerComplete(param); - return R.ok(); - } - - /** * 涓帶(2妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭� */ @PostMapping("/palletizing/complete/auth/v1") @@ -298,5 +285,47 @@ } /*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/ + /*...........................浜冲窞鐓滄槦..............浠ヤ笂.............浜冲窞鐓滄槦...........................*/ + +// /** +// * 浜冲窞鐓滄槦浠诲姟涓嬪彂 +// */ +// @PostMapping("/small/containers/auth/v1") +// @AppAuth(memo = "璐存爣鏈鸿创鏍囧畬鎴�") //old闇�瑕佷慨鏀� +// public synchronized R smallContainers(@RequestHeader(required = false) String appkey, +// @RequestBody LabellerCompleteParam param, +// HttpServletRequest request) { +// auth(appkey, param, request); +// openService.labellerComplete(param); +// return R.ok(); +// } +// +// /** +// * 浜冲窞鐓滄槦浠诲姟涓嬪彂 +// */ +// @PostMapping("/small/containers/auth/v1") +// @AppAuth(memo = "璐存爣鏈鸿创鏍囧畬鎴�") //old闇�瑕佷慨鏀� +// public synchronized R smallContainers(@RequestHeader(required = false) String appkey, +// @RequestBody LabellerCompleteParam param, +// HttpServletRequest request) { +// auth(appkey, param, request); +// openService.labellerComplete(param); +// return R.ok(); +// } +// +// /** +// * 浜冲窞鐓滄槦浠诲姟涓嬪彂 +// */ +// @PostMapping("/small/containers/auth/v1") +// @AppAuth(memo = "璐存爣鏈鸿创鏍囧畬鎴�") //old闇�瑕佷慨鏀� +// public synchronized R smallContainers(@RequestHeader(required = false) String appkey, +// @RequestBody LabellerCompleteParam param, +// HttpServletRequest request) { +// auth(appkey, param, request); +// openService.labellerComplete(param); +// return R.ok(); +// } + + /*...........................浜冲窞鐓滄槦..............浠ヤ笂.............浜冲窞鐓滄槦...........................*/ } diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java index 386cd70..50d9f3d 100644 --- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java @@ -68,6 +68,7 @@ locMast.setLocSts("D"); locMast.setIoTime(now); locMast.setModiTime(now); + locMast.setInvWh("1"); if (!locMastService.updateById(locMast)) { // exceptionHandle("绌烘澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�;[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo()); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index 43865c8..63f49d7 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -332,7 +332,7 @@ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>() .eq("row1", nearRow) .eq("loc_sts", "O") - .orderBy("lev1",true).orderBy("bay1",true)); + .orderBy("inv_wh",false).orderBy("lev1",true).orderBy("bay1",true)); for (LocMast locMast1 : locMasts) { if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) { continue; -- Gitblit v1.9.1