From 348e2f0d76e47431cfd9e13c37bfd97e5441637b Mon Sep 17 00:00:00 2001 From: wusiyu <2015098864@qq.com> Date: Fri, 26 Jun 2026 14:33:44 +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 --- .../StOtherReceiptRecordController.java | 7 +- .../StOtherReceiptRecordEntityExcel.java | 141 ++++++++++++++++++ .../springblade/wms/mapper/StGoodsMapper.xml | 1 + .../mapper/StOtherReceiptRecordMapper.java | 8 +- .../wms/mapper/StOtherReceiptRecordMapper.xml | 78 +++++++++- .../service/IStOtherReceiptRecordService.java | 7 +- .../impl/StOtherReceiptRecordServiceImpl.java | 8 +- 7 files changed, 234 insertions(+), 16 deletions(-) create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StOtherReceiptRecordEntityExcel.java diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherReceiptRecordController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherReceiptRecordController.java index 73c4c2258..eae195326 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherReceiptRecordController.java +++ b/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 stOtherReceiptRecord, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(stOtherReceiptRecord, StOtherReceiptRecord.class); +// QueryWrapper 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 list = stOtherReceiptRecordService.exportStOtherReceiptRecord(queryWrapper); - ExcelUtil.export(response, "其他入库表数据" + DateUtil.time(), "其他入库表数据表", list, StOtherReceiptRecordExcel.class); + List list = stOtherReceiptRecordService.exportStOtherReceiptRecord(stOtherReceiptRecord); + ExcelUtil.export(response, "其他入库表数据" + DateUtil.time(), "其他入库表数据表", list, StOtherReceiptRecordEntityExcel.class); } } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StOtherReceiptRecordEntityExcel.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StOtherReceiptRecordEntityExcel.java new file mode 100644 index 000000000..00fd14f2f --- /dev/null +++ b/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; + +} + 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 58d458e5b..bc14bc9cd 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 @@ -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 + 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 + + + + AND t2.sir_code LIKE CONCAT(CONCAT('%', #{stOtherReceiptRecord.sirCode}), '%') + + + + + AND t1.create_time >= TO_DATE(#{stOtherReceiptRecord.startCreateTime}, 'yyyy-mm-dd hh24:mi:ss') + + + AND t1.create_time <= TO_DATE(#{stOtherReceiptRecord.endCreateTime}, 'yyyy-mm-dd hh24:mi:ss') + 1 - 1/86400 + + + + + AND t4.sh_name = #{stOtherReceiptRecord.shName} + + + + + AND u.name LIKE '%' || #{stOtherReceiptRecord.userName} || '%' + + + + + AND t1.warehousing_reason = #{stOtherReceiptRecord.warehousingReason} + + + + + AND t3.goods_code LIKE CONCAT(CONCAT('%', #{stOtherReceiptRecord.goodsCode}), '%') + + ORDER BY t1.create_time DESC, t2.sir_code DESC