|
|
@ -586,6 +586,8 @@ public class RoutingApi { |
|
|
tempItem.setSetupLaborClassNo(tempMap.get("SETUP_LABOR_CLASS_NO")); |
|
|
tempItem.setSetupLaborClassNo(tempMap.get("SETUP_LABOR_CLASS_NO")); |
|
|
tempItem.setOverlap(tempMap.get("OVERLAP")); |
|
|
tempItem.setOverlap(tempMap.get("OVERLAP")); |
|
|
tempItem.setNoteText(tempMap.get("NOTE_TEXT")); |
|
|
tempItem.setNoteText(tempMap.get("NOTE_TEXT")); |
|
|
|
|
|
tempItem.setContract(tempMap.get("CONTRACT")); |
|
|
|
|
|
tempItem.setPartNo(tempMap.get("PART_NO")); |
|
|
//添加对象 |
|
|
//添加对象 |
|
|
resultItems.add(tempItem); |
|
|
resultItems.add(tempItem); |
|
|
} |
|
|
} |
|
|
@ -846,6 +848,7 @@ public class RoutingApi { |
|
|
tempItem.setRoutingRevision(tempMap.get("ROUTING_REVISION")); |
|
|
tempItem.setRoutingRevision(tempMap.get("ROUTING_REVISION")); |
|
|
tempItem.setAlternativeNo(tempMap.get("ALTERNATIVE_NO")); |
|
|
tempItem.setAlternativeNo(tempMap.get("ALTERNATIVE_NO")); |
|
|
tempItem.setOperationNo(tempMap.get("OPERATION_NO")); // |
|
|
tempItem.setOperationNo(tempMap.get("OPERATION_NO")); // |
|
|
|
|
|
tempItem.setToolId(tempMap.get("TOOL_ID")); // |
|
|
tempItem.setNoteText(tempMap.get("NOTE_TEXT")); |
|
|
tempItem.setNoteText(tempMap.get("NOTE_TEXT")); |
|
|
//添加对象 |
|
|
//添加对象 |
|
|
resultItems.add(tempItem); |
|
|
resultItems.add(tempItem); |
|
|
@ -1068,7 +1071,7 @@ public class RoutingApi { |
|
|
searchSql.append("SELECT rog.CONTRACT, rog.PART_NO, rog.ROUTING_REVISION, rog.BOM_TYPE, rog.ALTERNATIVE_NO, rot.OPERATION_NO, rog.GUIDELINE_NO,"); |
|
|
searchSql.append("SELECT rog.CONTRACT, rog.PART_NO, rog.ROUTING_REVISION, rog.BOM_TYPE, rog.ALTERNATIVE_NO, rot.OPERATION_NO, rog.GUIDELINE_NO,"); |
|
|
searchSql.append(" rog.GUIDELINE_SEQ, rog.OBJID ifsRowId, rog.OBJVERSION ifsRowVersion"); |
|
|
searchSql.append(" rog.GUIDELINE_SEQ, rog.OBJID ifsRowId, rog.OBJVERSION ifsRowVersion"); |
|
|
searchSql.append(" FROM IFSAPP.ROUTING_OPER_WORK_GUIDE rog"); |
|
|
searchSql.append(" FROM IFSAPP.ROUTING_OPER_WORK_GUIDE rog"); |
|
|
searchSql.append(" LEFT JOIN IFSAPP.ROUTING_OPERATION_TOOL rot"); |
|
|
|
|
|
|
|
|
searchSql.append(" LEFT JOIN IFSAPP.ROUTING_OPERATION rot"); |
|
|
searchSql.append(" ON rot.CONTRACT = rog.CONTRACT AND rot.PART_NO = rog.PART_NO AND rot.ROUTING_REVISION = rog.ROUTING_REVISION "); |
|
|
searchSql.append(" ON rot.CONTRACT = rog.CONTRACT AND rot.PART_NO = rog.PART_NO AND rot.ROUTING_REVISION = rog.ROUTING_REVISION "); |
|
|
searchSql.append(" AND rot.BOM_TYPE = rog.BOM_TYPE AND rot.ALTERNATIVE_NO = rog.ALTERNATIVE_NO AND rot.OPERATION_ID = rog.OPERATION_ID"); |
|
|
searchSql.append(" AND rot.BOM_TYPE = rog.BOM_TYPE AND rot.ALTERNATIVE_NO = rog.ALTERNATIVE_NO AND rot.OPERATION_ID = rog.OPERATION_ID"); |
|
|
searchSql.append(" WHERE rog.CONTRACT = :contract AND rog.PART_NO = :partNo"); |
|
|
searchSql.append(" WHERE rog.CONTRACT = :contract AND rog.PART_NO = :partNo"); |
|
|
@ -1102,6 +1105,7 @@ public class RoutingApi { |
|
|
tempItem.setRoutingRevision(tempMap.get("ROUTING_REVISION")); |
|
|
tempItem.setRoutingRevision(tempMap.get("ROUTING_REVISION")); |
|
|
tempItem.setAlternativeNo(tempMap.get("ALTERNATIVE_NO")); |
|
|
tempItem.setAlternativeNo(tempMap.get("ALTERNATIVE_NO")); |
|
|
tempItem.setOperationNo(tempMap.get("OPERATION_NO")); // |
|
|
tempItem.setOperationNo(tempMap.get("OPERATION_NO")); // |
|
|
|
|
|
tempItem.setGuidelineSeq(tempMap.get("GUIDELINE_SEQ")); |
|
|
tempItem.setNoteText(tempMap.get("NOTE_TEXT")); |
|
|
tempItem.setNoteText(tempMap.get("NOTE_TEXT")); |
|
|
//添加对象 |
|
|
//添加对象 |
|
|
resultItems.add(tempItem); |
|
|
resultItems.add(tempItem); |
|
|
|