仓库导出修改

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

@@ -188,7 +188,8 @@ public class StAllotRecordController extends BladeController {
 		//	queryWrapper.lambda().eq(StAllotRecord::getTenantId, bladeUser.getTenantId());
 		//}
 		//queryWrapper.lambda().eq(StAllotRecordEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<StAllotRecordExcel> list = stAllotRecordService.exportStAllotRecord(queryWrapper);
+//		List<StAllotRecordExcel> list = stAllotRecordService.exportStAllotRecord(queryWrapper);
+		List<StAllotRecordExcel> list = stAllotRecordService.exportStAllotRecord(stAllotRecord);
 		ExcelUtil.export(response, "库位调拨记录表数据" + DateUtil.time(), "库位调拨记录表数据表", list, StAllotRecordExcel.class);
 	}
 

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

@@ -29,65 +29,59 @@ public class StAllotRecordExcel 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）")
+	@Schema(description = "旧库位号")
-	private Long isDeleted;
+	private String oldWarehouseName;
 	/**
-	 * 物料库存ID（关联st_realtime_stock表主键）
+	 * 旧库位号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("物料库存ID（关联st_realtime_stock表主键）")
+	@ExcelProperty("旧库位号）")
-	private Long rlsId;
+	private String oldLocation;
 	/**
-	 * 旧库房ID
+	 * 新库房号
 	 */
 	@ColumnWidth(20)
-	@Schema(description = "旧库位ID（关联st_storage_location表主键）")
+	@Schema(description = "新库房号")
-	private Long oldShId;
+	private String newWarehouseName;
 	/**
-	 * 旧库位ID（关联st_storage_location表主键）
+	 * 新库位号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("旧库位ID（关联st_storage_location表主键）")
+	@ExcelProperty("新库位号")
-	private Long oldSlId;
+	private String newLocation;
 	/**
-	 * 新库房ID（关联st_storage_location表主键）
+	 * 物料规格
 	 */
 	@ColumnWidth(20)
-	@Schema(description = "新库房ID（关联st_storage_location表主键）")
+	@ExcelProperty("物料规格")
-	private Long newShId;
+	private String specifications;
 	/**
-	 * 新库位ID（关联st_storage_location表主键）
+	 * 批次号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("新库位ID（关联st_storage_location表主键）")
+	@ExcelProperty("批次号")
-	private Long newSlId;
+	private String piNo;
 	/**
-	 * 调拨状态;0：新建；1：完成
+	 * 库存数量
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("调拨状态;0：新建；1：完成")
+	@ExcelProperty("库存数量")
-	private Long curStatus;
+	private Double quantity;
-	/**
-	 * 调拨备注
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("调拨备注")
-	private String memo;
 
 }
 

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StAllotRecordMapper.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.StAllotRecord;
 import org.springblade.wms.pojo.vo.StAllotRecordVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @version 1.0
@@ -38,8 +38,10 @@ public interface StAllotRecordMapper extends BaseMapper<StAllotRecord> {
 	 * @param queryWrapper 查询条件
 	 * @return List<StAllotRecordExcel>
 	 */
-	List<StAllotRecordExcel> exportStAllotRecord(@Param("ew") Wrapper<StAllotRecord> queryWrapper);
+//	List<StAllotRecordExcel> exportStAllotRecord(@Param("ew") Wrapper<StAllotRecord> queryWrapper);
 
     IPage<StAllotRecordVO> selectAllotWithGoods(@Param("page") IPage<StAllotRecord> page, @Param("ew") QueryWrapper<StAllotRecord> wrapper);
+
+	List<StAllotRecordExcel> exportStAllotRecord(Map<String, Object> stAllotRecord);
 }
 

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

@@ -85,7 +85,31 @@
 
 
     <select id="exportStAllotRecord" resultType="org.springblade.wms.excel.StAllotRecordExcel">
