From 600128eb020f4d162c27798d96b955406081855b Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期三, 20 八月 2025 09:15:10 +0800
Subject: [PATCH] 修改完善2
---
src/main/resources/mapper/warehouse/DocumentationMapper.xml | 33 ++++++++
src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java | 9 ++
src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java | 11 --
src/main/java/com/ruoyi/warehouse/mapper/DocumentationMapper.java | 4
src/main/java/com/ruoyi/warehouse/service/impl/DocumentationServiceImpl.java | 11 ++
src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java | 5
src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml | 1
src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesRowcolServiceImpl.java | 7 +
src/main/java/com/ruoyi/warehouse/dto/ReturnExportDto.java | 4
src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml | 67 ++++++++--------
src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java | 27 +++---
src/main/java/com/ruoyi/warehouse/service/DocumentationService.java | 4
12 files changed, 117 insertions(+), 66 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
index f86b15e..2af0875 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
@@ -30,7 +30,14 @@
@ApiOperation("鏂囨。淇℃伅琛�-鍒嗛〉鏌ヨ")
@Log(title = "鏂囨。淇℃伅琛�-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult listPage(Page page, Documentation documentation) {
- List<DocumentationDto> list = documentationService.listPage(page, documentation);
+ IPage<DocumentationDto> list = documentationService.listPage(page, documentation);
+ return AjaxResult.success(list);
+ }
+ @GetMapping("/list")
+ @ApiOperation("鏂囨。淇℃伅琛ㄦ煡璇�")
+ @Log(title = "鏂囨。淇℃伅琛ㄦ煡璇�", businessType = BusinessType.OTHER)
+ public AjaxResult list() {
+ List<DocumentationDto> list = documentationService.listAll();
return AjaxResult.success(list);
}
@PostMapping("/add")
diff --git a/src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java b/src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java
index 8039f72..8fb893a 100644
--- a/src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java
+++ b/src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java
@@ -12,14 +12,5 @@
*/
@Excel(name = "鏂囨。鍚嶇О")
private String docName;
- /**
- * 鍊熼槄浜�
- */
- @Excel(name = "鍊熼槄浜�")
- private String nickName;
- /**
- * 褰掕繕浜�
- */
- @Excel(name = "褰掕繕浜�")
- private String returnNickName;
+
}
diff --git a/src/main/java/com/ruoyi/warehouse/dto/ReturnExportDto.java b/src/main/java/com/ruoyi/warehouse/dto/ReturnExportDto.java
index 6f76cb0..bb9c391 100644
--- a/src/main/java/com/ruoyi/warehouse/dto/ReturnExportDto.java
+++ b/src/main/java/com/ruoyi/warehouse/dto/ReturnExportDto.java
@@ -12,14 +12,14 @@
@Excel(name = "鏂囨。鍚嶇О")
private String docName; // 鏂囨。鍚嶇О
@Excel(name = "鍘熷�熼槄浜�")
- private String nickName; // 鍊熼槄浜�
+ private String borrower; // 鍊熼槄浜�
@Excel(name = "鍊熼槄鏃堕棿", dateFormat = "yyyy-MM-dd", width = 30)
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDateTime borrowDate; // 鍊熼槄鏃堕棿
@Excel(name = "褰掕繕浜�")
@NotBlank(message = "褰掕繕浜轰笉鑳戒负绌�!!")
- private String returnNickName; // 褰掕繕浜�
+ private String returner; // 褰掕繕浜�
@Excel(name = "褰掕繕鏃堕棿", dateFormat = "yyyy-MM-dd", width = 30)
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
diff --git a/src/main/java/com/ruoyi/warehouse/mapper/DocumentationMapper.java b/src/main/java/com/ruoyi/warehouse/mapper/DocumentationMapper.java
index 49624f6..d8f0178 100644
--- a/src/main/java/com/ruoyi/warehouse/mapper/DocumentationMapper.java
+++ b/src/main/java/com/ruoyi/warehouse/mapper/DocumentationMapper.java
@@ -20,8 +20,10 @@
@Mapper
public interface DocumentationMapper extends BaseMapper<Documentation> {
- List<DocumentationDto> listPage(Page page, @Param("documentation") Documentation documentation);
+ IPage<DocumentationDto> listPage(Page page, @Param("documentation") Documentation documentation);
+ List<DocumentationDto> list();
List<DocumentationDto> listByDocumentClassificationId(@Param("documentClassificationId") Long documentClassificationId);
+ List<DocumentationDto> listBywarehouseGoodsShelvesRowcolId(@Param("warehouseGoodsShelvesRowcolId") Long warehouseGoodsShelvesRowcolId);
}
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
index b71d4a2..6039b20 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
@@ -37,15 +38,17 @@
private Long documentationId;
/**
- * 鍊熼槄浜篿d
+ * 鍊熼槄浜�
*/
- @ApiModelProperty(value = "鍊熼槄浜篿d")
- private Long borrowerId;
+ @ApiModelProperty(value = "鍊熼槄浜�")
+ @Excel(name = "鍊熼槄浜�")
+ private String borrower;
/**
- * 褰掕繕浜篿d
+ * 褰掕繕浜�
*/
- @ApiModelProperty(value = "褰掕繕浜篿d")
- private Long returnerId;
+ @ApiModelProperty(value = "褰掕繕浜�")
+ @Excel(name = "褰掕繕浜�")
+ private String returner;
/**
* 鍊熼槄鐩殑
@@ -60,25 +63,25 @@
@ApiModelProperty(value = "鍊熼槄鏃ユ湡")
@Excel(name = "鍊熼槄鏃ユ湡", dateFormat = "yyyy-MM-dd", width = 30)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- private LocalDateTime borrowDate;
+ private LocalDate borrowDate;
/**
* 搴斿綊杩樻棩鏈�
*/
@ApiModelProperty(value = "搴斿綊杩樻棩鏈�")
@Excel(name = "搴斿綊杩樻棩鏈�", dateFormat = "yyyy-MM-dd", width = 30)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime dueReturnDate;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate dueReturnDate;
/**
* 瀹為檯褰掕繕鏃ユ湡
*/
@ApiModelProperty(value = "瀹為檯褰掕繕鏃ユ湡")
@Excel(name = "瀹為檯褰掕繕鏃ユ湡", dateFormat = "yyyy-MM-dd", width = 30)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime returnDate;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate returnDate;
/**
* 鍊熼槄鐘舵��
diff --git a/src/main/java/com/ruoyi/warehouse/service/DocumentationService.java b/src/main/java/com/ruoyi/warehouse/service/DocumentationService.java
index f18de3d..ca6c3ec 100644
--- a/src/main/java/com/ruoyi/warehouse/service/DocumentationService.java
+++ b/src/main/java/com/ruoyi/warehouse/service/DocumentationService.java
@@ -16,9 +16,11 @@
*/
public interface DocumentationService extends IService<Documentation> {
- List<DocumentationDto> listPage(Page page, Documentation documentation);
+ IPage<DocumentationDto> listPage(Page page, Documentation documentation);
void export(HttpServletResponse response,Documentation documentation);
boolean deleteByIds(List<Long> ids);
+
+ List<DocumentationDto> listAll();
}
diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java
index 05bfdc2..1e8f2a6 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java
@@ -18,6 +18,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
import java.util.stream.Collectors;
@@ -54,9 +55,9 @@
public boolean reventdbm(DocumentationBorrowManagement documentationBorrowManagement) {
// 鏇存柊鍊熼槄璁板綍鐘舵�佷负褰掕繕
DocumentationBorrowManagement documentationBorrowManagement1 = documentationBorrowManagementMapper.selectById(documentationBorrowManagement.getId());
- documentationBorrowManagement1.setReturnerId(documentationBorrowManagement.getReturnerId());
+ documentationBorrowManagement1.setReturner(documentationBorrowManagement.getReturner());
documentationBorrowManagement1.setBorrowStatus("褰掕繕");
- documentationBorrowManagement1.setReturnDate(LocalDateTime.now());
+ documentationBorrowManagement1.setReturnDate(LocalDate.now());
documentationBorrowManagementMapper.updateById(documentationBorrowManagement1);
// 鏇存柊鏂囨。鐘舵�佷负姝ｅ父
Documentation documentation = documentationService.getById(documentationBorrowManagement.getDocumentationId());
diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationServiceImpl.java
index cf1efd4..210401e 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationServiceImpl.java
@@ -27,15 +27,15 @@
@Autowired
private DocumentationMapper documentationMapper;
@Override
- public List<DocumentationDto> listPage(Page page, Documentation documentation) {
+ public IPage<DocumentationDto> listPage(Page page, Documentation documentation) {
return documentationMapper.listPage(page, documentation);
}
@Override
public void export(HttpServletResponse response,Documentation documentation) {
- List<DocumentationDto> list = documentationMapper.listPage(null, documentation);
+ IPage<DocumentationDto> list = documentationMapper.listPage(null, documentation);
ExcelUtil<DocumentationDto> util = new ExcelUtil<>(DocumentationDto.class);
- util.exportExcel(response, list, "鏂囨。淇℃伅琛�");
+ util.exportExcel(response, list.getRecords(), "鏂囨。淇℃伅琛�");
}
@Override
@@ -50,6 +50,11 @@
}
return true;
}
+
+ @Override
+ public List<DocumentationDto> listAll() {
+ return documentationMapper.list();
+ }
}
diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesRowcolServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesRowcolServiceImpl.java
index aa624ea..7715520 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesRowcolServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesRowcolServiceImpl.java
@@ -14,6 +14,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Arrays;
import java.util.List;
@@ -34,6 +35,12 @@
@Override
public List<WarehouseGoodsShelvesRowcolDto> getList(WarehouseGoodsShelvesRowcol warehouseGoodsShelvesRowcol) {
List<WarehouseGoodsShelvesRowcolDto> list = warehouseGoodsShelvesRowcolMapper.findList(warehouseGoodsShelvesRowcol);
+ for (WarehouseGoodsShelvesRowcolDto dto : list) {
+ //鑾峰彇灞俰ds
+ Long id = dto.getId();
+ //鑾峰彇鏂囨。
+ dto.setDocumentationDtoList(documentationMapper.listBywarehouseGoodsShelvesRowcolId(id));
+ }
return list;
}
@Override
diff --git a/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml b/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
index f28eadd..d29d24a 100644
--- a/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
+++ b/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
@@ -4,22 +4,22 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.warehouse.mapper.DocumentationBorrowManagementMapper">
- <resultMap id="BaseResultMap" type="com.ruoyi.warehouse.pojo.DocumentationBorrowManagement">
- <id property="id" column="id"/>
- <result property="documentationId" column="documentation_id" />
- <result property="borrowerId" column="borrower_id" />
- <result property="borrowPurpose" column="borrow_purpose" />
- <result property="borrowDate" column="borrow_date"/>
- <result property="dueReturnDate" column="due_return_date" />
- <result property="returnDate" column="return_date"/>
- <result property="borrowStatus" column="borrow_status" />
- <result property="remark" column="remark"/>
- <result property="createTime" column="create_time"/>
- <result property="createUser" column="create_user"/>
- <result property="updateTime" column="update_time"/>
- <result property="updateUser" column="update_user"/>
- <result property="tenantId" column="tenant_id"/>
- </resultMap>
+<!-- <resultMap id="BaseResultMap" type="com.ruoyi.warehouse.pojo.DocumentationBorrowManagement">-->
+<!-- <id property="id" column="id"/>-->
+<!-- <result property="documentationId" column="documentation_id" />-->
+<!-- <result property="borrowerId" column="borrower_id" />-->
+<!-- <result property="borrowPurpose" column="borrow_purpose" />-->
+<!-- <result property="borrowDate" column="borrow_date"/>-->
+<!-- <result property="dueReturnDate" column="due_return_date" />-->
+<!-- <result property="returnDate" column="return_date"/>-->
+<!-- <result property="borrowStatus" column="borrow_status" />-->
+<!-- <result property="remark" column="remark"/>-->
+<!-- <result property="createTime" column="create_time"/>-->
+<!-- <result property="createUser" column="create_user"/>-->
+<!-- <result property="updateTime" column="update_time"/>-->
+<!-- <result property="updateUser" column="update_user"/>-->
+<!-- <result property="tenantId" column="tenant_id"/>-->
+<!-- </resultMap>-->
<!-- <sql id="Base_Column_List">-->
<!-- id,documentation_id,borrower_id,-->
@@ -29,11 +29,9 @@
<!-- update_user,tenant_id-->
<!-- </sql>-->
<select id="listPage" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto">
- select dbm.*,doc.doc_name,su.nick_name,sur.nick_name as return_nick_name
+ select dbm.*,doc.doc_name
from documentation_borrow_management dbm
LEFT JOIN documentation doc on doc.id = dbm.documentation_id
- LEFT JOIN sys_user su on su.user_id = dbm.borrower_id
- LEFT JOIN sys_user sur on sur.user_id = dbm.returner_id
where 1=1
<if test="documentationBorrowManagement.borrowStatus != null">
and borrow_status = #{documentationBorrowManagement.borrowStatus}
@@ -41,11 +39,11 @@
<if test="documentationBorrowManagement.documentationId != null">
and documentation_id = #{documentationBorrowManagement.documentationId}
</if>
- <if test="documentationBorrowManagement.borrowerId != null">
- and borrower_id = #{documentationBorrowManagement.borrowerId}
+ <if test="documentationBorrowManagement.borrower != null">
+ and borrower like concat('%',#{documentationBorrowManagement.borrower},'%')
</if>
- <if test="documentationBorrowManagement.returnerId != null">
- and returner_id = #{documentationBorrowManagement.returnerId}
+ <if test="documentationBorrowManagement.returner != null">
+ and returner like concat('%',#{documentationBorrowManagement.returner},'%')
</if>
<if test="documentationBorrowManagement.entryDateStart != null and documentationBorrowManagement.entryDateStart != ''">
and borrow_date >= DATE_FORMAT(#{documentationBorrowManagement.entryDateStart},'%Y-%m-%d')
@@ -55,10 +53,9 @@
</if>
</select>
<select id="export" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto">
- select dbm.*,doc.doc_name,su.nick_name
+ select dbm.*,doc.doc_name
from documentation_borrow_management dbm
LEFT JOIN documentation doc on doc.id = dbm.documentation_id
- LEFT JOIN sys_user su on su.user_id = dbm.borrower_id
where 1=1
<if test="documentationBorrowManagement.borrowStatus != null">
and borrow_status = #{documentationBorrowManagement.borrowStatus}
@@ -66,8 +63,11 @@
<if test="documentationBorrowManagement.documentationId != null">
and documentation_id = #{documentationBorrowManagement.documentationId}
</if>
- <if test="documentationBorrowManagement.borrowerId != null">
- and borrower_id = #{documentationBorrowManagement.borrowerId}
+ <if test="documentationBorrowManagement.borrower != null">
+ and borrower like concat('%',#{documentationBorrowManagement.borrower},'%')
+ </if>
+ <if test="documentationBorrowManagement.returner != null">
+ and returner like concat('%',#{documentationBorrowManagement.returner},'%')
</if>
<if test="documentationBorrowManagement.entryDateStart != null and documentationBorrowManagement.entryDateStart != ''">
and borrow_date >= DATE_FORMAT(#{documentationBorrowManagement.entryDateStart},'%Y-%m-%d')
@@ -77,20 +77,21 @@
</if>
</select>
<select id="exportrevent" resultType="com.ruoyi.warehouse.dto.ReturnExportDto">
- select dbm.*,doc.doc_name,su.nick_name,sur.nick_name as return_nick_name
+ select dbm.*,doc.doc_name
from documentation_borrow_management dbm
LEFT JOIN documentation doc on doc.id = dbm.documentation_id
- LEFT JOIN sys_user su on su.user_id = dbm.borrower_id
- LEFT JOIN sys_user sur on sur.user_id = dbm.returner_id
- where sur.nick_name IS NOT NULL
+ where dbm.returner IS NOT NULL
<if test="documentationBorrowManagement.borrowStatus != null">
and borrow_status = #{documentationBorrowManagement.borrowStatus}
</if>
<if test="documentationBorrowManagement.documentationId != null">
and documentation_id = #{documentationBorrowManagement.documentationId}
</if>
- <if test="documentationBorrowManagement.borrowerId != null">
- and borrower_id = #{documentationBorrowManagement.borrowerId}
+ <if test="documentationBorrowManagement.borrower != null">
+ and borrower like concat('%',#{documentationBorrowManagement.borrower},'%')
+ </if>
+ <if test="documentationBorrowManagement.returner != null">
+ and returner like concat('%',#{documentationBorrowManagement.returner},'%')
</if>
<if test="documentationBorrowManagement.entryDateStart != null and documentationBorrowManagement.entryDateStart != ''">
and borrow_date >= DATE_FORMAT(#{documentationBorrowManagement.entryDateStart},'%Y-%m-%d')
diff --git a/src/main/resources/mapper/warehouse/DocumentationMapper.xml b/src/main/resources/mapper/warehouse/DocumentationMapper.xml
index f5f9f73..91f17a9 100644
--- a/src/main/resources/mapper/warehouse/DocumentationMapper.xml
+++ b/src/main/resources/mapper/warehouse/DocumentationMapper.xml
@@ -50,5 +50,38 @@
LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
where doc.document_classification_id = #{documentClassificationId}
</select>
+ <select id="list" resultType="com.ruoyi.warehouse.dto.DocumentationDto">
+ SELECT
+ doc.*,
+ dc.category,
+ CONCAT(
+ w.warehouse_name, '-',
+ wgs.name, '-',
+ wgsr.row, '灞�-',
+ wgsr.col, '鍒�'
+ ) AS location_info -- 鍚堝苟鍚庣殑瀛楁鍚�
+ FROM documentation doc
+ LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
+ LEFT JOIN warehouse_goods_shelves_rowcol wgsr ON wgsr.id = doc.warehouse_goods_shelves_rowcol_id
+ LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
+ LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
+ </select>
+ <select id="listBywarehouseGoodsShelvesRowcolId" resultType="com.ruoyi.warehouse.dto.DocumentationDto">
+ SELECT
+ doc.*,
+ dc.category,
+ CONCAT(
+ w.warehouse_name, '-',
+ wgs.name, '-',
+ wgsr.row, '灞�-',
+ wgsr.col, '鍒�'
+ ) AS location_info -- 鍚堝苟鍚庣殑瀛楁鍚�
+ FROM documentation doc
+ LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
+ LEFT JOIN warehouse_goods_shelves_rowcol wgsr ON wgsr.id = doc.warehouse_goods_shelves_rowcol_id
+ LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
+ LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
+ where doc.warehouse_goods_shelves_rowcol_id = #{warehouseGoodsShelvesRowcolId}
+ </select>
</mapper>
diff --git a/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml b/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml
index ed25288..aa2a16a 100644
--- a/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml
+++ b/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml
@@ -6,7 +6,6 @@
<select id="findList" resultType="com.ruoyi.warehouse.dto.WarehouseGoodsShelvesRowcolDto">
SELECT
wgsr.*,
- doc.*,
w.warehouse_name,
wgs.name,
dc.category
--
Gitblit v1.9.3