From 8b708128e451770d7c2d77591fb3e3e8e059b079 Mon Sep 17 00:00:00 2001 From: qiankanghui Date: Wed, 8 Jul 2026 14:59:31 +0800 Subject: [PATCH] =?UTF-8?q?feat(inspection):=20=E6=B7=BB=E5=8A=A0SKU?= =?UTF-8?q?=E5=92=8C=E5=88=86=E7=B1=BB=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 InspectionRequestDetail 实体中新增 sku、categoryLevel2、categoryLevel3 字段 - 在 InspectionRequestDetailSub 实体中新增 sku、categoryLevel2、categoryLevel3 字段 - 在 InspectionResultVO 中新增 sku、categoryLevel2、categoryLevel3 字段 - 更新 InspectionRequestDetailMapper.xml 查询语句以包含产品表相关字段 - 更新 InspectionRequestDetailSubMapper.xml 查询语句以包含产品表相关字段 - 在验货申请确认流程中添加检验模板校验功能 --- .../modules/inspection/data/InspectionResultVO.java | 10 ++++++++++ .../inspection/entity/InspectionRequestDetail.java | 9 +++++++++ .../inspection/entity/InspectionRequestDetailSub.java | 9 +++++++++ .../service/impl/InspectionRequestServiceImpl.java | 4 ++++ .../inspection/InspectionRequestDetailMapper.xml | 8 ++++++-- .../inspection/InspectionRequestDetailSubMapper.xml | 1 + 6 files changed, 39 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/xujie/modules/inspection/data/InspectionResultVO.java b/src/main/java/com/xujie/modules/inspection/data/InspectionResultVO.java index 52f0074..348acc7 100644 --- a/src/main/java/com/xujie/modules/inspection/data/InspectionResultVO.java +++ b/src/main/java/com/xujie/modules/inspection/data/InspectionResultVO.java @@ -1,5 +1,6 @@ package com.xujie.modules.inspection.data; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.math.BigDecimal; @@ -115,4 +116,13 @@ public class InspectionResultVO { * QC人员 */ private String qcOperator; + + @TableField(exist = false) + private String sku; + + @TableField(exist = false) + private String categoryLevel2; + + @TableField(exist = false) + private String categoryLevel3; } diff --git a/src/main/java/com/xujie/modules/inspection/entity/InspectionRequestDetail.java b/src/main/java/com/xujie/modules/inspection/entity/InspectionRequestDetail.java index c2b13cb..a0a123a 100644 --- a/src/main/java/com/xujie/modules/inspection/entity/InspectionRequestDetail.java +++ b/src/main/java/com/xujie/modules/inspection/entity/InspectionRequestDetail.java @@ -73,4 +73,13 @@ public class InspectionRequestDetail extends QueryPage { * 检验结果 */ private String inspectResult; + + @TableField(exist = false) + private String sku; + + @TableField(exist = false) + private String categoryLevel2; + + @TableField(exist = false) + private String categoryLevel3; } diff --git a/src/main/java/com/xujie/modules/inspection/entity/InspectionRequestDetailSub.java b/src/main/java/com/xujie/modules/inspection/entity/InspectionRequestDetailSub.java index f455ee7..fbabbbf 100644 --- a/src/main/java/com/xujie/modules/inspection/entity/InspectionRequestDetailSub.java +++ b/src/main/java/com/xujie/modules/inspection/entity/InspectionRequestDetailSub.java @@ -88,4 +88,13 @@ public class InspectionRequestDetailSub extends QueryPage { @TableField(exist = false) private String isChanged; + + @TableField(exist = false) + private String sku; + + @TableField(exist = false) + private String categoryLevel2; + + @TableField(exist = false) + private String categoryLevel3; } 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 d13d152..d8b0fed 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 @@ -376,6 +376,10 @@ public class InspectionRequestServiceImpl extends ServiceImpl requestNos = Arrays.asList(requestNo); + validateInspectionTemplate(site, requestNos); + // 2. 修改头表状态为已确认 baseMapper.confirm(site, requestNo); diff --git a/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml b/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml index dfae579..2dc6a8c 100644 --- a/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml +++ b/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml @@ -25,7 +25,8 @@ SELECT , + p.sku,p.category_level2,p.category_level3, CASE WHEN d.ship_mothod != poh.ship_via OR CONVERT(varchar(10), d.crd, 23) != CONVERT(varchar(10), ISNULL(pod.c_crd, pod.want_receive_date), 23)