From 100e8eddf472e7a49d62bff3e5d7eb79a1e7c08e Mon Sep 17 00:00:00 2001
From: qiankanghui <kanghui.qian@xujiesoft.com>
Date: Fri, 29 May 2026 10:28:12 +0800
Subject: [PATCH] =?UTF-8?q?feat(inspection):=20=E6=96=B0=E5=A2=9E=E9=AA=8C?=
 =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 实现检验申请单头表分页查询接口
- 实现检验申请单明细和子表明细分页查询接口
- 实现验货申请的保存、修改、取消、确认、审核和删除功能
- 实现可申请验货PO查询功能
- 实现QC人员查询功能
- 实现验货排程和排程视图查询功能
- 实现验货申请导入模板下载功能
- 实现Excel数据预览和批量保存功能
- 实现验货结果查询功能
- 完善事务处理和数据校验机制
---
 .../controller/InspectionController.java      |  9 +++++
 .../service/InspectionRequestService.java     |  2 +
 .../impl/InspectionRequestServiceImpl.java    | 37 +++++++++++++++++++
 3 files changed, 48 insertions(+)

diff --git a/src/main/java/com/xujie/modules/inspection/controller/InspectionController.java b/src/main/java/com/xujie/modules/inspection/controller/InspectionController.java
index fa408da..e49f4d0 100644
--- a/src/main/java/com/xujie/modules/inspection/controller/InspectionController.java
+++ b/src/main/java/com/xujie/modules/inspection/controller/InspectionController.java
@@ -96,6 +96,15 @@ public class InspectionController {
         return R.ok();
     }
 
+    /**
+     * 修改验货申请（仅允许修改建议验货日期、验货地址和联系人）
+     */
+    @PostMapping("/update")
+    public R update(@RequestBody InspectionRequestHeader header){
+        inspectionRequestService.updateRequest(header);
+        return R.ok();
+    }
+
     /**
      * 取消验货申请
      */
diff --git a/src/main/java/com/xujie/modules/inspection/service/InspectionRequestService.java b/src/main/java/com/xujie/modules/inspection/service/InspectionRequestService.java
index de719ec..47e1336 100644
--- a/src/main/java/com/xujie/modules/inspection/service/InspectionRequestService.java
+++ b/src/main/java/com/xujie/modules/inspection/service/InspectionRequestService.java
@@ -56,4 +56,6 @@ public interface InspectionRequestService extends IService<InspectionRequestHead
     void schedule(InspectionScheduleVO vo);
 
     List<InspectionScheduleViewVO> queryScheduleView(String qcOperator);
+
+    void updateRequest(InspectionRequestHeader header);
 }
diff --git a/src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestServiceImpl.java b/src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestServiceImpl.java
index befb1d1..06bd08b 100644
--- a/src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestServiceImpl.java
+++ b/src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestServiceImpl.java
@@ -1,6 +1,7 @@
 package com.xujie.modules.inspection.service.impl;
 
 import com.alibaba.excel.EasyExcel;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -626,4 +627,40 @@ public class InspectionRequestServiceImpl extends ServiceImpl<InspectionRequestH
 
         return baseMapper.queryScheduleView(qcOperator);
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateRequest(InspectionRequestHeader header) {
+        SysUserEntity user = (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
+        String site = user.getSite();
+
+        // 1. 查询头表，校验状态
+        InspectionRequestHeader existingHeader = baseMapper.selectByRequestNo(site, header.getRequestNo());
+        if (existingHeader == null) {
+            throw new RuntimeException("检验申请单不存在");
+        }
+
+        // 只有草稿状态的验货申请允许修改
+        if (!"Draft".equals(existingHeader.getStatusDb())) {
+            throw new RuntimeException("只有草稿状态的验货申请允许修改，当前状态：" + existingHeader.getStatusDb());
+        }
+
+        log.info("开始修改验货申请: requestNo={}, site={}", header.getRequestNo(), site);
+
+        // 使用UpdateWrapper确保只更新指定字段
+       UpdateWrapper<InspectionRequestHeader> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("site", site)
+                    .eq("request_no", header.getRequestNo())
+                    .set("need_inspect_date", header.getNeedInspectDate())
+                    .set("inspect_address", header.getInspectAddress())
+                    .set("inspect_contract", header.getInspectContract());
+
+        int updateCount = baseMapper.update(null, updateWrapper);
+
+        if (updateCount == 0) {
+            throw new RuntimeException("修改验货申请失败");
+        }
+
+        log.info("验货申请修改成功: requestNo={}", header.getRequestNo());
+    }
 }