From 9b3f8e27db649e14b1e43dc898af358f2192cdf9 Mon Sep 17 00:00:00 2001
From: Huluwa22 <2667400744@qq.com>
Date: Fri, 21 Mar 2025 13:46:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=AF=BC=E5=87=BA=E6=97=B6?=
 =?UTF-8?q?=E9=99=84=E5=8A=A0=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/wms/controller/ExcelController.java   | 13 +++
 .../wms/model/entity/excel/StockExcel.java    | 81 +++++++------------
 .../java/com/wms/service/GoodsService.java    |  2 +
 .../GoodsServiceImplements.java               |  5 ++
 4 files changed, 49 insertions(+), 52 deletions(-)

diff --git a/src/main/java/com/wms/controller/ExcelController.java b/src/main/java/com/wms/controller/ExcelController.java
index eb22c60..38d4d81 100644
--- a/src/main/java/com/wms/controller/ExcelController.java
+++ b/src/main/java/com/wms/controller/ExcelController.java
@@ -8,12 +8,14 @@ import com.wms.model.entity.table.*;
 import com.wms.service.*;
 import com.wms.utils.HttpUtils;
 
+import com.wms.utils.StringUtils;
 import com.wms.utils.excel.ExcelUtils;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
@@ -84,6 +86,17 @@ public class ExcelController extends BaseController {
         for (Stock stock : stocks) {
             StockExcel stockExcel = new StockExcel();
             BeanUtils.copyProperties(stock,stockExcel);
+            // 查询零件信息
+            Goods goods = goodsService.selGoodsByGoodsId(stock.getGoodsId());
+            // 设置零件信息
+            if (goods != null){
+                if (!StringUtils.isEmpty(goods.getGoodsName()) ) {
+                    stockExcel.setGoodsUnit(goods.getGoodsUnit());
+                }
+                if (!StringUtils.isEmpty(goods.getSingleWeight())){
+                    stockExcel.setSingleWeight(Double.valueOf(goods.getSingleWeight()));
+                }
+            }
             stockExcelList.add(stockExcel);
         }
         ExcelUtils.export(response, "库存报表", stockExcelList,StockExcel.class);
diff --git a/src/main/java/com/wms/model/entity/excel/StockExcel.java b/src/main/java/com/wms/model/entity/excel/StockExcel.java
index 6a32b9e..afaef43 100644
--- a/src/main/java/com/wms/model/entity/excel/StockExcel.java
+++ b/src/main/java/com/wms/model/entity/excel/StockExcel.java
@@ -47,51 +47,34 @@ public class StockExcel {
     @ExcelExport("物料号")
     private String goodsId;
 
-//    /**
-//     * 物料名称
-//     */
-//    @ExcelExport("零件名称")
-//    private String goodsName;
+    /**
+     * 规格型号
+     */
+    @ExcelExport("规格型号")
+    private String goodsUnit;
 
-//    /**
-//     * 批次号
-//     */
-//    @ExcelExport("批次号")
-//    private String batchNo;
 
     /**
      * 可用数量
      */
-    @ExcelExport("可用数量")
+    @ExcelExport("库存数量")
     private Integer availableNum;
 
-//    /**
-//     * 剩余数量
-//     */
-//    @ExcelExport("剩余数量")
-//    private Integer remainNum;
 
 //    /**
-//     * 实际数量
+//     * 生产日期
 //     */
-//    @ExcelExport("实际数量")
-//    private Integer realNum;
-
-
-    /**
-     * 生产日期
-     */
-    @ExcelExport("生产日期")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date productionDate;
-    /**
-     * 过期日期
-     */
-    @ExcelExport("过期日期")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date expirationDate;
+//    @ExcelExport("生产日期")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd")
+//    @JsonFormat(pattern = "yyyy-MM-dd")
+//    private Date productionDate;
+//    /**
+//     * 过期日期
+//     */
+//    @ExcelExport("过期日期")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd")
+//    @JsonFormat(pattern = "yyyy-MM-dd")
+//    private Date expirationDate;
     /**
      * 库存状态
      * 正常、出库中、锁定 等
@@ -106,23 +89,17 @@ public class StockExcel {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
-    /**
-     * 最后更新时间
-     */
-    @ExcelExport("最后更新时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date lastUpdateTime;
-    /**
-     * 最后更新用户
-     */
-    @ExcelExport("上架人")
-    private String lastUpdateUser;
-    /**
-     * 备注
-     */
-    @ExcelExport("备注")
-    private String remark;
+
+//    /**
+//     * 最后更新用户
+//     */
+//    @ExcelExport("上架人")
+//    private String lastUpdateUser;
+//    /**
+//     * 备注
+//     */
+//    @ExcelExport("备注")
+//    private String remark;
 
 
     @ExcelExport("单重")
diff --git a/src/main/java/com/wms/service/GoodsService.java b/src/main/java/com/wms/service/GoodsService.java
index 0054f2b..6047ef8 100644
--- a/src/main/java/com/wms/service/GoodsService.java
+++ b/src/main/java/com/wms/service/GoodsService.java
@@ -43,4 +43,6 @@ public interface GoodsService {
 
 
     void clearGoodsInfo();
+
+    Goods selGoodsByGoodsId(String goodsId);
 }
diff --git a/src/main/java/com/wms/service/serviceImplements/GoodsServiceImplements.java b/src/main/java/com/wms/service/serviceImplements/GoodsServiceImplements.java
index 68e8486..afd8b9a 100644
--- a/src/main/java/com/wms/service/serviceImplements/GoodsServiceImplements.java
+++ b/src/main/java/com/wms/service/serviceImplements/GoodsServiceImplements.java
@@ -47,4 +47,9 @@ public class GoodsServiceImplements implements GoodsService {
     public void clearGoodsInfo() {
         this.goodsMapper.clearGoodsInfo();
     }
+
+    @Override
+    public Goods selGoodsByGoodsId(String goodsId) {
+        return this.goodsMapper.selGoodsByGoodsName(goodsId);
+    }
 }