diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/domain/CheckDifferenceRecord.java b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/domain/CheckDifferenceRecord.java
index 7080ee3..89a1f6d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/domain/CheckDifferenceRecord.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/domain/CheckDifferenceRecord.java
@@ -69,6 +69,30 @@ public class CheckDifferenceRecord extends BaseEntity
/** 审核状态 */
@Excel(name = "审核状态")
private String status;
+ /** 仓库ID */
+ @Excel(name = "仓库ID")
+ private String warehouseId;
+
+ /** 仓库名称 */
+ @Excel(name = "仓库名称")
+ private String warehouseName;
+
+
+ public String getWarehouseId() {
+ return warehouseId;
+ }
+
+ public void setWarehouseId(String warehouseId) {
+ this.warehouseId = warehouseId;
+ }
+
+ public String getWarehouseName() {
+ return warehouseName;
+ }
+
+ public void setWarehouseName(String warehouseName) {
+ this.warehouseName = warehouseName;
+ }
public String getStatus() {
return status;
diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml
index 38d7bb1..e1f58bf 100644
--- a/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml
@@ -20,30 +20,66 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
- select check_guid, check_stock_detail_id, stock_id, tray_code, cargo_space_id, product_id, lot_no, supplier, customer, old_quantity, new_quantity, record_type, create_time, product_guid ,status from check_difference_record
+ select r.check_guid, r.check_stock_detail_id, r.stock_id, r.tray_code, r.cargo_space_id,
+ r.product_id, r.lot_no, r.supplier, r.customer, r.old_quantity, r.new_quantity,
+ r.record_type, r.create_time, r.product_guid, r.status, r.warehouse_id,
+ w.warehouse_name
+ from check_difference_record r
+ left join bas_warehouse w on r.warehouse_id = w.warehouse_id