From 4fcd53e0e991145ca425686f8e688f6bd10256be Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Wed, 20 Nov 2024 14:51:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2=E5=9C=A8?= =?UTF-8?q?=E7=94=A8=E5=8F=AF=E4=BB=A5=E7=82=B9=E5=87=BB=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/base/api/domain/MaType.java | 3 + .../controller/StorageStatusController.java | 10 ++ .../material/mapper/StorageStatusMapper.java | 2 + .../mapper/material/StorageStatusMapper.xml | 18 +++ sgzb-ui/src/api/stquery/deviceStatusRecord.js | 8 ++ .../src/views/stquery/deviceStatusRecord.vue | 125 +++++++++++++++--- 6 files changed, 151 insertions(+), 15 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java index 2ef34a23..3ece9613 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java @@ -40,6 +40,9 @@ public class MaType extends BaseEntity { /** 规格型号 */ @ApiModelProperty(value = "机具编码") private String maCode; + /** 工程名称 */ + @ApiModelProperty(value = "工程名称") + private String proName; /** 类型ID */ @ApiModelProperty(value = "类型ID,用作组织树筛选") diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/StorageStatusController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/StorageStatusController.java index 76ad120f..15af62cc 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/StorageStatusController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/StorageStatusController.java @@ -70,5 +70,15 @@ public class StorageStatusController extends BaseController { List list = storageStatusMapper.getMaCodeList(bean); return AjaxResult.success(getDataTable(list)); } + /** + * 查询机具编码 + */ + @ApiOperation(value = "综合查询--查询在用设备详情") + @GetMapping("/getUserRecords") + public AjaxResult getUserRecords(StorageStatus bean) { + startPage(); + List list = storageStatusMapper.getUserRecords(bean); + return AjaxResult.success(getDataTable(list)); + } } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/StorageStatusMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/StorageStatusMapper.java index 0a98b4aa..efc72c82 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/StorageStatusMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/StorageStatusMapper.java @@ -23,4 +23,6 @@ public interface StorageStatusMapper { List getStorageStatusList(StorageStatus bean); List getMaCodeList(StorageStatus bean); + + List getUserRecords(StorageStatus bean); } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml index a658f878..f9f92d3f 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml @@ -185,4 +185,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and mm.ma_code like concat('%',#{maCode},'%') + \ No newline at end of file diff --git a/sgzb-ui/src/api/stquery/deviceStatusRecord.js b/sgzb-ui/src/api/stquery/deviceStatusRecord.js index 96c515b6..8237f75c 100644 --- a/sgzb-ui/src/api/stquery/deviceStatusRecord.js +++ b/sgzb-ui/src/api/stquery/deviceStatusRecord.js @@ -54,6 +54,14 @@ export function getUseMaCode(query) { params: query }) } +// 获取 在用机具设备 +export function getUserRecords(query) { + return request({ + url: '/material/storageStatus/getUserRecords', + method: 'get', + params: query + }) +} diff --git a/sgzb-ui/src/views/stquery/deviceStatusRecord.vue b/sgzb-ui/src/views/stquery/deviceStatusRecord.vue index e128db4b..5361bf89 100644 --- a/sgzb-ui/src/views/stquery/deviceStatusRecord.vue +++ b/sgzb-ui/src/views/stquery/deviceStatusRecord.vue @@ -166,6 +166,7 @@ :show-overflow-tooltip="true" > @@ -325,6 +403,7 @@ import { exportList, getUnitData,getUseMaCode, getProData, getTypeKeeper, + getUserRecords, } from '@/api/stquery/deviceStatusRecord' import {getRecords} from "@/api/claimAndRefund/secondStore"; @@ -369,6 +448,7 @@ export default { }, //记录弹窗 openRecord: false, + openUseRecord: false, dialogQuery: { pageNum: 1, pageSize: 10, @@ -376,7 +456,8 @@ export default { maCode: undefined, }, unitList: [], //来往单位集合 - dialogList: [], + dialogList: [], //在库编码设备列表 + UserRecords: [], //在用设备列表 keepIdList: [], //库管员id集合 proList: [], //工程集合 dialogTotal: 0, @@ -499,6 +580,13 @@ export default { this.dialogQuery.typeId= row.typeId this.getUseMaCodeList() }, + + //查看在用设备 + openUserRecords(row) { + this.openUseRecord = true + this.dialogQuery.typeId= row.typeId + this.getUserRecords() + }, /** 查询编码机具列表 */ getUseMaCodeList() { getUseMaCode(this.dialogQuery).then((response) => { @@ -506,6 +594,13 @@ export default { this.dialogTotal = response.data.total }) }, + /** 查询在用设备列表 */ + getUserRecords() { + getUserRecords(this.dialogQuery).then((response) => { + this.UserRecords = response.data.rows + this.dialogTotal = response.data.total + }) + }, // 表单合并行 /* mergeRow ({ row, column, rowIndex, columnIndex}) { if (rowIndex == 0) {