From 254bdd150c4094c1b1c77cfd02e957da16812bc5 Mon Sep 17 00:00:00 2001
From: liweidong-hj <liweidong-hj@huafang.com>
Date: Tue, 16 Jun 2026 14:08:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PlateGoodsApplyServiceImpl.java     | 12 ++++++++++--
 .../order/service/impl/YieldOrderServiceImpl.java    |  8 +++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java
index 6de6be0dd..2ff278ec3 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java
@@ -68,11 +68,11 @@ public class PlateGoodsApplyServiceImpl extends BaseServiceImpl<PlateGoodsApplyM
 			dataList.add(item);
 			if(approvalStatus.equals(PlateGoodsEnum.STATUS_PASS.getCode())){
 				//审批通过
-				mesApprovalRecordService.passApproval(id, MesApprovalRecordBizTypeEnum.PLATE_GOODS_RECORD.getDesc(),  AuthUtil.getUserId(), new Date());
+				mesApprovalRecordService.passApproval(id, MesApprovalRecordBizTypeEnum.PLATE_GOODS_APPLY.getDesc(),  AuthUtil.getUserId(), new Date());
 			}
 			if(approvalStatus.equals(PlateGoodsEnum.STATUS_NOT_PASS.getCode())){
 				//审批驳回
-				mesApprovalRecordService.rejectApproval(id, MesApprovalRecordBizTypeEnum.PLATE_GOODS_RECORD.getDesc(),  AuthUtil.getUserId(), new Date());
+				mesApprovalRecordService.rejectApproval(id, MesApprovalRecordBizTypeEnum.PLATE_GOODS_APPLY.getDesc(),  AuthUtil.getUserId(), new Date());
 			}
 		});
 
@@ -99,6 +99,14 @@ public class PlateGoodsApplyServiceImpl extends BaseServiceImpl<PlateGoodsApplyM
 
 			// 3. 更新数据库
 			this.updateById(plateGoodsApply);
+			if(approvalStatus.equals(PlateGoodsEnum.SECOND_STATUS_PASS.getCode())){
+				//审批通过
+				mesApprovalRecordService.passApproval(id, MesApprovalRecordBizTypeEnum.PLATE_GOODS_APPLY.getDesc(),  AuthUtil.getUserId(), new Date());
+			}
+			if(approvalStatus.equals(PlateGoodsEnum.SECOND_STATUS_NOT_PASS.getCode())){
+				//审批驳回
+				mesApprovalRecordService.rejectApproval(id, MesApprovalRecordBizTypeEnum.PLATE_GOODS_APPLY.getDesc(),  AuthUtil.getUserId(), new Date());
+			}
 		}
 		return true;
 	}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
index 49856e7a0..36e01a0a6 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
@@ -382,9 +382,11 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
                     yieldOrder.getValidationResult().equals(YieldOrderEnum.VALIDATION_RESULT_PASS.getCode()) &&
                     yieldOrder.getReceiveStatus().equals(YieldOrderEnum.RECEIVE_STATUS_YES.getCode())) {
                 //订单状态为验证完成并且已接收 进行分派
-                boolean result = this.verifyYieldOrderResource(yieldOrder);
-                if (!result) {
-                    throw new ServiceException("分派异常请及时处理");
+                try {
+                    this.yieldOrderAutoDispatch(yieldOrder);
+                } catch (Exception e) {
+                    log.error("分派异常：{}",yieldOrder.getId());
+                    e.printStackTrace();
                 }
             }
         }