发货单 确认发货逻辑判断

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/Message.java

@@ -108,6 +108,10 @@ public class Message implements Serializable {
 		private String url;
 
 		private String parameter;
+
+		private String pageStatus;
+
+		private String pageLabel;
 	;
 
 

blade-service/blade-check/src/main/java/org/springblade/check/controller/AuditProecessController.java

@@ -145,7 +145,7 @@ public class AuditProecessController extends BladeController {
 	@GetMapping("findAuditProcessList")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "查看审核记录", notes = " ")
-	public R findAuditProcessList(@ApiParam(value = "申请表主键", required = true) @RequestParam Long id)
+	public R findAuditProcessList(@ApiParam(value = "申请表主键", required = true) @RequestParam Long id,@ApiParam(value = "批次号", required = false) @RequestParam Long batchNo)
 	{
 		//查询最大批次号
 		LambdaQueryWrapper<AuditProecess> countMaxWrapper=new LambdaQueryWrapper<>();
@@ -162,8 +162,15 @@ public class AuditProecessController extends BladeController {
 		int max = proecessList.stream().max(Comparator.comparing(AuditProecess::getBatchNo)).get().getBatchNo();
 		//根据最大批次号, 查询最新的审批记录
 		LambdaQueryWrapper<AuditProecess> auditProecessLambdaQueryWrapper=new LambdaQueryWrapper<>();
-		auditProecessLambdaQueryWrapper
-			.eq(AuditProecess::getBatchNo,max)
+			if(batchNo==null)
+			{
+				auditProecessLambdaQueryWrapper.eq(AuditProecess::getBatchNo,max);
+			}
+			else
+			{
+				auditProecessLambdaQueryWrapper.eq(AuditProecess::getBatchNo,batchNo);
+			}
+		    auditProecessLambdaQueryWrapper
 			.orderByAsc(AuditProecess::getLevelId)
 			.eq(AuditProecess::getSrcBillId,id)
 		.eq(AuditProecess::getIsDelete,0)

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

@@ -130,6 +130,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 					message.setToUserId(Long.valueOf(e.getAuditUserId()));
 				    message.setMessageType(1);
 					message.setMessageBody("你有新的审批待操作,请及时处理");
+			      	message.setUrl("/approveData/index");
 					R save = messageClient.save(message);
 					if(!save.isSuccess())
 					{
@@ -179,6 +180,9 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 		sendMessage.setTenantId(AuthUtil.getTenantId());
 		sendMessage.setCreateUser(AuthUtil.getUserId());
 		sendMessage.setCreateTime(new Date());
+		sendMessage.setUrl(auditProecess.getUrl());
+		sendMessage.setPageLabel(auditProecess.getPageLabel());
+		sendMessage.setPageStatus(auditProecess.getPageStatus());
 
 		//用户操作 1.通过  2.驳回
 		Integer operate = auditProecess.getOperate();
@@ -199,7 +203,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 				{
 					Settlement settlement=new Settlement();
 					settlement.setId(auditProecess.getSrcBillId());
-					settlement.setCheckStatus("审核中");
+					settlement.setCheckStatus("审批中");
 					R submit = financeClient.submit(settlement);
 					if(!submit.isSuccess())
 					{
@@ -239,7 +243,9 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 				message.setToUserId(Long.valueOf(proecess.getAuditUserId()));
 				message.setMessageType(1);
 				message.setTenantId(AuthUtil.getTenantId());
+				message.setMessageBody("你有新的审批待操作,请及时处理");
 				message.setCreateUser(AuthUtil.getUserId());
+				message.setUrl("/approveData/index");
 				message.setCreateTime(new Date());
 
 				R save = messageClient.save(message);

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

@@ -22,6 +22,7 @@ import com.trade.purchase.order.enums.OrderTypeEnum;
 import lombok.AllArgsConstructor;
 import org.springblade.client.feign.IGoodsDescClient;
 import org.springblade.client.vo.GoodsDescVO;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.deliver.goods.entity.Delivery;
@@ -138,10 +139,10 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 		List<DeliveryItems> collect = deliveryItemsList.stream().filter(e -> e.getGoodType() == 0).collect(Collectors.toList());//发货商品
 		List<DeliveryItems> itemsList = deliveryItemsList.stream().filter(e -> e.getGoodType() == 1).collect(Collectors.toList());//赠送商品
 		//判断要发货物的金额和已收金额的大小
-		/*R amount = this.deliveryAmount(collect, delivery.getTradeType());
+		R amount = this.deliveryAmount(collect, delivery.getTradeType());
 		if (!amount.isSuccess()){
 			throw  new RuntimeException(amount.getMsg());
-		}*/
+		}
 		if (CollectionUtils.isNotEmpty(collect)){
 			for (DeliveryItems deliveryItems : collect) {
 				if (deliveryItems.getItemId() == null){
@@ -550,11 +551,11 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 				newDelivery = itemsList.stream().reduce(BigDecimal.ZERO,(x,y) ->{ return x.add(y.getContractAmount().multiply(y.getExRate())); },BigDecimal::add);//本次发货金额
 				oldDelivery = deliveryItems.stream().reduce(BigDecimal.ZERO,(x,y) ->{ return x.add(y.getContractAmount().multiply(y.getExRate())); },BigDecimal::add);//历史发货金额
 				if (gathering.subtract(newDelivery.add(oldDelivery)).compareTo(BigDecimal.ZERO) <= 0){
-					throw new RuntimeException("订单"+srcOrderNo+"可发货金额为:"+BigDecimal.ZERO);
+					throw new RuntimeException("订单"+srcOrderNo+"发货金额超出 ,可发货金额为(CNY):"+(gathering.subtract(oldDelivery)).setScale(2,BigDecimal.ROUND_UP));
 				}
-				if (gathering.compareTo((newDelivery.add(oldDelivery))) < 0){
+				/*if (gathering.compareTo((newDelivery.add(oldDelivery))) < 0){
 					throw new RuntimeException("订单"+srcOrderNo+"可发货金额为:"+gathering.subtract(oldDelivery.add(newDelivery)));
-				}
+				}*/
 			}
 			return R.success("可以发货");
 		}else {

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

@@ -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);
 	}
 	//审核取消方法