| @@ -496,7 +496,7 @@ open class StockLedgerFixExportService( | |||||
| jdbc, | jdbc, | ||||
| """ | """ | ||||
| SELECT DISTINCT so.id, so.created, so.createdBy, so.version, so.modified, so.modifiedBy, so.deleted, | SELECT DISTINCT so.id, so.created, so.createdBy, so.version, so.modified, so.modifiedBy, so.deleted, | ||||
| so.type, so.completeDate, so.status, so.remarks | |||||
| so.type, so.completeDate, so.status, so.remarks, so.handlerId | |||||
| FROM stock_out so | FROM stock_out so | ||||
| INNER JOIN stock_out_line sol ON sol.stockOutId = so.id AND IFNULL(sol.deleted, 0) = 0 | INNER JOIN stock_out_line sol ON sol.stockOutId = so.id AND IFNULL(sol.deleted, 0) = 0 | ||||
| INNER JOIN stock_ledger sl ON sl.stockOutLineId = sol.id | INNER JOIN stock_ledger sl ON sl.stockOutLineId = sol.id | ||||
| @@ -510,11 +510,11 @@ open class StockLedgerFixExportService( | |||||
| table = "stock_out", | table = "stock_out", | ||||
| columns = listOf( | columns = listOf( | ||||
| "id", "created", "createdBy", "version", "modified", "modifiedBy", "deleted", | "id", "created", "createdBy", "version", "modified", "modifiedBy", "deleted", | ||||
| "type", "completeDate", "status", "remarks", | |||||
| "type", "completeDate", "status", "remarks", "handlerId", | |||||
| ), | ), | ||||
| onDup = "type=VALUES(type), completeDate=VALUES(completeDate), status=VALUES(status), " + | onDup = "type=VALUES(type), completeDate=VALUES(completeDate), status=VALUES(status), " + | ||||
| "remarks=VALUES(remarks), modified=VALUES(modified), modifiedBy=VALUES(modifiedBy), " + | |||||
| "version=stock_out.version+1, deleted=0", | |||||
| "remarks=VALUES(remarks), handlerId=VALUES(handlerId), modified=VALUES(modified), " + | |||||
| "modifiedBy=VALUES(modifiedBy), version=stock_out.version+1, deleted=0", | |||||
| emptyComment = "-- (no ADJ stock_out headers in range)", | emptyComment = "-- (no ADJ stock_out headers in range)", | ||||
| ) | ) | ||||
| writeExportRows( | writeExportRows( | ||||