From e414b7782bbb66b58d5dc74e7bdbbb74831cd574 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Fri, 24 Jan 2025 13:37:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=9F=E4=BA=A7=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=B0=8F=E6=9D=BF=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=BC=80?= =?UTF-8?q?=E6=96=99=E7=8A=B6=E6=80=81=E9=80=BB=E8=BE=91=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/optimizeplan/OptimizePlanServiceImpl.java | 4 ++++ .../imes/module/executor/service/plate/PlateServiceImpl.java | 5 +++-- .../src/main/resources/mapper/goods/GoodsMapper.xml | 5 +++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java index cade3a28a..861dc3866 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java @@ -1473,6 +1473,10 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { OptimizeBoardModelDO optimizeBoardModelDO, Date date) { + remainBoardInfos.forEach(f->{ + f.setPlaceBoardJSON(toJsonString(f.getPlaceBoardList())); + }); + Map updateData = new HashMap<>(); updateData.put("cutedBoardNumber", optimizeBoardModelDO.getCutedBoardNumber()); updateData.put("cutedBlockNumber", optimizeBoardModelDO.getCutedBlockNumber()); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java index 5356aabaf..a9cfef378 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java @@ -208,8 +208,9 @@ public class PlateServiceImpl implements PlateService { // 删除添加自增板时新增的大板ID List plateId = goodsMapper.selectInsertGoodsIds(orderIds, goodsIds, getUserOrganId()); - if(CollUtil.isEmpty(plateId)){ - goodsMapper.deleteBatchIds(goodsIds); + + if(CollUtil.isNotEmpty(plateId)){ + goodsMapper.deleteBatchIds(plateId); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml index 4d83ad997..826b1665b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml @@ -533,7 +533,7 @@ select distinct - op.id + og.id from order_goods og left join order_plate op on og.organ_id = op.organ_id and og.order_id = op.order_id and og.id = op.goods_id where og.organ_id = #{organId} @@ -548,7 +548,8 @@ #{goodsIds} - and og.raw_goods_id = '0'; + and og.raw_goods_id = '0' + and op.id is null;