新增不填采购人崩，修复

GeliBusinessPlatform/Model/WarehouseManageModel/InputInitInfoModel.swift

@@ -129,6 +129,8 @@ class InputInitInfoGoodsInfoModel: Mappable {  //商品信息
     var chuKuLiang:Int?
     var pog_id = 0
     
+    var no_push_num:Int?
+    
     required init?( map: Map) {
         
     }
@@ -148,6 +150,7 @@ class InputInitInfoGoodsInfoModel: Mappable {  //商品信息
         DayType <- map["DayType"]
         chuKuLiang <- map["chuKuLiang"]
         pog_id <- map["pog_id"]
+        no_push_num <- map["no_push_num"]
     }
 }
 

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

@@ -17,6 +17,7 @@ protocol NewOnlyRKCellDelegate {
 class NewOnlyRKCell: UITableViewCell,UITextFieldDelegate {
     var delegate:NewOnlyRKCellDelegate?
     
+    @IBOutlet weak var titLbl: UILabel!
     @IBOutlet weak var delBtn: UIButton!
     @IBOutlet weak var rightBtn: UIButton!
     @IBOutlet weak var leftBtn: UIButton!

GeliBusinessPlatform/ViewController/1.1入库&出库/入库/NewOnlyRKCell.xib

@@ -350,6 +350,7 @@
                 <outlet property="rkCountTf" destination="s2D-dg-gBi" id="HFy-WE-TYS"/>
                 <outlet property="rkPriceTf" destination="kGM-d5-IE6" id="azO-uu-LsV"/>
                 <outlet property="timeLbl" destination="yHy-KY-Uxt" id="b0q-mN-cer"/>
+                <outlet property="titLbl" destination="dXp-Fv-ghH" id="yQ6-ua-y2u"/>
                 <outlet property="totalPriceTf" destination="DNW-1v-r8x" id="emO-uV-Hk1"/>
             </connections>
             <point key="canvasLocation" x="155.79710144927537" y="117.1875"/>

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

@@ -17,6 +17,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
     var po_id = 0
     var isCaiGou = false
     var remark = ""
+    var orderNumStr = ""
     //MARK: - 提交申请
     func sureGeliAlertTextViewAction(sender: String) {
         
@@ -199,6 +200,8 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        
+        
         if isCaiGou {
             typeSelect = 0
             holderArr.insert(rkTypeArr[typeSelect!], at: 2)
@@ -419,6 +422,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
             }
             let data = rkSelectArr[indexPath.row]
             cell.nameLbl.text = data.goods_name
+            cell.titLbl.text = "入库数量：(可入库量为\(data.no_push_num!)"
             cell.detailLbl.text = data.spec_str! + " " + "¥\(data.price!)"
             cell.rkPriceTf.text = "\(data.price!)"
             cell.rkCountTf.text = "1"

GeliBusinessPlatform/ViewController/新增采购单/XinCaiGouViewController.swift

@@ -175,7 +175,7 @@ class XinCaiGouViewController: BaseViewController,UITableViewDelegate,UITableVie
             return
         }
         if textField.tag == 3 {
-            cgName = textField.text
+            cgName = textField.text!
         }
         
         listView.reloadData()
@@ -222,7 +222,7 @@ class XinCaiGouViewController: BaseViewController,UITableViewDelegate,UITableVie
     
     var glSelectView:GLAlertSelectView?
     var typeSelect = 1
-    var cgName:String?
+    var cgName = ""
     var contentStr = ""
     //MARK: - 提交审核
     @IBAction func submitAction(_ sender: Any) {

GeliBusinessPlatform/ViewController/采购单列表/CGDListVC.swift

@@ -133,7 +133,7 @@ class CGDListVC: BaseViewController , UITableViewDelegate, UITableViewDataSource
         var status = ""
         if orderStatus == 2 {
             cell.statusLbl.isHidden = false
-            switch model.push_status {
+            switch model.pay_status {
             case 1:
                 status = "未付款"
                 break

GeliBusinessPlatform/ViewController/采购单列表/CGDListViewController.swift

@@ -62,7 +62,7 @@ class CGDListViewController: BaseViewController  ,UISearchBarDelegate, SearchBar
             make.height.equalTo(35)
         }
         searchV = searchBr
-        searchBr.placeholderStr = "输入订单编号/制单人名称"
+        searchBr.placeholderStr = "输入订单编号/制单人名称/采购人名称"
         searchBr.cornerRadius = 35/2.0
         searchBr.delegate = self
         searchBr.delegateL = self

GeliBusinessPlatform/ViewController/采购单详情/CGDXQVc.swift

@@ -14,7 +14,7 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
     func XinCaiGouViewControllerFinish() {
         loadData()
     }
-      
+    
     func NewRKVcFinish() {
         loadData()
     }
@@ -98,8 +98,8 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
     
     let zfWayArr =  ["未支付","现金","转账（私）","转账（公）","转账（微信）","转账（支付宝）"]
     
-    var payZt = 0//支付方式
-    var payFs = 0//支付状态
+    var payZt = 0//支付状态
+    var payFs = 0//支付方式
     
     var model:PurchaseOrderDetailDataModel?
     
@@ -190,34 +190,38 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
         case "入库","补录入库":
             var rkDatas:Array<InputInitInfoGoodsInfoModel> = []
             model!.goods_res?.forEach({ (item) in
-                let dict = [
-                    "sku_id":item.sku_id as Any,
-                    "goods_id":item.goods_id as Any,
-                    "goods_name":item.goods_name as Any,
-                    "spec_str":item.sku_name as Any,
-                    "goods_thumb":"" as Any,
-                    "price":item.price as Any,
-                    "inventory":0 as Any,
-                    "warehouse_inventory":0 as Any,
-                    "BZQ":"" as Any,
-                    "ZJ":"" as Any,
-                    "RKSL":"" as Any,
-                    "RKJG":"" as Any,
-                    "DayType":1 as Any,
-                    "createDay":"" as Any,
-                    "createDayStr":"" as Any,
-                    "chuKuLiang":"" as Any,
-                    "pog_id":item.pog_id as Any
-                ]
-                let mo = InputInitInfoGoodsInfoModel(JSON: dict)
-                rkDatas.append(mo!)
+                if item.no_push_num != 0 {
+                    let dict = [
+                        "sku_id":item.sku_id as Any,
+                        "goods_id":item.goods_id as Any,
+                        "goods_name":item.goods_name as Any,
+                        "spec_str":item.sku_name as Any,
+                        "goods_thumb":"" as Any,
+                        "price":item.price as Any,
+                        "inventory":0 as Any,
+                        "warehouse_inventory":0 as Any,
+                        "BZQ":"" as Any,
+                        "ZJ":"" as Any,
+                        "RKSL":"" as Any,
+                        "RKJG":"" as Any,
+                        "DayType":1 as Any,
+                        "createDay":"" as Any,
+                        "createDayStr":"" as Any,
+                        "chuKuLiang":"" as Any,
+                        "pog_id":item.pog_id as Any,
+                        "no_push_num":item.no_push_num as Any
+                    ]
+                    
+                    let mo = InputInitInfoGoodsInfoModel(JSON: dict)
+                    rkDatas.append(mo!)
+                }
             })
             let vc = NewRKVc()
             vc.isCaiGou = true
             vc.rkSelectArr = rkDatas
             vc.po_id = model?.po_id! as! Int
             vc.delegate = self
-            
+            vc.orderNumStr = model?.po_no! as! String
             self.navigationController?.pushViewController(vc, animated: true)
             break
         case "撤销入库":
@@ -274,8 +278,11 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
                 self.holderArr.insert("固定采购", at: 4)
                 self.holderArr.remove(at: 5)
             }
+            
+            
             self.payFs = mo!.purchase_order!.pay_type!
             self.payZt = mo!.purchase_order!.pay_status! - 1
+            
             self.holderArr.insert(self.zfWayArr[self.payFs], at: 5)
             self.holderArr.remove(at: 6)
             self.holderArr.insert(self.zfTypeArr[self.payZt], at: 6)
@@ -286,7 +293,7 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
             }
             
             self.model = mo?.purchase_order
-          
+            
             switch self.model!.order_status {
             case 1 :
                 if (mo?.purchase_auth?.contains("119"))! {
@@ -351,7 +358,7 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
         cell.cgCount.text = num as String
         cell.cgPrice.text = amount as String
         cell.detailLbl.text =  "\(item!.sku_name!) ¥\(amount)x\(num) \(item!.unit!)"
-        cell.cgTotalPrice.text = "\(num.floatValue * amount.floatValue)"
+        cell.cgTotalPrice.text =  String(format: "%.2f", num.floatValue * amount.floatValue)
         return cell
     }
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {