提交代码

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/feign/IFinanceClient.java

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 
+import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -35,4 +36,7 @@ public interface IFinanceClient
 
 	@PostMapping("/acc/getAccListByCondition")
 	R<List<Acc>> getAccListByCondition( @RequestBody Acc acc);
+
+	@PostMapping("settlement/submit")
+	R submit(@Valid @RequestBody Settlement settlement);
 }

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

@@ -34,6 +34,9 @@ import org.springblade.check.service.IAuditProecessService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.seata.spring.annotation.GlobalTransactional;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.finance.vojo.Settlement;
+import org.springblade.purchase.sales.entity.Order;
+import org.springblade.purchase.sales.feign.IOrderDescClient;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.transaction.annotation.Transactional;
@@ -61,6 +64,8 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 
     private IMessageClient messageClient;
 
+    private IOrderDescClient orderDescClient;
+
 	@Override
 	public IPage<AuditProecessVO> selectAuditProecessPage(IPage<AuditProecessVO> page, AuditProecessVO auditProecess) {
 		return page.setRecords(baseMapper.selectAuditProecessPage(page, auditProecess));
@@ -189,6 +194,20 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 			//通过
             if(operate==1)
             {
+            	//如果是第一级, 则修改状态为审批中
+				if(auditProecess.getLevelId()==1)
+				{
+					Settlement settlement=new Settlement();
+					settlement.setId(auditProecess.getSrcBillId());
+					settlement.setCheckStatus("审核中");
+					R submit = financeClient.submit(settlement);
+					if(!submit.isSuccess())
+					{
+						throw new SecurityException("审批开始修改审核状态失败");
+					}
+				}
+
+
 				auditProecess.setAuditStatus("A");
                 //查询下一级,开启待审
 				LambdaQueryWrapper<AuditProecess> auditProecessLambdaQueryWrapper=new LambdaQueryWrapper<>();

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -118,6 +118,13 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			List<DeliveryItems> deliveryItemsList = deliveryItemsService.saveDeliveryItemsList(delivery.getId(), delivery.getDeliveryItemsList());
 			delivery.setDeliveryItemsList(deliveryItemsList);
 		}
+		List<DeliveryItems> deliveryItemsList = delivery.getDeliveryItemsList();
+		if(!CollectionUtils.isNotEmpty(deliveryItemsList))
+		{
+			BigDecimal totalActualQuantity = deliveryItemsList.stream().filter(e -> e.getActualQuantity() != null).map(DeliveryItems::getActualQuantity).reduce(BigDecimal.ZERO, BigDecimal::add);
+			delivery.setTotalQuantity(totalActualQuantity);
+			baseMapper.updateById(delivery);
+		}
 		//保存发货费用信息
 		if (CollectionUtils.isNotEmpty(delivery.getDeliveryFeesList())){
 			List<DeliveryFees> deliveryFeesList = deliveryFeesService.saveDeliveryFeesList(delivery.getId(), delivery.getDeliveryFeesList());

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -540,7 +540,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		   	 throw new SecurityException("业务未绑定成功");
 		   }
 		   settlement.setSrcBillId(itemsList.get(0).getSrcParentId());
-		   settlement.setCheckStatus("未请核");
+		   settlement.setCheckStatus("录入");
 		   baseMapper.insert(settlement);
 
 		   itemsList.forEach(e->{
@@ -633,7 +633,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
           //如果开启审批流了, 就直接创建审批业务
           else
 		  {
-			  selectOne.setCheckStatus("审核中");
+			  selectOne.setCheckStatus("提交");
 			  baseMapper.updateById(selectOne);
 		  	  //获取审批级次
 			  List<AuditPathsLevels> auditPathsLevels = iCheckClient.listLevelsByActId(1, "check_status");
@@ -821,7 +821,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			});
 		}
 		settlement.setFinanceStatus("待结算");
-		settlement.setCheckStatus("请核成功");
+		settlement.setCheckStatus("审核通过");
 		baseMapper.updateById(settlement);
 	}
 	//审核取消方法
@@ -838,7 +838,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		{
 			throw new SecurityException("审批取消失败");
 		}
-		settlement.setCheckStatus("未请核");
+		settlement.setCheckStatus("录入");
 		baseMapper.updateById(settlement);
 		/*
 		LambdaQueryWrapper<Items> itemsLambdaQueryWrapper=new LambdaQueryWrapper<>();