From e01bb4a1d21d19006c82cbb355244ae170bd83ba Mon Sep 17 00:00:00 2001
From: younger_times <841720330@qq.com>
Date: 星期五, 02 六月 2023 17:07:51 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/ios/Broker
---
BrokerDriver/ViewModels/OrderViewModel.swift | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/BrokerDriver/ViewModels/OrderViewModel.swift b/BrokerDriver/ViewModels/OrderViewModel.swift
index 05005d0..ff55472 100644
--- a/BrokerDriver/ViewModels/OrderViewModel.swift
+++ b/BrokerDriver/ViewModels/OrderViewModel.swift
@@ -1,9 +1,9 @@
-//
-// OrderViewModel.swift
-// BrokerDriver
-//
-// Created by 无故事王国 on 2023/4/26.
-//
+ //
+ // OrderViewModel.swift
+ // BrokerDriver
+ //
+ // Created by 无故事王国 on 2023/4/26.
+ //
import Foundation
@@ -16,7 +16,41 @@
var pickUpTime: String = ""
var portName: String = ""
var start: String = ""
- var status: Int = 0
+ var status:OrderType = .None
var type: Int = 0
+}
+
+struct OrderDetailModel:HandyJSON {
+ var containerNumber: String?
+ var eLat: CLLocationDistance = 0
+ var eLon: CLLocationDistance = 0
+ var lat: CLLocationDistance = 0
+ var list = [Dictionary<String,Any>]()
+ var lon: CLLocationDistance = 0
+ var orderId: String = ""
+ var orderType: String = ""
+ var status: OrderType = .None
+ var nextStatus:OrderType = .None
+ var tGoods: OrderDetailGoodsModel?
+ var type: Int = 0
+}
+
+struct OrderDetailGoodsModel:HandyJSON {
+ var billNumber: String = ""
+ var containerNumber: String = ""
+ var custRef: String = ""
+ var danger: Int = 0
+ var entry: String = ""
+ var id: Int = 0
+ var kg: String = ""
+ var orderId: String = ""
+ var ourRef: String = ""
+ var po: String = ""
+ var sb: String = ""
+ var shippingLine: String = ""
+ var size: String = ""
+ var type: String = ""
+ var typeClass: String = ""
+ var weight: Int = 0
}
--
Gitblit v1.7.1