Index: grails-app/services/com/lemans/ds/fitment/PartFitmentManagerService.groovy =================================================================== diff -u -r4fc092c25c4a44b01a19a043f5bc80a78340e0d6 -rd62387f918194bc923545698f275fd0c49a98e01 --- grails-app/services/com/lemans/ds/fitment/PartFitmentManagerService.groovy (.../PartFitmentManagerService.groovy) (revision 4fc092c25c4a44b01a19a043f5bc80a78340e0d6) +++ grails-app/services/com/lemans/ds/fitment/PartFitmentManagerService.groovy (.../PartFitmentManagerService.groovy) (revision d62387f918194bc923545698f275fd0c49a98e01) @@ -40,22 +40,15 @@ if (!errors) { List modelYearIdsToBeCreated = modelIdsToBeCreated(partNumber, modelYearIds) if (modelYearIdsToBeCreated) { - log.debug("modelYearIdsToBeCreated $modelYearIdsToBeCreated") Timestamp now = new Timestamp(new Date().time) sql().withBatch(50, FITMENT_INSERT_SQL) { stmt -> modelYearIdsToBeCreated.each { Integer modelYearId -> stmt.addBatch([modelYearId: modelYearId, partNumber: partNumber, footnote: values.footNote ?: null, now: now, username: username]) } } - log.debug("done with batch") List createdPartFitmentIds = createdPartFitmentsByModelYearIdsAndPartNumber(modelYearIdsToBeCreated, partNumber, now) - String query = """SELECT partFitmentId FROM PartFitment WITH(NOLOCK) WHERE - partNumber = :partNumber AND modelYearId IN (${modelYearIds.join(', ')}) AND dateDeleted is NULL""" - List results = sql().rows([partNumber: partNumber], query)?.partFitmentId - log.debug("partFitmentIdCreated $results") - log.debug("createdPartFitmentIds $createdPartFitmentIds") - qcChangeLogService.createAndLogForQC('Part', partNumber, 'PartFitment', results, now, username) + qcChangeLogService.createAndLogForQC('Part', partNumber, 'PartFitment', createdPartFitmentIds, now, username) qcChangeLogService.findAndDeleteChangeLogs('PartFitment', [partNumber], username) } } @@ -201,8 +194,8 @@ private List createdPartFitmentsByModelYearIdsAndPartNumber(List modelYearIds, String partNumber, Timestamp now) { String query = """SELECT partFitmentId FROM PartFitment WITH(NOLOCK) WHERE - dateCreated = :dateCreated AND partNumber = :partNumber AND modelYearId IN (${modelYearIds.join(', ')})""" - sql().rows([partNumber: partNumber, dateCreated: now], query)?.partFitmentId + partNumber = :partNumber AND modelYearId IN (${modelYearIds.join(', ')}) AND dateDeleted is NULL""" + sql().rows([partNumber: partNumber], query)?.partFitmentId } private Map deleteFitments(String partNumber, List partFitments, String username) {