Browse Source

qc阅读改动

master
shenzhouyu 3 weeks ago
parent
commit
6ddf65bb53
  1. 3
      src/main/java/com/xujie/sys/modules/reader/entity/EquipmentFolderSortEntity.java
  2. 4
      src/main/resources/mapper/pms/QcMapper.xml

3
src/main/java/com/xujie/sys/modules/reader/entity/EquipmentFolderSortEntity.java

@ -1,5 +1,7 @@
package com.xujie.sys.modules.reader.entity; 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.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
@ -9,6 +11,7 @@ import java.util.Date;
@Data @Data
@TableName("Equipment_folder_sort") @TableName("Equipment_folder_sort")
public class EquipmentFolderSortEntity { public class EquipmentFolderSortEntity {
@TableId(type = IdType.AUTO)
private int id; private int id;
private String site; private String site;

4
src/main/resources/mapper/pms/QcMapper.xml

@ -2254,7 +2254,7 @@
a.batch_qualified_qty, a.batch_qualified_qty,
isnull(a.work_file_read, 'N') as workFileRead, isnull(a.work_file_read, 'N') as workFileRead,
CASE WHEN ( 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 ( OR EXISTS (
SELECT 1 SELECT 1
FROM dbo.getSOP_RootPartList(a.site, a.part_no) p FROM dbo.getSOP_RootPartList(a.site, a.part_no) p
@ -3035,7 +3035,7 @@
a.batch_qualified_qty, a.batch_qualified_qty,
isnull(a.work_file_read, 'N') as workFileRead, isnull(a.work_file_read, 'N') as workFileRead,
CASE WHEN ( 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 ( OR EXISTS (
SELECT 1 SELECT 1
FROM dbo.getSOP_RootPartList(a.site, a.part_no) p FROM dbo.getSOP_RootPartList(a.site, a.part_no) p

Loading…
Cancel
Save