From 3b0c30d5918f1b50b3eb1a92b17124d5087e4a75 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期五, 10 五月 2024 16:29:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java index ca5df21..d139f5f 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java @@ -274,14 +274,8 @@ public boolean updateDownStorageCageDetails(int downStorageCageId,DownStorageCageDetails downStorageCageDetails){ DownStorageCage downItem=baseMapper.selectById(downStorageCageId); log.info("姝e父"+downItem); - DownStorageCageDetails edgDItem=downStorageCageDetailsMapper.selectById(downStorageCageDetails.getId()); - if (downItem!=null){ - //绉婚櫎 - DownStorageCageDetails result=downStorageCageDetailsMapper.selectOne(new MPJLambdaWrapper<DownStorageCageDetails>().eq(DownStorageCageDetails::getSlot,downStorageCageId)); - if (result!=null){ - result.setSlot(0); - downStorageCageDetailsMapper.updateById(result); - } + if(downStorageCageDetails !=null){ + DownStorageCageDetails edgDItem=downStorageCageDetailsMapper.selectById(downStorageCageDetails.getId()); //娣诲姞 if(edgDItem!=null){ //鍙紶鏍煎瓙 锛氱Щ闄ょ幓鐠� @@ -290,6 +284,16 @@ downStorageCageDetailsMapper.updateById(newresult); } } + + if (downItem!=null){ + //绉婚櫎 + DownStorageCageDetails result=downStorageCageDetailsMapper.selectOne(new MPJLambdaWrapper<DownStorageCageDetails>().eq(DownStorageCageDetails::getSlot,downStorageCageId)); + if (result!=null){ + result.setSlot(0); + downStorageCageDetailsMapper.updateById(result); + } + + } return true; } -- Gitblit v1.8.0