仓库导出修改

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

@@ -24,6 +24,7 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.wms.excel.StOtherReceiptRecordEntityExcel;
 import org.springblade.wms.excel.StOtherReceiptRecordExcel;
 import org.springblade.wms.pojo.dto.InitStockDTO;
 import org.springblade.wms.pojo.entity.*;
@@ -400,13 +401,13 @@ public class StOtherReceiptRecordController extends BladeController {
 	@ApiLog("导出数据")
 	@Operation(summary = "导出数据", description = "传入stOtherReceiptRecord")
 	public void exportStOtherReceiptRecord(@Parameter(hidden = true) @RequestParam Map<String, Object> stOtherReceiptRecord, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<StOtherReceiptRecord> queryWrapper = Condition.getQueryWrapper(stOtherReceiptRecord, StOtherReceiptRecord.class);
+//		QueryWrapper<StOtherReceiptRecord> queryWrapper = Condition.getQueryWrapper(stOtherReceiptRecord, StOtherReceiptRecord.class);
 		//if (!AuthUtil.isAdministrator()) {
 		//	queryWrapper.lambda().eq(StOtherReceiptRecord::getTenantId, bladeUser.getTenantId());
 		//}
 		//queryWrapper.lambda().eq(StOtherReceiptRecordEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<StOtherReceiptRecordExcel> list = stOtherReceiptRecordService.exportStOtherReceiptRecord(queryWrapper);
+		List<StOtherReceiptRecordEntityExcel> list = stOtherReceiptRecordService.exportStOtherReceiptRecord(stOtherReceiptRecord);
-		ExcelUtil.export(response, "其他入库表数据" + DateUtil.time(), "其他入库表数据表", list, StOtherReceiptRecordExcel.class);
+		ExcelUtil.export(response, "其他入库表数据" + DateUtil.time(), "其他入库表数据表", list, StOtherReceiptRecordEntityExcel.class);
 	}
 
 }

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

@@ -0,0 +1,141 @@
+package org.springblade.wms.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @version 1.0
+ * @program: jonhon-mes-svr
+ * @ClassName StOtherReceiptRecordExcel
+ * @description: 其他入库表 Excel实体类
+ * @autor: WuSiYu
+ * @create 2026-01-04 15:48
+ **/
+
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class StOtherReceiptRecordEntityExcel implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 出入库单号
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("入库单号")
+    private String sirCode;
+    /**
+     * 物料编码
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("物料编码")
+    private String goodsCode;
+    /**
+     * 物料名称
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("物料名称")
+    private String goodsName;
+    /**
+     * 型号/牌号
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("型号/牌号")
+    private String materialModel;
+    /**
+     * 质量编号
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("质量编号")
+    private String checkCode;
+    /**
+     * 批号
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("批号")
+    private String piNo;
+    /**
+     * 炉批号
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("炉批号")
+    private String stovePiNo;
+    /**
+     * 生产标识
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("生产标识")
+    private String quantityLevel;
+    /**
+     * 到期日期
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("到期日期")
+    private Date scrapCycle;
+    /**
+     * 入库数量
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("入库数量")
+    private Double quantity;
+    /**
+     * 计量单位
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("计量单位")
+    private String unitName;
+    /**
+     * 入库仓库
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("入库仓库")
+    private String shName;
+    /**
+     * 入库库位
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("入库库位")
+    private String location;
+    /**
+     * 单价
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("单价")
+    private Double unitPrice;
+    /**
+     * 金额
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("金额")
+    private Double sirMoney;
+    /**
+     * 入库人
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("入库人")
+    private String userName;
+    /**
+     * 入库时间
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("入库时间")
+    private Date createTime;
+    /**
+     * 入库原因
+     */
+	@ColumnWidth(20)
+	@ExcelProperty("入库原因")
+	private String warehousingReasonName;
+
+}
+

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

@@ -123,6 +123,7 @@
                  LEFT JOIN st_goods_class t3
                            ON t1.gc_id = t3.id
             ${ew.customSqlSegment}
+        ORDER BY t1.create_time DESC
     </select>
 
     <select id="queryByCode" resultMap="stGoodsResultMap">

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

@@ -1,16 +1,16 @@
 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;
 import org.springblade.desk.order.pojo.entity.YieldOrder;
 import org.springblade.desk.produce.pojo.entity.WorkOrder;
-import org.springblade.wms.excel.StOtherReceiptRecordExcel;
+import org.springblade.wms.excel.StOtherReceiptRecordEntityExcel;
 import org.springblade.wms.pojo.entity.StOtherReceiptRecord;
 import org.springblade.wms.pojo.vo.StOtherReceiptRecordVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @version 1.0