-        SELECT * FROM ST_ALLOT_RECORD ${ew.customSqlSegment}
+        SELECT
+        a.*,
+        g.goods_code, g.goods_name, g.specifications,
+        r.pi_no, r.quantity,
+        ow.sh_name AS oldWarehouseName, -- 旧库房名称
+        nw.sh_name AS newWarehouseName, -- 新库房名称
+        ol.location  AS oldLocation,  -- 旧库位号
+        nl.location  AS newLocation   -- 新库位号
+        FROM st_allot_record a
+        LEFT JOIN st_goods g ON a.goods_id = g.id
+        LEFT JOIN st_realtime_stock r ON a.rls_id = r.id
+        LEFT JOIN st_storehouse ow ON a.old_sh_id = ow.id
+        LEFT JOIN st_storehouse nw ON a.new_sh_id = nw.id
+        LEFT JOIN st_storage_location ol ON a.old_sl_id = ol.id
+        LEFT JOIN st_storage_location nl ON a.new_sl_id = nl.id
+        WHERE a.is_deleted = 0
+        <!-- 1. 数据权限：强制过滤【当前用户所属工厂/部门】，必生效 -->
+        AND a.create_dept = #{param2.createDept}
+        <!-- 2. 调拨单状态：前端传了用传的，没传用默认值NEW_BUILT，必生效 -->
+        AND a.cur_status = #{param2.curStatus}
+        <!-- 3. 商品编码：可选条件，传了就过滤，没传不生效（模糊查询，业务常用） -->
+        <if test="param2.goodsCode != null and param2.goodsCode != ''">
+            AND g.goods_code = #{param2.goodsCode}
+        </if>
+        ORDER BY a.create_time DESC
     </select>
 
 </mapper>

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

@@ -1,6 +1,5 @@
 package org.springblade.wms.service;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
@@ -9,6 +8,7 @@ import org.springblade.wms.pojo.entity.StAllotRecord;
 import org.springblade.wms.pojo.vo.StAllotRecordVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @version 1.0
@@ -36,12 +36,14 @@ public interface IStAllotRecordService extends BaseService<StAllotRecord> {
 	 * @param queryWrapper 查询条件
 	 * @return List<StAllotRecordExcel>
 	 */
-	List<StAllotRecordExcel> exportStAllotRecord(Wrapper<StAllotRecord> queryWrapper);
+//	List<StAllotRecordExcel> exportStAllotRecord(Wrapper<StAllotRecord> queryWrapper);
 
 	boolean add(StAllotRecord stAllotRecord);
 
 	boolean batchAdd(List<StAllotRecord> stAllotRecordList);
 
 	IPage<StAllotRecordVO> selectAllotWithGoods(IPage<StAllotRecord> page, QueryWrapper<StAllotRecord> wrapper);
+
+	List<StAllotRecordExcel> exportStAllotRecord(Map<String, Object> stAllotRecord);
 }
 

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

@@ -1,6 +1,5 @@
 package org.springblade.wms.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import jakarta.annotation.Resource;
@@ -20,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @version 1.0
@@ -117,12 +117,18 @@ public class StAllotRecordServiceImpl extends BaseServiceImpl<StAllotRecordMappe
 	}
 
 
+//	@Override
+//	public List<StAllotRecordExcel> exportStAllotRecord(Wrapper<StAllotRecord> queryWrapper) {
+//		List<StAllotRecordExcel> stAllotRecordList = baseMapper.exportStAllotRecord(queryWrapper);
+//		//stAllotRecordList.forEach(stAllotRecord -> {
+//		//	stAllotRecord.setTypeName(DictCache.getValue(DictEnum.YES_NO, StAllotRecord.getType()));
+//		//});
+//		return stAllotRecordList;
+//	}
+
 	@Override
-	public List<StAllotRecordExcel> exportStAllotRecord(Wrapper<StAllotRecord> queryWrapper) {
+	public List<StAllotRecordExcel> exportStAllotRecord(Map<String, Object> stAllotRecord) {
-		List<StAllotRecordExcel> stAllotRecordList = baseMapper.exportStAllotRecord(queryWrapper);
+		List<StAllotRecordExcel> stAllotRecordList = baseMapper.exportStAllotRecord(stAllotRecord);
-		//stAllotRecordList.forEach(stAllotRecord -> {
-		//	stAllotRecord.setTypeName(DictCache.getValue(DictEnum.YES_NO, StAllotRecord.getType()));
-		//});
 		return stAllotRecordList;
 	}
 }