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

fix:出库下发相同任务号问题

Browse Source
This commit is contained in:
zhangzq
2025-04-25 16:45:34 +08:00
parent 6a3d187f4e
commit 3b60fb6f3a
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java
View File

@@ -211,7 +211,10 @@ public class TwoOutTask extends AbstractAcsTask {
try { try {
this.immediateNotifyAcs(null); this.immediateNotifyAcs(null);
}catch (Exception ex){ }catch (Exception ex){
log.warn("载具出库批量下发异常",ex.getMessage()); log.warn("载具出库批量下发异常",ex.getMessage());
if (!ex.getMessage().equals("存在相同的任务号")){
throw new BadRequestException(ex.getMessage());
}
} }
} }
}, "cratergv", 30, this); }, "cratergv", 30, this);

4
lms/nladmin-ui/.env.development
View File

@@ -1,8 +1,8 @@
ENV = 'development' ENV = 'development'
# 接口地址 # 接口地址
VUE_APP_BASE_API = 'http://localhost:8013' VUE_APP_BASE_API = 'http://10.1.3.91:8013'
VUE_APP_WS_API = 'ws://localhost:8013' VUE_APP_WS_API = 'ws://10.1.3.91:8013'
# 是否启用 babel-plugin-dynamic-import-node插件 # 是否启用 babel-plugin-dynamic-import-node插件
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true

8
lms/nladmin-ui/src/views/wms/sch/task/index.vue
View File

@@ -269,14 +269,16 @@ export default {
crudTask.getFinishType().then(data => { crudTask.getFinishType().then(data => {
this.finishTypeList = data this.finishTypeList = data
}) })
this.crud.query.createTime = [new Date().daysAgo(7), new Date()] const afterD = new Date(new Date().getTime() + 2 * 8.64E7)
this.crud.query.createTime = [new Date().daysAgo(3), afterD]
}, },
methods: { methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据 // 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() { [CRUD.HOOK.beforeRefresh]() {
if (this.query_flag) { if (this.query_flag) {
this.crud.query.begin_time = (new Date().daysAgo(7)).strftime('%F', 'zh') const afterD = new Date(new Date().getTime() + 2 * 8.64E7)
this.crud.query.end_time = (new Date()).strftime('%F', 'zh') this.crud.query.begin_time = (new Date().daysAgo(3)).strftime('%F', 'zh')
this.crud.query.end_time = (afterD).strftime('%F', 'zh')
this.query_flag = false this.query_flag = false
} }
}, },