仓库导出修改

blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsClassController.java

@@ -17,6 +17,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.StGoodsClassExcel;
@@ -190,7 +191,7 @@ public class StGoodsClassController extends BladeController {
 		//if (!AuthUtil.isAdministrator()) {
 		//	queryWrapper.lambda().eq(StGoodsClass::getTenantId, bladeUser.getTenantId());
 		//}
-		//queryWrapper.lambda().eq(StGoodsClassEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		queryWrapper.lambda().eq(StGoodsClass::getIsDeleted, BladeConstant.DB_NOT_DELETED);
 		List<StGoodsClassExcel> list = stGoodsClassService.exportStGoodsClass(queryWrapper);
 		ExcelUtil.export(response, "物料类别表数据" + DateUtil.time(), "物料类别表数据表", list, StGoodsClassExcel.class);
 	}

blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsExtController.java

@@ -129,7 +129,7 @@ public class StGoodsExtController extends BladeController {
 		//	queryWrapper.lambda().eq(StGoodsExt::getTenantId, bladeUser.getTenantId());
 		//}
 		//queryWrapper.lambda().eq(StGoodsExtEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<StGoodsExtExcel> list = stGoodsExtService.exportStGoodsExt(queryWrapper);
+		List<StGoodsExtExcel> list = stGoodsExtService.exportStGoodsExt(stGoodsExt);
 		ExcelUtil.export(response, "物料状态表数据" + DateUtil.time(), "物料状态表数据表", list, StGoodsExtExcel.class);
 	}
 

blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StGoodsClassExcel.java

@@ -27,24 +27,6 @@ public class StGoodsClassExcel 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;
 	/**
 	 * 类别编码
 	 */

blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StGoodsExtExcel.java

@@ -28,29 +28,35 @@ public class StGoodsExtExcel implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	 * 主键
+	 * 物料编码
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("主键")
+	@ExcelProperty("物料编码")
-	private Long id;
+	private String goodsCode;
 	/**
-	 * 租户ID（默认值：000000）
+	 * 物料名称
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("租户ID（默认值：000000）")
+	@ExcelProperty("物料名称")
-	private String tenantId;
+	private String goodsName;
 	/**
-	 * 是否已删除（默认值：0）
+	 * 型号/牌号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("是否已删除（默认值：0）")
+	@ExcelProperty("型号/牌号")
-	private Long isDeleted;
+	private String materialModel;
+	/**
+	 * 物料规格
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("物料规格")
+	private String specifications;
 	/**
 	 * 季度月使用量均值
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("季度月使用量均值")
-	private Long useAverage;
+	private Double useAverage;
 	/**
 	 * 一级库存
 	 */
