From ec90425d5091cbd97b4e8fcd88e28eda23ea4eaa Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 19 Aug 2024 09:46:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E8=AF=86=E5=8D=A1=E7=A0=813?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProOrderWorkorderServiceImpl.java | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 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 41f1b24f..81c5fcf7 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 @@ -1275,33 +1275,22 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { BigDecimal pall = pow.getBatchQuantity(); BigDecimal pn = pow.getPalletNum(); - while(pall.subtract(pn).compareTo(BigDecimal.ZERO)>0){ + while(pall.compareTo(BigDecimal.ZERO)>0){ pw = new ProOrderWorkorder(); pw.setProductName(pow.getProductName()); pw.setWorkorderCode(pow.getWorkorderCode()); pw.setBatchCode(pow.getBatchCode()); pw.setProductDateStr(pow.getProductDateStr()); pw.setRecordId(IdUtils.fastSimpleUUID()); - pw.setBatchQuantity(pn); + if(pall.compareTo(pn)<0) {//最后一托盘 + pw.setBatchQuantity(pall); + } pw.setPalletNo(i++); pw.setPalletCode(pow.getPalletCode()+"-"+pw.getPalletNo()); pw.setCreateTime(nowDate); dtos.add(pw); pall = pall.subtract(pn); } - if(pall.compareTo(pn)<0){//最后一托盘 - pw = new ProOrderWorkorder(); - pw.setProductName(pow.getProductName()); - pw.setWorkorderCode(pow.getWorkorderCode()); - pw.setBatchCode(pow.getBatchCode()); - pw.setProductDateStr(pow.getProductDateStr()); - pw.setRecordId(IdUtils.fastSimpleUUID()); - pw.setBatchQuantity(pall); - pw.setPalletNo(i++); - pw.setPalletCode(pow.getPalletCode()+"-"+pw.getPalletNo()); - pw.setCreateTime(nowDate); - dtos.add(pw); - } } } if(!CollectionUtils.isEmpty(dtos)){