出库逻辑修复完成

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

@@ -8,17 +8,35 @@
 
 import UIKit
 protocol NewSelectItemVcDelegate {
-    func NewSelectItemVcSelect(datas:Array<InputInitInfoGoodsInfoModel>)
+    func NewSelectItemVcSelect(datas:Array<InputInitInfoGoodsInfoModel>,pici:Array<Array<GetGoodBatchDataModel>>)
 }
 class NewSelectItemVc: BaseViewController,UITableViewDelegate,UITableViewDataSource{
     
     var rkDatas:Array<InputInitInfoGoodsInfoModel> = []
     var rkSelectArr:Array<InputInitInfoGoodsInfoModel> = []
+    var tempRecord:Array<Int> = []
+    var recordArr:Array<Array<GetGoodBatchDataModel>>  = []{
+        didSet{
+            tempRecord.removeAll()
+            for i in 0 ..< recordArr.count{
+                tempRecord.append(i)
+            }
+        }
+    }
     
     var delegate:NewSelectItemVcDelegate?
     
     @IBAction func submitAction(_ sender: Any) {
-        delegate?.NewSelectItemVcSelect(datas: rkSelectArr)
+        if tempRecord.count > 0 {
+            for i in 0 ..< tempRecord.count {
+                let idx = tempRecord[i]
+                if idx == 10086 {
+                    recordArr.remove(at: i)
+                    recordArr.append([])
+                }
+            }
+        }
+        delegate?.NewSelectItemVcSelect(datas: rkSelectArr, pici: recordArr)
         self.navigationController?.popViewController(animated: true)
     }
     @IBOutlet weak var listView: UITableView!
@@ -71,6 +89,8 @@ class NewSelectItemVc: BaseViewController,UITableViewDelegate,UITableViewDataSou
         }
         if idx != nil {
             rkSelectArr.remove(at: idx!)
+            tempRecord.insert(10086, at: idx!)
+            tempRecord.remove(at: idx!+1)
         }else{
             rkSelectArr.append(data)
         }

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

@@ -14,6 +14,14 @@ protocol NewRKVcDelegate {
     func NewRKVcFinish()
 }
 class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, NewOnlyRKCellDelegate,NewSelectItemVcDelegate,NewSelectWarehouseVCDelegate,GLAlertSelectViewDelegate,GeliAlertTextViewDelegate, ShowTimeSelectViewDelegate, GYSListViewControllerDelegate, GYSGLViewControllerDelegate, Add_Report_View_Delegate{
+    func NewSelectItemVcSelect(datas: Array<InputInitInfoGoodsInfoModel>, pici: Array<Array<GetGoodBatchDataModel>>) {
+        rkSelectArr.removeAll()
+        datas.forEach { (model) in
+            rkSelectArr.append(model)
+        }
+        listView.reloadData()
+    }
+    
     
     var maxFiveImgsArr:Array<String> = []//多图
     func Add_Report_View_Select_Img(view: Add_Report_View) {
@@ -807,13 +815,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
         listView.reloadData()
     }
     
-    func NewSelectItemVcSelect(datas: Array<InputInitInfoGoodsInfoModel>) {
-        rkSelectArr.removeAll()
-        datas.forEach { (model) in
-            rkSelectArr.append(model)
-        }
-        listView.reloadData()
-    }
+  
     func GLASClose(view: GLAlertSelectView, selectnum: Int, selectArr: Array<Int>) {
         if view.tag == 2 {
             typeSelect = selectnum

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

@@ -14,8 +14,6 @@ protocol CKGmCellDelegate {
 class CKGmCell: UITableViewCell {
     var dataArr:Array<GetGoodBatchDataModel>? = []
     
-  
-    
     @IBOutlet weak var select_btn: UIButton!
     @IBOutlet weak var detailLbl: UILabel!
  

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

@@ -61,8 +61,8 @@
                         <color key="textColor" name="个人中心灰色字体"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="分配批次" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yRi-If-85q">
-                        <rect key="frame" x="15" y="104" width="53.5" height="16"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="选择商品批次" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yRi-If-85q">
+                        <rect key="frame" x="15" y="104" width="80" height="16"/>
                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                         <color key="textColor" name="标题字颜色"/>
                         <nil key="highlightedColor"/>

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

@@ -10,6 +10,19 @@ import UIKit
 import LGButton
 
 class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNonGmCellDelegate,CKGmCellDelegate, PiCiXuanZeViewControllerDelegate,GLAlertSelectViewDelegate,NewSelectItemVcDelegate,GeliAlertTextViewDelegate, Print_Gprinter_View_Delegate{
+    func NewSelectItemVcSelect(datas: Array<InputInitInfoGoodsInfoModel>, pici: Array<Array<GetGoodBatchDataModel>>) {
+        rkSelectArr.removeAll()
+        datas.forEach { (item) in
+            rkSelectArr.append(item)
+        }
+        piCiArr?.removeAll()
+        pici.forEach { (item) in
+            piCiArr?.append(item)
+        }
+        
+        listView.reloadData()
+    }
+    
     func Print_Gprinter_View_Print(data: Array<Dictionary<String, Any>>) {
         let dict = [
             "user_token":UserToken as Any,
@@ -220,6 +233,7 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
     @IBOutlet weak var btmBtn: LGButton!
     @IBOutlet weak var btmLbl: UILabel!
     @IBOutlet weak var listView: UITableView!
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         navbar.title = "出库"
@@ -249,6 +263,7 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
                 }
                 self.rkDatas.append(item)
                 self.piCiArr?.append([])
+                
             })
             
             model.data?.auth?.forEach({ (str) in
@@ -295,14 +310,7 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
             
         }
     }
-    //添加商品
-    @objc func addProduct(){
-        let vc = NewSelectItemVc()
-        vc.delegate = self
-        vc.rkDatas = rkDatas
-        vc.rkSelectArr = rkSelectArr
-        self.navigationController?.pushViewController(vc, animated: true)
-    }
+    
     //MARK: - cell delegate
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
@@ -507,13 +515,8 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
         glSelectView = nil
         listView.reloadData()
     }
-    func NewSelectItemVcSelect(datas: Array<InputInitInfoGoodsInfoModel>) {
-        rkSelectArr.removeAll()
-        datas.forEach { (item) in
-            rkSelectArr.append(item)
-        }
-        listView.reloadData()
-    }
+    
+   
     
     
     func PiCiXuanZeViewControllerPiCiSelect(data: Array<GetGoodBatchDataModel>, p_id: Int) {
@@ -538,6 +541,17 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
         rkSelectArr.remove(at: cell.tag)
         listView.reloadData()
     }
+    
+    //添加商品
+    @objc func addProduct(){
+        let vc = NewSelectItemVc()
+        vc.delegate = self
+        vc.rkDatas = rkDatas
+        vc.rkSelectArr = rkSelectArr
+        vc.recordArr = piCiArr!
+        self.navigationController?.pushViewController(vc, animated: true)
+    }
+    
     func CKGmCellSelectAction(cell: CKGmCell) {
         //跳转选择批次
         let data = rkSelectArr[cell.tag]