diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesYfReportDaoImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesYfReportDaoImpl.java index 97201ea..4989b3a 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesYfReportDaoImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesYfReportDaoImpl.java @@ -203,7 +203,7 @@ public class MesYfReportDaoImpl implements IMesYfReportDao { StringBuilder commonHql = new StringBuilder(); commonHql.append(" from MesWorkOrderAssembly orderAssembly left join MesWorkOrder workOrder on workOrder.organizeCode = :organizeCode and workOrder.isDeleted=:isDeleted and workOrder.isValid=:isValid and orderAssembly.workOrderNo = workOrder.workOrderNo "); commonHql.append(" left join MesProductionAssembly assembly on assembly.organizeCode=:organizeCode and assembly.isDeleted=:isDeleted and assembly.isValid=:isValid and workOrder.custSn = assembly.custSn and orderAssembly.assemblyPartNo = assembly.assemblyPartNo "); - commonHql.append(" left join MesProdRuleSortCfg sortCfg on sortCfg.organizeCode = :organizeCode and sortCfg.isDeleted=:isDeleted and sortCfg.isValid=:isValid and orderAssembly.pid = sortCfg.id and orderAssembly.assemblyPartNo = sortCfg.assemblyPartNo "); + commonHql.append(" left join MesProdRuleSortCfg sortCfg on sortCfg.organizeCode = :organizeCode and sortCfg.isDeleted=:isDeleted and sortCfg.isValid=:isValid and orderAssembly.pid = sortCfg.id "); commonHql.append(" left join MesPartType partType on partType.organizeCode = :organizeCode and partType.isDeleted=:isDeleted and partType.isValid=:isValid and sortCfg.partTypeCode = partType.partTypeCode "); commonHql.append(" where orderAssembly.organizeCode=:organizeCode and orderAssembly.isDeleted=:isDeleted and orderAssembly.isValid=:isValid and workOrder.organizeCode = :organizeCode"); commonHql.append(" and workOrder.isDeleted=:isDeleted and workOrder.isValid=:isValid and assembly.organizeCode = :organizeCode and assembly.isDeleted=:isDeleted and assembly.isValid=:isValid");