From cce2ddf4f9cd88e772fb3f807879983b66dcde34 Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Mon, 13 Jan 2025 10:27:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E9=AA=8C=E6=94=B6=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchase/domain/PurchaseCheckInfo.java       |  1 -
 .../impl/PurchaseCheckInfoServiceImpl.java       | 16 +++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java
index cef76dd5..fcf79e39 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java
@@ -45,7 +45,6 @@ public class PurchaseCheckInfo extends BaseEntity {
     private String code;
 
     /** 采购日期 */
-    @Excel(name = "采购日期", sort = 1)
     @ApiModelProperty(value = "采购日期")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date purchaseTime;
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
index 0f928fcd..18783b11 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
@@ -334,7 +334,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
      * @return 结果
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult insertPurchaseCheckInfo(PurchaseCheckDto purchaseCheckInfo) {
         purchaseCheckInfo.getPurchaseCheckInfo().setCreateTime(DateUtils.getNowDate());
         purchaseCheckInfo.getPurchaseCheckInfo().setCreateBy(SecurityUtils.getUsername());
@@ -352,15 +352,21 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
             if (0 < count) {
                 return insertPurchaseCheckDetails(purchaseCheckInfo.getPurchaseCheckDetailsList(), taskId);
             } else {
-                return AjaxResult.error("新增任务失败,purchase_check_info表插入0条");
+                return AjaxResult.error("新增任务失败,新购任务信息表插入0条");
             }
-        } catch (final DataAccessException e) {
-            return AjaxResult.error("数据库操作失败:" + e.getMessage());
+        } catch (final DataAccessException dae) {
+            throw new ServiceException("数据库错误:" + dae.getMessage());
         } catch (final Exception e) {
-            return AjaxResult.error("新增任务失败:" + e.getMessage());
+            throw new ServiceException("新增任务失败:" + e.getMessage());
         }
     }
 
+    /**
+     * 插入新购验收任务详情
+     * @param purchaseCheckDetailsList 新购验收物资明细
+     * @param taskId 任务id
+     * @return 结果
+     */
     private AjaxResult insertPurchaseCheckDetails(List<PurchaseCheckDetails> purchaseCheckDetailsList, Long taskId) {
         if (!CollectionUtils.isEmpty(purchaseCheckDetailsList)) {
             for (PurchaseCheckDetails details : purchaseCheckDetailsList) {