From 0b7f0783e709c326c283d90f818b3d1270444217 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 9 Jul 2024 16:12:59 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=87=BA=E5=BA=93=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/StIvtIostorinvdtlServiceImpl.java | 16 +++++++++------- .../util/impl/LashManageServiceImpl.java | 8 +++++++- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java index 2bcc294ff..0ce9ddbf6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java @@ -305,13 +305,15 @@ public class StIvtIostorinvdtlServiceImpl extends ServiceImpl().lambda() - .set(StIvtIostorinvdtl::getBill_status, dtlDao.getBill_status()) - .eq(StIvtIostorinvdtl::getIostorinv_id, dtlDao.getIostorinv_id()) - .eq(StIvtIostorinvdtl::getBox_no, dtlDao.getBox_no()) - ); + // 更新此木箱中所有的明细状态 (如果此明细的木箱不为空) + if (ObjectUtil.isNotEmpty(dtlDao.getBox_no())) { + this.update( + new UpdateWrapper().lambda() + .set(StIvtIostorinvdtl::getBill_status, dtlDao.getBill_status()) + .eq(StIvtIostorinvdtl::getIostorinv_id, dtlDao.getIostorinv_id()) + .eq(StIvtIostorinvdtl::getBox_no, dtlDao.getBox_no()) + ); + } } /** diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java index 9b20d7b71..61b2eb7e3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java @@ -90,6 +90,12 @@ public class LashManageServiceImpl implements LashManageService { throw new BadRequestException("没有此木箱信息："+whereJson.getString("vehicle_code")); } + // 获取次木箱对应的木箱类型 + MdpbBoxtype boxTypeDao = iMdpbBoxtypeService.getById(boxDao.getMaterial_code()); + if (ObjectUtil.isEmpty(boxTypeDao)) { + throw new BadRequestException("木箱类型不存在!"+boxDao.getMaterial_code()); + } + JSONObject jsonSub = WQLObject.getWQLObject("pdm_bi_subpackagerelation") .query("package_box_sn = '" + boxDao.getBox_no() + "'") .uniqueResult(0); @@ -132,7 +138,7 @@ public class LashManageServiceImpl implements LashManageService { jsonPoint.put("vehicle_qty", NumberUtil.add(jsonPoint.getBigDecimal("vehicle_qty"),1)); - if (jsonPoint.getIntValue("vehicle_qty") == Integer.parseInt(boxDao.getLash_num())) { + if (jsonPoint.getIntValue("vehicle_qty") == Integer.parseInt(boxTypeDao.getLash_num_tow())) { // 相同清空载具以及数量 jsonPoint.put("vehicle_qty",0); jsonPoint.put("vehicle_code","");