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:
zhouz
2025-08-26 13:41:31 +08:00
parent d0df9f415f
commit 867d6ddf4c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java
View File

@@ -341,7 +341,7 @@ public class FaultDeviceServiceImpl implements FaultDeviceService {
//查询当前人员对应的设备是多少
JSONArray b1_rows = WQLObject.getWQLObject("em_bi_monitordevice").query(query_sql + "AND product_area = 'B1'").getResultJSONArray(0);
JSONArray b1_rows = WQLObject.getWQLObject("em_bi_monitordevice").query(query_sql + "AND product_area = 'B1' AND is_crux = '1'").getResultJSONArray(0);
List<String> b1List = new ArrayList<>();
for (int i = 0; i < b1_rows.size(); i++) {
JSONObject row = b1_rows.getJSONObject(i);
@@ -352,7 +352,7 @@ public class FaultDeviceServiceImpl implements FaultDeviceService {
// 调用acs接口获取设备
JSONArray b1_data = result.getJSONArray("data");
JSONArray blk_rows = WQLObject.getWQLObject("em_bi_monitordevice").query(query_sql + "AND product_area = 'BLK'").getResultJSONArray(0);
JSONArray blk_rows = WQLObject.getWQLObject("em_bi_monitordevice").query(query_sql + "AND product_area = 'BLK' AND is_crux = '1'").getResultJSONArray(0);
List<String> blkList = new ArrayList<>();
for (int i = 0; i < blk_rows.size(); i++) {
JSONObject row = blk_rows.getJSONObject(i);
@@ -389,7 +389,7 @@ public class FaultDeviceServiceImpl implements FaultDeviceService {
}
}
//查询内包间套轴对接位的异常
if (inArea.contains("NBJ")) {
if (inArea.contains("NBJ") && (StrUtil.isEmpty(region_code) || region_code.equals("NBJ")) ) {
IBstIvtCutpointivtService bean2 = SpringContextHolder.getBean(IBstIvtCutpointivtService.class);
List<BstIvtCutpointivt> list = bean2.list(new LambdaQueryWrapper<BstIvtCutpointivt>()
.eq(BstIvtCutpointivt::getPoint_type, "1")

4
lms/nladmin-ui/src/views/wms/agvrush/deviceerror/index.vue
View File

@@ -21,7 +21,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.DEVICE_REGION_TYPE"
v-for="item in dict.DEVICE_ERROR_REGION"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -66,7 +66,7 @@ const defaultForm = {
}
export default {
name: 'Deviceerror',
dicts: ['DEVICE_ERROR_TYPE', 'IS_OR_NOT', 'DEVICE_REGION_TYPE', 'product_area'],
dicts: ['DEVICE_ERROR_TYPE', 'IS_OR_NOT', 'DEVICE_ERROR_REGION', 'product_area'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {

2
lms/nladmin-ui/src/views/wms/basedata/product/userDevice/index.vue
View File

@@ -116,7 +116,7 @@ export default {
level: 3,
currentId: 0, menuLoading: false, showButton: false,
menus: [], menuIds: [], depts: [], deptDatas: [], // 多选时使用
tableData: [{ 'region_code': 'B1Foil', 'region_name': 'B1生箔' }, { 'region_code': 'B1FQ', 'region_name': 'B1分切' }, { 'region_code': 'B2Foil', 'region_name': 'B2生箔' }, { 'region_code': 'B2FQ', 'region_name': 'B2分切' }, { 'region_code': 'CBJ', 'region_name': '穿拔轴区' }, { 'region_code': 'NBJ', 'region_name': '内包间' }, { 'region_code': 'RK', 'region_name': '入库区' }, { 'region_code': 'CK', 'region_name': '出库区' }],
tableData: [{ 'region_code': 'B1Foil', 'region_name': 'B1生箔' }, { 'region_code': 'B1FQ', 'region_name': 'B1分切' }, { 'region_code': 'B2Foil', 'region_name': 'B2生箔' }, { 'region_code': 'B2FQ', 'region_name': 'B2分切' }, { 'region_code': 'CBJ', 'region_name': '穿拔轴区' }, { 'region_code': 'NBJ', 'region_name': '内包间' }, { 'region_code': 'RK', 'region_name': '入库区' }, { 'region_code': 'DDJ', 'region_name': '堆垛机' }, { 'region_code': 'CK', 'region_name': '出库区' }],
currentRow: null,
permission: {
add: ['admin', 'roles:add'],