@@ -74,36 +80,30 @@ public class StGoodsExtExcel implements Serializable {
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("是否油漆")
-	private Boolean paint;
+	private String paintName;
 	/**
 	 * 周转工
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("周转工")
-	private Long turnover;
+	private String turnoverName;
 	/**
 	 * 是否配送
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("是否配送")
-	private Boolean delivery;
+	private String deliveryName;
 	/**
-	 * 是否特殊;默认 false
+	 * 是否特殊
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("是否特殊;默认 false")
+	@ExcelProperty("是否特殊")
-	private Boolean special;
+	private String specialName;
 	/**
 	 * 物料状态
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("物料状态")
-	private Long goodsStatus;
+	private String goodsStatusName;
-	/**
-	 * 物料信息ID（关联st_goods表）
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("物料信息ID（关联st_goods表）")
-	private Long goodsId;
 
 }

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.java

@@ -1,6 +1,5 @@
 package org.springblade.wms.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,6 +9,7 @@ import org.springblade.wms.pojo.entity.StGoodsExt;
 import org.springblade.wms.pojo.vo.StGoodsExtVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @version 1.0
@@ -38,7 +38,7 @@ public interface StGoodsExtMapper extends BaseMapper<StGoodsExt> {
 	 * @param queryWrapper 查询条件
 	 * @return List<StGoodsExtExcel>
 	 */
-	List<StGoodsExtExcel> exportStGoodsExt(@Param("ew") Wrapper<StGoodsExt> queryWrapper);
+//	List<StGoodsExtExcel> exportStGoodsExt(@Param("ew") Wrapper<StGoodsExt> queryWrapper);
 
     IPage<StGoodsExtVO> selectGoodsExtWithGoods(IPage<StGoodsExtVO> page, @Param("ew") QueryWrapper<StGoodsExt> queryWrapper);
 
@@ -47,5 +47,7 @@ public interface StGoodsExtMapper extends BaseMapper<StGoodsExt> {
 	StGoodsExt selectWithAvgMonth(Long goodsId);
 
 	Double getPlanQty(Long goodsId);
+
+	List<StGoodsExtExcel> exportStGoodsExt(Map<String, Object> stGoodsExt);
 }
 

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.xml

@@ -115,7 +115,71 @@
     </select>
 
     <select id="exportStGoodsExt" resultType="org.springblade.wms.excel.StGoodsExtExcel">
-        SELECT * FROM ST_GOODS_EXT ${ew.customSqlSegment}
+        SELECT
+        se.*,
+        -- 是否油漆
+        CASE se.paint
+        WHEN 1 THEN '是'
+        WHEN 0 THEN '否'
+        ELSE ''
+        END AS paintName,
+        -- 是否配送
+        CASE se.delivery
+        WHEN 1 THEN '是'
+        WHEN 0 THEN '否'
+        ELSE ''
+        END AS deliveryName,
+        -- 是否特殊
+        CASE se.special
+        WHEN 1 THEN '是'
+        WHEN 0 THEN '否'
+        ELSE ''
+        END AS specialName,
+        -- 状态
+        CASE se.goods_status
+        WHEN 1 THEN '需报料'
+        WHEN 2 THEN '需跟踪'
+        WHEN 3 THEN '待领料'
+        WHEN 4 THEN '正常'
+        WHEN 5 THEN '长期未使用'
+        ELSE ''
+        END AS goods_status_name,
+        u.real_name AS turnoverName,
+        g.goods_code ,    <!-- 物料编号 -->
+        g.goods_name ,    <!-- 物料名称 -->
+        g.material_model      ,      <!-- 型号/牌号 -->
+        g.specifications       <!-- 物料规格 -->
+        FROM st_goods_ext se
+        <!-- 关联物料主表，查询核心字段 -->
+        LEFT JOIN st_goods g ON se.goods_id = g.id
+        LEFT JOIN BLADE_USER u ON se.turnover = u.id
+        WHERE se.is_deleted = 0
+        <!-- 3. 商品编码：可选条件，传了就过滤，没传不生效（模糊查询，业务常用） -->
+        <if test="param2.goodsCode != null and param2.goodsCode != ''">
+            AND g.goods_code = #{param2.goodsCode}
+        </if>
+        <!-- 4. 物料名称：新增可选条件，传了就过滤，没传不生效（模糊查询，同编码格式） -->
+        <if test="param2.goodsName != null and param2.goodsName != ''">
+            AND g.goods_name LIKE '%' || #{param2.goodsName} || '%'
+        </if>
+        <!-- 5. 周转工：新增可选条件，传了就过滤，没传不生效（精准匹配，数值类型） -->
+        <if test="param2.turnover != null">
+            AND se.turnover = #{param2.turnover}
+        </if>
+        <!-- 6. 物料状态：新增可选条件，传了就过滤，没传不生效（精准匹配，数值类型） -->
+        <if test="param2.goodsStatus != null">
+            AND se.goods_status = #{param2.goodsStatus}
+        </if>
+
+        <if test="param2.delivery != null">
+            AND se.delivery = #{param2.delivery}
+        </if>
+
+        <if test="param2.special != null">
+            AND se.special = #{param2.special}
+        </if>
+
+        ORDER BY se.create_time DESC
     </select>
 
     <select id="selectWithAvgMonth" resultType="org.springblade.wms.pojo.vo.StGoodsExtVO">

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsExtServiceImpl.java

@@ -118,12 +118,18 @@ public class StGoodsExtServiceImpl extends BaseServiceImpl<StGoodsExtMapper, StG
 		}
 	}
 
+//	@Override
+//	public List<StGoodsExtExcel> exportStGoodsExt(Wrapper<StGoodsExt> queryWrapper) {
+//		List<StGoodsExtExcel> stGoodsExtList = baseMapper.exportStGoodsExt(queryWrapper);
+//		//stGoodsExtList.forEach(stGoodsExt -> {
+//		//	stGoodsExt.setTypeName(DictCache.getValue(DictEnum.YES_NO, StGoodsExt.getType()));
+//		//});
+//		return stGoodsExtList;
+//	}
+
 	@Override
-	public List<StGoodsExtExcel> exportStGoodsExt(Wrapper<StGoodsExt> queryWrapper) {
+	public List<StGoodsExtExcel> exportStGoodsExt(Map<String, Object> stGoodsExt) {
-		List<StGoodsExtExcel> stGoodsExtList = baseMapper.exportStGoodsExt(queryWrapper);
+		List<StGoodsExtExcel> stGoodsExtList = baseMapper.exportStGoodsExt(stGoodsExt);
-		//stGoodsExtList.forEach(stGoodsExt -> {
-		//	stGoodsExt.setTypeName(DictCache.getValue(DictEnum.YES_NO, StGoodsExt.getType()));
-		//});
 		return stGoodsExtList;
 	}