From 0424de106fc20c2ff8b18f82646adf807c506b5a Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Sat, 16 May 2026 17:22:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PlateGoodsApplyServiceImpl.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java index f98f336a4..d5d84dbcf 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java @@ -13,13 +13,11 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.order.mapper.PlateGoodsApplyMapper; import org.springblade.desk.order.pojo.entity.AssayContentDetail; import org.springblade.desk.order.pojo.entity.PlateGoodsApply; +import org.springblade.desk.order.pojo.entity.PlateGoodsApplyDetail; import org.springblade.desk.order.pojo.entity.PlateGoodsRecord; import org.springblade.desk.order.pojo.enums.AssayContentEnum; import org.springblade.desk.order.pojo.enums.PlateGoodsEnum; -import org.springblade.desk.order.service.IAssayContentDetailService; -import org.springblade.desk.order.service.IAssayContentService; -import org.springblade.desk.order.service.IPlateGoodsApplyService; -import org.springblade.desk.order.service.IPlateGoodsRecordService; +import org.springblade.desk.order.service.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -40,6 +38,7 @@ public class PlateGoodsApplyServiceImpl extends BaseServiceImpl selectPage(IPage page, PlateGoodsApply entity) { @@ -176,6 +175,17 @@ public class PlateGoodsApplyServiceImpl extends BaseServiceImpl goodsApplyDetailList = new ArrayList<>(); + for (PlateGoodsRecord goodsRecord : addRecordList) { + PlateGoodsApplyDetail plateGoodsApplyDetail = new PlateGoodsApplyDetail(); + plateGoodsApplyDetail.setPgaId(apply.getId()); + plateGoodsApplyDetail.setPgrId(goodsRecord.getId()); + goodsApplyDetailList.add(plateGoodsApplyDetail); + } + goodsApplyDetailService.saveBatch(goodsApplyDetailList); + return true; } From 530e8a92c12d6a4de97708f2eb68e149ab20490c Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Sat, 16 May 2026 18:02:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=82=B2=E8=A7=82?= =?UTF-8?q?=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/order/service/impl/YieldOrderServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 56462ee48..c0179a328 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 @@ -1416,8 +1416,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl wrapper = Wrappers.lambdaQuery(YieldOrder.class) .likeRight(YieldOrder::getYoCode, codePattern) - .orderBy(true, false, YieldOrder::getYoCode) - .last("FOR UPDATE"); + .orderBy(true, false, YieldOrder::getYoCode); List list = baseMapper.selectList(wrapper);