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

异常场景取消及手动页面清空来源点位

Browse Source
This commit is contained in:
psh
2024-07-02 14:13:29 +08:00
parent 28cc482001
commit fbba53d92c
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java
View File

@@ -217,12 +217,12 @@ public class KGHJRKTask extends AbstractTask {
}
String startPoint = taskObj.getPoint_code1(); // 获取起点
if (taskObj.getPoint_code2().startsWith("QHQ")) {
if (ObjectUtil.isNotEmpty(taskObj)&&ObjectUtil.isNotEmpty(taskObj.getPoint_code2())&&taskObj.getPoint_code2().startsWith("QHQ")) {
taskObj.setPoint_code2("HCQ" + taskObj.getPoint_code2().substring(3));
}
String endPoint = taskObj.getPoint_code2(); // 获取终点
SchBasePoint startPointObj = pointService.getById(startPoint);
if (endPoint.startsWith("ZJBDJW")) {
if (ObjectUtil.isNotEmpty(endPoint)&&endPoint.startsWith("ZJBDJW")) {
endPoint = endPoint.substring(0, endPoint.length() - 2);
}
SchBasePoint endPointObj = pointService.getById(endPoint);

4
lms/nladmin-ui/src/views/wms/sch/point/index.vue
View File

@@ -227,6 +227,9 @@
<el-form-item label="载具数量" prop="vehicle_qty">
<el-input-number v-model="form.vehicle_qty" style="width: 370px;" :controls="false" class="clear-number-input" :min="0" :precision="0" :max="99999" label="载具数量" size="mini" />
</el-form-item>
<el-form-item label="当前来源" prop="ext_point_code">
<el-input v-model="form.ext_point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否有工单">
<el-radio v-for="item in dict.TrueOrFalse" :key="item.id" v-model="form.is_has_workder" :label="item.value">{{ item.label }}</el-radio>
</el-form-item>
@@ -262,6 +265,7 @@
<el-table-column prop="vehicle_type" label="物料类型" :min-width="flexWidth('vehicle_type',crud.data,'物料类型')" />
<el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
<el-table-column prop="vehicle_qty" label="载具数量" :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')" />
<el-table-column prop="ext_point_code" label="当前来源" :min-width="flexWidth('ext_point_code',crud.data,'当前来源')" />
<el-table-column label="是否锁定" :min-width="flexWidth('vehicle_qty',crud.data,'是否锁定')">
<template slot-scope="scope">
{{ scope.row.ing_task_code?'是':'否' }}