根据id来判断是否执行 saveandupdate

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

@@ -327,14 +327,20 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				}
 			}
 		}
-		LocalDateTime now = LocalDateTime.now();
-		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-		String formatted = now.format(formatter);
-		System.out.println("起 "+formatted);
-		this.saveOrUpdate(bills);
-		LocalDateTime now2 = LocalDateTime.now();
-		String formatted2 = now2.format(formatter);
-		System.out.println("止 "+formatted2);
+
+
+		if (ObjectUtils.isEmpty(bills.getId())) {
+			LocalDateTime now = LocalDateTime.now();
+			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+			String formatted = now.format(formatter);
+			System.out.println("起1 "+formatted);
+			this.saveOrUpdate(bills);
+			LocalDateTime now2 = LocalDateTime.now();
+			String formatted2 = now2.format(formatter);
+			System.out.println("止1 "+formatted2);
+		}
+
+
 		/**-------------箱型箱量计算---------*/
 		Integer GP20 = 0;
 		Integer GP40 = 0;
@@ -494,6 +500,8 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		//主单应加上分单费用
 		if ("MM".equals(bills.getBillType()) && ObjectUtils.isNotNull(bills.getId())) {
 			List<Bills> details = baseMapper.selectList(new LambdaQueryWrapper<Bills>()
+				.select(Bills::getAmountDr,Bills::getAmountCr,Bills::getAmountDrUsd,Bills::getAmountCrUsd,Bills::getAmountDrLoc,Bills::getAmountCrLoc
+				   ,Bills::getQuantity,Bills::getGrossWeight,Bills::getMeasurement)
 				.eq(Bills::getTenantId, AuthUtil.getTenantId())
 				.eq(Bills::getIsDeleted, 0)
 				.eq(Bills::getMasterId, bills.getId()));
@@ -510,7 +518,11 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 
 			}
 		} else if ("MH".equals(bills.getBillType()) && ObjectUtils.isNotNull(bills.getId())) {
-			Bills details = baseMapper.selectById(bills.getMasterId());
+			Bills details = baseMapper.selectById(new LambdaQueryWrapper<Bills>()
+				.select(Bills::getAmountDr,Bills::getAmountCr,Bills::getAmountProfit,Bills::getAmountDrUsd,Bills::getAmountCrUsd
+					,Bills::getAmountProfitUsd,Bills::getAmountDrLoc,Bills::getAmountCrLoc,Bills::getAmountProfitLoc
+					,Bills::getQuantity,Bills::getGrossWeight,Bills::getMeasurement)
+				.eq(Bills::getMasterId,bills.getMasterId()));
 			//重新计算主单合计
 			if (details != null) {
 				BigDecimal amountDrM = new BigDecimal("0.00");
@@ -526,6 +538,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				BigDecimal grossWeightM = new BigDecimal("0.00");
 				BigDecimal measurementM = new BigDecimal("0.00");
 				List<FeeCenter> feeCenterList = feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
+					.select(FeeCenter::getCurCode,FeeCenter::getAmount,FeeCenter::getDc)
 					.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
 					.eq(FeeCenter::getIsDeleted, 0)
 					.eq(FeeCenter::getPid, details.getId()));
@@ -551,6 +564,8 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					}
 				}
 				List<Bills> billsList = this.list(new LambdaQueryWrapper<Bills>()
+					.select(Bills::getAmountDr,Bills::getAmountCr,Bills::getAmountDrUsd,Bills::getAmountCrUsd,Bills::getAmountDrLoc
+						,Bills::getAmountCrLoc,Bills::getQuantity,Bills::getQuantity,Bills::getGrossWeight,Bills::getMeasurement)
 					.eq(Bills::getTenantId, AuthUtil.getTenantId())
 					.eq(Bills::getIsDeleted, 0)
 					.eq(Bills::getMasterId, details.getId()));
@@ -611,7 +626,18 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		bills.setQuantity(quantity);
 		bills.setGrossWeight(grossWeight);
 		bills.setMeasurement(measurement);
+
+
+
+		LocalDateTime now = LocalDateTime.now();
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+		String formatted = now.format(formatter);
+		System.out.println("起2 "+formatted);
 		this.saveOrUpdate(bills);
+		LocalDateTime now2 = LocalDateTime.now();
+		String formatted2 = now2.format(formatter);
+		System.out.println("止2 "+formatted2);
+
 		/**-------------费用计算---------*/
 		return R.data(bills);
 	}