回调标签打印数据

GeliBusinessPlatform/Model/printOrder_model/printOrderModel.swift

@@ -9,6 +9,8 @@
 import Foundation
 import ObjectMapper
 
+
+
 //MARK: - 订单打印信息
 class printOrder_model: Mappable {
     var code:Int?

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

@@ -9,7 +9,24 @@
 import UIKit
 import LGButton
 
-class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNonGmCellDelegate,CKGmCellDelegate, PiCiXuanZeViewControllerDelegate,GLAlertSelectViewDelegate,NewSelectItemVcDelegate,GeliAlertTextViewDelegate{
+class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNonGmCellDelegate,CKGmCellDelegate, PiCiXuanZeViewControllerDelegate,GLAlertSelectViewDelegate,NewSelectItemVcDelegate,GeliAlertTextViewDelegate, Print_Gprinter_View_Delegate{
+    func Print_Gprinter_View_Print(data: Array<Dictionary<String, Any>>) {
+        let dict = [
+            "user_token":UserToken as Any,
+            "o_type":typeSelect! + 1 as Any,
+            "audit_remark":remark as Any,
+            "goods_info":dataChangeString(sender: goodsInfoArr) as Any
+        ]
+        HUD.show(.progress)
+        GoodsOutput(dict, success: { (data) in
+            HUD.hide()
+            HUD.flash(.labeledSubSuccess(subtitle: "出库成功"), delay: 1.2)
+            self.navigationController?.popViewController(animated: true)
+        }) { (error) in
+            
+        }
+    }
+    
     let UserToken = UserDefaults.standard.value(forKey: "user_token")
     var gmNumber:Int?
     
@@ -113,17 +130,17 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
             data.chuKuLiang = num.integerValue
         }
     }
-    
+    var goodsInfoArr:Array<Any> = []
     @IBOutlet weak var gm_view: UIView!
     @IBAction func ck_action(_ sender: UIButton) {
-//        if typeSelect == nil {
-//            HUD.flash(.label("请选择出库类型"),delay: 1.2)
-//            return
-//        }
-//        if remark.count == 0 {
-//            HUD.flash(.label("请填写备注"), delay: 1.2)
-//            return
-//        }
+        if typeSelect == nil {
+            HUD.flash(.label("请选择出库类型"),delay: 1.2)
+            return
+        }
+        if remark.count == 0 {
+            HUD.flash(.label("请填写备注"), delay: 1.2)
+            return
+        }
         if rkSelectArr.count == 0 {
             HUD.flash(.label("请选择出库商品"), delay: 1.2)
             return
@@ -131,7 +148,7 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
         
         
         
-        var goodsInfoArr:Array<Any> = []
+        goodsInfoArr.removeAll()
         for i in 0 ..< rkSelectArr.count {
             let item = rkSelectArr[i]
             var count = 0
@@ -141,6 +158,7 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
                 HUD.flash(.label("请选择出库商品批次"), delay: 1.2)
                 return
             }
+            
             for data in pici {
                 count += data.chuHuoLiang!
             }
@@ -173,29 +191,30 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
             goodsInfoArr.append(goods)
         }
         
-//        let dict = [
-//            "user_token":UserToken as Any,
-//            "o_type":typeSelect! + 1 as Any,
-//            "audit_remark":remark as Any,
-//            "goods_info":dataChangeString(sender: goodsInfoArr) as Any
-//        ]
+        let dict = [
+            "user_token":UserToken as Any,
+            "o_type":typeSelect! + 1 as Any,
+            "audit_remark":remark as Any,
+            "goods_info":dataChangeString(sender: goodsInfoArr) as Any
+        ]
         
         if sender.tag == 1 {//打印
             print("连接打印机")
             let vc = Print_Gprinter_View(frame: self.view.bounds)
+            vc.delegate = self
             vc.rkSelectArr = rkSelectArr
             vc.piCiArr = piCiArr
             self.view.addSubview(vc)
             return
         }
         HUD.show(.progress)
-//        GoodsOutput(dict, success: { (data) in
-//            HUD.hide()
-//            HUD.flash(.labeledSubSuccess(subtitle: "出库成功"), delay: 1.2)
-//            self.navigationController?.popViewController(animated: true)
-//        }) { (error) in
-//            
-//        }
+        GoodsOutput(dict, success: { (data) in
+            HUD.hide()
+            HUD.flash(.labeledSubSuccess(subtitle: "出库成功"), delay: 1.2)
+            self.navigationController?.popViewController(animated: true)
+        }) { (error) in
+            
+        }
     }
     @IBOutlet weak var btmBtn: LGButton!
     @IBOutlet weak var btmLbl: UILabel!

GeliBusinessPlatform/ViewController/商品详情/EPViewController.swift

@@ -977,9 +977,8 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         if indexPath.row == 4 {
             //MARK: - 查看库存详情
-            print("abc")
-//            let vc = S_P_K_C_Detail_Vc()
-//            self.navigationController?.pushViewController(vc, animated: true)
+            let vc = S_P_K_C_Detail_Vc()
+            self.navigationController?.pushViewController(vc, animated: true)
         }
     }
     //MARK: - 底部广告软文跳转 && 编辑

GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift

@@ -465,10 +465,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
             self.navigationController?.pushViewController(vc, animated: true)
             return
         case 59: //地址管理
-            //            HUD.flash(.label("敬请期待"),delay: 1.2)
-            //            return
-            let vc = S_P_K_C_Detail_Vc()
-//            let vc = DZGLViewController()
+            let vc = DZGLViewController()
             self.navigationController?.pushViewController(vc, animated: true )
             return
         case 61: //库存商品

GeliBusinessPlatform/ViewController/溯源/Print_Gprinter_View.swift

@@ -8,13 +8,15 @@
 
 import UIKit
 import LGButton
-
+protocol Print_Gprinter_View_Delegate {
+    func Print_Gprinter_View_Print(data:Array<Dictionary<String,Any>>)
+}
 class Print_Gprinter_View: UIView,UITableViewDelegate,UITableViewDataSource, GPrinter_Cell_Delegate {
     func GPrinter_Cell_print_copy(num: Array<Int>, cell: GPrinter_Cell) {
         print_num_arr.insert(num, at: cell.tag)
         print_num_arr.remove(at: cell.tag+1)
     }
-    
+    var delegate:Print_Gprinter_View_Delegate?
     func GPrinter_Cell_select_item(selects: Array<Int>, cell: GPrinter_Cell) {
         pi_ci_select.insert(selects, at: cell.tag)
         pi_ci_select.remove(at: cell.tag+1)
@@ -84,18 +86,28 @@ class Print_Gprinter_View: UIView,UITableViewDelegate,UITableViewDataSource, GPr
             }
             temp_print_arr.append(arr2)
         }
-     
+       
+        var print_data:Array<Dictionary<String,Any>> = []
         for item in temp_rk_arr {
             let model = rkSelectArr[item]
-            print(model.goods_name)
             let select_arr = temp_print_arr[item]
+            var dict:Dictionary<String,Any> = Dictionary()
             for i in select_arr {
+                dict["goods_name"] = model.goods_name
                 let p = piCiArr![item][i]
+                dict["goods_data"] = p
                 let n = print_num_arr[item][i]
-                print(p.p_id,n)
+                dict["print_counts"] = n
+                print_data.append(dict)
             }
         }
-
+        for item in print_data {
+            let data = item["goods_data"] as! GetGoodBatchDataModel
+            print("print_target = ",item["goods_name"],data.batch_id,item["print_counts"])
+        }
+        //连接打印机
+        delegate?.Print_Gprinter_View_Print(data: print_data)
+        
     }
     @IBAction func close_action(_ sender: UIButton) {
         self.removeFromSuperview()