From 6ddf65bb536942c34a4fe42bbb9d1310e0b37e63 Mon Sep 17 00:00:00 2001 From: shenzhouyu Date: Wed, 5 Aug 2026 11:23:21 +0800 Subject: [PATCH] =?UTF-8?q?qc=E9=98=85=E8=AF=BB=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/modules/reader/entity/EquipmentFolderSortEntity.java | 3 +++ src/main/resources/mapper/pms/QcMapper.xml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentFolderSortEntity.java b/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentFolderSortEntity.java index 16b73c51..5ae48839 100644 --- a/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentFolderSortEntity.java +++ b/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentFolderSortEntity.java @@ -1,5 +1,7 @@ package com.xujie.sys.modules.reader.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -9,6 +11,7 @@ import java.util.Date; @Data @TableName("Equipment_folder_sort") public class EquipmentFolderSortEntity { + @TableId(type = IdType.AUTO) private int id; private String site; diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index 3f43717d..9ca819ce 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -2254,7 +2254,7 @@ a.batch_qualified_qty, isnull(a.work_file_read, 'N') as workFileRead, CASE WHEN ( - EXISTS (SELECT 1 FROM sys_oss o WHERE o.order_ref1 = a.site AND o.order_ref2 = a.inspection_no AND o.order_ref4 = a.bu_no) + EXISTS (SELECT 1 FROM sys_oss o WHERE o.order_ref1 = a.site AND o.order_ref2 = a.part_no AND o.order_ref4 = a.bu_no) OR EXISTS ( SELECT 1 FROM dbo.getSOP_RootPartList(a.site, a.part_no) p @@ -3035,7 +3035,7 @@ a.batch_qualified_qty, isnull(a.work_file_read, 'N') as workFileRead, CASE WHEN ( - EXISTS (SELECT 1 FROM sys_oss o WHERE o.order_ref1 = a.site AND o.order_ref2 = a.inspection_no AND o.order_ref4 = a.bu_no) + EXISTS (SELECT 1 FROM sys_oss o WHERE o.order_ref1 = a.site AND o.order_ref2 = a.part_no AND o.order_ref4 = a.bu_no) OR EXISTS ( SELECT 1 FROM dbo.getSOP_RootPartList(a.site, a.part_no) p