出入库记录待完善ing

GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -7,7 +7,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
          <BreakpointContent
-            uuid = "133D1437-55DD-4ABF-AA73-308367DE7A99"
+            uuid = "99EA5A96-5F71-4423-89D2-F17C048E538E"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
@@ -19,7 +19,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.SwiftErrorBreakpoint">
          <BreakpointContent
-            uuid = "FC4B7CDB-AB19-420A-9D96-9F442C622FBC"
+            uuid = "1A4465E3-66B4-4656-B502-BC293DCB6AC0"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No">

GeliBusinessPlatform/Define/NetworkRequest.swift

@@ -10,7 +10,7 @@ import Foundation
 import Alamofire
 import SwiftyJSON
 import ObjectMapper
-
+import RealmSwift
 import UIKit
 
 private let NetworkRequestShareInstance = NetworkRequest()
@@ -126,6 +126,10 @@ extension NetworkRequest {
                     HUD.flash(.label(json["message"].stringValue), delay: 1.5)
                     failture(DogError.DataInvalidError)
                     delay(1.5) {
+                        let realm = try! Realm()
+                        try! realm.write {
+                          realm.deleteAll()
+                        }
                         UserDefaults.standard.removeObject(forKey: "user_token")
                         NotificationCenter.default.post(name: Notification.Name(rawValue: "logout"), object: nil)
                         JPUSHService.deleteAlias({ (resCode, alias, num) in

GeliBusinessPlatform/View/MoreBtnView/MoreAndTimeSelectView.swift

@@ -376,6 +376,46 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect
             
             timeTilelV.timeLbl.text = dayByDouble(sender: timeInterval) + "," + dayByDouble(sender: timeIntervalEnd)
         }
+        if sendSelectArr.count > 0 {
+            let suv = contenV.viewWithTag(10086)
+            suv?.removeFromSuperview()
+            
+            contentH = contentH + 120*glscale
+            contentHeight.constant = contentH
+            
+            if sendSelectArr.count == 10{
+                let arrStr = ["全部","采购","调入","退货","生产","调出被拒绝","外采","其他","固定采购","临时采购"]
+                sendSArr.removeAll()
+                arrStr.forEach { (str) in
+                    sendSArr.append(false)
+                }
+                let statusV = addTitleAndMoreBtn(title: "具体类型", arrStr: arrStr, btnTag: 3000)
+                contenV.addSubview(statusV)
+                statusV.tag = 10086
+                statusV.snp.makeConstraints { (make) in
+                    make.left.equalTo(15*glscale)
+                    make.top.equalTo(line3.snp_bottom).offset(15*glscale)
+                    make.right.equalTo(0)
+                    make.height.equalTo(140*glscale)
+                }
+            }else if sendSelectArr.count == 11{
+                let arrStr = ["全部","销售","调出","报损","赠品","自用","生产使用","过期处理","用户试用","采购退货","其他"]
+                sendSArr.removeAll()
+                arrStr.forEach { (str) in
+                    sendSArr.append(false)
+                }
+                let statusV = addTitleAndMoreBtn(title: "具体类型", arrStr:arrStr,  btnTag: 3000)
+                contenV.addSubview(statusV)
+                statusV.tag = 10086
+                statusV.snp.makeConstraints { (make) in
+                    make.left.equalTo(15*glscale)
+                    make.top.equalTo(line3.snp_bottom).offset(15*glscale)
+                    make.right.equalTo(0)
+                    make.height.equalTo(140*glscale)
+                }
+            }
+        }
+        
         allSelectBtn.forEach { (sender) in
             if sender.tag < 2000 {
                 let i = sender.tag - 1000
@@ -396,6 +436,7 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect
                 }
                 
             }else{
+                
                 let i = sender.tag - 3000
                 let isBool = sendSelectArr[i]
                 sender.isSelected = isBool

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

@@ -25,21 +25,39 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
      }
      return true
  }
+    var isSearch = false
+
     //MARK: - searchView delegate
     func clearSearchAction() {
          print("取消搜索代理了--")
     }
+    //MARK:--编辑即将结束
     func searchBarTextDidEndEditing(_ searchBar: UISearchBar) {
         print("编辑即将结束了--")
-       
+        if keyword.count > 0 {
+            keyword = searchBar.text!
+            if keyword.count == 0 {
+                loadData()
+            }
+        }
     }
-    var page = 0
+    func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
+        print("点击搜索进行--")
+        searchBar.resignFirstResponder()
+        keyword = searchBar.text!
+        listView.mj_header?.beginRefreshing()
 
+        
+    }
     var isGm = true
     private let animations = [AnimationType.from(direction: .bottom, offset: 300*glscale)]
     
     @IBOutlet weak var topBtn: UIButton!
-
+    var BeginDate: Date! = nil
+    var EndDate: Date! = nil
+    var paySArr:Array<Bool> = [false,false,false,false]
+    var bugSArr:Array<Bool> = [false,false,false]
+    var sendSArr:Array<Bool> = []
     var moreTimeSelectView:MoreAndTimeSelectView! = nil
     @IBAction func openViewAction(_ sender: Any) {
         print("筛选选项")
@@ -54,7 +72,7 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
             }
             moreTimeSelectView.setUI()
             
-            
+            moreTimeSelectView.setUIbyData(beginDate: BeginDate, endginDate: EndDate, paySelectArr: paySArr, bugSelectArr: bugSArr, sendSelectArr: sendSArr)
         }else{
             moreTimeSelectView.removeFromSuperview()
             moreTimeSelectView  = nil
@@ -64,8 +82,12 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
     }
     //MARK:--筛选回调数据
     func sureActionMoreAndTimeSelectView(beginDate: Date?, endginDate: Date?, paySelectArr: Array<Bool>, bugSelectArr: Array<Bool>, sendSelectArr: Array<Bool>) {
-        
-        print(beginDate,endginDate,paySelectArr,bugSelectArr,sendSelectArr)
+        moreTimeSelectView  = nil
+        BeginDate = beginDate
+        EndDate = endginDate
+        paySArr = paySelectArr
+        bugSArr = bugSelectArr
+        sendSArr =  sendSelectArr
         
     }
     //MARK:--筛选回调数据
