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

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-03-07 12:18:31 +08:00
parent d74b3c1ff4
commit 9d8c3668a1
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
View File

@@ -219,9 +219,11 @@ public class MesToLmsServiceImpl implements MesToLmsService {
throw new BadRequestException("该生箔工单对应的状态不为准备就绪，不允许确认下卷！"); throw new BadRequestException("该生箔工单对应的状态不为准备就绪，不允许确认下卷！");
} }
// 下发ACS更改任务状态 // 下发ACS更改任务状态
JSONObject task_jo = WQLObject.getWQLObject("SCH_BASE_Task").query("material_code = '" + containerName + "' and task_status <> '07' AND is_delete = '0'").uniqueResult(0);
JSONArray paramArr = new JSONArray(); JSONArray paramArr = new JSONArray();
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("device_code", jsonSb.getString("point_code")); json.put("device_code", jsonSb.getString("point_code"));
param.put("task_code", task_jo.getString("task_code"));
json.put("option ", "2"); json.put("option ", "2");
paramArr.add(json); paramArr.add(json);

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql
View File

@@ -92,7 +92,7 @@
FROM FROM
sch_base_task sch_base_task
WHERE WHERE
( point_code1 = full_point_code OR point_code2 = full_point_code ) ( point_code1 = empty_point_code OR point_code2 = empty_point_code )
AND task_status < '07' AND task_status < '07'
AND is_delete = '0' AND is_delete = '0'
) )

4
lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue
View File

@@ -102,6 +102,9 @@
<el-form-item label="母卷号"> <el-form-item label="母卷号">
<el-input v-model="form.container_name" style="width: 370px;" /> <el-input v-model="form.container_name" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="空轴编码">
<el-input v-model="form.empty_vehicle_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否启用"> <el-form-item label="是否启用">
<el-switch v-model="form.is_used" active-value="1" inactive-value="0" /> <el-switch v-model="form.is_used" active-value="1" inactive-value="0" />
</el-form-item> </el-form-item>
@@ -153,7 +156,6 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="container_name" label="母卷号" width="150px" show-overflow-tooltip /> <el-table-column prop="container_name" label="母卷号" width="150px" show-overflow-tooltip />
<el-table-column prop="empty_point_code" label="空轴位" width="120px" show-overflow-tooltip />
<el-table-column prop="empty_point_status" label="空轴位状态" min-width="100" show-overflow-tooltip> <el-table-column prop="empty_point_status" label="空轴位状态" min-width="100" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ dict.label.sch_empty_point_status[scope.row.empty_point_status] }} {{ dict.label.sch_empty_point_status[scope.row.empty_point_status] }}