From 9f1f07649d02b4c1a0fafd6f4d804c90cd335916 Mon Sep 17 00:00:00 2001 From: jason Date: Thu, 17 Jul 2025 11:29:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=B9=E5=99=A8=E7=BB=91=E5=AE=9A=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E6=89=AB=E6=8F=8F=E5=AE=B9=E5=99=A8=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E6=98=8E=E7=BB=86=E6=95=B0=E9=87=8F=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8F=98=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/busi/MesContainerSnBindServiceImpl.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesContainerSnBindServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesContainerSnBindServiceImpl.java index 8752bc1..2414bf2 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesContainerSnBindServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesContainerSnBindServiceImpl.java @@ -20,6 +20,7 @@ import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.repository.*; import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -240,20 +241,25 @@ public class MesContainerSnBindServiceImpl implements IMesContainerSnBindService new String[]{MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.IS_DELETED, MesPcnExtConstWords.IS_VALID, "containerSn"}, new Object[]{model.getOrganizeCode(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), containerSn.getContainerSn()}); if (containerPackage != null) { + List newPackageDetails = new ArrayList<>(); List packageDetails = containerPackageDetailRDao.findByProperty( new String[]{MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.IS_DELETED, MesPcnExtConstWords.IS_VALID, "pid", "snStatus"}, new Object[]{model.getOrganizeCode(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), containerPackage.getId(), MesExtEnumUtil.CONTAINER_BARCODE_STATUS.STATUS_10.getValue()}); for (MesContainerPackageDetail detail : packageDetails) { - if (detail.getQty() == null) { - detail.setQty(0.0); + MesContainerPackageDetail newDetail = new MesContainerPackageDetail(); + BeanUtils.copyProperties(detail, newDetail); + + if (newDetail.getQty() == null) { + newDetail.setQty(0.0); } MesContainerPackageDetailFeeding feeding = packageDetailFeedingRDao.getByProperty(new String[]{MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.IS_DELETED, MesPcnExtConstWords.IS_VALID, "pid", "sourceId"}, new Object[]{model.getOrganizeCode(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), detail.getPid(), detail.getId()}); if (feeding != null && feeding.getQty() != null) { - detail.setQty(detail.getQty() - feeding.getQty()); + newDetail.setQty(newDetail.getQty() - feeding.getQty()); } + newPackageDetails.add(newDetail); } - model.setPackageDetails(packageDetails); + model.setPackageDetails(newPackageDetails); } model.setContainerPackage(containerPackage);