@@ -39,7 +39,7 @@ public interface StOtherReceiptRecordMapper extends BaseMapper<StOtherReceiptRec
 	 * @param queryWrapper 查询条件
 	 * @return List<StOtherReceiptRecordExcel>
 	 */
-	List<StOtherReceiptRecordExcel> exportStOtherReceiptRecord(@Param("ew") Wrapper<StOtherReceiptRecord> queryWrapper);
+//	List<StOtherReceiptRecordExcel> exportStOtherReceiptRecord(@Param("ew") Wrapper<StOtherReceiptRecord> queryWrapper);
 
 	List<StOtherReceiptRecord> selectByWoCode(String woCode);
 
@@ -50,5 +50,7 @@ public interface StOtherReceiptRecordMapper extends BaseMapper<StOtherReceiptRec
 	void updateByWoId(Long id, String batchNo);
 
 	void updateByYoId(Long id, String batchNo);
+
+	List<StOtherReceiptRecordEntityExcel> exportStOtherReceiptRecord(@Param("stOtherReceiptRecord") Map<String, Object> stOtherReceiptRecord);
 }
 

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

@@ -106,8 +106,82 @@
           AND part.IS_CLASS_CAKE = '1' -- 筛选玻璃饼类型
     </select>
 
-    <select id="exportStOtherReceiptRecord" resultType="org.springblade.wms.excel.StOtherReceiptRecordExcel">
+    <select id="exportStOtherReceiptRecord" resultType="org.springblade.wms.excel.StOtherReceiptRecordEntityExcel">
-        SELECT * FROM ST_OTHER_RECEIPT_RECORD ${ew.customSqlSegment}
+        SELECT
+        t1.id,
+        t2.sir_code ,
+        t2.goods_id ,
+        t3.goods_code ,
+        t3.goods_name ,
+        t3.material_model ,
+        t6.check_code ,
+        t2.check_no as checkCode,
+        t2.pi_no ,
+        t2.stove_pi_no ,
+        t2.quantity_level ,
+        t2.scrap_cycle ,
+        t2.quantity ,
+        t2.unit_price,
+        t2.in_out_date,
+        t2.in_out_reason,
+        t3.unit_name ,
+        t4.sh_name ,
+        t5.location ,
+        t2.sir_money ,
+        t1.create_user ,
+        u.name as userName,
+        t1.create_time ,
+        CASE t1.warehousing_reason
+        WHEN 1 THEN '余料退库'
+        WHEN 2 THEN '库转移'
+        WHEN 3 THEN '计划取消退库'
+        WHEN 4 THEN '领用入库'
+        WHEN 5 THEN '领用入库'
+        WHEN 7 THEN '玻璃饼入库'
+        ELSE ''
+        END AS warehousingReasonName
+        FROM ST_OTHER_RECEIPT_RECORD t1
+        LEFT JOIN ST_STOCK_INOUT_RECORD t2 ON t1.sir_id = t2.id AND t2.is_deleted = 0 AND t2.in_out_source = 3
+        LEFT JOIN ST_GOODS t3 ON t2.goods_id = t3.id AND t3.used = 1
+        LEFT JOIN ST_STOREHOUSE t4 ON t2.sh_id = t4.id
+        LEFT JOIN ST_STORAGE_LOCATION t5 ON t2.sl_id = t5.id
+        LEFT JOIN ST_REALTIME_STOCK t6 ON t2.rls_id = t6.id
+        LEFT JOIN blade_user u ON t1.create_user = u.id AND u.is_deleted = 0
+        WHERE t1.is_deleted = 0
+
+        <!-- 新增：入库单号（对应t2.sir_code） -->
+        <if test="stOtherReceiptRecord.sirCode != null and stOtherReceiptRecord.sirCode != ''">
+            AND t2.sir_code LIKE CONCAT(CONCAT('%', #{stOtherReceiptRecord.sirCode}), '%')
+        </if>
+
+        <!-- 新增：入库时间范围（对应t1.create_time） -->
+        <if test="stOtherReceiptRecord.startCreateTime != null and stOtherReceiptRecord.startCreateTime != ''">
+            AND t1.create_time &gt;= TO_DATE(#{stOtherReceiptRecord.startCreateTime}, 'yyyy-mm-dd hh24:mi:ss')
+        </if>
+        <if test="stOtherReceiptRecord.endCreateTime != null and stOtherReceiptRecord.endCreateTime != ''">
+            AND t1.create_time &lt;= TO_DATE(#{stOtherReceiptRecord.endCreateTime}, 'yyyy-mm-dd hh24:mi:ss') + 1 - 1/86400
+        </if>
+
+        <!-- 新增：入库仓库（对应t2.sh_id） -->
+        <if test="stOtherReceiptRecord.shName != null">
+            AND t4.sh_name = #{stOtherReceiptRecord.shName}
+        </if>
+
+        <!-- 新增：入库人（对应t1.create_user） -->
+        <if test="stOtherReceiptRecord.userName != null and stOtherReceiptRecord.userName != ''">
+            AND u.name LIKE '%' || #{stOtherReceiptRecord.userName} || '%'
+        </if>
+
+        <!-- 新增：入库原因（对应t1.warehousing_reason） -->
+        <if test="stOtherReceiptRecord.warehousingReason != null and stOtherReceiptRecord.warehousingReason != ''">
+            AND t1.warehousing_reason = #{stOtherReceiptRecord.warehousingReason}
+        </if>
+
+        <!-- 新增：物料编码（对应t3.goods_code） -->
+        <if test="stOtherReceiptRecord.goodsCode != null and stOtherReceiptRecord.goodsCode != ''">
+            AND t3.goods_code LIKE CONCAT(CONCAT('%', #{stOtherReceiptRecord.goodsCode}), '%')
+        </if>
+        ORDER BY t1.create_time DESC, t2.sir_code DESC
     </select>
 
     <select id="getByWoCode" resultType="org.springblade.desk.produce.pojo.entity.WorkOrder">

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

@@ -1,10 +1,9 @@
 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;
-import org.springblade.wms.excel.StOtherReceiptRecordExcel;
+import org.springblade.wms.excel.StOtherReceiptRecordEntityExcel;
 import org.springblade.wms.pojo.dto.InitStockDTO;
 import org.springblade.wms.pojo.entity.StOtherReceiptRecord;
 import org.springblade.wms.pojo.entity.StStockInoutRecord;
@@ -12,6 +11,7 @@ import org.springblade.wms.pojo.vo.StOtherReceiptRecordVO;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @version 1.0
@@ -39,7 +39,7 @@ public interface IStOtherReceiptRecordService extends BaseService<StOtherReceipt
 	 * @param queryWrapper 查询条件
 	 * @return List<StOtherReceiptRecordExcel>
 	 */
-	List<StOtherReceiptRecordExcel> exportStOtherReceiptRecord(Wrapper<StOtherReceiptRecord> queryWrapper);
+//	List<StOtherReceiptRecordExcel> exportStOtherReceiptRecord(Wrapper<StOtherReceiptRecord> queryWrapper);
 
 	void saveImportData(List<InitStockDTO> list, BladeUser user) throws Exception;
 
@@ -49,5 +49,6 @@ public interface IStOtherReceiptRecordService extends BaseService<StOtherReceipt
 
 	void saveSubOrderWarehousing(String woCode, String goodsCode, String batchNo, Double quantity, Long shId, Long slId, Date date, Long userId, String checkNo, String quantityLevel, Date scrapCycle) throws Exception;
 
+	List<StOtherReceiptRecordEntityExcel> exportStOtherReceiptRecord(Map<String, Object> stOtherReceiptRecord);
 }
 

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

@@ -15,6 +15,7 @@ import org.springblade.desk.dashboard.pojo.entity.DsPartEntity;
 import org.springblade.desk.order.pojo.entity.YieldOrder;
 import org.springblade.desk.produce.pojo.entity.WorkOrder;
 import org.springblade.system.feign.IUserClient;
+import org.springblade.wms.excel.StOtherReceiptRecordEntityExcel;
 import org.springblade.wms.excel.StOtherReceiptRecordExcel;
 import org.springblade.wms.mapper.StOtherReceiptRecordMapper;
 import org.springblade.wms.mapper.StStockInoutRecordMapper;
@@ -419,11 +420,8 @@ public class StOtherReceiptRecordServiceImpl extends BaseServiceImpl<StOtherRece
 	}
 
 	@Override
-	public List<StOtherReceiptRecordExcel> exportStOtherReceiptRecord(Wrapper<StOtherReceiptRecord> queryWrapper) {
+	public List<StOtherReceiptRecordEntityExcel> exportStOtherReceiptRecord(Map<String, Object> stOtherReceiptRecord) {
-		List<StOtherReceiptRecordExcel> stOtherReceiptRecordList = baseMapper.exportStOtherReceiptRecord(queryWrapper);
+		List<StOtherReceiptRecordEntityExcel> stOtherReceiptRecordList = baseMapper.exportStOtherReceiptRecord(stOtherReceiptRecord);
-		//stOtherReceiptRecordList.forEach(stOtherReceiptRecord -> {
-		//	stOtherReceiptRecord.setTypeName(DictCache.getValue(DictEnum.YES_NO, StOtherReceiptRecord.getType()));
-		//});
 		return stOtherReceiptRecordList;
 	}