From 4a18016acb2eabc02f59a88424cab9294122746f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Tue, 16 Jun 2026 14:12:20 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E6=B4=BE?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E8=AE=A2=E5=8D=95=E5=AE=9A=E6=97=B6=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=88=86=E6=B4=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/order/service/impl/YieldOrderServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java index 36e01a0a6..df13230e9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java @@ -386,7 +386,6 @@ public class YieldOrderServiceImpl extends BaseServiceImpl Date: Tue, 16 Jun 2026 14:51:36 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/wms/pojo/entity/StRealtimeStock.java | 3 ++- .../org/springblade/wms/controller/StGoodsController.java | 6 ++++++ .../wms/service/impl/StOtherOutRecordServiceImpl.java | 6 +++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StRealtimeStock.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StRealtimeStock.java index 9c9bc195f..e61a8af91 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StRealtimeStock.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StRealtimeStock.java @@ -203,7 +203,8 @@ public class StRealtimeStock extends TenantEntity { @TableField(exist = false) private Long outRecordId; - + @Schema(description = "领料人ID") + private Long picker; } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java index 6869a9335..7812b88e3 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java @@ -1,5 +1,6 @@ package org.springblade.wms.controller; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; @@ -69,6 +70,11 @@ public class StGoodsController extends BladeController { QueryWrapper wrapper = Condition.getQueryWrapper(stGoods, StGoods.class); wrapper.eq("is_deleted", 0) .orderByDesc("create_time"); + + String goodsCodeAndGoodsName = StrUtil.toString(stGoods.get("goodsCodeAndGoodsName")); + if (StrUtil.isNotBlank(goodsCodeAndGoodsName)) { + wrapper.and(w -> w.like("goods_code", goodsCodeAndGoodsName).or().like("goods_name", goodsCodeAndGoodsName)); + } IPage pages = stGoodsService.page(Condition.getPage(query), wrapper); return R.data(StGoodsWrapper.build().pageVO(pages)); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java index 1c9a51bfa..6a259f087 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java @@ -1,5 +1,6 @@ package org.springblade.wms.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import jakarta.annotation.Resource; @@ -254,6 +255,9 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl Date: Tue, 16 Jun 2026 15:41:22 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oem/pojo/excel/OemStatementExcel.java | 38 ++++++++++++++++++- .../desk/oem/mapper/OemStatementMapper.xml | 9 +++++ 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/excel/OemStatementExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/excel/OemStatementExcel.java index 63967da11..f4bf475e5 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/excel/OemStatementExcel.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/excel/OemStatementExcel.java @@ -9,8 +9,6 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; /** @@ -121,4 +119,40 @@ public class OemStatementExcel implements Serializable { @ExcelProperty("结算状态") private String rosStatusName; + @ColumnWidth(20) + @ExcelProperty("异常原因") + private String memo; + + @ColumnWidth(20) + @ExcelProperty("报价单号") + private String quotation; + + @ColumnWidth(20) + @ExcelProperty("计量单位") + private String unit; + + @ColumnWidth(20) + @ExcelProperty("结算单价") + private BigDecimal unitPrice; + + @ColumnWidth(20) + @ExcelProperty("结算金额") + private BigDecimal totalPrice; + + @ColumnWidth(20) + @ExcelProperty("结算时间") + private String settleDate; + + @ColumnWidth(20) + @ExcelProperty("审核时间") + private String approvalDate; + + @ColumnWidth(20) + @ExcelProperty("推送时间") + private String pushDate; + + @ColumnWidth(20) + @ExcelProperty("结算单号") + private String statementNo; + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml index 9a0970ffe..fceb4391e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml @@ -130,6 +130,15 @@ + + + + + + + + + + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorehouseMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorehouseMapper.xml index e4457a920..14473dda9 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorehouseMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorehouseMapper.xml @@ -40,6 +40,21 @@ + + AND EXISTS ( + SELECT 1 + FROM st_realtime_stock r + JOIN st_goods g ON r.goods_id = g.id + WHERE r.sh_id = t.id + AND r.is_deleted = 0 + AND g.is_deleted = 0 + AND ( + g.goods_code LIKE '%' || #{stStorehouse.goodsCodeAndGoodsName} || '%' + OR g.goods_name LIKE '%' || #{stStorehouse.goodsCodeAndGoodsName} || '%' + ) + ) + + AND EXISTS ( SELECT 1