补充入库新增内容

GeliBusinessPlatform/Model/LalamoveInterface/LalamoveModel.swift

@@ -555,11 +555,13 @@ class getHllOrderDetailsSalePlatDataModel: Mappable {
     var wb_no : String?
     var bill_price_arr:Float?
     var pay_status:Int?
-
+    var pay_time:String?
+    
     required init?( map: Map) {
         
     }
     func mapping(map: Map) {
+        pay_time <- map["pay_time"]
         sale_plat <- map["sale_plat"]
         order_sn <- map["order_sn"]
         hll_pay_status_two <- map["hll_pay_status_two"]

GeliBusinessPlatform/Model/Logistics/LogisticsModel.swift

@@ -364,11 +364,13 @@ class logisticsOrderDetailsDataModel: Mappable {
     var fc_flag_cn :String?  //运费结算方式-中文
     var zcservice : Int? //装货服务
     var xcservice :Int? //卸货服务
+    
+    var pay_time:String?//支付时间
     required init?( map: Map) {
         
     }
     func mapping(map: Map) {
-
+        pay_time <- map["pay_time"]
         id <- map["id"]
         user_id <- map["user_id"]
         wb_no <- map["wb_no"]

GeliBusinessPlatform/Model/OrderManageModel/OrderDetailModel.swift

@@ -276,7 +276,7 @@ class OrderDetailSaleResModel: Mappable {
 }
 class OrderDetailGoodsSourceModel: Mappable {
     var ven_id:Int?//供应商的ven_id
-    var batch_id : Int?//产品批次号
+    var batch_sn : String?//产品批次号
     var add_time : String? //入库时间
     var production_data : String?    //生产日期
     var valid_date : String?  //有效日期
@@ -292,7 +292,7 @@ class OrderDetailGoodsSourceModel: Mappable {
     }
     func mapping(map: Map) {
         ven_id <- map["ven_id"]
-        batch_id <- map["batch_id"]
+        batch_sn <- map["batch_sn"]
         add_time <- map["add_time"]
         production_data <- map["production_data"]
         valid_date <- map["valid_date"]

GeliBusinessPlatform/Model/WarehouseManageModel/GetGoodBatchModel.swift

@@ -26,7 +26,7 @@ class GetGoodBatchModel: Mappable {
 
 class GetGoodBatchDataModel: Mappable {
     var batch_id:Int?//批次id
-    var batch_sn : Int?  //批次号
+    var batch_sn : String?  //批次号
     var w_id : Int? //仓储id
     
     var p_id:Int?  //库位id

GeliBusinessPlatform/Model/WarehouseManageModel/InputInitInfoModel.swift

@@ -131,11 +131,19 @@ class InputInitInfoGoodsInfoModel: Mappable {  //商品信息
     
     var no_push_num:Int?
     var report_id :String?
+    
+    
+    var ven_list:Array<InputInitInfoGoodsVenInfoModel>?
+    
+    
+    
     required init?( map: Map) {
         
     }
     func mapping(map: Map) {
+        
         sku_id <- map["sku_id"]
+        ven_list <- map["ven_list"]
         goods_id <- map["goods_id"]
         goods_name <- map["goods_name"]
         goods_thumb <- map["goods_thumb"]
@@ -154,6 +162,18 @@ class InputInitInfoGoodsInfoModel: Mappable {  //商品信息
         report_id <- map["report_id"]
     }
 }
+class InputInitInfoGoodsVenInfoModel: Mappable {
+    var ven_id:Int?
+    var ven_name : String?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        ven_id <- map["ven_id"]
+        ven_name <- map["ven_name"]
+    }
+}
 
 class GoodsReportAddModel: Mappable {
     var code:Int?

GeliBusinessPlatform/Model/WarehouseManageModel/IoGoodsDetailModel.swift

@@ -42,7 +42,7 @@ class IoGoodsDetailDataIoResModel: Mappable {
     var apply_remark:String?
     //审核备注
     var audit_remark : String?
-   
+    var auditor:String?
     
     required init?( map: Map) {
         
@@ -50,6 +50,7 @@ class IoGoodsDetailDataIoResModel: Mappable {
     func mapping(map: Map) {
         apply_remark <- map["apply_remark"]
         audit_remark <- map["audit_remark"]
+        auditor <- map["auditor"]
     }
 }
 
@@ -73,8 +74,10 @@ class IoGoodsDetailDataGoodsResModel: Mappable {
     var w_name : String?//仓库
     var p_name:String?//库位
 
+    var ven_id:Int?
     var ven_name:String?//供货供应商名称
     var batch_id:Int?//商品批次号
+    var batch_sn:String?
     var bar_code:Int?//商品条码
     required init?( map: Map) {
         
@@ -98,9 +101,10 @@ class IoGoodsDetailDataGoodsResModel: Mappable {
         file_url <- map["file_url"]
         w_name <- map["w_name"]
         p_name <- map["p_name"]
-        
+        ven_id <- map["ven_id"]
         ven_name <- map["ven_name"]
         batch_id <- map["batch_id"]
+        batch_sn <- map["batch_sn"]
         bar_code <- map["bar_code"]
     }
 }

GeliBusinessPlatform/Other/SDK/HLPrinter/HLBluetooth/HLBLEManager.m

@@ -321,6 +321,9 @@ static HLBLEManager *instance = nil;
 // 读取特性中的值
 - (void)peripheral:(CBPeripheral *)peripheral didUpdateValueForCharacteristic:(CBCharacteristic *)characteristic error:(NSError *)error
 {
+    
+    
+    
     if (error) {
         if (_valueForCharacteristicBlock) {
             _valueForCharacteristicBlock(characteristic,nil,error);

GeliBusinessPlatform/View/Cell/TitleAndTFAndBtnCell.swift

@@ -9,6 +9,7 @@
 import UIKit
 @objc protocol TitleAndTFAndBtnCellDelegate {
     @objc optional func TitleAndTFAndBtnCellBtnClick()
+    @objc optional func TitleAndTFAndBtnCelltextFieldContent(str:String)
 }
 class TitleAndTFAndBtnCell: UITableViewCell {
     var delegate:TitleAndTFAndBtnCellDelegate?
@@ -21,9 +22,13 @@ class TitleAndTFAndBtnCell: UITableViewCell {
     override func awakeFromNib() {
         super.awakeFromNib()
         self.selectionStyle = .none
+        textTF.addTarget(self, action: #selector(textChange(textField:)), for: .editingChanged)
         // Initialization code
     }
-
+    @objc func textChange(textField:UITextField){
+        delegate?.TitleAndTFAndBtnCelltextFieldContent?(str: textField.text!)
+    }
+      
     override func setSelected(_ selected: Bool, animated: Bool) {
         super.setSelected(selected, animated: animated)
 

GeliBusinessPlatform/View/Cell/TitleAndTFAndBtnCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -43,7 +43,7 @@
                             <constraint firstAttribute="width" constant="14" id="Kai-ig-cv8"/>
                         </constraints>
                     </imageView>
-                    <button opaque="NO" alpha="0.5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bwc-Q5-ss2">
+                    <button opaque="NO" alpha="0.5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bwc-Q5-ss2">
                         <rect key="frame" x="343" y="0.0" width="32" height="49"/>
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <connections>

GeliBusinessPlatform/View/Cell/TitleAndTFCell.swift

@@ -24,7 +24,7 @@ class TitleAndTFCell: UITableViewCell {
   
     
     @objc func textChange(textField:UITextField){
-        
+        print("te == ",textField.text)
         delegate?.textFieldContent?(content: textField.text!, cell: self)
     }
         

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

@@ -8,12 +8,14 @@
 
 import UIKit
 protocol NewSelectItemVcDelegate {
-    func NewSelectItemVcSelect(datas:Array<InputInitInfoGoodsInfoModel>,pici:Array<Array<GetGoodBatchDataModel>>)
+    func NewSelectItemVcSelect(datas:Array<InputInitInfoGoodsInfoModel>,pici:Array<Array<GetGoodBatchDataModel>>,select:Array<Int>,str:Array<String>)
 }
 class NewSelectItemVc: BaseViewController,UITableViewDelegate,UITableViewDataSource{
     var isRuKu = false
     var rkDatas:Array<InputInitInfoGoodsInfoModel> = []
     var rkSelectArr:Array<InputInitInfoGoodsInfoModel> = []
+    var select_ven_list:Array<Int> = []
+    var report_sn_arr:Array<String> = []
     var tempRecord:Array<Int> = []
     var recordArr:Array<Array<GetGoodBatchDataModel>>  = []{
         didSet{
@@ -36,7 +38,7 @@ class NewSelectItemVc: BaseViewController,UITableViewDelegate,UITableViewDataSou
                 }
             }
         }
-        delegate?.NewSelectItemVcSelect(datas: rkSelectArr, pici: recordArr)
+        delegate?.NewSelectItemVcSelect(datas: rkSelectArr, pici: recordArr,select:select_ven_list,str:report_sn_arr)
         self.navigationController?.popViewController(animated: true)
     }
     @IBOutlet weak var listView: UITableView!
@@ -89,12 +91,22 @@ class NewSelectItemVc: BaseViewController,UITableViewDelegate,UITableViewDataSou
         }
         if idx != nil {
             rkSelectArr.remove(at: idx!)
+            if select_ven_list.count > 0 {
+                select_ven_list.remove(at: idx!)
+                report_sn_arr.remove(at: idx!)
+            }
             if !isRuKu {
                 tempRecord.insert(10086, at: idx!)
                 tempRecord.remove(at: idx!+1)
             }
         }else{
             rkSelectArr.append(data)
+            report_sn_arr.append("")
+            if data.ven_list?.count == 1 {
+                select_ven_list.append(0)
+            }else{
+                select_ven_list.append(-1)
+            }
         }
         listView.reloadData()
     }

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

@@ -13,14 +13,23 @@ protocol NewOnlyRKCellDelegate {
     func NewOnlyRKCellAddRepord(cell:NewOnlyRKCell)//添加检测报告
     func NewOnlyRKCellDel(cell:NewOnlyRKCell)//删除
     func NewOnlyRKCellTFinput(text:String,inputType:Int,cell:NewOnlyRKCell)
+    func NewOnlyRKCell_gys_select(cell:NewOnlyRKCell)
 }
 class NewOnlyRKCell: UITableViewCell,UITextFieldDelegate {
+    @IBAction func select_gys_action(_ sender: UIButton) {
+        delegate?.NewOnlyRKCell_gys_select(cell: self)
+    }
     @IBOutlet weak var btn_title_lbl: UILabel!
     var delegate:NewOnlyRKCellDelegate?
     
     @IBAction func add_report_action(_ sender: UIButton) {
         delegate?.NewOnlyRKCellAddRepord(cell: self)
     }
+
+    
+    @IBOutlet weak var gys_right_margin: NSLayoutConstraint!
+    @IBOutlet weak var gys_arrow: UIImageView!
+    @IBOutlet weak var gys_name_lbl: UILabel!
     @IBOutlet weak var titLbl: UILabel!
     @IBOutlet weak var delBtn: UIButton!
     @IBOutlet weak var rightBtn: UIButton!

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

@@ -98,7 +98,7 @@ class CKGmCell: UITableViewCell {
                     make.centerY.equalTo(view.snp_centerY)
                     make.width.equalTo(100)
                 }
-                leftL.text = "\(model.batch_id!)"
+                leftL.text = model.batch_sn
 
                 let middleL = UILabel()
                 bottomView.addSubview(middleL)

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

@@ -10,7 +10,7 @@ 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>>) {
+    func NewSelectItemVcSelect(datas: Array<InputInitInfoGoodsInfoModel>, pici: Array<Array<GetGoodBatchDataModel>>,select:Array<Int>,str:Array<String>) {
         rkSelectArr.removeAll()
         datas.forEach { (item) in
             rkSelectArr.append(item)
@@ -25,7 +25,7 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
     
     func Print_Gprinter_View_Print(data: Array<Dictionary<String, Any>>) {
         print("打印")
-
+        
 
         
         
@@ -546,6 +546,7 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
         vc.rkDatas = rkDatas
         vc.rkSelectArr = rkSelectArr
         vc.recordArr = piCiArr!
+        
         self.navigationController?.pushViewController(vc, animated: true)
     }
     

GeliBusinessPlatform/ViewController/代客下单（货运）/运单详情/YunDanXiangQingViewController.swift

@@ -187,7 +187,7 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
             let view = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 36))
             view.backgroundColor = UIColor.white
             let lbl = UILabel()
-            lbl.text = "货物信息"
+            lbl.text = "快递信息"
             lbl.textColor = UIColor(named: "标题字颜色")
             lbl.font = UIFont.boldSystemFont(ofSize: 15)
             view.addSubview(lbl)
@@ -275,7 +275,7 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
         return 30
     }
     let p2Arr = ["关联平台：","关联订单号：","运单号：","运费：","运费支付方式："]
-    let p3Arr = ["寄托物","寄托物包装","温类","总重量","件数","体积","寄件方式","派件方式","付款方式"]
+    let p3Arr = ["寄托物","寄托物包装","温类","总重量","件数","体积","寄件方式","派件方式","付款方式","支付时间"]
     let p4Arr = ["额外服务","声明价值","保费","备注"]
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         if indexPath.section == 0 {
@@ -333,6 +333,7 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
         arrStr.append((dataModel?.home_delivery_on_cn)!)
         arrStr.append((dataModel?.site_delivery_cn)!)
         arrStr.append((dataModel?.fc_flag_cn)!)
+        arrStr.append((dataModel?.pay_time)!)
         var str = arrStr[indexPath.row]
         if str == "" {
             str = "-"

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

@@ -14,15 +14,16 @@ protocol GYSGLViewControllerDelegate {
     func GYSGLViewControllerFinish()
 }
 class GYSGLViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,TitleAndTFAndBtnCellDelegate,TitleAndOnlyBtnCellDelegate,SJMapViewControllerDelegate, UIPickerViewDelegate, UIPickerViewDataSource,GeliAlertViewDelegate,UITextFieldDelegate, TitleAndTFCellDelegate{
+    func TitleAndTFAndBtnCelltextFieldContent(str: String) {
+        detailDzStr = str
+//        listView.reloadData()
+    }
     func textFieldContent(content: String, cell: TitleAndTFCell) {
         
         switch cell.textTF.tag {
         case 0:
             gysName = content
             break
-        case 2:
-            detailDzStr = content
-            break
         case 99:
             create_number = content
             break
@@ -246,6 +247,7 @@ class GYSGLViewController: BaseViewController,UITableViewDelegate,UITableViewDat
     let sec2Arr = ["姓名：","手机：","电话："]
     let hold2Arr = ["请输入联系人姓名","请输入联系人手机号码","请输入联系电话"]
     let sec3Arr = ["单位统一社会信用代码：","营业资格证：","食品流通许可证："]
+    
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         switch indexPath.section {
         case 0:
@@ -762,6 +764,7 @@ class GYSGLViewController: BaseViewController,UITableViewDelegate,UITableViewDat
             HUD.flash(.label("请选择地址"), delay: 1.2)
             return
         }
+        print("abc == ",detailDzStr)
         if detailDzStr.count == 0 {
             HUD.flash(.label("请填写详细地址"), delay: 1.2)
             return

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

@@ -18,12 +18,8 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
     let UserToken = UserDefaults.standard.value(forKey: "user_token")
     func sureGeliAlertViewAction(sender: UIButton) {
         
-        
-        
         //MARK: - 出入库列表 iog_id
         
-        
-        
         var goodInfoArr:Array<Any> = []
         inGoodsModels?.forEach({ (item) in
             let goods = [
@@ -110,7 +106,7 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
             btmColor.isHidden = true
             btmViewH.constant = 0
         }
-        
+        print("st = ",model?.status,model?.io_type)
         if model?.status == 2 {//通过审核
             IoGoodsDetail(dict, success: { (data) in
                 let model = data as! IoGoodsDetailModel
@@ -519,8 +515,8 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
                     }
                     
                     cell.pi_ci_lbl.text = "商品批次:无"
-                    if data.batch_id != nil {
-                        cell.pi_ci_lbl.text = "商品批次:" + "\(data.batch_id!)"
+                    if data.batch_sn != nil {
+                        cell.pi_ci_lbl.text = "商品批次:" + data.batch_sn!
                     }
                     
                     cell.gys_lbl.text = "供应商:无"

GeliBusinessPlatform/ViewController/新增采购单/CGDCell1.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -25,7 +25,7 @@
                             <constraint firstAttribute="height" constant="1" id="tYk-77-cq1"/>
                         </constraints>
                     </view>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zUM-gk-TDF">
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zUM-gk-TDF">
                         <rect key="frame" x="326.5" y="0.0" width="48.5" height="48.5"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="48.5" id="5oN-gR-Ld8"/>
@@ -157,8 +157,8 @@
                     <constraint firstAttribute="bottom" secondItem="c2P-6b-lpC" secondAttribute="bottom" id="xqy-z2-fqO"/>
                 </constraints>
             </tableViewCellContentView>
-            <color key="backgroundColor" name="白色背景色"/>
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
+            <color key="backgroundColor" name="白色背景色"/>
             <connections>
                 <outlet property="btnWidth" destination="IJP-pf-u5R" id="64D-9I-XmJ"/>
                 <outlet property="cgCount" destination="HF8-ja-1Mp" id="GRT-MI-GPA"/>
@@ -180,7 +180,7 @@
             <color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="个人中心灰色字体">
-            <color red="0.3919999897480011" green="0.3919999897480011" blue="0.3919999897480011" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.38823529411764707" green="0.38823529411764707" blue="0.38823529411764707" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="标题字颜色">
             <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

GeliBusinessPlatform/ViewController/溯源/cell/S_Y_View_Cell.swift

@@ -32,7 +32,7 @@ class S_Y_View_Cell: UITableViewCell {
                 sheng_chan_ri_qi_lbl.text = data?.production_data
                 chan_di_lbl.text = data?.product_origin
                 ru_ku_time_lbl.text = data?.add_time
-                pi_ci_number_lbl.text = StringByInt(number:(data?.batch_id)!)
+                pi_ci_number_lbl.text = data?.batch_sn
                 gys_name_lbl.text = data?.ven_name
                 
                 img.sd_setImage(with: URL(string:SERVERCE_ImageHost +  ((data?.report_picture?.first)!)!))

GeliBusinessPlatform/ViewController/蓝牙连接/BtViewController.m

@@ -28,20 +28,7 @@
     [self.navigationController popViewControllerAnimated:YES];
 }
 
-/** 接收到数据回调 */
-- (void)peripheral:(CBPeripheral *)peripheral didUpdateValueForCharacteristic:(CBCharacteristic *)characteristic error:(NSError *)error {
-    NSData *data = characteristic.value; //获取到的数据
-    NSLog(@"bbb-----%@----",data); //打印出来应该是<01a5>这样的数据，可以通过下面的方式去判断一些自己想要的逻辑
-    Byte * resultByte = (Byte *)[data bytes];
-    if(data.length>=1){
-        if(resultByte[0]==16){ //16代表前两位的值
-            NSLog(@"---打印机打开---");
-        }else if (resultByte[0]==1){ //01
-            NSLog(@"----打印机缺纸-----");
-        }
-    }
-    //下面的处理方式我没处理过，大家可以试试
-}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view from its nib.

GeliBusinessPlatform/ViewController/货拉拉/运单详情/WaybillDetailViewController.swift

@@ -204,8 +204,10 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
             }
             return 0
         }
-        
-        if section == 5 || section == 6{
+        if section == 6 {
+            return 3
+        }
+        if section == 5{
             return 2
         }
         if section == 4 {
@@ -228,6 +230,9 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
                 let distance = CGFloat((dataModel?.order_detail_item?.exceed_distance)!) / 1000.0
                 orderPriceArrName.append("超里程价"  + "(" + String(format: "%.2f", distance) + "公里" + ")")
                 orderPriceArrStr.append("¥" + String(format: "%.2f", (rowModel.price_fen!/100.0)))
+            case 17:
+                orderPriceArrName.append("其他费用")
+                orderPriceArrStr.append("¥" + String(format: "%.2f", (rowModel.price_fen!/100.0)))
             case 4:
                 dataModel?.order_detail_item?.spec_req_price_arr?.forEach({ (specModel) in
                     if specModel.price_fen! != 0 {
@@ -288,7 +293,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
             return 35
         }
         if indexPath.section == 6{
-            if indexPath.row == 1 {
+            if indexPath.row == 2 {
                 return UITableView.automaticDimension
                 
             }
@@ -429,9 +434,16 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
             }else if indexPath.section == 6 {
                 cell.nameLbl.textColor = UIColor.init(named: "标题字颜色")
                 cell.textTF.textColor = UIColor.init(named: "灰色字体颜色")
-                cell.nameLbl.text = "货物保障"
-                cell.textTF.text = "-"
+                
+                if indexPath.row == 0 {
+                    cell.nameLbl.text = "支付时间"
+                    cell.textTF.text = dataModel?.delivery?.pay_time
+                }
                 if indexPath.row == 1 {
+                    cell.nameLbl.text = "货物保障"
+                    cell.textTF.text = "-"
+                }
+                if indexPath.row == 2 {
                     let cell1 = tableView.dequeueReusableCell(withIdentifier: "TitleAndLblCell") as! TitleAndLblCell
                     cell1.nameLbl.text = "备注"
                     cell1.contentLbl.text = dataModel?.order_detail_item?.order_item?.remark

GeliBusinessPlatform/ViewController/货拉拉/运单详情/WaybillDetailViewController.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -33,7 +34,7 @@
                 </tableView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LNV-ad-a6k" customClass="LGButton" customModule="LGButton">
                     <rect key="frame" x="0.0" y="813" width="414" height="83"/>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
                             <color key="value" name="按钮渐变色上"/>
@@ -57,7 +58,8 @@
                     <nil key="highlightedColor"/>
                 </label>
             </subviews>
-            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+            <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
+            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
             <constraints>
                 <constraint firstItem="t9e-fZ-mil" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="1yK-Aa-n27"/>
                 <constraint firstItem="LNV-ad-a6k" firstAttribute="top" secondItem="t9e-fZ-mil" secondAttribute="bottom" id="A7F-HJ-emZ"/>
@@ -71,10 +73,14 @@
                 <constraint firstItem="tOa-jF-wGg" firstAttribute="bottom" secondItem="fnl-2z-Ty3" secondAttribute="bottom" id="sZS-id-ZNc"/>
                 <constraint firstItem="tOa-jF-wGg" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="x9b-qn-W90"/>
             </constraints>
-            <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
             <point key="canvasLocation" x="131.8840579710145" y="124.55357142857142"/>
         </view>
     </objects>
+    <designables>
+        <designable name="LNV-ad-a6k">
+            <size key="intrinsicContentSize" width="10" height="10"/>
+        </designable>
+    </designables>
     <resources>
         <namedColor name="app底色">
             <color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -88,5 +94,8 @@
         <namedColor name="白色背景色">
             <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>

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

@@ -260,6 +260,8 @@ class CGDListVC: BaseViewController , UITableViewDelegate, UITableViewDataSource
                     "chuKuLiang":"" as Any,
                     "pog_id":item.pog_id as Any,
                     "no_push_num":item.no_push_num as Any
+                    
+//                    "ven_list":item.ven_list as Any
                 ]
                 let mo = InputInitInfoGoodsInfoModel(JSON: dict)
                 rkDatas.append(mo!)
@@ -269,6 +271,8 @@ class CGDListVC: BaseViewController , UITableViewDelegate, UITableViewDataSource
             vc.isCaiGou = true
             vc.rkSelectArr = rkDatas
             vc.po_id = model.po_id!
+            vc.isCaiGou_GYS_name = model.ven_name!
+            vc.isCaiGou_GYS_ven_id = model.ven_id!
             vc.delegate = self
             vc.orderNumStr = model.po_no! as! String
             self.navigationController?.pushViewController(vc, animated: true)

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

@@ -87,7 +87,7 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
     var po_id:Int?
     let tArr = ["制单信息","商品信息"]
     var glSelectView:GLAlertSelectView?
-    
+    var modelD:PurchaseOrderDetailNewModel?
     let UserToken = UserDefaults.standard.value(forKey: "user_token")
     
     //MARK: - cell delegate
@@ -190,6 +190,7 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
             break
         case "入库","补录入库":
             var rkDatas:Array<InputInitInfoGoodsInfoModel> = []
+           
             model!.goods_res?.forEach({ (item) in
                 if item.no_push_num != 0 {
                     let dict = [
@@ -210,15 +211,17 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
                         "createDayStr":"" as Any,
                         "chuKuLiang":"" as Any,
                         "pog_id":item.pog_id as Any,
-                        "no_push_num":item.no_push_num 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.isCaiGou_GYS_name = (modelD?.purchase_order?.ven_name)!
+            vc.isCaiGou_GYS_ven_id = (modelD?.purchase_order?.ven_id)!
+            print("name= = ",vc.isCaiGou_GYS_name)
             vc.rkSelectArr = rkDatas
             vc.po_id = model?.po_id! as! Int
             vc.delegate = self
@@ -258,7 +261,7 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
         purchaseOrderDetail(dict, success: { (data) in
             let item = data as! PurchaseOrderDetailModel
             let mo = item.data
-            
+            self.modelD = item.data
             self.holderArr.insert(mo!.purchase_order!.po_no!, at: 0)
             self.holderArr.remove(at: 1)