From f5780f250e8033e424cc9f7b71a2d5c97daf21fb Mon Sep 17 00:00:00 2001
From: wusiyu <2015098864@qq.com>
Date: Thu, 25 Jun 2026 20:20:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=AF=BC=E5=87=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/controller/StGoodsController.java     |  19 ++
 .../springblade/wms/excel/StGoodsExcel.java   | 263 ++++--------------
 .../springblade/wms/mapper/StGoodsMapper.xml  |  35 ++-
 3 files changed, 100 insertions(+), 217 deletions(-)

diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java
index 6869a9335..eec218ab8 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java
@@ -1,5 +1,6 @@
 package org.springblade.wms.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -17,6 +18,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.annotation.IsAdmin;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.wms.excel.StGoodsExcel;
@@ -171,6 +173,23 @@ public class StGoodsController extends BladeController {
 		//	queryWrapper.lambda().eq(StGoods::getTenantId, bladeUser.getTenantId());
 		//}
 		//queryWrapper.lambda().eq(StGoodsEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		queryWrapper.clear();
+        // 物理编号
+		String goodsCode = Func.toStr(stGoods.get("goodsCode"));
+		if (StrUtil.isNotBlank(goodsCode)) {
+			queryWrapper.like("t1.goods_code", goodsCode);
+		}
+        // 物料名称
+		String goodsName = Func.toStr(stGoods.get("goodsName"));
+		if (StrUtil.isNotBlank(goodsName)) {
+			queryWrapper.like("t1.goods_name", goodsName);
+		}
+        // 型号
+		String materialModel = Func.toStr(stGoods.get("materialModel"));
+		if (StrUtil.isNotBlank(materialModel)) {
+			queryWrapper.like("t1.material_model", materialModel);
+		}
+		queryWrapper.eq("t1.is_deleted", BladeConstant.DB_NOT_DELETED);
 		List<StGoodsExcel> list = stGoodsService.exportStGoods(queryWrapper);
 		ExcelUtil.export(response, "物料信息表数据" + DateUtil.time(), "物料信息表数据表", list, StGoodsExcel.class);
 	}
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StGoodsExcel.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StGoodsExcel.java
index 77428609e..cec5a2136 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StGoodsExcel.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StGoodsExcel.java
@@ -8,7 +8,6 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @version 1.0
@@ -28,24 +27,6 @@ public class StGoodsExcel implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 主键
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("主键")
-	private Long id;
-	/**
-	 * 租户ID（默认值：000000）
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("租户ID（默认值：000000）")
-	private String tenantId;
-	/**
-	 * 是否已删除（默认值：0）
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("是否已删除（默认值：0）")
-	private Long isDeleted;
 	/**
 	 * 物料编码
 	 */
