提交代码

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

@@ -166,6 +166,18 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 	@GlobalTransactional
 	public void operationFinanceProcess(AuditProecess auditProecess)
 	{
+
+		//查看最新操作记录,防止重复提交
+		AuditProecess auditProecess1= baseMapper.selectById(auditProecess.getId());
+		if(auditProecess1==null)
+		{
+			throw new SecurityException("未查到此审批记录,禁止操作");
+		}
+		if(auditProecess1.getAuditStatus().equals("A")||auditProecess1.getAuditStatus().equals("B"))
+		{
+			throw new SecurityException("当前记录已经完成审批,禁止重复操作");
+		}
+
 		if(auditProecess.getAuditStatus()==null || !auditProecess.getAuditStatus().equals("S"))
 		{
 			 throw new SecurityException("审批状态非待审,禁止操作");
@@ -184,6 +196,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 		sendMessage.setPageLabel(auditProecess.getPageLabel());
 		sendMessage.setPageStatus(auditProecess.getPageStatus());
 
+
 		//用户操作 1.通过  2.驳回
 		Integer operate = auditProecess.getOperate();
 		//查看当前审批是否为最后一级
@@ -195,6 +208,8 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 		//不是最后一级
 		if(iffinalItem.equals("F"))
 		{
+
+
 			//通过
             if(operate==1)
             {

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderController.java

@@ -525,8 +525,8 @@ public class OrderController extends BladeController {
 						itemMoney=BigDecimal.ZERO;
 					}
 				}
-				itemMoney.setScale(2,BigDecimal.ROUND_HALF_UP);
-				e.setItemMoney(itemMoney);
+
+				e.setItemMoney(itemMoney.setScale(2,BigDecimal.ROUND_HALF_UP));
 				//销售主表信息
 				LambdaQueryWrapper<Order> saleOrderWrapper=new LambdaQueryWrapper<>();
 				saleOrderWrapper.eq(Order::getId,e.getOrderSaleId()).eq(Order::getTenantId,AuthUtil.getTenantId());

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

@@ -547,13 +547,16 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		   	   //修改原费用明细状态
 		   	   if(e.getSrcType()==2)
 		   	   {
-		   	   	   OrderFees orderFees=new OrderFees();
-		   	   	   orderFees.setId(e.getSrcFeesId());
-				   orderFees.setIsCheck(1);
-				   R submit = orderFeesClient.submit(orderFees);
+				   OrderFees client = orderFeesClient.getById(e.getSrcFeesId());
+				   if(client==null)
+				   {
+					   throw new SecurityException("未查到原单据的费用明细,无法修改状态");
+				   }
+				   client.setIsCheck(1);
+				   R submit = orderFeesClient.submit(client);
 				   if(!submit.isSuccess())
 				   {
-				   	throw new SecurityException("财务-修改原单据的费用明细错误");
+					   throw new SecurityException("财务-修改原单据的费用明细错误");
 				   }
 			   }
 		   	   e.setId(null);