Merge remote-tracking branch 'origin/dev' into dev

blade-service/blade-los/src/main/java/org/springblade/los/box/service/impl/PutBoxServiceImpl.java

@@ -3661,11 +3661,11 @@ public class PutBoxServiceImpl extends ServiceImpl<PutBoxMapper, PutBox> impleme
 			if (billsHYJKList.isEmpty()) {
 				throw new RuntimeException("未查到海运出口单据");
 			}
-			for (Bills item : billsHYJKList) {
+/*			for (Bills item : billsHYJKList) {
 				if (ObjectUtils.isNotNull(item.getEtd()) && new Date().compareTo(item.getEtd()) > 0) {
 					throw new RuntimeException("提单号：" + item.getMblno() + "已开船，修改失败");
 				}
-			}
+			}*/
 			List<Long> idHYJKList = billsHYJKList.stream().map(Bills::getMasterId).distinct().collect(Collectors.toList());
 			List<Bills> billsHYJKListFD = billsMapper.selectList(new LambdaQueryWrapper<Bills>()
 				.eq(Bills::getTenantId, AuthUtil.getTenantId())
@@ -3721,11 +3721,11 @@ public class PutBoxServiceImpl extends ServiceImpl<PutBoxMapper, PutBox> impleme
 			if (billsHYJKList.isEmpty()) {
 				throw new RuntimeException("未查到海运出口单据");
 			}
-			for (Bills item : billsHYJKList) {
+/*			for (Bills item : billsHYJKList) {
 				if (new Date().compareTo(item.getEtd()) > 0) {
 					throw new RuntimeException("提单号：" + item.getMblno() + "已开船，修改失败");
 				}
-			}
+			}*/
 			List<Long> idHYJKList = billsHYJKList.stream().map(Bills::getMasterId).distinct().collect(Collectors.toList());
 			List<Bills> billsHYJKListFD = billsMapper.selectList(new LambdaQueryWrapper<Bills>()
 				.eq(Bills::getTenantId, AuthUtil.getTenantId())

blade-service/blade-los/src/main/java/org/springblade/los/box/service/impl/TradingBoxServiceImpl.java

@@ -2535,11 +2535,11 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				.eq(Bills::getIsDeleted, 0)
 				.in(Bills::getMblno, mblno));
 			if (!billsList.isEmpty()) {
-				for (Bills item : billsList) {
+/*				for (Bills item : billsList) {
 					if (new Date().compareTo(item.getEtd()) > 0) {
 						throw new RuntimeException("提单号：" + item.getMblno() + "已开船，修改失败");
 					}
-				}
+				}*/
 				List<Containers> containersList = containersService.list(new LambdaQueryWrapper<Containers>()
 					.eq(Containers::getTenantId, AuthUtil.getTenantId())
 					.eq(Containers::getIsDeleted, 0)