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

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -1454,6 +1454,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				}
 				containersCommodityService.saveBatch(containersCommodityListNew);
 			}
+/*
 			List<ContainersBills> containersBillsList = containersBillsService.list(new LambdaQueryWrapper<ContainersBills>()
 				.eq(ContainersBills::getTenantId, AuthUtil.getTenantId())
 				.eq(ContainersBills::getIsDeleted, 0)
@@ -1479,6 +1480,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				}
 				containersBillsService.saveBatch(containersBillsListNew);
 			}
+*/
 		} /*else {
 			if (status) {
 				throw new RuntimeException("分单号：" + billsList.stream().map(Bills::getHblno).collect(Collectors.joining(","))

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/ContainersServiceImpl.java

@@ -497,6 +497,7 @@ public class ContainersServiceImpl extends ServiceImpl<ContainersMapper, Contain
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public R submitList(List<Containers> list) {
+		BigDecimal quantity;
 		String deptId = AuthUtil.getDeptId();
 		String deptName = "";
 		String branchId = AuthUtil.getDeptId();
@@ -509,16 +510,19 @@ public class ContainersServiceImpl extends ServiceImpl<ContainersMapper, Contain
 //		List<ContainersBills> subtractContainersBillsList = new ArrayList<>();
 		List<ContainersCommodity> containersCommodityList = new ArrayList<>();
 		Bills bills = billsMapper.selectById(list.get(0).getPid());
-		bills.setQuantity(list.stream().map(Containers::getQuantity).filter(ObjectUtils::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-		bills.setGrossWeight(list.stream().map(Containers::getGrossWeight).filter(ObjectUtils::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-		bills.setMeasurement(list.stream().map(Containers::getMeasurement).filter(ObjectUtils::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-		bills.setCfsQuantity(list.stream().map(Containers::getQuantity).filter(ObjectUtils::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-		bills.setCfsGrossWeight(list.stream().map(Containers::getGrossWeight).filter(ObjectUtils::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-		bills.setCfsMeasurement(list.stream().map(Containers::getMeasurement).filter(ObjectUtils::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-		bills.setUpdateUserName(AuthUtil.getUserName());
-		bills.setUpdateUser(AuthUtil.getUserId());
-		bills.setUpdateTime(new Date());
-		billsMapper.updateById(bills);
+		quantity = list.stream().map(Containers::getQuantity).filter(ObjectUtils::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+		if (quantity.compareTo(BigDecimal.ZERO) > 0){
+			bills.setQuantity(quantity);
+			bills.setGrossWeight(list.stream().map(Containers::getGrossWeight).filter(ObjectUtils::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+			bills.setMeasurement(list.stream().map(Containers::getMeasurement).filter(ObjectUtils::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+			bills.setCfsQuantity(list.stream().map(Containers::getQuantity).filter(ObjectUtils::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+			bills.setCfsGrossWeight(list.stream().map(Containers::getGrossWeight).filter(ObjectUtils::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+			bills.setCfsMeasurement(list.stream().map(Containers::getMeasurement).filter(ObjectUtils::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+			bills.setUpdateUserName(AuthUtil.getUserName());
+			bills.setUpdateUser(AuthUtil.getUserId());
+			bills.setUpdateTime(new Date());
+			billsMapper.updateById(bills);
+		}
 		for (Containers containers : list) {
 			BoxNumUtils.containerNumberVerification(containers.getCntrNo());
 			String sealNo = ObjectUtils.isNotNull(containers.getSealNo()) ? containers.getSealNo().toUpperCase() : "";