导入 Excel

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

@@ -1280,7 +1280,7 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 				}
 				BigDecimal sumQty = new BigDecimal(0L);
 				BigDecimal sumGw = new BigDecimal(0L);
-				BigDecimal sumVol = new BigDecimal(BigInteger.ZERO);
+				BigDecimal sumVol = BigDecimal.ZERO;
 
 				for(int cr=r+1; cr<=lastRow; cr++) {
 					String cntrType = getSheetCellValueAsString(sheet, cr, 0);
@@ -1323,8 +1323,8 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 				bills.setGrossWeight(sumGw);
 				bills.setCfsGrossWeight(sumGw);
 				sumVol.setScale(3, BigDecimal.ROUND_HALF_UP);
-				bills.setMeasurement(sumVol);
-				bills.setCfsMeasurement(sumVol);
+				bills.setMeasurement(containersList.stream().map(Containers::getMeasurement).reduce(BigDecimal.ZERO,BigDecimal::add).setScale(2, RoundingMode.HALF_UP));
+				bills.setCfsMeasurement(bills.getMeasurement());
 			}
 		}
 
@@ -1391,8 +1391,7 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 			cntr.setId(null);
 		}
 
-		// containersService.removeByPid(bills.getId(), "");
-		/*
+		containersService.removeByPid(bills.getId(), "");
 		if(containersList.size()>0) {
 			// 保存配箱箱号明细
 			containersService.submitList(containersList);
@@ -1403,7 +1402,6 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 				.eq(Containers::getTenantId, AuthUtil.getTenantId())
 				.eq(Containers::getIsDeleted, 0));
 		}
-        */
 
 		bills.setContainersList(containersList);
 		bills.setPreContainersList(preContainers);
@@ -1415,6 +1413,9 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 		bills.setDetail(seaBillsDetail);
 		resetBillsNullValuesAsEmptyString(bills);
 
+		// billsService.updateById(bills);
+		billsService.submit(bills);
+
 		return R.data(bills);
 	}