From 1053dd795201eb150808eb1ab59e69cecd436610 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Wed, 20 Nov 2024 17:02:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E5=8C=85=E6=9C=89=E9=87=8F=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E7=82=B9=E5=87=BB=E6=9F=A5=E7=9C=8B=E7=BC=96=E7=A0=81?= =?UTF-8?q?=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 | 28 +++++ .../material/mapper/StorageStatusMapper.java | 12 ++ .../mapper/material/StorageStatusMapper.xml | 92 +++++++++++++++ sgzb-ui/src/api/stquery/deviceStatusRecord.js | 8 ++ .../src/views/stquery/deviceStatusRecord.vue | 109 +++++++++++++++++- 6 files changed, 250 insertions(+), 2 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 3ece9613..a99adfb9 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 = "机具ID") + private Integer maId; /** 工程名称 */ @ApiModelProperty(value = "工程名称") private String proName; 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 15af62cc..1c5ca563 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 @@ -19,7 +19,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Set; /** * @description 综合查询--机具仓储状态查询 @@ -81,4 +84,29 @@ public class StorageStatusController extends BaseController { return AjaxResult.success(getDataTable(list)); } + + /** + * 获取总保有量编码设备详情 + */ + @ApiOperation(value = "综合查询--获取总保有量编码设备详情") + @GetMapping("/getAllRecords") + public AjaxResult getAllRecords(StorageStatus bean) { + List maIds = new ArrayList<>(); + // 获取在库maid + List zkids = storageStatusMapper.getzk(bean); + // 获取在用maid + List zyids = storageStatusMapper.getzy(bean); + // 获取在修maid + List zxids = storageStatusMapper.getzx(bean); + // 获取修饰后待入库maid + List xshdrkids = storageStatusMapper.getxshdrk(bean); + maIds.addAll(zkids); + maIds.addAll(zyids); + maIds.addAll(zxids); + maIds.addAll(xshdrkids); + Set ids = new HashSet<>(maIds); + startPage(); + List list = storageStatusMapper.getAllRecords(ids); + 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 efc72c82..3eab5c3f 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 @@ -4,8 +4,10 @@ import com.bonus.sgzb.base.api.domain.MaType; import com.bonus.sgzb.material.domain.ProjUsingRecord; import com.bonus.sgzb.material.domain.StorageStatus; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Set; /** * @description 综合查询--机具仓储状态查询 @@ -25,4 +27,14 @@ public interface StorageStatusMapper { List getMaCodeList(StorageStatus bean); List getUserRecords(StorageStatus bean); + + List getzk(StorageStatus bean); + + List getzy(StorageStatus bean); + + List getzx(StorageStatus bean); + + List getxshdrk(StorageStatus bean); + + List getAllRecords(@Param("ids") Set ids); } 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 f9f92d3f..0464c252 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 @@ -203,4 +203,96 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND sai.end_time IS NULL AND sai.back_id IS NULL + + + + + + \ 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 8237f75c..747f968a 100644 --- a/sgzb-ui/src/api/stquery/deviceStatusRecord.js +++ b/sgzb-ui/src/api/stquery/deviceStatusRecord.js @@ -62,6 +62,14 @@ export function getUserRecords(query) { params: query }) } +// 获取 总保有量编码设备 +export function getAllRecords(query) { + return request({ + url: '/material/storageStatus/getAllRecords', + method: 'get', + params: query + }) +} diff --git a/sgzb-ui/src/views/stquery/deviceStatusRecord.vue b/sgzb-ui/src/views/stquery/deviceStatusRecord.vue index 5361bf89..961221b3 100644 --- a/sgzb-ui/src/views/stquery/deviceStatusRecord.vue +++ b/sgzb-ui/src/views/stquery/deviceStatusRecord.vue @@ -216,7 +216,22 @@ align="center" prop="allNum" :show-overflow-tooltip="true" - /> + > + + + + + + + + + + + + 查询 + + + + + + + + + + + + + + { + this.AllRecords = response.data.rows + this.dialogTotal = response.data.total + }) + }, // 表单合并行 /* mergeRow ({ row, column, rowIndex, columnIndex}) { if (rowIndex == 0) {