From e234b8782c02df757c1edf5d382b208bfd266cf4 Mon Sep 17 00:00:00 2001 From: zhangjiangwei Date: Wed, 15 Mar 2023 09:20:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- acs/qd/src/views/login.vue | 18 +++++++-------- .../acs/service/impl/AcsToWmsServiceImpl.java | 23 +++++++++++-------- wms/qd/src/views/login.vue | 18 +++++++-------- 3 files changed, 32 insertions(+), 27 deletions(-) diff --git a/acs/qd/src/views/login.vue b/acs/qd/src/views/login.vue index e4f3a84..39f1f4b 100644 --- a/acs/qd/src/views/login.vue +++ b/acs/qd/src/views/login.vue @@ -94,9 +94,9 @@ export default { }) }, getCookie() { - const username = Cookies.get('username') - let password = Cookies.get('password') - const rememberMe = Cookies.get('rememberMe') + const username = Cookies.get('acsUsername') + let password = Cookies.get('acsPassword') + const rememberMe = Cookies.get('acsRememberMe') // 保存cookie里面的加密后的密码 this.cookiePass = password === undefined ? '' : password password = password === undefined ? this.loginForm.password : password @@ -122,13 +122,13 @@ export default { if (valid) { this.loading = true if (user.rememberMe) { - Cookies.set('username', user.username, { expires: Config.passCookieExpires }) - Cookies.set('password', user.password, { expires: Config.passCookieExpires }) - Cookies.set('rememberMe', user.rememberMe, { expires: Config.passCookieExpires }) + Cookies.set('acsUsername', user.username, { expires: Config.passCookieExpires }) + Cookies.set('acsPassword', user.password, { expires: Config.passCookieExpires }) + Cookies.set('acsRememberMe', user.rememberMe, { expires: Config.passCookieExpires }) } else { - Cookies.remove('username') - Cookies.remove('password') - Cookies.remove('rememberMe') + Cookies.remove('acsUsername') + Cookies.remove('acsPassword') + Cookies.remove('acsRememberMe') } this.$store.dispatch('Login', user).then(() => { this.loading = false diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index fa2def7..829a5f7 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -478,15 +478,20 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } //将之前的托盘信息删除 // groupTable.delete("vehicle_code='" + vehicle_code + "' and task_id <>'" + task_id + "'"); - JSONObject groupObj = groupTable.query("task_id='" + task_id + "'").uniqueResult(0); - // 根据任务标识查询组盘，如果不存在表示已经走过下面的反向组盘过程，如果存在则需要走一遍反向组盘过程 - if (ObjectUtil.isNotEmpty(groupObj)) { - groupObj.put("task_id", ""); - groupObj.put("vehicle_code", vehicle_code); - groupObj.put("update_optid", SecurityUtils.getCurrentUserId()); - groupObj.put("update_optname", SecurityUtils.getNickName()); - groupObj.put("update_time", DateUtil.now()); - groupTable.update(groupObj); + // 如果是送料任务需要反向组盘 + if (SendMaterialTask.class.getName().equals(taskobj.getString("handle_class"))) { + JSONObject groupObj = groupTable.query("task_id='" + task_id + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(groupObj)) { + groupObj.put("vehicle_code", vehicle_code); + groupObj.put("update_optid", SecurityUtils.getCurrentUserId()); + groupObj.put("update_optname", SecurityUtils.getNickName()); + groupObj.put("update_time", DateUtil.now()); + groupTable.update(groupObj); + } else { + String msg = "未找到任务号为" + task_code + "的组盘信息"; + log.error(msg); + throw new BadRequestException(msg); + } } //更新入库单单据的托盘条码 diff --git a/wms/qd/src/views/login.vue b/wms/qd/src/views/login.vue index a80e607..dca1ec9 100644 --- a/wms/qd/src/views/login.vue +++ b/wms/qd/src/views/login.vue @@ -94,9 +94,9 @@ export default { }) }, getCookie() { - const username = Cookies.get('username') - let password = Cookies.get('password') - const rememberMe = Cookies.get('rememberMe') + const username = Cookies.get('lmsUsername') + let password = Cookies.get('lmsPassword') + const rememberMe = Cookies.get('lmsRememberMe') // 保存cookie里面的加密后的密码 this.cookiePass = password === undefined ? '' : password password = password === undefined ? this.loginForm.password : password @@ -122,13 +122,13 @@ export default { if (valid) { this.loading = true if (user.rememberMe) { - Cookies.set('username', user.username, { expires: Config.passCookieExpires }) - Cookies.set('password', user.password, { expires: Config.passCookieExpires }) - Cookies.set('rememberMe', user.rememberMe, { expires: Config.passCookieExpires }) + Cookies.set('lmsUsername', user.username, { expires: Config.passCookieExpires }) + Cookies.set('lmsPassword', user.password, { expires: Config.passCookieExpires }) + Cookies.set('lmsRememberMe', user.rememberMe, { expires: Config.passCookieExpires }) } else { - Cookies.remove('username') - Cookies.remove('password') - Cookies.remove('rememberMe') + Cookies.remove('lmsUsername') + Cookies.remove('lmsPassword') + Cookies.remove('lmsRememberMe') } this.$store.dispatch('Login', user).then(() => { this.loading = false