修复提交入库

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

@@ -21,12 +21,16 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
         HUD.show(.progress)
         
         let UserToken = UserDefaults.standard.value(forKey: "user_token")
-        let warehouse = poiArr[selectIdx!]
+        
         if lgBtnTitLbl.text == "提交申请" {
             var goodsInfoArr:Array<Any>? = []
             rkSelectArr.forEach { (model) in
                 var rkjg:Float = 0
                 var total:Float = 0
+                var number = 0
+                if model.RKSL != nil {
+                    number = model.RKSL!
+                }
                 if model.RKJG != nil {
                     rkjg = model.RKJG!
                     total = rkjg * Float(model.RKSL!)
@@ -36,12 +40,14 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
                 if model.DayType == 0 {
                     shelf_life = model.BZQ! * 30
                 }
+                
+                
                 let goods = [
                     "goods_id":model.goods_id as Any,
                     "sku_id":model.sku_id as Any,
                     "goods_name":model.goods_name as Any,
                     "goods_spec":model.spec_str as Any,
-                    "number":model.RKSL as Any,
+                    "number":number as Any,
                     "price":model.price as Any,
                     "amount":rkjg as Any,
                     "subtotal":total as Any,
@@ -106,11 +112,11 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
         }
         let goods_info = dataChangeString(sender: goodsInfoArr!)
         //直接入库
-        let p = poiArr[selectIdx!]
+        
         let dict = [
             "user_token":UserToken as Any,
-            "w_id":warehouse.w_id as Any,
-            "p_id":p.p_id as Any,
+            "w_id":w_id as Any,
+            "p_id":p_id as Any,
             "i_type":typeSelect! + 1 as Any,
             "apply_remark":sender as Any,
             "goods_info":goods_info as Any,
@@ -138,7 +144,17 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
             HUD.flash(.label("请选择入库类型"), delay: 1.2)
             return
         }
+        if rkSelectArr.count == 0 {
+            HUD.flash(.label("请选择商品"), delay: 1.2)
+            return
+        }
         
+        for item in rkSelectArr{
+            if item.createDay == nil || item.BZQ == nil || item.RKSL == nil{
+                HUD.flash(.label("请完整填写数据"), delay: 1.2)
+                return
+            }
+        }
         let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
         alterView.delegate = self
         alterView.titleLbl.text = "请填写入库备注"
@@ -174,6 +190,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
     var authArr:Array<String> = []//权限
     
     var w_id:Int?
+    var p_id:Int?
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -200,10 +217,12 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
                 if item.is_default == 1 {
                     self.holderArr.insert(item.w_name!, at: 0)
                     self.holderArr.remove(at: 1)
-                    //待另一个请求
+                    
                     self.w_id = item.w_id
+                    
                     item.warehouse_position?.forEach({ (data) in
                         if data.is_default == 1 {
+                            self.p_id = data.p_id
                             self.holderArr.insert(data.p_name!, at: 1)
                             self.holderArr.remove(at: 2)
                         }
@@ -430,13 +449,19 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
         switch inputType {
         case 100:
             data.BZQ = num.integerValue
-            
             break
         case 101:
             data.ZJ = num.floatValue
             break
         case 102:
-            data.RKSL = num.integerValue
+            if num.integerValue == 0 {
+                HUD.flash(.label("入库数量不小于1"), delay: 1.2)
+                data.RKSL = 1
+                let idx = IndexPath(row: cell.tag, section: 1)
+                listView.reloadRows(at: [idx], with: .none)
+            }else{
+                data.RKSL = num.integerValue
+            }
             if data.RKJG != nil && data.RKSL != nil {
                 data.ZJ = data.RKJG! * Float(data.RKSL!)
                 cell.totalPriceTf.text = "\(data.ZJ!)"
@@ -552,6 +577,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
         holderArr.remove(at: 1)
         holderArr.insert("请选择库位", at: 1)
         holderArr.remove(at: 2)
+        w_id = data.w_id
         poiArr.removeAll()
         kuWeiArr.forEach { (item) in
             poiArr.append(item)
@@ -584,6 +610,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
         }else{
             selectIdx = selectNum
             let data = poiArr[selectIdx!]
+            p_id = data.p_id
             holderArr.insert(data.p_name!, at: 1)
             holderArr.remove(at: 2)
         }

GeliBusinessPlatform/ViewController/出入库记录/CRKListVC.swift

@@ -430,7 +430,7 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
         let model = datas![indexPath.row]
         let vc = CRKXiangQVC()
         vc.delegate = self
-        if model.io_type == 1 && auth.contains("122"){
+        if model.io_type == 1 && auth.contains("122"){//入库
             vc.isGm = true
         }
         if model.io_type == 2 && auth.contains("121"){

GeliBusinessPlatform/ViewController/出入库记录/CRKXiangQVC.swift

@@ -143,7 +143,7 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
                 model.data?.goods_res?.forEach({ (item) in
                     self.ioGoodsModels?.append(item)
                 })
-
+                
                 if self.model?.io_type == 1 {
                     self.titleArr = ["入库类型","审核人","备注","未通过原因"]
                     var remark = "-"
@@ -176,9 +176,10 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
             }
             
         }else{
+            //MARK: - 入库详情
             if model?.io_type == 1 {
                 titleArr = ["仓库","库位","入库类型"]
-                holderArr = ["默认仓库","默认库位",str]
+                holderArr = ["请选择仓库","请选择库位",str]
                 
                 navbar.title = "商品入库详情"
                 
@@ -186,6 +187,7 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
                     let model = data as! InGoodsDetailModel
                     model.data?.goods_res?.forEach({ (item) in
                         self.inGoodsModels?.append(item)
+                        
                     })
                     if self.isGm == false {
                         self.titleArr = ["入库类型","备注"]
@@ -238,13 +240,13 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
         if sender.tag == 0 {//通过
             if model?.io_type == 1 {
                 let str = holderArr![0]
-                if str == "默认仓库" {
+                if str == "请选择仓库" {
                     HUD.flash(.label("请选择仓库"), delay: 1.2)
                     return
                 }
                 
                 let str1 = holderArr![1]
-                if str1 == "默认库位" {
+                if str1 == "请选择库位" {
                     HUD.flash(.label("请选择库位"), delay: 1.2)
                     return
                 }