From efc1458bc96c6fa80dfbaa7c0572bcf4a78f7c4a Mon Sep 17 00:00:00 2001
From: qinyulong <yulong.qin@ceict.com.cn>
Date: Thu, 19 Mar 2026 17:58:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E8=BF=87=E7=A8=8B=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=A4=84=E7=90=86=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/controller/DsTaskBillController.java     | 10 ++++++++++
 .../desk/oem/service/impl/OemTaskBillServiceImpl.java  |  8 ++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskBillController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskBillController.java
index 7dc87cf0..8b50aeb9 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskBillController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskBillController.java
@@ -202,4 +202,14 @@ public class DsTaskBillController extends BladeController {
 		return R.data(bsFillingDetailService.listFillingDetail(busId,BsFillingDetailEntity.DS_TASK_BILL));
 	}
 
+	/**
+	 * 外协任务单表 详情
+	 */
+	@GetMapping("/listOemFillingDetail")
+	@ApiOperationSupport(order = 12)
+	@Operation(summary = "外协任务单表", description = "传入dsTaskBill")
+	public R listOemFillingDetail(@RequestParam Long busId) {
+		return R.data(bsFillingDetailService.listFillingDetail(busId, BsFillingDetailEntity.OEM_PROCESS_TASK));
+	}
+
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemTaskBillServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemTaskBillServiceImpl.java
index 4e1dc02e..7767c8bb 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemTaskBillServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemTaskBillServiceImpl.java
@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDate;
@@ -98,6 +99,7 @@ public class OemTaskBillServiceImpl extends BaseServiceImpl<OemTaskBillMapper, O
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public R handleOemTaskBill(HandleOemTaskBillEntity handleOemTaskBill) {
         OemTaskBillEntity oemTaskBillEntity = baseMapper.selectById(handleOemTaskBill.getOtbId());
         oemTaskBillEntity.setFillMemo(handleOemTaskBill.getFillMemo());
@@ -105,8 +107,10 @@ public class OemTaskBillServiceImpl extends BaseServiceImpl<OemTaskBillMapper, O
         baseMapper.updateById(oemTaskBillEntity);
         //存入上次处理时间
         OemSpecialProEntity oemSpecialProEntity = oemSpecialProMapper.selectById(oemTaskBillEntity.getSpId());
-        oemSpecialProEntity.setLastDueTime(new Date());
-        oemSpecialProMapper.updateById(oemSpecialProEntity);
+        if (null != oemSpecialProEntity) {
+            oemSpecialProEntity.setLastDueTime(new Date());
+            oemSpecialProMapper.updateById(oemSpecialProEntity);
+        }
         List<BsFillingDetailEntity> fillingDetailList = handleOemTaskBill.getFillingDetailList();
         if (null != fillingDetailList && fillingDetailList.size() > 0) {
             for (BsFillingDetailEntity fillingDetail : fillingDetailList) {