root/rongLiJiaNai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
zhangjiangwei
2023-03-15 09:20:07 +08:00
parent 6b23c87f1e
commit e234b8782c
3 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
acs/qd/src/views/login.vue
View File

@@ -94,9 +94,9 @@ export default {
}) })
}, },
getCookie() { getCookie() {
const username = Cookies.get('username') const username = Cookies.get('acsUsername')
let password = Cookies.get('password') let password = Cookies.get('acsPassword')
const rememberMe = Cookies.get('rememberMe') const rememberMe = Cookies.get('acsRememberMe')
// 保存cookie里面的加密后的密码 // 保存cookie里面的加密后的密码
this.cookiePass = password === undefined ? '' : password this.cookiePass = password === undefined ? '' : password
password = password === undefined ? this.loginForm.password : password password = password === undefined ? this.loginForm.password : password
@@ -122,13 +122,13 @@ export default {
if (valid) { if (valid) {
this.loading = true this.loading = true
if (user.rememberMe) { if (user.rememberMe) {
Cookies.set('username', user.username, { expires: Config.passCookieExpires }) Cookies.set('acsUsername', user.username, { expires: Config.passCookieExpires })
Cookies.set('password', user.password, { expires: Config.passCookieExpires }) Cookies.set('acsPassword', user.password, { expires: Config.passCookieExpires })
Cookies.set('rememberMe', user.rememberMe, { expires: Config.passCookieExpires }) Cookies.set('acsRememberMe', user.rememberMe, { expires: Config.passCookieExpires })
} else { } else {
Cookies.remove('username') Cookies.remove('acsUsername')
Cookies.remove('password') Cookies.remove('acsPassword')
Cookies.remove('rememberMe') Cookies.remove('acsRememberMe')
} }
this.$store.dispatch('Login', user).then(() => { this.$store.dispatch('Login', user).then(() => {
this.loading = false this.loading = false

23
wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -478,15 +478,20 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
} }
//将之前的托盘信息删除 //将之前的托盘信息删除
// groupTable.delete("vehicle_code='" + vehicle_code + "' and task_id <>'" + task_id + "'"); // groupTable.delete("vehicle_code='" + vehicle_code + "' and task_id <>'" + task_id + "'");
JSONObject groupObj = groupTable.query("task_id='" + task_id + "'").uniqueResult(0); // 如果是送料任务需要反向组盘
// 根据任务标识查询组盘，如果不存在表示已经走过下面的反向组盘过程，如果存在则需要走一遍反向组盘过程 if (SendMaterialTask.class.getName().equals(taskobj.getString("handle_class"))) {
if (ObjectUtil.isNotEmpty(groupObj)) { JSONObject groupObj = groupTable.query("task_id='" + task_id + "'").uniqueResult(0);
groupObj.put("task_id", ""); if (ObjectUtil.isNotEmpty(groupObj)) {
groupObj.put("vehicle_code", vehicle_code); groupObj.put("vehicle_code", vehicle_code);
groupObj.put("update_optid", SecurityUtils.getCurrentUserId()); groupObj.put("update_optid", SecurityUtils.getCurrentUserId());
groupObj.put("update_optname", SecurityUtils.getNickName()); groupObj.put("update_optname", SecurityUtils.getNickName());
groupObj.put("update_time", DateUtil.now()); groupObj.put("update_time", DateUtil.now());
groupTable.update(groupObj); groupTable.update(groupObj);
} else {
String msg = "未找到任务号为" + task_code + "的组盘信息";
log.error(msg);
throw new BadRequestException(msg);
}
} }
//更新入库单单据的托盘条码 //更新入库单单据的托盘条码

18
wms/qd/src/views/login.vue
View File

@@ -94,9 +94,9 @@ export default {
}) })
}, },
getCookie() { getCookie() {
const username = Cookies.get('username') const username = Cookies.get('lmsUsername')
let password = Cookies.get('password') let password = Cookies.get('lmsPassword')
const rememberMe = Cookies.get('rememberMe') const rememberMe = Cookies.get('lmsRememberMe')
// 保存cookie里面的加密后的密码 // 保存cookie里面的加密后的密码
this.cookiePass = password === undefined ? '' : password this.cookiePass = password === undefined ? '' : password
password = password === undefined ? this.loginForm.password : password password = password === undefined ? this.loginForm.password : password
@@ -122,13 +122,13 @@ export default {
if (valid) { if (valid) {
this.loading = true this.loading = true
if (user.rememberMe) { if (user.rememberMe) {
Cookies.set('username', user.username, { expires: Config.passCookieExpires }) Cookies.set('lmsUsername', user.username, { expires: Config.passCookieExpires })
Cookies.set('password', user.password, { expires: Config.passCookieExpires }) Cookies.set('lmsPassword', user.password, { expires: Config.passCookieExpires })
Cookies.set('rememberMe', user.rememberMe, { expires: Config.passCookieExpires }) Cookies.set('lmsRememberMe', user.rememberMe, { expires: Config.passCookieExpires })
} else { } else {
Cookies.remove('username') Cookies.remove('lmsUsername')
Cookies.remove('password') Cookies.remove('lmsPassword')
Cookies.remove('rememberMe') Cookies.remove('lmsRememberMe')
} }
this.$store.dispatch('Login', user).then(() => { this.$store.dispatch('Login', user).then(() => {
this.loading = false this.loading = false