出库

GeliBusinessPlatform/AppDelegate.swift

@@ -258,7 +258,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate, UITabBarCon
         
         tabBarController.viewControllers = [v1, v2, v3, v4, v5]
         
-        tabBarController.selectedIndex = 2
+        tabBarController.selectedIndex = 1
         
         
         

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

@@ -10,12 +10,7 @@ import UIKit
 import LGButton
 
 class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, NewOnlyRKCellDelegate,NewSelectItemVcDelegate,NewSelectWarehouseVCDelegate,GLAlertSelectViewDelegate,GeliAlertTextViewDelegate{
-    
-    
-    
-    
-    
-    
+ 
     //MARK: - 提交申请
     func sureGeliAlertTextViewAction(sender: String) {
         HUD.show(.progress)
@@ -137,7 +132,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
         
         
     }
-    var poiArr:Array<ShopWarehouseDetailDataPositionModel> = []
+    
     var goods_id:Int?
     @IBOutlet weak var lgBtnTitLbl: UILabel!
     @IBOutlet weak var lgBtn: LGButton!
@@ -150,12 +145,13 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
     
     var glSelectView:GLAlertSelectView?
     
+    var poiArr:Array<ShopWarehouseDetailDataPositionModel> = []
     
     @IBOutlet weak var btmView: UIView!
     @IBOutlet weak var listView: UITableView!
     
-    var rkSelectArr:Array<InputInitInfoGoodsInfoModel> = []//仓库选择
-    var rkDatas:Array<InputInitInfoGoodsInfoModel> = []//仓库
+    var rkSelectArr:Array<InputInitInfoGoodsInfoModel> = []//产品选择
+    var rkDatas:Array<InputInitInfoGoodsInfoModel> = []//产品
     
     var rkWareHouseArr:Array<InputInitInfoWareHouseResModel> = []//库位选择
     var selectIdx:Int?//库位选择
@@ -192,10 +188,10 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
             }
             
             self.lgBtnTitLbl.text = "提交申请"
