From 3fa04e2d1e41455b84b1bba63429a4513f44e74e Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 22 七月 2024 19:01:57 +0800
Subject: [PATCH] 森林防火 供应商管理

---
 ruoyi-modules/ruoyi-management/target/classes/mapper/management/ManagementGoodsMaterialsMapper.xml                     |    2 
 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionZyMapper.xml                         |   19 ---
 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionCkMapper.xml                         |   19 ---
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/InventoriesSuppliesInfoVO.java             |    6 +
 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlStoreManagementImgMapper.xml                         |   13 --
 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlEquipmentMapper.xml                                  |   14 --
 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlGoodsShelfMapper.xml                                 |   16 ---
 ruoyi-modules/ruoyi-management/target/classes/mapper/management/InventoriesSuppliesMapper.xml                          |    2 
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/HomeStatisticsService.java                   |    4 
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesInfoServiceImpl.java |   11 +
 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlStoreManagementMapper.xml                            |   22 ----
 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlAuditMapper.xml                                      |   13 --
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/HomeStatisticsController.java             |   13 ++
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkglServiceImpl.java  |    6 
 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlAuditRecordMapper.xml                                |   13 --
 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionZyglMapper.xml                       |   16 ---
 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionCkglMapper.xml                       |   15 ---
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java  |    6 
 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionRkglMapper.xml                       |   15 ---
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/HomeStatisticsServiceImpl.java          |    6 +
 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlGoodsMaterialsMapper.xml                             |   17 ---
 ruoyi-modules/ruoyi-management/target/classes/mapper/management/InventoriesSuppliesInfoMapper.xml                      |    2 
 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionRkMapper.xml                         |   20 ----
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java  |   13 +-
 24 files changed, 54 insertions(+), 229 deletions(-)

diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/HomeStatisticsController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/HomeStatisticsController.java
new file mode 100644
index 0000000..9d10e6b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/HomeStatisticsController.java
@@ -0,0 +1,13 @@
+package com.ruoyi.management.controller;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/home-statistics")
+@Api(value = "首页统计接口", tags = "首页统计接口", description = "首页统计接口")
+public class HomeStatisticsController {
+
+
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/InventoriesSuppliesInfoVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/InventoriesSuppliesInfoVO.java
index 0bd9d49..c42e90d 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/InventoriesSuppliesInfoVO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/InventoriesSuppliesInfoVO.java
@@ -39,4 +39,10 @@
     @ApiModelProperty("是否匹配 1未匹配,已匹配")
     private Integer type;
 
+    @ApiModelProperty("货架名称")
+    private String goodsShelfName;
+
+    @ApiModelProperty("仓库层数 1代表一层,2代表两层,3代表三层")
+    private Integer storeManagementNumber;
+
 }
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/HomeStatisticsService.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/HomeStatisticsService.java
new file mode 100644
index 0000000..51ac5d1
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/HomeStatisticsService.java
@@ -0,0 +1,4 @@
+package com.ruoyi.management.service;
+
+public interface HomeStatisticsService {
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/HomeStatisticsServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/HomeStatisticsServiceImpl.java
new file mode 100644
index 0000000..ec0b7fd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/HomeStatisticsServiceImpl.java
@@ -0,0 +1,6 @@
+package com.ruoyi.management.service.impl;
+
+import com.ruoyi.management.service.HomeStatisticsService;
+
+public class HomeStatisticsServiceImpl implements HomeStatisticsService {
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesInfoServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesInfoServiceImpl.java
index 47f122c..98dca03 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesInfoServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesInfoServiceImpl.java
@@ -9,10 +9,7 @@
 import com.ruoyi.management.domain.dto.InventoriesSuppliesInfoQuery;
 import com.ruoyi.management.domain.vo.InventoriesSuppliesInfoVO;
 import com.ruoyi.management.domain.vo.InventoriesSuppliesVO;
-import com.ruoyi.management.mapper.InventoriesSuppliesInfoMapper;
-import com.ruoyi.management.mapper.ManagementGoodsMaterialsMapper;
-import com.ruoyi.management.mapper.SlGoodsMaterialsMapper;
-import com.ruoyi.management.mapper.SlVolumeProductionRkMapper;
+import com.ruoyi.management.mapper.*;
 import com.ruoyi.management.service.InventoriesSuppliesInfoService;
 import org.springframework.stereotype.Service;
 
@@ -42,6 +39,9 @@
 
     @Resource
     private ManagementGoodsMaterialsMapper managementGoodsMaterialsMapper;
+
+    @Resource
+    private SlGoodsShelfMapper slGoodsShelfMapper;
     @Override
     public PageDTO<InventoriesSuppliesInfoVO> inventoriesSuppliesInfoService(InventoriesSuppliesInfoQuery inventoriesSuppliesInfoQuery) {
 
@@ -62,6 +62,9 @@
             SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(slVolumeProductionRk.getMaterialsId());
             sl.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
             sl.setIsConsume(slGoodsMaterials.getIsConsume());
+            sl.setStoreManagementNumber(slVolumeProductionRk.getStoreManagementNumber());
+            SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(slVolumeProductionRk.getShelfId());
+            sl.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());
 
         }
         return slGoodsMaterialsVO;
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkglServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkglServiceImpl.java
index 01ffd04..33c2288 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkglServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkglServiceImpl.java
@@ -143,7 +143,7 @@
         vo.setStoreManagementName(slStoreManagement.getStoreManagementName());
         String directorId = slStoreManagement.getDirectorId();
         List<String> stri = Arrays.asList(directorId.split(","));
-        String str1 = null;
+        String str1 = "";
         if (stri.size() > 0) {
             for (String str : stri) {
                 SysUser data1 = sysUserClient.getSysUser(Long.valueOf(str)).getData();
@@ -154,7 +154,7 @@
 
         String competentId = slStoreManagement.getCompetentId();
         List<String> stri1 = Arrays.asList(competentId.split(","));
-        String str11 = null;
+        String str11 = "";
         if (stri1.size() > 0) {
             for (String str : stri1) {
                 SysUser data1 = sysUserClient.getSysUser(Long.valueOf(str)).getData();
@@ -165,7 +165,7 @@
 
         String administratorId = slStoreManagement.getAdministratorId();
         List<String> stri11 = Arrays.asList(administratorId.split(","));
-        String str111 = null;
+        String str111 = "";
         if (stri11.size() > 0) {
             for (String str : stri11) {
                 SysUser data1 = sysUserClient.getSysUser(Long.valueOf(str)).getData();
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
index 0c20646..f631cb8 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
@@ -171,7 +171,7 @@
     public VolumeProductionRkgInventoryVO getVolumeProductionRkgInventory(Long id) {
         SlVolumeProductionRkgl byId = this.getById(id);
         VolumeProductionRkgInventoryVO vo = new VolumeProductionRkgInventoryVO();
-        SysUser data = sysUserClient.getSysUser(byId.getId()).getData();
+        SysUser data = sysUserClient.getSysUser(byId.getSysId()).getData();
         vo.setSysPhone(data.getPhonenumber());
         vo.setSysName(data.getNickName());
         vo.setStartiTime(byId.getStartiTime());
@@ -179,7 +179,7 @@
         vo.setStoreManagementName(slStoreManagement.getStoreManagementName());
         String directorId = slStoreManagement.getDirectorId();
         List<String> stri = Arrays.asList(directorId.split(","));
-        String str1 = null;
+        String str1 ="";
         if (stri.size() > 0) {
             for (String str : stri) {
                 SysUser data1 = sysUserClient.getSysUser(Long.valueOf(str)).getData();
@@ -190,7 +190,7 @@
 
         String competentId = slStoreManagement.getCompetentId();
         List<String> stri1 = Arrays.asList(competentId.split(","));
-        String str11 = null;
+        String str11 = "";
         if (stri1.size() > 0) {
             for (String str : stri1) {
                 SysUser data1 = sysUserClient.getSysUser(Long.valueOf(str)).getData();
@@ -201,7 +201,7 @@
 
         String administratorId = slStoreManagement.getAdministratorId();
         List<String> stri11 = Arrays.asList(administratorId.split(","));
-        String str111 = null;
+        String str111 = "";
         if (stri11.size() > 0) {
             for (String str : stri11) {
                 SysUser data1 = sysUserClient.getSysUser(Long.valueOf(str)).getData();
@@ -217,6 +217,7 @@
         wrapper1.eq(SlVolumeProductionRk::getVolumeProductionRkglId, byId.getId());
         wrapper1.eq(SlVolumeProductionRk::getDelFlag, 0);
         wrapper1.orderByDesc(SlVolumeProductionRk::getCreateTime);
+        SysUser data1 = sysUserClient.getSysUser(byId.getSupplierId()).getData();
         List<SlVolumeProductionRk> page2 = slVolumeProductionRkMapper.selectList(wrapper1);
         for (SlVolumeProductionRk list : page2) {
                 ManagementimgVolumeProductionRkVO rkVO = new ManagementimgVolumeProductionRkVO();
@@ -226,11 +227,13 @@
                 rkVO.setRkModel(list.getRkModel());
                 rkVO.setRkNum(list.getRkNum());
                 rkVO.setRkPice(list.getRkPice());
-                rkVO.setStoreManagementNumber(rkVO.getStoreManagementNumber());
+                rkVO.setStoreManagementNumber(list.getStoreManagementNumber());
                 SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(list.getShelfId());
                 rkVO.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());
+                rkVO.setSupplierName(data1.getNickName());
                 managementList.add(rkVO);
         }
+        vo.setManagementimgVolumeProductionRkVOList(managementList);
         return vo;
     }
 
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java
index 2738285..9e7a0c7 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java
@@ -150,7 +150,7 @@
         vo.setBstoreManagementName(bslStoreManagement.getStoreManagementName());
         String directorId = slStoreManagement.getDirectorId();
         List<String> stri = Arrays.asList(directorId.split(","));
-        String str1 = null;
+        String str1 = "";
         if (stri.size() > 0) {
             for (String str : stri) {
                 SysUser data1 = sysUserClient.getSysUser(Long.valueOf(str)).getData();
@@ -161,7 +161,7 @@
 
         String competentId = slStoreManagement.getCompetentId();
         List<String> stri1 = Arrays.asList(competentId.split(","));
-        String str11 = null;
+        String str11 = "";
         if (stri1.size() > 0) {
             for (String str : stri1) {
                 SysUser data1 = sysUserClient.getSysUser(Long.valueOf(str)).getData();
@@ -172,7 +172,7 @@
 
         String administratorId = slStoreManagement.getAdministratorId();
         List<String> stri11 = Arrays.asList(administratorId.split(","));
-        String str111 = null;
+        String str111 = "";
         if (stri11.size() > 0) {
             for (String str : stri11) {
                 SysUser data1 = sysUserClient.getSysUser(Long.valueOf(str)).getData();
diff --git a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/InventoriesSuppliesInfoMapper.xml b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/InventoriesSuppliesInfoMapper.xml
index 3976f0a..a0a7a71 100644
--- a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/InventoriesSuppliesInfoMapper.xml
+++ b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/InventoriesSuppliesInfoMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.rouyi.management.mapper.InventoriesSuppliesInfoMapper">
+<mapper namespace="com.ruoyi.management.mapper.InventoriesSuppliesInfoMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.InventoriesSuppliesInfo">
diff --git a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/InventoriesSuppliesMapper.xml b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/InventoriesSuppliesMapper.xml
index c28a8d2..892a50a 100644
--- a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/InventoriesSuppliesMapper.xml
+++ b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/InventoriesSuppliesMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.rouyi.management.mapper.InventoriesSuppliesMapper">
+<mapper namespace="com.ruoyi.management.mapper.InventoriesSuppliesMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.InventoriesSupplies">
diff --git a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/ManagementGoodsMaterialsMapper.xml b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/ManagementGoodsMaterialsMapper.xml
index 721d034..7845762 100644
--- a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/ManagementGoodsMaterialsMapper.xml
+++ b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/ManagementGoodsMaterialsMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.rouyi.management.mapper.ManagementGoodsMaterialsMapper">
+<mapper namespace="com.ruoyi.management.mapper.ManagementGoodsMaterialsMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.ManagementGoodsMaterials">
diff --git a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlAuditMapper.xml b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlAuditMapper.xml
index 27d3619..5961cfa 100644
--- a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlAuditMapper.xml
+++ b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlAuditMapper.xml
@@ -2,18 +2,5 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.management.mapper.SlAuditMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlAudit">
-        <id column="id" property="id" />
-        <result column="rk_id" property="rkId" />
-        <result column="del_flag" property="delFlag" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="state" property="state" />
-        <result column="type" property="type" />
-        <result column="cause" property="cause" />
-    </resultMap>
 
 </mapper>
diff --git a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlAuditRecordMapper.xml b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlAuditRecordMapper.xml
index dcf38ed..bcef46a 100644
--- a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlAuditRecordMapper.xml
+++ b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlAuditRecordMapper.xml
@@ -2,18 +2,5 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.management.mapper.SlAuditRecordMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlAuditRecord">
-        <id column="id" property="id" />
-        <result column="audit_id" property="auditId" />
-        <result column="shenh_id" property="shenhId" />
-        <result column="type" property="type" />
-        <result column="state" property="state" />
-        <result column="del_flag" property="delFlag" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
 
 </mapper>
diff --git a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlEquipmentMapper.xml b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlEquipmentMapper.xml
index 300a602..f62b42a 100644
--- a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlEquipmentMapper.xml
+++ b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlEquipmentMapper.xml
@@ -2,18 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.management.mapper.SlEquipmentMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlEquipment">
-        <id column="id" property="id" />
-        <result column="equipment_name" property="equipmentName" />
-        <result column="equipment_num" property="equipmentNum" />
-        <result column="type" property="type" />
-        <result column="management_id" property="managementId" />
-        <result column="del_flag" property="delFlag" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
 </mapper>
diff --git a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlGoodsMaterialsMapper.xml b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlGoodsMaterialsMapper.xml
index 79ee950..1f589d4 100644
--- a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlGoodsMaterialsMapper.xml
+++ b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlGoodsMaterialsMapper.xml
@@ -2,22 +2,5 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.management.mapper.SlGoodsMaterialsMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlGoodsMaterials">
-        <id column="id" property="id" />
-        <result column="goods_materials_name" property="goodsMaterialsName" />
-        <result column="is_consume" property="isConsume" />
-        <result column="repertory" property="repertory" />
-        <result column="del_flag" property="delFlag" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="repertory_sum" property="repertorySum" />
-        <result column="repertory_zhai" property="repertoryZhai" />
-        <result column="repertory_chu" property="repertoryChu" />
-        <result column="repertory_yishi" property="repertoryYishi" />
-        <result column="check_num" property="checkNum" />
-    </resultMap>
 
 </mapper>
diff --git a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlGoodsShelfMapper.xml b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlGoodsShelfMapper.xml
index 250ea2d..e190722 100644
--- a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlGoodsShelfMapper.xml
+++ b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlGoodsShelfMapper.xml
@@ -2,21 +2,5 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.management.mapper.SlGoodsShelfMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlGoodsShelf">
-        <id column="id" property="id" />
-        <result column="goods_shelf_name" property="goodsShelfName" />
-        <result column="store_management_id" property="storeManagementId" />
-        <result column="is_store_management" property="isStoreManagement" />
-        <result column="img_id" property="imgId" />
-        <result column="zb_x" property="zbX" />
-        <result column="zb_y" property="zbY" />
-        <result column="store_management_number" property="storeManagementNumber" />
-        <result column="del_flag" property="delFlag" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
 
 </mapper>
diff --git a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlStoreManagementImgMapper.xml b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlStoreManagementImgMapper.xml
index 69dd644..c36c375 100644
--- a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlStoreManagementImgMapper.xml
+++ b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlStoreManagementImgMapper.xml
@@ -2,17 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.management.mapper.SlStoreManagementImgMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlStoreManagementImg">
-        <id column="id" property="id" />
-        <result column="img_url" property="imgUrl" />
-        <result column="store_management_number" property="storeManagementNumber" />
-        <result column="store_management_id" property="storeManagementId" />
-        <result column="del_flag" property="delFlag" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
+
 
 </mapper>
diff --git a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlStoreManagementMapper.xml b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlStoreManagementMapper.xml
index 7ea9aa7..bad5244 100644
--- a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlStoreManagementMapper.xml
+++ b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlStoreManagementMapper.xml
@@ -2,26 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.management.mapper.SlStoreManagementMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlStoreManagement">
-        <id column="id" property="id" />
-        <result column="store_management_name" property="storeManagementName" />
-        <result column="store_management_no" property="storeManagementNo" />
-        <result column="store_management_number" property="storeManagementNumber" />
-        <result column="store_management_grade" property="storeManagementGrade" />
-        <result column="store_management_city" property="storeManagementCity" />
-        <result column="store_management_county" property="storeManagementCounty" />
-        <result column="store_management_village" property="storeManagementVillage" />
-        <result column="director_id" property="directorId" />
-        <result column="competent_id" property="competentId" />
-        <result column="administrator_id" property="administratorId" />
-        <result column="store_management_adder" property="storeManagementAdder" />
-        <result column="store_management_explain" property="storeManagementExplain" />
-        <result column="del_flag" property="delFlag" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
 </mapper>
diff --git a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionCkMapper.xml b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionCkMapper.xml
index f877988..e719bb9 100644
--- a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionCkMapper.xml
+++ b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionCkMapper.xml
@@ -2,24 +2,5 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.management.mapper.SlVolumeProductionCkMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlVolumeProductionCk">
-        <id column="id" property="id" />
-        <result column="materials_id" property="materialsId" />
-        <result column="rk_id" property="rkId" />
-        <result column="ck_num" property="ckNum" />
-        <result column="del_flag" property="delFlag" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="supplier_id" property="supplierId" />
-        <result column="attachment" property="attachment" />
-        <result column="source" property="source" />
-        <result column="remark" property="remark" />
-        <result column="state" property="state" />
-        <result column="guih_num" property="guihNum" />
-        <result column="type" property="type" />
-    </resultMap>
 
 </mapper>
diff --git a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionCkglMapper.xml b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionCkglMapper.xml
index 2bb1322..64ace9f 100644
--- a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionCkglMapper.xml
+++ b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionCkglMapper.xml
@@ -2,20 +2,5 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.management.mapper.SlVolumeProductionCkglMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlVolumeProductionCkgl">
-        <id column="id" property="id" />
-        <result column="sys_id" property="sysId" />
-        <result column="management_id" property="managementId" />
-        <result column="starti_time" property="startiTime" />
-        <result column="end_time" property="endTime" />
-        <result column="del_flag" property="delFlag" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="present_state" property="presentState" />
-        <result column="audit_status" property="auditStatus" />
-    </resultMap>
 
 </mapper>
diff --git a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionRkMapper.xml b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionRkMapper.xml
index 88dac5b..5acad16 100644
--- a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionRkMapper.xml
+++ b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionRkMapper.xml
@@ -2,26 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.management.mapper.SlVolumeProductionRkMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlVolumeProductionRk">
-        <id column="id" property="id" />
-        <result column="materials_id" property="materialsId" />
-        <result column="rk_num" property="rkNum" />
-        <result column="rk_model" property="rkModel" />
-        <result column="rk_pice" property="rkPice" />
-        <result column="store_management_number" property="storeManagementNumber" />
-        <result column="shelf_id" property="shelfId" />
-        <result column="del_flag" property="delFlag" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="supplier_id" property="supplierId" />
-        <result column="attachment" property="attachment" />
-        <result column="source" property="source" />
-        <result column="remark" property="remark" />
-        <result column="state" property="state" />
-    </resultMap>
 
     <select id="getManagementInventoryList" resultType="java.lang.Integer">
         SELECT ifnull(COUNT(*), 0) FROM sl_volume_production_rk sl
diff --git a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionRkglMapper.xml b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionRkglMapper.xml
index 1c1efa5..549cbbe 100644
--- a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionRkglMapper.xml
+++ b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionRkglMapper.xml
@@ -2,20 +2,5 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.management.mapper.SlVolumeProductionRkglMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlVolumeProductionRkgl">
-        <id column="id" property="id" />
-        <result column="sys_id" property="sysId" />
-        <result column="management_id" property="managementId" />
-        <result column="starti_time" property="startiTime" />
-        <result column="end_time" property="endTime" />
-        <result column="del_flag" property="delFlag" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="present_state" property="presentState" />
-        <result column="audit_status" property="auditStatus" />
-    </resultMap>
 
 </mapper>
diff --git a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionZyMapper.xml b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionZyMapper.xml
index 3e5b166..af6fa96 100644
--- a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionZyMapper.xml
+++ b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionZyMapper.xml
@@ -2,24 +2,5 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.management.mapper.SlVolumeProductionZyMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlVolumeProductionZy">
-        <id column="id" property="id" />
-        <result column="materials_id" property="materialsId" />
-        <result column="rk_id" property="rkId" />
-        <result column="zy_num" property="zyNum" />
-        <result column="del_flag" property="delFlag" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="supplier_id" property="supplierId" />
-        <result column="attachment" property="attachment" />
-        <result column="source" property="source" />
-        <result column="remark" property="remark" />
-        <result column="state" property="state" />
-        <result column="guih_num" property="guihNum" />
-        <result column="type" property="type" />
-    </resultMap>
 
 </mapper>
diff --git a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionZyglMapper.xml b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionZyglMapper.xml
index 35bd618..cdb876e 100644
--- a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionZyglMapper.xml
+++ b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionZyglMapper.xml
@@ -2,21 +2,5 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.management.mapper.SlVolumeProductionZyglMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlVolumeProductionZygl">
-        <id column="id" property="id" />
-        <result column="sys_id" property="sysId" />
-        <result column="management_id" property="managementId" />
-        <result column="starti_time" property="startiTime" />
-        <result column="end_time" property="endTime" />
-        <result column="del_flag" property="delFlag" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="present_state" property="presentState" />
-        <result column="audit_status" property="auditStatus" />
-        <result column="bmanagement_id" property="bmanagementId" />
-    </resultMap>
 
 </mapper>

--
Gitblit v1.7.1