分支1.6.1临时修复版本

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -3987,7 +3987,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2.0;
+				CURRENT_PROJECT_VERSION = 2.1;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
 				DEVELOPMENT_TEAM = K48346UACH;
@@ -4035,7 +4035,7 @@
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
 				);
-				MARKETING_VERSION = 1.6;
+				MARKETING_VERSION = 1.6.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -4116,7 +4116,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2.0;
+				CURRENT_PROJECT_VERSION = 2.1;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
 				DEVELOPMENT_TEAM = K48346UACH;
@@ -4164,7 +4164,7 @@
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
 				);
-				MARKETING_VERSION = 1.6;
+				MARKETING_VERSION = 1.6.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

GeliBusinessPlatform/ViewController/仓库管理/WarehoseMangementListVC.swift

@@ -204,7 +204,7 @@ class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableV
         cell.statusLbl.text = typeArr[model.w_type!]
         cell.statusLbl.isHidden = false
         cell.adrLbl.text = model.w_address!
-        cell.kuCunLbl.text = "库存位" + StringByInt(number: model.inventory_count!)
+        cell.kuCunLbl.text = "库存位" + StringByInt(number: model.position_count!)
         switch model.w_type {
         case 0:
             //异常

GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.swift

@@ -1274,7 +1274,49 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         if sender.tag == 0 {
             print("左边")
             adrArr = tempadrArr
+        }else{
+            if adrArr.count > 0 {
+                let firstData = adrArr.first! as NSDictionary
+                if firstData["locName"] as! String != "空" && adrArr.count > 1 {
+                    
+                    var adrDs:Array<Any> = []
+                    adrDs.removeAll()
+                    for item in adrArr {
+                        let data = item["adr"] as! cityListDataModel
+                        let dict = ["lat":data.lat_lon!.lat!,"lon":data.lat_lon!.lon!,"city_id":data.city_id!] as [String : Any]
+                        adrDs.append(dict)
+                    }
+                    let lat_lon_arr = dataChangeString(sender: adrDs)
+                    
+                    let fD = adrArr.first!
+                    let cityData = fD["adr"] as! cityListDataModel
+                    let params = ["user_token":UserToken as Any,
+                                  "nonce_str":nonce_str as Any,
+                                  "city_id":cityData.city_id as Any,
+                                  "city_info_revision":carModel?.revision as Any,
+                                  "order_vehicle_id":carTypesArr[selectCarType].order_vehicle_id as Any,
+                                  "std_tag_arr":"" as Any,
+                                  "spec_req_arr":spec_select_arr as Any,
+                                  "lat_lon_arr":lat_lon_arr as Any
+                    ]
+                    
+                    orderPriceCalculate(params, success: { (data) in
+                        let model = data as! orderPriceCalculateModel
+                        self.YuGuPriceLbl.text = "\(model.data!.total_price_fen!/100)"
+                        self.logisticsCostModel = model
+                        let view = self.hListView.footerView(forSection: 1)
+                        
+                        view?.layoutIfNeeded()
+                        
+                        self.hListView.reloadData()
+                        return
+                    }) { (err) in
+                        
+                    }
+                }
+            }
         }
+
         
         hListView.reloadData()
     }