-            //            if self.authArr.contains("63"){
-            //                self.isGm = true
-            //                self.lgBtnTitLbl.text = "直接入库"
-            //            }
+                        if self.authArr.contains("63"){
+                            self.isGm = true
+                            self.lgBtnTitLbl.text = "直接入库"
+                        }
             
             model.data?.warehouse_res?.forEach({ (item) in
                 self.rkWareHouseArr.append(item)
@@ -462,6 +458,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
         view.removeFromSuperview()
         glSelectView = nil
     }
+    
     func GLAlertSelectViewClick(selectNum: Int, view: GLAlertSelectView) {
         if view.tag == 2 {
             typeSelect = selectNum

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

@@ -16,6 +16,7 @@ class CKGmCell: UITableViewCell {
     @IBOutlet weak var listBg: UIView!
     @IBOutlet weak var titleViewH: NSLayoutConstraint!
    
+    @IBOutlet weak var detailLbl: UILabel!
     @IBOutlet weak var titleView: UIView!
     var delegate:CKGmCellDelegate?
     @IBAction func selectAction(_ sender: Any) {
@@ -38,6 +39,7 @@ class CKGmCell: UITableViewCell {
             titleView.isHidden = false
             titleViewH.constant = 35
             for i in 0 ..< dataArr!.count {
+                let model = dataArr![i]
                 let view = UIView()
                 listBg.addSubview(view)
                 view.snp.makeConstraints { (make) in
@@ -54,6 +56,8 @@ class CKGmCell: UITableViewCell {
                     make.top.bottom.right.equalTo(0)
                 }
                 
+                leftL.text = "\(model.batch_id!)"
+                
                 let rightL = UILabel()
                 view.addSubview(rightL)
                 rightL.textColor = UIColor(named: "个人中心灰色字体")
@@ -63,10 +67,8 @@ class CKGmCell: UITableViewCell {
                     make.right.equalTo(-30)
                     make.top.bottom.left.equalTo(0)
                 }
+                rightL.text = "\(model.chuHuoLiang!)"
             }
-        }else{
-            titleView.isHidden = true
-            titleViewH.constant = 0
         }
     }
     override func setSelected(_ selected: Bool, animated: Bool) {

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

@@ -136,6 +136,7 @@
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
             <connections>
+                <outlet property="detailLbl" destination="oxJ-qd-UEI" id="be4-eE-hhI"/>
                 <outlet property="listBg" destination="d5T-uL-vW9" id="SVo-od-Th4"/>
                 <outlet property="nameLbl" destination="d4N-n8-5II" id="bI7-ba-Voz"/>
                 <outlet property="titleView" destination="fta-n1-NF1" id="JJL-vJ-1vN"/>

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

@@ -7,16 +7,30 @@
 //
 
 import UIKit
+import LGButton
 
-
-class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNonGmCellDelegate,CKGmCellDelegate, PiCiXuanZeViewControllerDelegate{
+class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNonGmCellDelegate,CKGmCellDelegate, PiCiXuanZeViewControllerDelegate,GLAlertSelectViewDelegate,NewSelectItemVcDelegate{
+    func NewSelectItemVcSelect(datas: Array<InputInitInfoGoodsInfoModel>) {
+        rkSelectArr.removeAll()
+        datas.forEach { (item) in
+            rkSelectArr.append(item)
+        }
+        listView.reloadData()
+    }
+    
+    
     func PiCiXuanZeViewControllerPiCiSelect(data: Array<GetGoodBatchDataModel>, p_id: Int) {
-        
+        print(data.count)
+        piCiArr?.insert(data, at: p_id)
+        piCiArr?.remove(at: p_id + 1)
+        listView.reloadData()
     }
     
     //MARK: - 普通流程
     func CKNonGmCellDelAction(cell: CKNonGmCell) {
         //删除
+        rkSelectArr.remove(at: cell.tag)
+        listView.reloadData()
     }
     
     func CKNonGmCellInputCount(sender: String, cell: CKNonGmCell) {
@@ -25,6 +39,8 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
     //MARK: - 权限操作
     func CKGmCellDelAction(cell: CKGmCell) {
         //删除
+        rkSelectArr.remove(at: cell.tag)
+        listView.reloadData()
     }
     
     
@@ -32,21 +48,38 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
     
     func CKGmCellSelectAction(cell: CKGmCell) {
         //跳转选择批次
-        //        let data = outGoodsModels![cell.tag]
+        let data = rkSelectArr[cell.tag]
         let vc = PiCiXuanZeViewController()
-        //                   vc.sku_id = sku_id
+        vc.sku_id = data.sku_id
         vc.delegate = self
         vc.tag = cell.tag
-        let arr = piCiArr![cell.tag]
-        vc.recordArr = arr
+        if piCiArr!.count > 0 {
+            let arr = piCiArr![cell.tag]
+            vc.recordArr = arr
+        }
         self.navigationController?.pushViewController(vc, animated: true)
     }
-    
+    func GLASClose(view: GLAlertSelectView, selectnum: Int, selectArr: Array<Int>) {
+        
+        typeSelect = selectnum
+        
+        view.removeFromSuperview()
+        glSelectView = nil
+    }
     let titleArr = ["出库类型：","出库时间："]
     var holderArr = ["请选择出库类型","时间"]
-    var dataArr:Array<Any>? = []
+    var glSelectView:GLAlertSelectView?
+    let ckTypeArr = ["销售","调出","报损","赠品","自用","生产使用","过期处理","用户试用","采购退货","其他"]
+    var typeSelect:Int?
     
     var isGm = true
+    var goods_id:Int?
+    
+    var rkSelectArr:Array<InputInitInfoGoodsInfoModel> = []//产品选择
+    var rkDatas:Array<InputInitInfoGoodsInfoModel> = []//产品
+    
+    var authArr:Array<String> = []//权限
+    
     
     @IBAction func submitAction(_ sender: Any) {
         if isGm {//直接出库
@@ -55,6 +88,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() {
@@ -68,12 +102,50 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
         listView.register(UINib(nibName: "CRKBtnCell", bundle: nil), forCellReuseIdentifier: "CRKBtnCell")
         listView.register(UINib(nibName: "CKGmCell", bundle: nil), forCellReuseIdentifier: "CKGmCell")
         
-        // Do any additional setup after loading the view.
+        holderArr.insert(getTimeNow(), at: 1)
+        holderArr.remove(at: 2)
+        
+        let UserToken = UserDefaults.standard.value(forKey: "user_token")
+        OutputInitInfo(["user_token":UserToken as Any,"p_id":0 as Any], success: { (data) in
+            
+            let model = data as! InputInitInfoModel
+            
+            
+            
+            model.data?.goods_info?.forEach({ (item) in
+                self.rkDatas.append(item)
+                self.piCiArr?.append([])
+            })
+            
+            model.data?.auth?.forEach({ (str) in
+                self.authArr.append(str)
+            })
+            
+            if self.authArr.contains("64") == false && self.authArr.contains("66") == false {
+                self.listView.isHidden = true
+                self.btmLbl.isHidden = true
+                self.btmBtn.isHidden = true
+                HUD.flash(.label("亲，您不具备编辑的权限"), delay:1.2)
+                return
+            }
+            
+            self.btmLbl.text = "提交申请"
+            if self.authArr.contains("64"){
+                self.isGm = true
+                self.btmLbl.text = "直接出库"
+            }
+            self.listView.reloadData()
+        }) { (error) in
+            
+        }
     }
     //添加商品
     @objc func addProduct(){
-        dataArr?.append("1")
-        listView.reloadData()
+        let vc = NewSelectItemVc()
+        vc.delegate = self
+        vc.rkDatas = rkDatas
+        vc.rkSelectArr = rkSelectArr
+        self.navigationController?.pushViewController(vc, animated: true)
     }
     //MARK: - cell delegate
     
@@ -84,7 +156,23 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
             if isGm {
                 let cell = tableView.dequeueReusableCell(withIdentifier: "CKGmCell") as! CKGmCell
                 cell.tag = indexPath.row
+                let data = rkSelectArr[cell.tag]
                 cell.delegate = self
+                cell.nameLbl.text = data.goods_name
+                cell.detailLbl.text = data.spec_str
+                
+                let arr = piCiArr?[cell.tag]
+                if arr!.count > 0 {
+                    cell.dataArr = arr
+                    cell.titleView.alpha = 1
+                    cell.titleView.isHidden = false
+                    cell.titleViewH.constant = 35
+                }else{
+                    cell.titleView.isHidden = true
+                    cell.titleViewH.constant = 0
+                    cell.titleView.alpha = 0
+                }
+                
                 return cell
             }
             let cell = tableView.dequeueReusableCell(withIdentifier: "CKNonGmCell") as! CKNonGmCell
@@ -111,7 +199,12 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
         }
         if isGm {
             let arr = piCiArr![indexPath.row]
-            return CGFloat(125 + arr.count * 30)
+            if arr.count > 0 {
+                return CGFloat(125 + arr.count * 30 + 35)
+            }else{
+                return 125
+            }
+            
         }
         return 139
     }
@@ -161,9 +254,9 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
             lbl.sizeToFit()
             view.addSubview(lbl)
             
-            if dataArr!.count > 0 {
+            if rkSelectArr.count > 0 {
                 let lbl2 = UILabel(frame: CGRect(x: lbl.frame.maxX + 5, y: 16, width: fullScreenWidth, height: 18.5))
-                lbl2.text = "(共\(dataArr!.count)件)"
+                lbl2.text = "(共\(rkSelectArr.count)件)"
                 lbl2.textColor = UIColor(named: "标题字颜色")
                 lbl2.font = UIFont.boldSystemFont(ofSize: 13)
                 view.addSubview(lbl2)
@@ -175,7 +268,7 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
     
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
         if section == 1 {
-            if dataArr!.count > 0 {
+            if rkSelectArr.count > 0 {
                 return 49
             }
             return 39
@@ -190,7 +283,36 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
         if section == 0 {
             return 2
         }
-        return dataArr!.count
+        return rkSelectArr.count
+    }
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if indexPath.section == 0 {
+            if indexPath.row == 0 {
+                if glSelectView == nil {
+                    let view = GLAlertSelectView(frame: self.view.bounds)
+                    view.tag = indexPath.row
+                    if typeSelect != nil {
+                        view.selectNum = typeSelect
+                        view.tempNum = view.selectNum
+                    }
+                    view.isOnlySelectKuWei = true
+                    view.delegate = self
+                    view.titleLbl.text = "请选择出库类型"
+                    view.dataArr = ckTypeArr
+                    self.view.addSubview(view)
+                    glSelectView = view
+                }
+            }
+        }
+    }
+    func GLAlertSelectViewClick(selectNum: Int, view: GLAlertSelectView) {
+        
+        typeSelect = selectNum
+        holderArr.insert(ckTypeArr[typeSelect!], at: 0)
+        holderArr.remove(at: 1)
+        
+        glSelectView?.removeFromSuperview()
+        glSelectView = nil
+        listView.reloadData()
     }
-    
 }

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

@@ -11,6 +11,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="NewCKVc" customModule="TestClass" customModuleProvider="target">
             <connections>
+                <outlet property="btmBtn" destination="yfg-Ft-JzP" id="BU2-Kp-3re"/>
                 <outlet property="btmLbl" destination="GKS-4B-MyY" id="X7n-F5-1a4"/>
                 <outlet property="listView" destination="Myt-AK-Ady" id="UCq-v8-4KC"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>

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

@@ -185,16 +185,18 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
                 
                 
                 let UserToken = UserDefaults.standard.value(forKey: "user_token")
-//                var iogArr:Array<Any> = []
-//                inGoodsModels?.forEach({ (item) in
-//                    iogArr.append(item.iog_id)
-//                })
+                //MARK: - 出入库列表 iog_id
+                var iogArr:Array<Any> = []
+                inGoodsModels?.forEach({ (item) in
+                    iogArr.append(item.iog_id!)
+                })
+                
                 let poi = positionArr![selectIdx!]
                 
                 let goods = [
                     "w_id":wareHouseModel?.w_id as Any,
                     "p_id":poi.p_id as Any,
-                    "iog_id":inGoodsModels?.first?.iog_id as Any
+                    "iog_id":dataChangeString(sender: iogArr) as Any
                 ]
                 var goodInfoArr:Array<Any> = []
                 goodInfoArr.append(goods)

GeliBusinessPlatform/ViewController/商品管理/GoodsManageListVC.swift

@@ -496,7 +496,8 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
                 print("入库哦哦")
 //                HUD.flash(.label("敬请期待"),delay: 1.2)
 //                return
-                let vc = NewRKVc()
+//                let vc = NewRKVc()
+                let vc = NewCKVc()
                 vc.goods_id = changeGoodsResModel?.goods_id
                 self.navigationController?.pushViewController(vc, animated: true)
 //                let vc = RuKuViewController()
@@ -527,7 +528,8 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
  
             }else{
                 print("入库哦哦")
-                let vc = NewRKVc()
+//                let vc = NewRKVc()
+                let vc = NewCKVc()
                 vc.goods_id = changeGoodsResModel?.goods_id
                 self.navigationController?.pushViewController(vc, animated: true)
 //                HUD.flash(.label("敬请期待"),delay: 1.2)