2024年1月18日17:08:23

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/sea/entity/Bills.java

@@ -1610,41 +1610,37 @@ public class Bills implements Serializable {
 	@TableField(exist = false)
 	private BigDecimal boxWeightSum;
 	/**
-	 * 修改前
-	 */
-	@TableField(exist = false)
-	private BigDecimal amount;
-	/**
-	 * 修改后
+	 * 本位币利润(CNY)
 	 */
 	@TableField(exist = false)
-	private BigDecimal amountUpdate;
+	private BigDecimal amountProfitUpdate;
 	/**
-	 * 修改前
+	 * 利润(USD)
 	 */
 	@TableField(exist = false)
-	private BigDecimal amountUsd;
+	private BigDecimal amountProfitUsdUpdate;
 	/**
-	 * 修改后
+	 * 综合利润(CNY)
 	 */
 	@TableField(exist = false)
-	private BigDecimal amountUsdUpdate;
+	private BigDecimal amountProfitLocUpdate;
 
 	/**
-	 * 修改前
+	 * 责任方
 	 */
 	@TableField(exist = false)
-	private BigDecimal amountTotal;
+	private String responsibleParty;
+
 	/**
-	 * 修改后
+	 * analysis
 	 */
 	@TableField(exist = false)
-	private BigDecimal amountTotalUpdate;
+	private String analysis;
 
 	/**
-	 * 责任方
+	 * 利润率
 	 */
 	@TableField(exist = false)
-	private String responsibleParty;
+	private String profitMargin;
 
 }

blade-service/blade-los/src/main/java/org/springblade/los/Util/MagicValues.java

@@ -0,0 +1,43 @@
+package org.springblade.los.Util;
+
+/**
+ * @author :jixinyuan
+ * @date : 2024/1/18
+ */
+public class MagicValues {
+
+	public static final String BUSINESS = "业务";
+
+	public static final String DOCUMENT = "单证";
+	public static final String COST = "费用";
+	public static final String PAID_APPLICATION = "付费申请";
+	public static final String PAID_SETTLEMENT = "付费结算";
+	public static final String CHARGE_SETTLEMENT = "收费结算";
+	public static final String SETTLEMENT_CENTER = "结算中心";
+	public static final String MEET = "应付";
+	public static final String RECEIVABLE = "应收";
+	public static final String DISPATCH_NOTICE = "派车通知单";
+	public static final String INCOMING_NOTIFICATION = "派车通知单";
+	public static final String SALES_REPORT = "销售报告";
+	public static final String MASTER_BILLS = "MASTER 提单";
+	public static final String HYCK = "HYCK";
+	public static final String HYJK = "HYJK";
+	public static final String AMEND = "AMEND";
+	public static final String SE = "SE";
+	public static final String USD = "USD";
+	public static final String CNY = "CNY";
+	public static final String D = "D";
+	public static final String C = "C";
+	public static final String ONE = "1";
+	public static final String ZERO = "0.00";
+	public static final String MH = "MH";
+	public static final String MM = "MM";
+	public static final String DD = "DD";
+	public static final String PROFIT_MARGIN = "profit.margin";
+	public static final String FM = "JMS";
+	public static final String DATA = "data";
+	public static final String HUNDRED = "100";
+
+	private MagicValues() {} // 防止外部实例化该类
+
+}

blade-service/blade-los/src/main/java/org/springblade/los/business/amends/controller/AmendsController.java

