仓库导出修改

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

@@ -195,12 +195,12 @@ public class StErpWarehouseTransferController extends BladeController {
 	@ApiLog("导出数据")
 	@Operation(summary = "导出数据", description  = "传入stErpWarehouseTransfer")
 	public void exportStErpWarehouseTransfer(@Parameter(hidden = true) @RequestParam Map<String, Object> stErpWarehouseTransfer, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<StErpWarehouseTransfer> queryWrapper = Condition.getQueryWrapper(stErpWarehouseTransfer, StErpWarehouseTransfer.class);
+//		QueryWrapper<StErpWarehouseTransfer> queryWrapper = Condition.getQueryWrapper(stErpWarehouseTransfer, StErpWarehouseTransfer.class);
 		//if (!AuthUtil.isAdministrator()) {
 		//	queryWrapper.lambda().eq(StErpWarehouseTransfer::getTenantId, bladeUser.getTenantId());
 		//}
 		//queryWrapper.lambda().eq(StErpWarehouseTransferEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<StErpWarehouseTransferExcel> list = stErpWarehouseTransferService.exportStErpWarehouseTransfer(queryWrapper);
+		List<StErpWarehouseTransferExcel> list = stErpWarehouseTransferService.exportStErpWarehouseTransfer(stErpWarehouseTransfer);
 		ExcelUtil.export(response, "ERP库转移记录表数据" + DateUtil.time(), "ERP库转移记录表数据表", list, StErpWarehouseTransferExcel.class);
 	}
 

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

@@ -28,30 +28,6 @@ public class StErpWarehouseTransferExcel 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;
-	/**
-	 * 物料编号（关联st_goods表主键）
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("物料编号（关联st_goods表主键）")
-	private Long goodsId;
 	/**
 	 * 出库单号
 	 */
@@ -59,95 +35,95 @@ public class StErpWarehouseTransferExcel implements Serializable {
 	@ExcelProperty("出库单号")
 	private String outCode;
 	/**
-	 * 出库数量
+	 * 材料编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("出库数量")
-	private Double outQuantity;
+	@ExcelProperty("材料编号")
+	private String goodsCode;
 	/**
-	 * 出库仓库
+	 * 出库数量
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("出库仓库")
-	private String outWarehouse;
+	@ExcelProperty("出库数量")
+	private Double outQuantity;
 	/**
-	 * 库房库位
+	 * 出库人
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("库房库位")
-	private String outLocation;
+	@ExcelProperty("出库人")
+	private String checkUser;
 	/**
-	 * 检验编号
+	 * 入库数量
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("检验编号")
-	private String checkCode;
+	@ExcelProperty("入库数量")
+	private Double putQuantity;
 	/**
-	 * 批次号
+	 * 入库仓库
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("批次号")
-	private String batchCode;
+	@ExcelProperty("入库仓库")
+	private String shName;
 	/**
-	 * 单价
+	 * 入库库位
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("单价")
-	private Double unitPrice;
+	@ExcelProperty("入库库位")
+	private String location;
 	/**
-	 * 出库人
+	 * 材料名称
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("出库人")
-	private String checkUser;
+	@ExcelProperty("材料名称")
+	private String goodsName;
 	/**
-	 * 入库数量
+	 * 物料规格
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("入库数量")
-	private Double putQuantity;
+	@ExcelProperty("物料规格")
+	private String specifications;
 	/**
-	 * 质量等级
+	 * 型号/牌号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("质量等级")
-	private String quantityLevel;
+	@ExcelProperty("型号/牌号")
+	private String materialModel;
 	/**
-	 * 报废日期
+	 * 单位
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("报废日期")
-	private Date scrapCycle;
+	@ExcelProperty("单位")
+	private String unitName;
 	/**
-	 * erp入库日期
+	 * 批次号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("erp入库日期")
-	private Date warehousingDate;
+	@ExcelProperty("批次号")
+	private String batchCode;
 	/**
-	 * 条码号
+	 * 炉批号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("条码号")
-	private String barCode;
+	@ExcelProperty("炉批号")
+	private String prtWoCode;
 	/**
-	 * 分厂id，热表102，模塑5
+	 * 单价
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("分厂id，热表102，模塑5")
-	private Long deptId;
+	@ExcelProperty("单价")
+	private Double unitPrice;
 	/**
-	 * 炉批号
+	 * 检验编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("炉批号")
-	private String prtWoCode;
+	@ExcelProperty("检验编号")
+	private String checkCode;
 	/**
-	 * 供方代码
+	 * 到期日期
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("供方代码")
-	private String splyCode;
+	@ExcelProperty("到期日期")
+	private Date scrapCycle;
 
 }
 

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

@@ -1,6 +1,5 @@
 package org.springblade.wms.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
@@ -9,6 +8,7 @@ import org.springblade.wms.pojo.entity.StErpWarehouseTransfer;
 import org.springblade.wms.pojo.vo.StErpWarehouseTransferVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @version 1.0
@@ -30,6 +30,8 @@ public interface StErpWarehouseTransferMapper extends BaseMapper<StErpWarehouseT
 	 */
 	List<StErpWarehouseTransferVO> selectStErpWarehouseTransferPage(IPage page, StErpWarehouseTransferVO stErpWarehouseTransfer);
 
+	List<StErpWarehouseTransferExcel> exportStErpWarehouseTransfer(@Param("stErpWarehouseTransfer") Map<String, Object> stErpWarehouseTransfer);
+
 
 	/**
 	 * 获取导出数据
@@ -37,7 +39,7 @@ public interface StErpWarehouseTransferMapper extends BaseMapper<StErpWarehouseT
 	 * @param queryWrapper 查询条件
 	 * @return List<StErpWarehouseTransferExcel>
 	 */
-	List<StErpWarehouseTransferExcel> exportStErpWarehouseTransfer(@Param("ew") Wrapper<StErpWarehouseTransfer> queryWrapper);
+//	List<StErpWarehouseTransferExcel> exportStErpWarehouseTransfer(@Param("ew") Wrapper<StErpWarehouseTransfer> queryWrapper);
 
 }
 

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

@@ -96,7 +96,50 @@
 
 
     <select id="exportStErpWarehouseTransfer" resultType="org.springblade.wms.excel.StErpWarehouseTransferExcel">
-        SELECT * FROM ST_ERP_WAREHOUSE_TRANSFER ${ew.customSqlSegment}
+        SELECT
+        transfer.*,
+        -- 关联ST_GOODS物料表：补充原表没有的物料相关字段
+        g.goods_code ,       -- 材料编号（物料表编码）
+        g.goods_name ,       -- 材料名称（物料表名称）
+        g.specifications ,   -- 物料规格（物料表规格）
+        g.material_model ,           -- 型号/牌号（物料表型号）
+        g.unit_name,                -- 单位（物料表计量单位）
+        s.sh_id,
+        s.sh_name,
+        s.id AS slId,
+        s.location,
+        (transfer.out_quantity - transfer.put_quantity) AS remainQuantity
+        FROM st_erp_warehouse_transfer transfer
+        -- 左关联物料表：保证无物料ID时，转移记录仍能查询
+        LEFT JOIN st_goods g ON transfer.goods_id = g.id AND g.is_deleted = 0
+        <where>
+            (transfer.out_quantity - transfer.put_quantity) > 0
+            <!-- 1. 出库单号：原表outCode模糊查询 -->
+            <if test="stErpWarehouseTransfer.outCode != null and stErpWarehouseTransfer.outCode != ''">
+                AND transfer.out_code LIKE '%' || #{stErpWarehouseTransfer.outCode} || '%'
+            </if>
+
+            <!-- 2. 材料编号：关联物料表goods_code模糊查询 -->
+            <if test="stErpWarehouseTransfer.goodsCode != null and stErpWarehouseTransfer.goodsCode != ''">
+                AND g.goods_code LIKE '%' || #{stErpWarehouseTransfer.goodsCode} || '%'
+            </if>
+
+            <!-- 3. 材料名称：关联物料表goods_name模糊查询 -->
+            <if test="stErpWarehouseTransfer.goodsName != null and stErpWarehouseTransfer.goodsName != ''">
+                AND g.goods_name LIKE '%' || #{stErpWarehouseTransfer.goodsName} || '%'
+            </if>
+
+            <!-- 4. 批次号：原表batchCode模糊查询 -->
+            <if test="stErpWarehouseTransfer.batchCode != null and stErpWarehouseTransfer.batchCode != ''">
+                AND transfer.batch_code LIKE '%' || #{stErpWarehouseTransfer.batchCode} || '%'
+            </if>
+
+            <!-- 5. 检验编号：原表checkCode模糊查询 -->
+            <if test="stErpWarehouseTransfer.checkCode != null and stErpWarehouseTransfer.checkCode != ''">
+                AND transfer.check_code LIKE '%' || #{stErpWarehouseTransfer.checkCode} || '%'
+            </if>
+        </where>
+        ORDER BY transfer.create_time DESC
     </select>
 
 </mapper>

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

@@ -2,6 +2,7 @@ package org.springblade.wms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.wms.excel.StRequisitionExcel;
 import org.springblade.wms.pojo.entity.StRequisition;
 import org.springblade.wms.pojo.vo.StRequisitionVO;
@@ -40,5 +41,5 @@ public interface StRequisitionMapper extends BaseMapper<StRequisition> {
 
 	List<StRequisitionVO> selectWaitPushPage(IPage<StRequisitionVO> page, StRequisitionVO stRequisition);
 
-	List<StRequisitionExcel> exportStRequisition(Map<String, Object> stRequisition);
+	List<StRequisitionExcel> exportStRequisition(@Param("stRequisition") Map<String, Object> stRequisition);
 }

blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStErpWarehouseTransferService.java

@@ -1,6 +1,5 @@
 package org.springblade.wms.service;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.secure.BladeUser;
@@ -9,6 +8,7 @@ import org.springblade.wms.pojo.entity.StErpWarehouseTransfer;
 import org.springblade.wms.pojo.vo.StErpWarehouseTransferVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @version 1.0
@@ -36,10 +36,12 @@ public interface IStErpWarehouseTransferService extends BaseService<StErpWarehou
 	 * @param queryWrapper 查询条件
 	 * @return List<StErpWarehouseTransferExcel>
 	 */
-	List<StErpWarehouseTransferExcel> exportStErpWarehouseTransfer(Wrapper<StErpWarehouseTransfer> queryWrapper);
+//	List<StErpWarehouseTransferExcel> exportStErpWarehouseTransfer(Wrapper<StErpWarehouseTransfer> queryWrapper);
 
 	void transferReceipt(Long shId, Long slId, Long ewtId, Double putQuantity, BladeUser user);
 
 	void transferReceiptBatch(BladeUser user);
+
+	List<StErpWarehouseTransferExcel> exportStErpWarehouseTransfer(Map<String, Object> stErpWarehouseTransfer);
 }
 

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

@@ -2,7 +2,6 @@ package org.springblade.wms.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.NumberUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -24,6 +23,7 @@ import java.math.BigDecimal;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @version 1.0
@@ -186,11 +186,8 @@ public class StErpWarehouseTransferServiceImpl extends BaseServiceImpl<StErpWare
 	}
 
 	@Override
-	public List<StErpWarehouseTransferExcel> exportStErpWarehouseTransfer(Wrapper<StErpWarehouseTransfer> queryWrapper) {
-		List<StErpWarehouseTransferExcel> stErpWarehouseTransferList = baseMapper.exportStErpWarehouseTransfer(queryWrapper);
-		//stErpWarehouseTransferList.forEach(stErpWarehouseTransfer -> {
-		//	stErpWarehouseTransfer.setTypeName(DictCache.getValue(DictEnum.YES_NO, StErpWarehouseTransfer.getType()));
-		//});
+	public List<StErpWarehouseTransferExcel> exportStErpWarehouseTransfer(Map<String, Object> stErpWarehouseTransfer) {
+		List<StErpWarehouseTransferExcel> stErpWarehouseTransferList = baseMapper.exportStErpWarehouseTransfer(stErpWarehouseTransfer);
 		return stErpWarehouseTransferList;
 	}