@@ -114,10 +136,19 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
            self.listView?.mj_header?.beginRefreshing()
         
     }
+    var status = 0 //    出入库(审核)状态，1审核中，2通过，3不通过；0全部
+    var io_type = 0 //类型(出/入库)，1入库，2出库，3撤销入库,0全部
+    var i_type = 0 //入库类型，选项见下文
+    var o_type = 0 //出库类型，选项见下文
+    var start_time = 0
+    var end_time = 0
+    var keyword = ""
+    var page = 0
+
     @objc func loadData(){
         page = 1
         let UserToken = UserDefaults.standard.value(forKey: "user_token")
-        let dic = ["user_token":UserToken as Any,"status":0 as Any,"page":page as Any]
+        let dic = ["user_token":UserToken as Any,"status":0 as Any,"page":page as Any,"io_type":io_type as Any ,"i_type":i_type  as Any,"o_type":o_type  as Any,"start_time":"","end_time":"","keyword":""]
       
         WarehouseIoList(dic , success: { (data) in
             self.datas?.removeAll()
@@ -151,8 +182,8 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
         print("加载更多数据")
         print("page = ",page)
         let UserToken = UserDefaults.standard.value(forKey: "user_token")
-        let dic = ["user_token":UserToken as Any,"status":"0" as Any,"page":page as Any]
-       
+        let dic = ["user_token":UserToken as Any,"status":0 as Any,"page":page as Any,"io_type":io_type as Any ,"i_type":i_type  as Any,"o_type":o_type  as Any,"start_time":"","end_time":"","keyword":""]
+
         WarehouseIoList(dic, success: { (data) in
             let dataM = data as! WarehouseIoListModel
             if dataM.data?.count == 0 {

GeliBusinessPlatform/ViewController/账号信息/AccountViewController.swift

@@ -7,7 +7,7 @@
 //
 
 import UIKit
-
+import RealmSwift
 class AccountViewController: BaseViewController{
 
     @IBOutlet weak var phoneLbl: UILabel!
@@ -52,6 +52,10 @@ class AccountViewController: BaseViewController{
     @IBAction func logOutAction(_ sender: Any) {
         print("退出登录")
         //模拟退出登录
+        let realm = try! Realm()
+        try! realm.write {
+            realm.deleteAll()
+        }
         UserDefaults.standard.removeObject(forKey: "user_token")
         NotificationCenter.default.post(name: Notification.Name(rawValue: "logout"), object: nil)
         JPUSHService.deleteAlias({ (resCode, alias, num) in