@@ -75,10 +75,10 @@ public class AmendsController extends BladeController {
 			.eq(ObjectUtils.isNotNull(amends.getStatus()), Amends::getStatus, amends.getStatus())
 			.like(ObjectUtils.isNotNull(amends.getBillNo()), Amends::getBillNo, amends.getBillNo())
 			.eq(ObjectUtils.isNotNull(amends.getBusinessType()), Amends::getBusinessType, amends.getBusinessType())
-			.like(ObjectUtils.isNotNull(amends.getMblno()), Amends::getStatus, amends.getStatus())
-			.like(ObjectUtils.isNotNull(amends.getHblno()), Amends::getStatus, amends.getStatus())
-			.like(ObjectUtils.isNotNull(amends.getRefno()), Amends::getStatus, amends.getStatus())
-			.like(ObjectUtils.isNotNull(amends.getBookingNo()), Amends::getStatus, amends.getStatus())
+			.like(ObjectUtils.isNotNull(amends.getMblno()), Amends::getMblno, amends.getMblno())
+			.like(ObjectUtils.isNotNull(amends.getHblno()), Amends::getHblno, amends.getHblno())
+			.like(ObjectUtils.isNotNull(amends.getRefno()), Amends::getRefno, amends.getRefno())
+			.like(ObjectUtils.isNotNull(amends.getBookingNo()), Amends::getBookingNo, amends.getBookingNo())
 			.and(ObjectUtils.isNotNull(amends.getCorpCnName()), i -> i.like(Amends::getCorpCnName, amends.getCorpCnName()).or()
 				.like(Amends::getCorpEnName, amends.getCorpCnName()))
 			.and(ObjectUtils.isNotNull(amends.getVesselCnName()), i -> i.like(Amends::getVesselCnName, amends.getVesselCnName()).or()
@@ -90,7 +90,8 @@ public class AmendsController extends BladeController {
 			.le(ObjectUtils.isNotNull(amends.getEtdEnd()), Amends::getEtd, amends.getEtdEnd())
 			.ge(ObjectUtils.isNotNull(amends.getEtaStart()), Amends::getEta, amends.getEtaStart())
 			.le(ObjectUtils.isNotNull(amends.getEtaEnd()), Amends::getEta, amends.getEtaEnd())
-			.eq(Amends::getIsDeleted, 0);
+			.eq(Amends::getIsDeleted, 0)
+			.orderByDesc(Amends::getCreateTime);
 		IPage<Amends> pages = amendsService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}

blade-service/blade-los/src/main/java/org/springblade/los/business/amends/service/impl/AmendsServiceImpl.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.seata.spring.annotation.GlobalTransactional;
 import lombok.AllArgsConstructor;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
@@ -46,6 +47,7 @@ import org.springblade.los.finance.fee.service.IFinAccBillsService;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.feign.ISysClient;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.math.BigDecimal;
@@ -87,6 +89,8 @@ public class AmendsServiceImpl extends ServiceImpl<AmendsMapper, Amends> impleme
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R submit(Amends amends) {
 		String deptId = "";
 		String deptName = "";
@@ -139,7 +143,7 @@ public class AmendsServiceImpl extends ServiceImpl<AmendsMapper, Amends> impleme
 		}
 		this.saveOrUpdate(amends);
 		if (ObjectUtils.isNotNull(amends.getFeeCenterList())) {
-			for (FeeCenter item:amends.getFeeCenterList()) {
+			for (FeeCenter item : amends.getFeeCenterList()) {
 				item.setPid(amends.getId());
 			}
 			feeCenterService.submitList(amends.getFeeCenterList());
@@ -174,6 +178,8 @@ public class AmendsServiceImpl extends ServiceImpl<AmendsMapper, Amends> impleme
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public Amends checkAmends(Amends amends) {
 		Amends declare = baseMapper.selectById(amends.getId());
 		Integer actId = null;
@@ -256,6 +262,9 @@ public class AmendsServiceImpl extends ServiceImpl<AmendsMapper, Amends> impleme
 				.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
 				.eq(FeeCenter::getPid, declare.getId())
 			);
+			if (feeCenterList.size() == 0) {
+				throw new RuntimeException("费用明细不能为空");
+			}
 			BigDecimal amountC = feeCenterList.stream().filter(e -> "C".equals(e.getDc())).map(FeeCenter::getAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
 			BigDecimal amountD = feeCenterList.stream().filter(e -> "D".equals(e.getDc())).map(FeeCenter::getAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
 			auditProecessDTO.setPayAmount(amountC);
@@ -273,6 +282,8 @@ public class AmendsServiceImpl extends ServiceImpl<AmendsMapper, Amends> impleme
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public Amends revokeCheckAmends(Amends amends) {
 		Amends declare = baseMapper.selectById(amends.getId());
 		if (3 == declare.getStatus()) {
@@ -288,6 +299,8 @@ public class AmendsServiceImpl extends ServiceImpl<AmendsMapper, Amends> impleme
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R passCheck(Long id) {
 		Amends bills = baseMapper.selectById(id);
 		if (bills == null) {

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/BillsController.java

@@ -126,6 +126,7 @@ public class BillsController extends BladeController {
 			.eq(ObjectUtils.isNotNull(bills.getBusinessType()), Bills::getBusinessType, bills.getBusinessType())
 			.eq(ObjectUtils.isNotNull(bills.getSeaType()), Bills::getSeaType, bills.getSeaType())
 			.eq(ObjectUtils.isNotNull(bills.getBillStatus()), Bills::getBillStatus, bills.getBillStatus())
+			.eq(ObjectUtils.isNotNull(bills.getStatus()), Bills::getStatus, bills.getStatus())
 			.orderByDesc(Bills::getCreateTime);
 		IPage<Bills> pages = billsService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);

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

@@ -1443,7 +1443,6 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			.eq(Bills::getIsDeleted, 0)
 			.eq(Bills::getTenantId, AuthUtil.getTenantId())
 			.eq(Bills::getStatus, 3)
-			.eq(Bills::getBillStatus, 3)
 		);
 		if (billsList.size() == 0) {
 			throw new RuntimeException("未查到单据信息");