diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java index f93f3010..47dabfc8 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java @@ -137,6 +137,26 @@ public class QcFAIRecordData extends QueryPage { // 标签条码 private String rollNo; private List submitList; + // PN + private String cinvSourceCode; + // sku + private String sku; + + public String getCinvSourceCode() { + return cinvSourceCode; + } + + public void setCinvSourceCode(String cinvSourceCode) { + this.cinvSourceCode = cinvSourceCode; + } + + public String getSku() { + return sku; + } + + public void setSku(String sku) { + this.sku = sku; + } public String getSupplierDesc() { return supplierDesc; diff --git a/src/main/java/com/xujie/sys/modules/sys/service/impl/SysFileServiceImpl.java b/src/main/java/com/xujie/sys/modules/sys/service/impl/SysFileServiceImpl.java index 6cbfc0d0..ea1a8fd0 100644 --- a/src/main/java/com/xujie/sys/modules/sys/service/impl/SysFileServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/sys/service/impl/SysFileServiceImpl.java @@ -82,7 +82,7 @@ public class SysFileServiceImpl implements SysFileService { ossEntity.setCreateDate(new Date()); ossEntity.setOrderRef1(inData.getSite()); ossEntity.setOrderRef2(inData.getObjectID()); - if (inData.getFolder().equals("reportFault") || inData.getFolder().equals("reportSparPart")){ + if (inData.getFolder().equals("reportFault") || inData.getFolder().equals("reportSparPart")) { ossEntity.setOrderRef3(inData.getFolder()); } else if (inData.getFolder().equals("DJItemImageFile") || inData.getFolder().equals("WBItemImageFile")) { // 点检和维保的项目图片上传 ossEntity.setOrderRef3(inData.getOrderRef1()); diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index 2fa4d783..0971e1b2 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -1431,7 +1431,9 @@ inspector_no, ssr_id, unqualified_qty, - submit_flag + submit_flag, + dbo.qc_get_cinv_source_code(site, part_no) as cinvSourceCode, + dbo.qc_get_sku(site, part_no) as sku FROM qc_fai_record site = #{query.site} @@ -1687,7 +1689,9 @@ inspector_no, ssr_id, unqualified_qty, - submit_flag + submit_flag, + dbo.qc_get_cinv_source_code(site, part_no) as cinvSourceCode, + dbo.qc_get_sku(site, part_no) as sku FROM qc_ipqc_record site = #{query.site} @@ -2235,7 +2239,9 @@ inspector_no, ssr_id, unqualified_qty, - submit_flag + submit_flag, + dbo.qc_get_cinv_source_code(site, part_no) as cinvSourceCode, + dbo.qc_get_sku(site, part_no) as sku FROM qc_fqc_record site = #{query.site}