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

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-06-06 15:37:48 +08:00
parent 3f024ffe63 52b234ff9c
commit 301fac9827
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -667,7 +667,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("task_code", task_code); json.put("task_code", task_code);
json.put("ext_task_id", ext_task_id); json.put("ext_task_id", ext_task_id);
json.put("message", "不能存在相同的任务号:" + task_code); json.put("message", "已存在任务id为"+taskDto.getTask_id()+"相同的任务号:" + task_code);
errArr.add(json); errArr.add(json);
continue; continue;
} }
@@ -677,7 +677,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("task_code", task_code); json.put("task_code", task_code);
json.put("ext_task_id", ext_task_id); json.put("ext_task_id", ext_task_id);
json.put("message", "不能存在相同的托盘号:" + vehicle_code); json.put("message", "已存在任务id为"+vehicle_dto.getTask_id()+"托盘号:" + vehicle_code);
errArr.add(json); errArr.add(json);
continue; continue;
} }

2
acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue
View File

@@ -268,6 +268,8 @@
<el-table-column prop="remark" label="备注" /> <el-table-column prop="remark" label="备注" />
<el-table-column prop="create_by" label="创建者" /> <el-table-column prop="create_by" label="创建者" />
<el-table-column prop="create_time" label="创建时间" width="135" /> <el-table-column prop="create_time" label="创建时间" width="135" />
<el-table-column prop="update_by" label="修改者" />
<el-table-column prop="update_time" label="结束时间" width="135" />
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination /> <pagination />

2
acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
View File

@@ -129,6 +129,8 @@
<el-table-column prop="remark" label="备注" /> <el-table-column prop="remark" label="备注" />
<el-table-column prop="create_by" label="创建者" /> <el-table-column prop="create_by" label="创建者" />
<el-table-column prop="create_time" label="创建时间" width="135" /> <el-table-column prop="create_time" label="创建时间" width="135" />
<el-table-column prop="update_by" label="修改者" />
<el-table-column prop="update_time" label="结束时间" width="135" />
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination /> <pagination />