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 c26e2afc..cc5b35ca 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 @@ -110,7 +110,7 @@ public class SysFileServiceImpl implements SysFileService { @Override public List getInspectionFile(SysOssEntity inData) { - List files1 = sysOssDao.getSysFileByOrderRef2(inData); + List files1 = getSysFileByOrderRef2(inData); // mes文件 List list = sysOssDao.searchPartSopListFather(inData); for (SysOssEntity p : list) { diff --git a/src/main/resources/mapper/oss/SysOssDao.xml b/src/main/resources/mapper/oss/SysOssDao.xml index a423b082..14cc0ffb 100644 --- a/src/main/resources/mapper/oss/SysOssDao.xml +++ b/src/main/resources/mapper/oss/SysOssDao.xml @@ -85,9 +85,14 @@ and order_ref1 = #{orderRef1} - - and order_ref2 = #{orderRef2} - + + + and order_ref2 in (#{orderRef2}, #{partNo}) + + + and order_ref2 = #{orderRef2} + + and order_ref3 = #{orderRef3}