修复已知入库详情显示bug

GeliBusinessPlatform/Model/WarehouseManageModel/InGoodsDetailModel.swift

@@ -69,6 +69,10 @@ class InGoodsDetailDataGoodsResModel: Mappable {
     var report_sn : String?
     var file_url : String?
     
+    var batch_id:Int?
+    var ven_name:String?
+    var ven_id:Int?
+    
     required init?( map: Map) {
         
     }
@@ -89,6 +93,10 @@ class InGoodsDetailDataGoodsResModel: Mappable {
         inventory <- map["inventory"]
         report_sn <- map["report_sn"]
         file_url <- map["file_url"]
+        
+        ven_name <- map["ven_name"]
+        batch_id <- map["batch_id"]
+        ven_id <- map["ven_id"]
     }
 }
 

GeliBusinessPlatform/ViewController/供应商管理/GYSListViewController.swift

@@ -10,6 +10,7 @@ import UIKit
 protocol GYSListViewControllerDelegate {
     func GYSListViewControllerGetGYS(sender:VendorListDataModel)
 }
+
 class GYSListViewController: BaseViewController,UITableViewDataSource,UITableViewDelegate,UISearchBarDelegate,SearchBarViewDelegate,GYSGLViewControllerDelegate{
     func GYSGLViewControllerFinish() {
         listView.mj_header?.beginRefreshing()

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

@@ -464,6 +464,7 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
             return cell
         }
         
+        print("abc=== ",model?.io_type,model?.status)
         if model?.io_type == 1 || (model?.status!)! > 1 { //入库
             
             let cell = tableView.dequeueReusableCell(withIdentifier: "NewRKCell") as! NewRKCell
@@ -570,6 +571,15 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
                         cell.baogao.text = "报告:" + "\(model.report_sn!)"
                     }
                     
+                    cell.pi_ci_lbl.text = "商品批次:无"
+                    if model.batch_id != nil {
+                        cell.pi_ci_lbl.text = "商品批次:" + "\(model.batch_id!)"
+                    }
+                    
+                    cell.gys_lbl.text = "供应商:无"
+                    if model.ven_name != nil {
+                        cell.gys_lbl.text = "供应商:" + "\(model.ven_name!)"
+                    }
                 
                     return cell
                 }
@@ -618,8 +628,15 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
             }
             cell.baogao.isHidden = true
             
+            cell.pi_ci_lbl.text = "商品批次:无"
+            if model.batch_id != nil {
+                cell.pi_ci_lbl.text = "商品批次:" + "\(model.batch_id!)"
+            }
             
-            
+            cell.gys_lbl.text = "供应商:无"
+            if model.ven_name != nil {
+                cell.gys_lbl.text = "供应商:" + "\(model.ven_name!)"
+            }
             
             return cell
         }

GeliBusinessPlatform/ViewController/出入库记录/NewRKCell.xib

@@ -149,7 +149,7 @@
                                     <constraint firstAttribute="height" constant="1" id="kGX-Nr-KTJ"/>
                                 </constraints>
                             </view>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QfU-XN-RsA">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="商品批次:无" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QfU-XN-RsA">
                                 <rect key="frame" x="15" y="266" width="315" height="18.5"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="18.5" id="Cka-T1-bE3"/>
@@ -165,7 +165,7 @@
                                     <constraint firstAttribute="height" constant="1" id="vQc-bh-ein"/>
                                 </constraints>
                             </view>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7YJ-pG-OWQ">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="供应商:无" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7YJ-pG-OWQ">
                                 <rect key="frame" x="15" y="315.5" width="315" height="18.5"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="18.5" id="7KK-29-r33"/>