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<StIvtIostorinvdtlM
 
         this.updateById(dtlDao);
 
-        // 更新此木箱中所有的明细状态
-        this.update(
-                new UpdateWrapper<StIvtIostorinvdtl>().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<StIvtIostorinvdtl>().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 101e06597..7b314defd 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
@@ -91,6 +91,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);
@@ -133,7 +139,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","");