修改订单列表请求问题

GeliBusinessPlatform/View/AlertView/GLAlertSelectView.swift

@@ -214,6 +214,7 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
         return cell
     }
     @IBAction func submitClick(_ sender: Any) {
+ 
         if (titleLbl.text?.contains("库位"))! {
             delegate?.KuWeiDataArr?(sender: kuWeiArr)
             return

GeliBusinessPlatform/View/AlertView/GLAlertSelectView.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_5" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="GLAlertSelectView" customModule="GeliBusinessPlatform" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="GLAlertSelectView" customModule="TestClass" customModuleProvider="target">
             <connections>
                 <outlet property="btmVHeight" destination="HPp-z3-Qzc" id="2I3-bt-sU4"/>
                 <outlet property="btmView" destination="Y0m-9G-DsZ" id="iws-lT-YWW"/>

GeliBusinessPlatform/ViewController/新增、编辑（查看）仓库/CheckWareHourseViewController.swift

@@ -191,27 +191,50 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
             break
         }
     }
-    func pdContent(sender:String,str:String){
+    func pdContent(sender:String,str:String) -> Bool{
         if sender.count == 0 {
             HUD.flash(.label(str), delay: 1.2)
-            return
+            return false
         }
+        return true
     }
-    func pdSelect(select:Int?,str:String){
+    func pdSelect(select:Int?,str:String) -> Bool{
         if select == nil {
             HUD.flash(.label(str), delay: 1.2)
-            return
+            return false
         }
+        return true
     }
     @IBAction func submitAction(_ sender: LGButton) {
-        pdContent(sender: cangKuName, str: "请填写仓库名称")
-        pdSelect(select: warehourseType, str: "请选择仓库类型")
-        pdContent(sender: kuWeiName, str: "请选择库位")
-        pdContent(sender: cangKuAdr, str: "请填写仓库地址")
-        pdContent(sender: rongJi, str: "请填写仓库容积")
-        pdContent(sender: mianJi, str: "请填写仓库面积")
-        pdContent(sender: lianXiRen, str: "请填写联系人")
-        pdContent(sender: phone, str: "请填写联系人电话")
+        if !pdContent(sender: cangKuName, str: "请填写仓库名称") {
+            return
+        }
+        if !pdSelect(select: warehourseType, str: "请选择仓库类型") {
+            return
+        }
+        if !pdSelect(select: warehourseType, str: "请选择仓库类型") {
+            return
+        }
+        if !pdContent(sender: kuWeiName, str: "请选择库位") {
+            return
+        }
+        if !pdContent(sender: cangKuAdr, str: "请填写仓库地址") {
+            return
+        }
+        if !pdContent(sender: rongJi, str: "请填写仓库容积") {
+            return
+        }
+        if !pdContent(sender: mianJi, str: "请填写仓库面积") {
+            return
+        }
+        if !pdContent(sender: lianXiRen, str: "请填写联系人") {
+            return
+        }
+        if !pdContent(sender: phone, str: "请填写联系人电话") {
+            return
+        }
+ 
+        
         let rj = rongJi as NSString
         let mj = mianJi as NSString
         var num = 0

GeliBusinessPlatform/ViewController/订单列表/OrderListViewController.swift

@@ -195,6 +195,9 @@ class OrderListViewController: BaseViewController ,UISearchBarDelegate, SearchBa
                     }
                 }
             }
+            if payStr.count == 0 {
+                payStr = "100"
+            }
             vc.payStatus = payStr
             //下单方式
             vc.orderSource = 0
@@ -235,6 +238,9 @@ class OrderListViewController: BaseViewController ,UISearchBarDelegate, SearchBa
                     }
                 }
             }
+            if shippingStr.count == 0 {
+                shippingStr = "100"
+            }
             vc.shippingStatus = shippingStr
             vc.isUpData = false
         }

GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
@@ -8,7 +8,7 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="OrderDViewController" customModule="GeliBusinessPlatform" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="OrderDViewController" customModule="TestClass" customModuleProvider="target">
             <connections>
                 <outlet property="bottomBgView" destination="n9R-tn-hVY" id="eSi-Ty-uFr"/>
                 <outlet property="bottomView" destination="uzE-Ha-UZM" id="KNM-2q-cr7"/>