From 90d1e52de8bcb1a31b61153016222824ac29257a Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 1 Aug 2024 11:06:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E6=AC=A1=E6=9B=B4=E6=96=B0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/plan/service/impl/ProOrderWorkorderServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index 1377de7a..e058e4f7 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -1191,7 +1191,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { return count; } @Override - @Transactional(rollbackFor = Exception.class) + //@Transactional(rollbackFor = Exception.class) @DS("#header.poolName") public int updateWorkOrderBatch(ProOrderWorkorderBatch proOrderWorkorderBatch) { String workOrderCode = proOrderWorkorderBatch.getWorkorderCode(); @@ -1218,10 +1218,10 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { if(proOrderWorkorderBatch.getNewBatchQuantity() != null){ Long newBatchQuantity = proOrderWorkorderBatch.getNewBatchQuantity(); - if(m==0 || m== workOrders.size()-1){ - // 设置子工单数量 + if(m==0){ batch.setNewBatchQuantity(newBatchQuantity); }else{ + // 设置子工单数量 batch.setNewBatchQuantity(workOrders.get(m-1).getUmrez() .multiply(new BigDecimal(newBatchQuantity)).longValue()); }