入库上访调整完成

GeliBusinessPlatform/Model/Logistics/LogisticsModel.swift

@@ -143,7 +143,7 @@ class registerModel: Mappable {
     }
 }
 class registerDataModel: Mappable {
-    var price_jd:String?
+    var price_jd:Float?
     var price_sf : Float?
     
     var total_freight_jd:Float?

GeliBusinessPlatform/View/AlertView/GLAlertSelectView.swift

@@ -30,7 +30,7 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
     func sureGeliAlertViewAction(sender: UIButton) {
         delegate?.GLAlertSelectViewFinish?(sender:sender,title: ysyfTitle,cellTag: cellTag!)
     }
-    var isHideCaiGou = false
+
     var isBz = false
     var is_center_select = false
     var isNonSelect = false {
@@ -90,9 +90,7 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
     var dataArr = Array<String>(){
         didSet{
             var tbvH = CGFloat(dataArr.count * 49)
-            if isHideCaiGou {
-                tbvH = CGFloat((dataArr.count-1) * 49)
-            }
+           
             if tbvH > fullScreenHeight*0.6 {
                 tbvH = fullScreenHeight*0.6
                 selectTbv.isScrollEnabled = true
@@ -193,11 +191,7 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
                 return 0.001
             }
         }
-        if isHideCaiGou {
-            if indexPath.row == 0 {
-                return 0.001
-            }
-        }
+      
         return 49
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {

GeliBusinessPlatform/ViewController/1.1入库&出库/入库/NewRKVc.swift

@@ -175,14 +175,14 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
             HUD.flash(.label("请选择入库类型"), delay: 1.2)
             return
         }
-        if holderArr[3] == "请选择供应商" {
-            HUD.flash(.label("请选择供应商"), delay: 1.2)
-            return
-        }
-        if holderArr[4] == "请选择商品类型" {
-            HUD.flash(.label("请选择商品类型"), delay: 1.2)
-            return
-        }
+//        if holderArr[3] == "请选择供应商" {
+//            HUD.flash(.label("请选择供应商"), delay: 1.2)
+//            return
+//        }
+//        if holderArr[4] == "请选择商品类型" {
+//            HUD.flash(.label("请选择商品类型"), delay: 1.2)
+//            return
+//        }
         if rkSelectArr.count == 0 {
             HUD.flash(.label("请选择商品"), delay: 1.2)
             return
@@ -241,14 +241,14 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
             }
             let goods_info = dataChangeString(sender: goodsInfoArr!)
             //直接入库
-            if rkTypeArr[typeSelect] == "直营入库" {
-                typeSelect = 9
-            }
+//            if rkTypeArr[typeSelect] == "直营入库" {
+//                typeSelect = 9
+//            }
             let dict = [
                 "user_token":UserToken as Any,
                 "w_id":w_id as Any,
                 "p_id":p_id as Any,
-                "i_type":typeSelect + 1 as Any,
+                "i_type":typeSelect + 8 as Any,
                 "apply_remark":remark as Any,
                 "po_id":po_id as Any,
                 "ven_id":ven_id as Any,//待处理
@@ -295,12 +295,12 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
                 goodsInfoArr?.append(goods)
             }
             let goods_info = dataChangeString(sender: goodsInfoArr!)
-            if rkTypeArr[typeSelect] == "直营入库" {
-                typeSelect = 9
-            }
+//            if rkTypeArr[typeSelect] == "直营入库" {
+//                typeSelect = 9
+//            }
             let dict = [
                 "user_token":UserToken as Any,
-                "i_type":typeSelect + 1 as Any,
+                "i_type":typeSelect + 8 as Any,
                 "apply_remark":remark as Any,
                 "po_id":po_id as Any,
                 "ven_id":ven_id as Any,
@@ -329,12 +329,15 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
     @IBOutlet weak var lgBtnTitLbl: UILabel!
     @IBOutlet weak var lgBtn: LGButton!
     var isGm = false
-    var titleArr = ["仓库：","库位：","入库类型：","选择供应商：","选择商品类型：","备注："]
-    var holderArr = ["请选择仓库","请选择库位","直营入库","请选择供应商","直销商品","请输入备注"]
+        var titleArr = ["仓库：","库位：","入库类型：","备注："]
+        var holderArr = ["请选择仓库","请选择库位","固定采购","请输入备注"]
+//    var titleArr = ["仓库：","库位：","入库类型：","选择供应商：","选择商品类型：","备注："]
+//    var holderArr = ["请选择仓库","请选择库位","直营入库","请选择供应商","直销商品","请输入备注"]
     //入库类型 // "固定采购","临时采购"
-    var rkTypeArr = ["采购","调入","退货","生产","调出被拒绝","外采","其他","直营入库"]
+//    var rkTypeArr = ["采购","调入","退货","生产","调出被拒绝","外采","其他","直营入库"]
+    var rkTypeArr = ["固定采购","临时采购","直营入库"]
     var rkSelectTypeArr = ["直销商品","代销商品"]
-    var typeSelect:Int = 7
+    var typeSelect:Int = 0
     var selectTypeSelect:Int = 0
     
     var glSelectView:GLAlertSelectView?
@@ -481,29 +484,29 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
         if indexPath.section == 1 {
             return
         }
+//        if indexPath.row == 3 {
+//            print("选择供应商")
+//            let vc = GYSListViewController()
+//            vc.barTitle = "选择供应商"
+//            vc.delegate = self
+//            self.navigationController?.pushViewController(vc, animated: true)
+//        }
+//        if indexPath.row == 4 {
+//            if isCaiGou  == false{
+//                if glSelectView == nil {
+//                    let view = GLAlertSelectView(frame: self.view.bounds)
+//                    view.tag = indexPath.row
+//                    view.selectNum = selectTypeSelect
+//                    view.isOnlySelectKuWei = true
+//                    view.delegate = self
+//                    view.titleLbl.text = "选择商品类型"
+//                    view.dataArr = rkSelectTypeArr
+//                    self.view.addSubview(view)
+//                    glSelectView = view
+//                }
+//            }
+//        }
         if indexPath.row == 3 {
-            print("选择供应商")
-            let vc = GYSListViewController()
-            vc.barTitle = "选择供应商"
-            vc.delegate = self
-            self.navigationController?.pushViewController(vc, animated: true)
-        }
-        if indexPath.row == 4 {
-            if isCaiGou  == false{
-                if glSelectView == nil {
-                    let view = GLAlertSelectView(frame: self.view.bounds)
-                    view.tag = indexPath.row
-                    view.selectNum = selectTypeSelect
-                    view.isOnlySelectKuWei = true
-                    view.delegate = self
-                    view.titleLbl.text = "选择商品类型"
-                    view.dataArr = rkSelectTypeArr
-                    self.view.addSubview(view)
-                    glSelectView = view
-                }
-            }
-        }
-        if indexPath.row == 5 {
             let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
             alterView.delegate = self
             alterView.titleLbl.text = "请填写入库备注"
@@ -518,7 +521,6 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
             if isCaiGou  == false{
                 if glSelectView == nil {
                     let view = GLAlertSelectView(frame: self.view.bounds)
-                    view.isHideCaiGou = true
                     view.tag = indexPath.row
                     view.selectNum = typeSelect
                     view.tempNum = view.selectNum
@@ -652,7 +654,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
             return cell
         }
         
-        if indexPath.row == 5 {
+        if indexPath.row == 3 {
             let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndLblCell") as! TitleAndLblCell
             cell.nameLbl.text = titleArr[indexPath.row]
             if orderNumStr.count == 0 {
@@ -680,7 +682,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
         cell.mustLbl.isHidden = true
         cell.nameLeft.constant = 0
         cell.mustWidth.constant = 0
-        if indexPath.row > 4 {
+        if indexPath.row > 2 {
             setCellUI(cell: cell)
         }
         return cell
@@ -937,20 +939,20 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
             holderArr.insert(rkTypeArr[typeSelect], at: 2)
             holderArr.remove(at: 3)
         }else if view.tag == 4 {
-            selectTypeSelect = selectNum
-            holderArr.insert(rkSelectTypeArr[selectTypeSelect], at: 4)
-            holderArr.remove(at: 5)
-            if selectTypeSelect == 0 {
-                typeSelect = 7
-                holderArr.insert("直营入库", at: 2)
-                holderArr.remove(at: 3)
-                rkTypeArr = ["采购","调入","退货","生产","调出被拒绝","外采","其他","直营入库"]
-            }else{
-                holderArr.insert("固定采购", at: 2)
-                holderArr.remove(at: 3)
-                rkTypeArr = ["采购","调入","退货","生产","调出被拒绝","外采","其他","固定采购","临时采购"]
-                typeSelect = 7
-            }
+//            selectTypeSelect = selectNum
+//            holderArr.insert(rkSelectTypeArr[selectTypeSelect], at: 4)
+//            holderArr.remove(at: 5)
+//            if selectTypeSelect == 0 {
+//                typeSelect = 7
+//                holderArr.insert("直营入库", at: 2)
+//                holderArr.remove(at: 3)
+//                rkTypeArr = ["采购","调入","退货","生产","调出被拒绝","外采","其他","直营入库"]
+//            }else{
+//                holderArr.insert("固定采购", at: 2)
+//                holderArr.remove(at: 3)
+//                rkTypeArr = ["采购","调入","退货","生产","调出被拒绝","外采","其他","固定采购","临时采购"]
+//                typeSelect = 7
+//            }
         }else{
             selectIdx = selectNum
             let data = poiArr[selectIdx!]

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

@@ -670,8 +670,8 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         }
         let alertView = LogisticalSelectView(frame: self.view.window!.bounds)
         alertView.delegate = self
-        if logPayPriceModel?.total_freight_jd != nil && logPayPriceModel?.total_freight_jd != 0 {
-            alertView.jdPriceLbl.text = "京东冷运（预估运费\(logPayPriceModel?.total_freight_jd!)元）"
+        if logPayPriceModel?.price_jd != nil && logPayPriceModel?.price_jd != 0 {
+            alertView.jdPriceLbl.text = "京东冷运（预估运费\(logPayPriceModel!.price_jd!)元）"
         }else{
             alertView.jdPriceLbl.text = "京东冷运（待上门评估）"
         }