diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/service/TruckLaneVersionService.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/service/TruckLaneVersionService.kt index bd50d7f..41fc24b 100644 --- a/src/main/java/com/ffii/fpsms/modules/pickOrder/service/TruckLaneVersionService.kt +++ b/src/main/java/com/ffii/fpsms/modules/pickOrder/service/TruckLaneVersionService.kt @@ -145,6 +145,8 @@ open class TruckLaneVersionService( truckRowId = key, shopCode = b?.shopCode ?: a?.shopCode, changes = changes, + truckLanceCode = b?.truckLanceCode ?: a?.truckLanceCode, + remark = b?.remark ?: a?.remark, ) ) } diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/service/TruckService.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/service/TruckService.kt index 0175ef4..5d60425 100644 --- a/src/main/java/com/ffii/fpsms/modules/pickOrder/service/TruckService.kt +++ b/src/main/java/com/ffii/fpsms/modules/pickOrder/service/TruckService.kt @@ -1102,6 +1102,8 @@ open class TruckService( truckRowId = key, shopCode = b?.shopCode ?: a?.shopCode, changes = changes, + truckLanceCode = b?.truckLanceCode ?: a?.truckLanceCode, + remark = b?.remark ?: a?.remark, ), ) } diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/TruckLaneVersionModels.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/TruckLaneVersionModels.kt index 7dfe507..8f59864 100644 --- a/src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/TruckLaneVersionModels.kt +++ b/src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/TruckLaneVersionModels.kt @@ -45,6 +45,9 @@ data class TruckLaneVersionDiffLine( val truckRowId: Long, val shopCode: String?, val changes: List, + /** 快照中的車線代碼(優先 to 版,刪除列時 fallback from)— 供僅欄位異動時顯示車線 */ + val truckLanceCode: String? = null, + val remark: String? = null, ) /** 物流主檔異動(版本區間內新增/修改;不依賴 truck 列是否已指派) */