@@ -59,95 +40,23 @@ public class StGoodsExcel implements Serializable {
 	@ExcelProperty("物料名称")
 	private String goodsName;
 	/**
-	 * 最高库存
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("最高库存")
-	private Double maxNum;
-	/**
-	 * 最低库存
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("最低库存")
-	private Double minNum;
-	/**
-	 * 采购数量
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("采购数量")
-	private Double purchaseQuantity;
-	/**
-	 * 必检标识
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("必检标识")
-	private Short mustCheck;
-	/**
-	 * 是否停用（默认值：0）
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("是否停用（默认值：0）")
-	private Boolean used;
-	/**
-	 * 使用件数核算
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("使用件数核算")
-	private Short numAcc;
-	/**
-	 * 产地
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("产地")
-	private String madeIn;
-	/**
-	 * 单价
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("单价")
-	private Double price;
-	/**
-	 * 等级
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("等级")
-	private String grade;
-	/**
-	 * 来源 1=自制 2=外购
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("来源 1=自制 2=外购")
-	private Short source;
-	/**
-	 * 组件模式
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("组件模式")
-	private String prtType;
-	/**
-	 * 版本
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("版本")
-	private String releaseNo;
-	/**
-	 * 版本时间
+	 * 采购部门
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("版本时间")
-	private Date releaseNoTime;
+	@ExcelProperty("采购部门")
+	private String deptName;
 	/**
-	 * 型号
+	 * 型号/牌号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("型号")
+	@ExcelProperty("型号/牌号")
 	private String materialModel;
 	/**
-	 * 重量
+	 * 换算比例
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("重量")
-	private Double weight;
+	@ExcelProperty("换算比例")
+	private Double conversionRatio;
 	/**
 	 * 计量单位
 	 */
@@ -155,107 +64,71 @@ public class StGoodsExcel implements Serializable {
 	@ExcelProperty("计量单位")
 	private String unitName;
 	/**
-	 * 产品类别
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("产品类别")
-	private String productCategory;
-	/**
-	 * 规格型号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("规格型号")
-	private String specifications;
-	/**
-	 * 技术条件
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("技术条件")
-	private String productTechSpec;
-	/**
-	 * 密度
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("密度")
-	private Double density;
-	/**
-	 * 图号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("图号")
-	private String drawingNo;
-	/**
-	 * 变更通告编号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("变更通告编号")
-	private String ecnNo;
-	/**
-	 * 是否成品（默认值：0）
+	 * PDM单位
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("是否成品（默认值：0）")
-	private Short endItem;
+	@ExcelProperty("PDM单位")
+	private String pdmUnit;
 	/**
-	 * 优选等级
+	 * 物料类别
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("优选等级")
-	private String priority;
+	@ExcelProperty("物料类别")
+	private String gcName;
 	/**
-	 * 超级链接
+	 * 是否工艺审批
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("超级链接")
-	private String partLink;
+	@ExcelProperty("是否工艺审批")
+	private String processApproval;
 	/**
-	 * 腔数
+	 * 补制类型
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("腔数")
-	private String cavityNo;
+	@ExcelProperty("补制类型")
+	private String reissueTypeName;
 	/**
-	 * 采购部门
+	 * 等级
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("采购部门")
-	private Long deptId;
+	@ExcelProperty("等级")
+	private String grade;
 	/**
-	 * 物料类别
+	 * 最高库存
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("物料类别")
-	private Long gcId;
+	@ExcelProperty("最高库存")
+	private Double maxNum;
 	/**
-	 * 生命周期状态
+	 * 最低库存
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("生命周期状态")
-	private String partRevisionStatus;
+	@ExcelProperty("最低库存")
+	private Double minNum;
 	/**
-	 * 牌号
+	 * 采购数量
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("牌号")
-	private String tradeMark;
+	@ExcelProperty("采购数量")
+	private Double purchaseQuantity;
 	/**
-	 * 备注
+	 * 是否启用
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("备注")
-	private String remark;
+	@ExcelProperty("是否启用")
+	private String used;
 	/**
-	 * 锁料数量
+	 * 版本
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("锁料数量")
-	private Double lockQuantity;
+	@ExcelProperty("版本")
+	private String releaseNo;
 	/**
-	 * 在途数量
+	 * 属性
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("在途数量")
-	private Double onthewayQuantity;
+	@ExcelProperty("属性")
+	private Long materialProperty;
 	/**
 	 * 当前库存
 	 */
@@ -263,59 +136,17 @@ public class StGoodsExcel implements Serializable {
 	@ExcelProperty("当前库存")
 	private Double currentQuantity;
 	/**
-	 * 物料类型
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("物料类型")
-	private Long goodsType;
-	/**
-	 * 大类
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("大类")
-	private String matBigClassify;
-	/**
-	 * 小类
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("小类")
-	private String matSmallClassify;
-	/**
-	 * 检验编号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("检验编号")
-	private String checkCode;
-	/**
-	 * 批次号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("批次号")
-	private String batch;
-	/**
-	 * 表面积
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("表面积")
-	private Double sectionArea;
-	/**
-	 * 物料属性
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("物料属性")
-	private Long materialProperty;
-	/**
-	 * PDM单位
+	 * 在途数量
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("PDM单位")
-	private String pdmUnit;
+	@ExcelProperty("在途数量")
+	private Double onthewayQuantity;
 	/**
-	 * 是否工艺审批
+	 * 锁料数量
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("是否工艺审批")
-	private String processApproval;
+	@ExcelProperty("锁料数量")
+	private Double lockQuantity;
 	/**
 	 * 是否最低库存预警
 	 */
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml
index 8ea5d2b30..98e66a8e8 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml
@@ -89,7 +89,40 @@
     </select>
 
     <select id="exportStGoods" resultType="org.springblade.wms.excel.StGoodsExcel">
-        SELECT * FROM ST_GOODS ${ew.customSqlSegment}
+        SELECT
+            t1.*,
+            -- 补制类型数字转文字
+            CASE t1.reissue_type
+                WHEN 0 THEN '无'
+                WHEN 1 THEN '物料出库'
+                WHEN 2 THEN '最低库存'
+                ELSE ''
+                END AS reissue_type_name,
+            CASE t1.process_approval
+                WHEN '0' THEN '否'
+                WHEN '1' THEN '是'
+                ELSE ''
+                END AS process_approval,
+            CASE t1.used
+                WHEN 1 THEN '启用'
+                WHEN 0 THEN '停用'
+                ELSE ''
+                END AS used,
+            CASE t1.min_warning
+                WHEN '0' THEN '否'
+                WHEN '1' THEN '是'
+                ELSE ''
+                END AS min_warning,
+            -- 部门名称
+            t2.dept_name,
+            -- 物料类别名称
+            t3.gc_name
+        FROM st_goods t1
+                 LEFT JOIN blade_dept t2
+                           ON t1.dept_id = t2.id
+                 LEFT JOIN st_goods_class t3
+                           ON t1.gc_id = t3.id
+            ${ew.customSqlSegment}
     </select>
 
     <select id="queryByCode" resultMap="stGoodsResultMap">