| @@ -118,6 +118,7 @@ open class DeliveryOrderService( | |||||
| code = deliveryOrder.code ?: "", | code = deliveryOrder.code ?: "", | ||||
| supplierCode = deliveryOrder.supplier?.code, | supplierCode = deliveryOrder.supplier?.code, | ||||
| shopCode = deliveryOrder.shop?.code, | shopCode = deliveryOrder.shop?.code, | ||||
| shopName = deliveryOrder.shop?.name, | |||||
| currencyCode = deliveryOrder.currency?.code, | currencyCode = deliveryOrder.currency?.code, | ||||
| orderDate = deliveryOrder.orderDate, | orderDate = deliveryOrder.orderDate, | ||||
| estimatedArrivalDate = deliveryOrder.estimatedArrivalDate, | estimatedArrivalDate = deliveryOrder.estimatedArrivalDate, | ||||
| @@ -7,6 +7,7 @@ data class DoDetailResponse( | |||||
| val code: String, | val code: String, | ||||
| val supplierCode: String?, | val supplierCode: String?, | ||||
| val shopCode: String?, | val shopCode: String?, | ||||
| val shopName: String?, | |||||
| val currencyCode: String?, | val currencyCode: String?, | ||||
| @JsonFormat(pattern = "yyyy-MM-dd") | @JsonFormat(pattern = "yyyy-MM-dd") | ||||
| val orderDate: LocalDateTime?, | val orderDate: LocalDateTime?, | ||||
| @@ -30,6 +30,8 @@ interface JobOrderInfo { | |||||
| @get:Value("#{target.stockInLines?.size() > 0 ? target.stockInLines[0].escalationLog.^[status.value == 'pending']?.handler?.id : null}") | @get:Value("#{target.stockInLines?.size() > 0 ? target.stockInLines[0].escalationLog.^[status.value == 'pending']?.handler?.id : null}") | ||||
| val silHandlerId: Long?; | val silHandlerId: Long?; | ||||
| @get:Value("#{target.planStart}") | |||||
| val planStart: java.time.LocalDateTime?; | |||||
| // @get:Value("#{target.bom.item.itemUoms.^[salesUnit == true && deleted == false]?.uom}") | // @get:Value("#{target.bom.item.itemUoms.^[salesUnit == true && deleted == false]?.uom}") | ||||
| //// @get:Value("#{target.bom.item.itemUoms.^[salesUnit == true && deleted == false]?.uom.udfudesc}") | //// @get:Value("#{target.bom.item.itemUoms.^[salesUnit == true && deleted == false]?.uom.udfudesc}") | ||||
| // val uom: UomConversion; | // val uom: UomConversion; | ||||
| @@ -1,4 +1,8 @@ | |||||
| -- liquibase formatted sql | -- liquibase formatted sql | ||||
| -- changeset kelvin:update stock in line table | -- changeset kelvin:update stock in line table | ||||
| --preconditions onFail:MARK_RAN | |||||
| --precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'stock_in_line' AND COLUMN_NAME = 'jobOrderId' | |||||
| ALTER TABLE `stock_in_line` | ALTER TABLE `stock_in_line` | ||||
| ADD COLUMN `jobOrderId` INT NULL DEFAULT NULL AFTER `stockTakeLineId`; | ADD COLUMN `jobOrderId` INT NULL DEFAULT NULL AFTER `stockTakeLineId`; | ||||