2023年12月29日10:59:55

blade-service-api/blade-los-api/src/main/java/org/springblade/los/check/entity/LosAuditItems.java

@@ -33,7 +33,7 @@ import java.time.LocalDateTime;
  * @since 2021-12-07
  */
 @Data
-@TableName("pjpf_audit_items")
+@TableName("los_audit_items")
 @ApiModel(value = "AuditItems对象", description = "审批流任务明细")
 public class LosAuditItems implements Serializable {
 

blade-service-api/blade-los-api/src/main/java/org/springblade/los/check/entity/LosAuditItemsUsers.java

@@ -32,7 +32,7 @@ import java.io.Serializable;
  * @since 2021-12-07
  */
 @Data
-@TableName("pjpf_audit_items_users")
+@TableName("los_audit_items_users")
 @ApiModel(value = "AuditItemsUsers对象", description = "审批流任务明细用户表")
 public class LosAuditItemsUsers implements Serializable {
 

blade-service-api/blade-los-api/src/main/java/org/springblade/los/check/entity/LosAuditPaths.java

@@ -34,7 +34,7 @@ import java.util.List;
  * @since 2021-12-07
  */
 @Data
-@TableName("pjpf_audit_paths")
+@TableName("los_audit_paths")
 @ApiModel(value = "AuditPaths对象", description = "审批流配置主表")
 public class LosAuditPaths implements Serializable {
 

blade-service-api/blade-los-api/src/main/java/org/springblade/los/check/entity/LosAuditPathsActs.java

@@ -33,7 +33,7 @@ import java.io.Serializable;
  * @since 2021-12-07
  */
 @Data
-@TableName("pjpf_audit_paths_acts")
+@TableName("los_audit_paths_acts")
 @ApiModel(value = "AuditPathsActs对象", description = "审批流配置明细表")
 public class LosAuditPathsActs implements Serializable {
 

blade-service-api/blade-los-api/src/main/java/org/springblade/los/check/entity/LosAuditPathsLevels.java

@@ -32,7 +32,7 @@ import java.io.Serializable;
  * @since 2021-12-07
  */
 @Data
-@TableName("pjpf_audit_paths_levels")
+@TableName("los_audit_paths_levels")
 @ApiModel(value = "AuditPathsLevels对象", description = "审批流配置明细级别表")
 public class LosAuditPathsLevels implements Serializable {
 

blade-service-api/blade-los-api/src/main/java/org/springblade/los/check/entity/LosAuditProecess.java

@@ -37,7 +37,7 @@ import java.util.List;
  * @since 2021-12-08
  */
 @Data
-@TableName("pjpf_audit_proecess")
+@TableName("los_audit_proecess")
 @ApiModel(value = "AuditProecess对象", description = "审批流记录")
 public class LosAuditProecess implements Serializable {
 

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/stl/entity/FinStlBills.java

@@ -413,10 +413,22 @@ public class FinStlBills implements Serializable {
 	private BigDecimal amountSub;
 
 	/**
-	 * 税后差额
+	 * 综合差额
 	 */
-	@ApiModelProperty(value = "税后差额")
+	@ApiModelProperty(value = "综合差额")
 	private BigDecimal amountSubLoc;
+
+	/**
+	 * 差额
+	 */
+	@ApiModelProperty(value = "差额")
+	private BigDecimal amountSubUsd;
+
+	/**
+	 * 综合税后差额
+	 */
+	@ApiModelProperty(value = "综合税后差额")
+	private BigDecimal amountSubLocNet;
 	/**
 	 * 版本
 	 */

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

@@ -170,6 +170,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			bills.setUpdateTime(new Date());
 			bills.setUpdateUserName(AuthUtil.getUserName());
 
+			//主单信息同步分单
 			if ("MM".equals(bills.getBillType())) {
 				Bills details = baseMapper.selectById(bills.getId());
 				if (!details.getVesselId().equals(bills.getVesselId()) || !details.getVoyageNo().equals(bills.getVoyageNo())) {
@@ -179,6 +180,56 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 						.eq(Bills::getIsDeleted, 0)
 						.eq(Bills::getMblno, bills.getMblno()));
 					if (billsList.size() > 0) {
+						for (Bills item : billsList) {
+							item.setEtd(bills.getEtd());
+							item.setVesselId(bills.getVesselId());
+							item.setVesselCnName(bills.getVesselCnName());
+							item.setVesselEnName(bills.getVesselEnName());
+							item.setVoyageNo(bills.getVoyageNo());
+							item.setPolId(bills.getPolId());
+							item.setPolCnName(bills.getPolCnName());
+							item.setPolEnName(bills.getPolEnName());
+							item.setPolCode(bills.getPolCode());
+							item.setPolNamePrint(bills.getPolNamePrint());
+							item.setPodId(bills.getPodId());
+							item.setPodCnName(bills.getPodCnName());
+							item.setPodEnName(bills.getPodEnName());
+							item.setPodNamePrint(bills.getPodNamePrint());
+							item.setPodCode(bills.getPodCode());
+							item.setPlaceReceiptId(bills.getPlaceReceiptId());
+							item.setPlaceReceiptCode(bills.getPlaceReceiptCode());
+							item.setPlaceReceiptName(bills.getPlaceReceiptName());
+							item.setPlaceReceiptNamePrint(bills.getPlaceReceiptNamePrint());
+							item.setPlaceDeliveryId(bills.getPlaceDeliveryId());
+							item.setPlaceDeliveryCode(bills.getPlaceDeliveryCode());
+							item.setPlaceDeliveryName(bills.getPlaceDeliveryName());
+							item.setPlaceDeliveryNamePrint(bills.getPlaceDeliveryNamePrint());
+							item.setDestinationId(bills.getDestinationId());
+							item.setDestinationName(bills.getDestinationName());
+							item.setDestinationCode(bills.getDestinationCode());
+							item.setDestinationNamePrint(bills.getDestinationNamePrint());
+							item.setFinalDestinationId(bills.getFinalDestinationId());
+							item.setFinalDestinationCode(bills.getFinalDestinationCode());
+							item.setFinalDestinationName(bills.getFinalDestinationName());
+							item.setFinalDestinationNamePrint(bills.getFinalDestinationNamePrint());
+							item.setCyId(bills.getCyId());
+							item.setCyCode(bills.getCyCode());
+							item.setCyCnName(bills.getCyCnName());
+							item.setCyEnName(bills.getCyEnName());
+							item.setCyAddress(bills.getCyAddress());
+							item.setCyTel(bills.getCyTel());
+							item.setCyRemarks(bills.getCyRemarks());
+							item.setCyTrailerTime(bills.getCyTrailerTime());
+							item.setCyReturnTime(bills.getCyReturnTime());
+							item.setCarrierId(bills.getCarrierId());
+							item.setCarrierCnName(bills.getCarrierCnName());
+							item.setCarrierEnName(bills.getCarrierEnName());
+							item.setCarrierArgreementNo(bills.getCarrierArgreementNo());
+							item.setBookingDate(bills.getBookingDate());
+						}
+						if (billsList.size() > 0) {
+							this.updateBatchById(billsList);
+						}
 						List<Long> billIds = billsList.stream().map(Bills::getId).collect(Collectors.toList());
 						List<FeeCenter> feeCenterList = feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
 							.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
@@ -314,6 +365,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		BigDecimal amountDrLoc = new BigDecimal("0.00");
 		BigDecimal amountCrLoc = new BigDecimal("0.00");
 		BigDecimal amountProfitLoc = new BigDecimal("0.00");
+		//应付
 		if (ObjectUtils.isNotNull(bills.getFeeCenterListC())) {
 			for (FeeCenter item : bills.getFeeCenterListC()) {
 				item.setPid(bills.getId());
@@ -363,6 +415,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			}
 			feeCenterService.submitList(bills.getFeeCenterListC());
 		}
+		//应收
 		if (ObjectUtils.isNotNull(bills.getFeeCenterListD())) {
 			for (FeeCenter item : bills.getFeeCenterListD()) {
 				item.setPid(bills.getId());
@@ -426,6 +479,80 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				amountDrLoc = amountDrLoc.add(details.stream().map(Bills::getAmountDrLoc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 				amountCrLoc = amountCrLoc.add(details.stream().map(Bills::getAmountCrLoc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 			}
+		} else if ("MH".equals(bills.getBillType()) && ObjectUtils.isNotNull(bills.getId())) {
+			Bills details = baseMapper.selectById(bills.getMasterId());
+			//重新计算主单合计
+			if (details != null) {
+				BigDecimal amountDrM = new BigDecimal("0.00");
+				BigDecimal amountCrM = new BigDecimal("0.00");
+				BigDecimal amountProfitM = new BigDecimal("0.00");
+				BigDecimal amountDrUsdM = new BigDecimal("0.00");
+				BigDecimal amountCrUsdM = new BigDecimal("0.00");
+				BigDecimal amountProfitUsdM = new BigDecimal("0.00");
+				BigDecimal amountDrLocM = new BigDecimal("0.00");
+				BigDecimal amountCrLocM = new BigDecimal("0.00");
+				BigDecimal amountProfitLocM = new BigDecimal("0.00");
+				List<FeeCenter> feeCenterList = feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
+					.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
+					.eq(FeeCenter::getIsDeleted, 0)
+					.eq(FeeCenter::getPid, details.getId()));
+				for (FeeCenter item : feeCenterList) {
+					if ("C".equals(item.getDc())) {
+						if ("USD".equals(item.getCurCode())) {
+							amountCrUsdM = amountCrUsdM.add(item.getAmount());
+						} else if ("CNY".equals(item.getCurCode())) {
+							amountCrM = amountCrM.add(item.getAmount());
+						} else {
+							BigDecimal usd = bCurrencyService.converter(item.getCurCode(), item.getAmount());
+							amountCrUsdM = amountCrUsdM.add(usd);
+						}
+					} else {
+						if ("USD".equals(item.getCurCode())) {
+							amountDrUsdM = amountDrUsdM.add(item.getAmount());
+						} else if ("CNY".equals(item.getCurCode())) {
+							amountDrM = amountDrM.add(item.getAmount());
+						} else {
+							BigDecimal usd = bCurrencyService.converter(item.getCurCode(), item.getAmount());
+							amountDrUsdM = amountDrUsdM.add(usd);
+						}
+					}
+				}
+				List<Bills> billsList = this.list(new LambdaQueryWrapper<Bills>()
+					.eq(Bills::getTenantId, AuthUtil.getTenantId())
+					.eq(Bills::getIsDeleted, 0)
+					.eq(Bills::getMasterId, details.getId()));
+				List<Bills> billsLists = billsList.stream().filter(e -> !e.getId().equals(bills.getId())).collect(Collectors.toList());
+				if (billsLists.size() > 0) {
+					amountDrM = amountDrM.add(billsLists.stream().map(Bills::getAmountDr).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+					amountCrM = amountCrM.add(billsLists.stream().map(Bills::getAmountCr).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+					amountDrUsdM = amountDrUsdM.add(billsLists.stream().map(Bills::getAmountDrUsd).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+					amountCrUsdM = amountCrUsdM.add(billsLists.stream().map(Bills::getAmountCrUsd).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+					amountDrLocM = amountDrLocM.add(billsLists.stream().map(Bills::getAmountDrLoc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+					amountCrLocM = amountCrLocM.add(billsLists.stream().map(Bills::getAmountCrLoc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+				}
+				amountDrM = amountDrM.add(amountDr);
+				amountCrM = amountCrM.add(amountCr);
+				amountDrUsdM = amountDrUsdM.add(amountDrUsd);
+				amountCrUsdM = amountCrUsdM.add(amountCrUsd);
+				amountDrLocM = amountDrLocM.add(amountDrLoc);
+				amountCrLocM = amountCrLocM.add(amountCrLoc);
+				//利润 = 收 - 付
+				amountProfitM = amountDrM.subtract(amountCrM);
+				amountProfitUsdM = amountDrUsdM.subtract(amountCrUsdM);
+				amountDrLocM = amountDrLocM.add(bCurrencyService.converterCny("USD", amountDrUsdM)).add(amountDrM);
+				amountCrLocM = amountCrLocM.add(bCurrencyService.converterCny("USD", amountCrUsdM)).add(amountCrM);
+				amountProfitLocM = amountDrLocM.subtract(amountCrLocM);
+				details.setAmountDr(amountDrM);
+				details.setAmountCr(amountCrM);
+				details.setAmountProfit(amountProfitM);
+				details.setAmountDrUsd(amountDrUsdM);
+				details.setAmountCrUsd(amountCrUsdM);
+				details.setAmountProfitUsd(amountProfitUsdM);
+				details.setAmountDrLoc(amountDrLocM);
+				details.setAmountCrLoc(amountCrLocM);
+				details.setAmountProfitLoc(amountProfitLocM);
+				baseMapper.updateById(details);
+			}
 		}
 		//利润 = 收 - 付
 		amountProfit = amountDr.subtract(amountCr);
@@ -575,6 +702,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				}
 				item.setMasterId(bills.getId());
 				item.setMasterBillNo(bills.getBillNo());
+				item.setEtd(bills.getEtd());
 				item.setVesselId(bills.getVesselId());
 				item.setVesselCnName(bills.getVesselCnName());
 				item.setVesselEnName(bills.getVesselEnName());
@@ -583,10 +711,28 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				item.setPolCnName(bills.getPolCnName());
 				item.setPolEnName(bills.getPolEnName());
 				item.setPolCode(bills.getPolCode());
+				item.setPolNamePrint(bills.getPolNamePrint());
 				item.setPodId(bills.getPodId());
 				item.setPodCnName(bills.getPodCnName());
 				item.setPodEnName(bills.getPodEnName());
+				item.setPodNamePrint(bills.getPodNamePrint());
 				item.setPodCode(bills.getPodCode());
+				item.setPlaceReceiptId(bills.getPlaceReceiptId());
+				item.setPlaceReceiptCode(bills.getPlaceReceiptCode());
+				item.setPlaceReceiptName(bills.getPlaceReceiptName());
+				item.setPlaceReceiptNamePrint(bills.getPlaceReceiptNamePrint());
+				item.setPlaceDeliveryId(bills.getPlaceDeliveryId());
+				item.setPlaceDeliveryCode(bills.getPlaceDeliveryCode());
+				item.setPlaceDeliveryName(bills.getPlaceDeliveryName());
+				item.setPlaceDeliveryNamePrint(bills.getPlaceDeliveryNamePrint());
+				item.setDestinationId(bills.getDestinationId());
+				item.setDestinationName(bills.getDestinationName());
+				item.setDestinationCode(bills.getDestinationCode());
+				item.setDestinationNamePrint(bills.getDestinationNamePrint());
+				item.setFinalDestinationId(bills.getFinalDestinationId());
+				item.setFinalDestinationCode(bills.getFinalDestinationCode());
+				item.setFinalDestinationName(bills.getFinalDestinationName());
+				item.setFinalDestinationNamePrint(bills.getFinalDestinationNamePrint());
 				item.setCyId(bills.getCyId());
 				item.setCyCode(bills.getCyCode());
 				item.setCyCnName(bills.getCyCnName());

blade-service/blade-los/src/main/java/org/springblade/los/check/mapper/AuditItemsMapper.xml

@@ -31,7 +31,7 @@
 
 
     <select id="selectAuditItemsPage" resultMap="auditItemsResultMap">
-        select * from pjpf_audit_items where is_deleted = 0
+        select * from los_audit_items where is_deleted = 0
     </select>
 
 </mapper>

blade-service/blade-los/src/main/java/org/springblade/los/check/mapper/AuditItemsUsersMapper.xml

@@ -16,7 +16,7 @@
 
 
     <select id="selectAuditItemsUsersPage" resultMap="auditItemsUsersResultMap">
-        select * from pjpf_audit_items_users where is_deleted = 0
+        select * from los_audit_items_users where is_deleted = 0
     </select>
 
 </mapper>

blade-service/blade-los/src/main/java/org/springblade/los/check/mapper/AuditPathsActsMapper.xml

@@ -14,13 +14,13 @@
 
 
     <select id="selectAuditPathsActsPage" resultMap="auditPathsActsResultMap">
-        select * from pjpf_audit_paths_acts where is_deleted = 0
+        select * from los_audit_paths_acts where is_deleted = 0
     </select>
     <select id="getApprovalActId" resultMap="auditPathsActsResultMap">
     SELECT
 	    *
     FROM
-        pjpf_audit_paths_acts
+        los_audit_paths_acts
 	WHERE
 	is_enable = 1
 	AND act_id = #{actId}

blade-service/blade-los/src/main/java/org/springblade/los/check/mapper/AuditPathsLevelsMapper.xml

@@ -16,14 +16,14 @@
 
 
     <select id="selectAuditPathsLevelsPage" resultMap="auditPathsLevelsResultMap">
-        select * from pjpf_audit_paths_levels where is_deleted = 0
+        select * from los_audit_paths_levels where is_deleted = 0
     </select>
     <select id="listApproval" resultMap="auditPathsLevelsResultMap">
         SELECT
 	    levels.*
         FROM
-            pjpf_audit_paths_levels levels
-	    LEFT JOIN pjpf_audit_paths_acts acts
+            los_audit_paths_levels levels
+	    LEFT JOIN los_audit_paths_acts acts
 	    ON levels.path_id = acts.path_id
 	    WHERE acts.act_id = #{actId}
 	    AND acts.fid_status = #{fidStatus}

blade-service/blade-los/src/main/java/org/springblade/los/check/mapper/AuditPathsMapper.xml

@@ -17,7 +17,7 @@
 
 
     <select id="selectAuditPathsPage" resultMap="auditPathsResultMap">
-        select * from pjpf_audit_paths where is_deleted = 0
+        select * from los_audit_paths where is_deleted = 0
     </select>
 
 </mapper>

blade-service/blade-los/src/main/java/org/springblade/los/check/mapper/AuditProecessMapper.xml

@@ -24,15 +24,15 @@
         <result column="times" property="times"/>
     </resultMap>
     <delete id="deteleByBillId">
-        delete from pjpf_audit_proecess where bill_id = #{billId}
+        delete from los_audit_proecess where bill_id = #{billId}
     </delete>
 
     <delete id="deteleByBillIdOrGrade">
-        delete from pjpf_audit_proecess where bill_id = #{billId} and times = #{times}
+        delete from los_audit_proecess where bill_id = #{billId} and times = #{times}
     </delete>
 
     <select id="selectAuditProecessPage" resultMap="auditProecessResultMap">
-        select * from pjpf_audit_proecess where is_deleted = 0
+        select * from los_audit_proecess where is_deleted = 0
     </select>
 
 </mapper>

blade-service/blade-los/src/main/java/org/springblade/los/check/service/impl/AuditProecessServiceImpl.java

@@ -404,7 +404,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 					throw new SecurityException("审批通过失败");
 				}
 				detail.setStatus(3);
-				detail.setBillStatus(2);
+				detail.setBillStatus(3);
 				int count = billsMapper.updateById(detail);
 				if (count == 0) {
 					throw new SecurityException("修改订单数据失败");
@@ -646,6 +646,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 					throw new SecurityException("审批通过失败");
 				}
 				detail.setStatus(3);
+				detail.setAuditDateTo(new Date());
 				int count = finStlBillsMapper.updateById(detail);
 				if (count == 0) {
 					throw new SecurityException("修改订单数据失败");
@@ -666,6 +667,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 					throw new SecurityException("审批通过失败");
 				}
 				detail.setStatus(4);
+				detail.setAuditDateTo(new Date());
 				int count = finStlBillsMapper.updateById(detail);
 				if (count == 0) {
 					throw new SecurityException("修改订单数据失败");

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FeeCenterServiceImpl.java

@@ -297,24 +297,24 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 					}
 					if ("TEU".equals(items.getUnitNo())) {
 						BigDecimal quantity20GPTeu = preContainers.stream().filter(e -> "20GP".equals(e.getCntrTypeCode())).map(PreContainers::getTeu).reduce(BigDecimal.ZERO, BigDecimal::add);
-						Integer quantity20GP = preContainers.stream().filter(e -> "20GP".equals(e.getCntrTypeCode())).map(PreContainers::getQuantity).reduce(Integer.MIN_VALUE, Integer::sum);
-						BigDecimal quantity20GPSum = quantity20GPTeu.multiply(new BigDecimal(quantity20GP));
+						Integer quantity20GP = preContainers.stream().filter(e -> "20GP".equals(e.getCntrTypeCode())).map(PreContainers::getQuantity).mapToInt(Integer::intValue).sum();
+						BigDecimal quantity20GPSum = quantity20GPTeu.multiply(new BigDecimal(quantity20GP+""));
 
 						BigDecimal quantity40GPTeu = preContainers.stream().filter(e -> "40GP".equals(e.getCntrTypeCode())).map(PreContainers::getTeu).reduce(BigDecimal.ZERO, BigDecimal::add);
-						Integer quantity40GP = preContainers.stream().filter(e -> "40GP".equals(e.getCntrTypeCode())).map(PreContainers::getQuantity).reduce(Integer.MIN_VALUE, Integer::sum);
-						BigDecimal quantity40GPSum = quantity40GPTeu.multiply(new BigDecimal(quantity40GP));
+						Integer quantity40GP = preContainers.stream().filter(e -> "40GP".equals(e.getCntrTypeCode())).map(PreContainers::getQuantity).mapToInt(Integer::intValue).sum();
+						BigDecimal quantity40GPSum = quantity40GPTeu.multiply(new BigDecimal(quantity40GP+""));
 
 						BigDecimal quantity40HCTeu = preContainers.stream().filter(e -> "40HC".equals(e.getCntrTypeCode())).map(PreContainers::getTeu).reduce(BigDecimal.ZERO, BigDecimal::add);
-						Integer quantity40HC = preContainers.stream().filter(e -> "40HC".equals(e.getCntrTypeCode())).map(PreContainers::getQuantity).reduce(Integer.MIN_VALUE, Integer::sum);
-						BigDecimal quantity40HCSum = quantity40HCTeu.multiply(new BigDecimal(quantity40HC));
+						Integer quantity40HC = preContainers.stream().filter(e -> "40HC".equals(e.getCntrTypeCode())).map(PreContainers::getQuantity).mapToInt(Integer::intValue).sum();
+						BigDecimal quantity40HCSum = quantity40HCTeu.multiply(new BigDecimal(quantity40HC+""));
 
 						BigDecimal quantity45GPTeu = preContainers.stream().filter(e -> "45GP".equals(e.getCntrTypeCode())).map(PreContainers::getTeu).reduce(BigDecimal.ZERO, BigDecimal::add);
-						Integer quantity45GP = preContainers.stream().filter(e -> "45GP".equals(e.getCntrTypeCode())).map(PreContainers::getQuantity).reduce(Integer.MIN_VALUE, Integer::sum);
-						BigDecimal quantity45GPSum = quantity45GPTeu.multiply(new BigDecimal(quantity45GP));
+						Integer quantity45GP = preContainers.stream().filter(e -> "45GP".equals(e.getCntrTypeCode())).map(PreContainers::getQuantity).mapToInt(Integer::intValue).sum();
+						BigDecimal quantity45GPSum = quantity45GPTeu.multiply(new BigDecimal(quantity45GP+""));
 
 						BigDecimal quantity48GPTeu = preContainers.stream().filter(e -> "48GP".equals(e.getCntrTypeCode())).map(PreContainers::getTeu).reduce(BigDecimal.ZERO, BigDecimal::add);
-						Integer quantity48GP = preContainers.stream().filter(e -> "48GP".equals(e.getCntrTypeCode())).map(PreContainers::getQuantity).reduce(Integer.MIN_VALUE, Integer::sum);
-						BigDecimal quantity48GPSum = quantity48GPTeu.multiply(new BigDecimal(quantity48GP));
+						Integer quantity48GP = preContainers.stream().filter(e -> "48GP".equals(e.getCntrTypeCode())).map(PreContainers::getQuantity).mapToInt(Integer::intValue).sum();
+						BigDecimal quantity48GPSum = quantity48GPTeu.multiply(new BigDecimal(quantity48GP+""));
 
 						BigDecimal quantity = quantity20GPSum.add(quantity40GPSum).add(quantity40HCSum).add(quantity45GPSum).add(quantity48GPSum);
 						if (quantity.compareTo(new BigDecimal("0")) == 0) {

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FinAccBillsServiceImpl.java

@@ -205,18 +205,18 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 				//分单
 				data.setBusinessBillDivideId(item.getPid());
 				data.setBusinessBillDivideNo(item.getBillNo());
-				data.setBusinessDivideDate(item.getBillDate());
+				data.setBusinessDivideDate(item.getEtd());
 				//主单
 				Bills bills = billsList.stream().filter(e -> e.getId().equals(item.getPid())).findFirst().orElse(new Bills());
 				if (ObjectUtils.isNotNull(bills.getMasterId())) {
 					data.setBusinessBillId(bills.getMasterId());
 					data.setBusinessBillNo(bills.getMasterBillNo());
-					data.setBusinessDate(item.getBillDate());
+					data.setBusinessDate(item.getEtd());
 				}
 			} else {
 				data.setBusinessBillId(item.getPid());
 				data.setBusinessBillNo(item.getBillNo());
-				data.setBusinessDate(item.getBillDate());
+				data.setBusinessDate(item.getEtd());
 			}
 			data.setPaymode(item.getPaymode());
 			data.setAccelementid(item.getElementsId());

blade-service/blade-los/src/main/java/org/springblade/los/finance/stl/service/impl/FinStlBillsServiceImpl.java

@@ -256,12 +256,14 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 				.filter(e -> "USD".equals(e.getCurrentStlCurCode()) && "C".equals(e.getDc())).map(FinStlBillsItems::getCurrentStlAmountNet)
 				.filter(ObjectUtils::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 			finStlBills.setAmountCrUsdNet(amountCrUSDTax);
+			finStlBills.setAmountSub(finStlBills.getAmountCr().subtract(finStlBills.getAmountDr()));
+			finStlBills.setAmountSubUsd(finStlBills.getAmountCrUsd().subtract(finStlBills.getAmountDrUsd()));
 			finStlBills.setAmountDrLoc(amountDrCNY.add(bCurrencyService.converterCny("USD", amountDrUSD)));
 			finStlBills.setAmountCrLoc(amountCrCNY.add(bCurrencyService.converterCny("USD", amountCrUSD)));
-			finStlBills.setAmountSub(finStlBills.getAmountCrLoc().subtract(finStlBills.getAmountDrLoc()));
+			finStlBills.setAmountSubLoc(finStlBills.getAmountCrLoc().subtract(finStlBills.getAmountDrLoc()));
 			finStlBills.setAmountDrLocNet(amountDrCNYTax.add(bCurrencyService.converterCny("USD", amountDrUSDTax)));
 			finStlBills.setAmountCrLocNet(amountCrCNYTax.add(bCurrencyService.converterCny("USD", amountCrUSDTax)));
-			finStlBills.setAmountSubLoc(finStlBills.getAmountCrLocNet().subtract(finStlBills.getAmountDrLocNet()));
+			finStlBills.setAmountSubLocNet(finStlBills.getAmountCrLocNet().subtract(finStlBills.getAmountDrLocNet()));
 
 		}
 		this.saveOrUpdate(finStlBills);
@@ -1195,6 +1197,7 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 			}
 		}
 		detail.setStatus(1);
+		detail.setAuditDateFrom(new Date());
 		if (ObjectUtils.isNotNull(finStlBills.getFinStlBillsItemsList())) {
 			List<FeeCenter> feeCenterList = new ArrayList<>();
 			for (FinStlBillsItems item : finStlBills.getFinStlBillsItemsList()) {