出入库审核通过，不通过

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

@@ -8,7 +8,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.SwiftErrorBreakpoint">
          <BreakpointContent
             uuid = "FD43E86D-38D7-4600-B0BB-79E6930D5DF0"
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No">
          </BreakpointContent>
@@ -17,7 +17,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
          <BreakpointContent
             uuid = "B1D5CEF0-844F-4D3D-BAEB-9139DD392272"
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             breakpointStackSelectionBehavior = "1"

GeliBusinessPlatform/Interface/Interface_Z.plist

@@ -130,5 +130,7 @@
 	<string>Passport/mobileLogin</string>
 	<key>消息列表</key>
 	<string>Admin/messageList</string>
+	<key>出库入库审核不通过</key>
+	<string>Warehouse/auditFail</string>
 </dict>
 </plist>

GeliBusinessPlatform/Model/UpDataModel.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 import ObjectMapper
-//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态),商家仓库添加,商家仓库修改,商家仓库删除,提交下单,商品入库审核,商品入库,商品入库申请,商品出库,商品申请出库,商品审核出库
+//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态),商家仓库添加,商家仓库修改,商家仓库删除,提交下单,商品入库审核,商品入库,商品入库申请,商品出库,商品申请出库,商品审核出库,出库入库审核不通过
 
 class UpDataModel: Mappable {
     var code:Int?

GeliBusinessPlatform/Model/WarehouseInterface.swift

@@ -426,3 +426,19 @@ func InGoodsDetail(_ params:[String:Any],success:@escaping (_ res:Any)->(),failt
     }
 }
 
+//MARK: -- 出库入库审核不通过
+
+/**
+ params-key:
+ user_token(验证token)
+ io_id 出/入库单号
+audit_remark 审核备注
+ */
+func AuditFail(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("出库入库审核不通过", params, { (rep:DataResponse<UpDataModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}

GeliBusinessPlatform/ViewController/入库/PiCiXuanZeViewController.swift

@@ -55,6 +55,15 @@ class PiCiXuanZeViewController: BaseViewController,UITableViewDelegate,UITableVi
             model.data?.forEach({ (item) in
                 self.dataArray.append(item)
             })
+            if self.recordArr.count > 0 {
+                for item in self.dataArray{
+                    for model in self.recordArr{
+                        if item.batch_id == model.batch_id{
+                            item.chuHuoLiang = model.chuHuoLiang
+                        }
+                    }
+                }
+            }
             self.listView.reloadData()
         }) { (error) in
             
@@ -65,7 +74,6 @@ class PiCiXuanZeViewController: BaseViewController,UITableViewDelegate,UITableVi
             for item in recordArr{
                 totalCount += item.chuHuoLiang!
             }
-            
         }
     }
     
@@ -137,22 +145,29 @@ class PiCiXuanZeViewController: BaseViewController,UITableViewDelegate,UITableVi
         }
         listView.reloadData()
     }
+    
     func PiCiXuanZeCellBtnSelect(cell: PiCiXuanZeCell) {
-        if selectArr.contains(cell.tag) {
+        if selectArr.contains(cell.tag){
             let idx = selectArr.index(of: cell.tag)
             selectArr.remove(at: idx!)
-            if recordArr[idx!] != nil {
-                recordArr.remove(at: idx!)
-            }
         }else{
             selectArr.append(cell.tag)
-            recordArr.append(dataArray[cell.tag])
         }
+        
+        let data = dataArray[cell.tag]
+        let idx = recordArr.firstIndex { (model) -> Bool in
+            return data.batch_id == model.batch_id
+        }
+        if idx != nil {
+            recordArr.remove(at: idx!)
+        }else{
+            recordArr.append(data)
+        }
+        
         totalCount = 0
-        for item in selectArr{
-            let data = dataArray[item]
-            if data.chuHuoLiang != nil {
-                totalCount += data.chuHuoLiang!
+        for item in recordArr{
+            if item.chuHuoLiang != nil {
+                totalCount += item.chuHuoLiang!
             }
         }
         listView.reloadData()

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

@@ -9,7 +9,11 @@
 import UIKit
 import ViewAnimator //cell动效
 
-class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CRKCellDelegate,UISearchBarDelegate, SearchBarViewDelegate {
+class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CRKCellDelegate,UISearchBarDelegate, SearchBarViewDelegate,CRKXiangQVCDelegate {
+    func CRKXiangQVCFinishAction() {
+        listView.mj_header?.beginRefreshing()
+    }
+    
     var page = 0
 
     var isGm = true
@@ -137,6 +141,7 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
         //MARK: - 跳转详情
         let model = datas![indexPath.row]
         let vc = CRKXiangQVC()
+        vc.delegate = self
         vc.isGm = isGm
         vc.model = model
         vc.status = model.status

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

@@ -7,12 +7,14 @@
 //
 
 import UIKit
-
+protocol CRKXiangQVCDelegate {
+    func CRKXiangQVCFinishAction()
+}
 class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,NewCKCellDelegate,PiCiXuanZeViewControllerDelegate,WarehoseMangementListVCDelegate,GLAlertSelectViewDelegate,GeliAlertTextViewDelegate{
-  
     
     
     
+    var delegate:CRKXiangQVCDelegate?
     func GLASClose(view: GLAlertSelectView, selectnum: Int, selectArr: Array<Int>) {
         selectIdx = selectnum
         view.removeFromSuperview()
@@ -33,7 +35,7 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
     }
     
     var selectIdx:Int?
-    
+    var isFailAction = false
     var glSelectView:GLAlertSelectView? = nil
     var positionArr:Array<ShopWarehouseDetailDataPositionModel>? = []//库位
     var wareHouseModel:ShopWarehouseListDataModel?//仓库
@@ -164,37 +166,124 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
         listView.register(UINib(nibName: "NewRKCell", bundle: nil), forCellReuseIdentifier: "NewRKCell")
     }
     
-    
+    //MARK: - 通过点击事件
     @IBAction func crkxqBtnClick(_ sender: UIButton) {
         
         if sender.tag == 0 {//通过
-            
+            if model?.io_type == 1 {
+                let str = holderArr![0]
+                if str == "默认仓库" {
+                    HUD.flash(.label("请选择仓库"), delay: 1.2)
+                    return
+                }
+                
+                let str1 = holderArr![1]
+                if str1 == "默认库位" {
+                    HUD.flash(.label("请选择库位"), delay: 1.2)
+                    return
+                }
+                
+                
+                let UserToken = UserDefaults.standard.value(forKey: "user_token")
+//                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
+                ]
+                var goodInfoArr:Array<Any> = []
+                goodInfoArr.append(goods)
+                let goodsInfo = dataChangeString(sender: goodInfoArr)
+                print(goodsInfo)
+                let dict = [
+                    "user_token":UserToken as Any,
+                    "io_id":model?.io_id as Any,
+                    "goods_info":goodsInfo as Any
+                ]
+                GoodsInputAudit(dict, success: { (data) in
+                    self.delegate?.CRKXiangQVCFinishAction()
+                    self.navigationController?.popViewController(animated: true)
+                }) { (error) in
+
+                }
+            }else{
+                let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
+                alterView.delegate = self
+                self.view.window?.addSubview(alterView)
+                isFailAction = false
+            }
+        }else{
             let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
             alterView.delegate = self
             self.view.window?.addSubview(alterView)
+            isFailAction = true
         }
         
     }
-    
+    //MARK: - 通过审核
     func sureGeliAlertTextViewAction(sender: String) {
+        
         if sender.count > 0 {
-            
             let UserToken = UserDefaults.standard.value(forKey: "user_token")
-            //通过
-            if model?.io_type == 1 {//入库
-                
-                
-            }else{//出库
-                
-                
-                for item in piCiArr {
+            if isFailAction {//不通过
+                let dict = [
+                    "user_token":UserToken as Any,
+                    "io_id":model?.io_id as Any,
+                    "audit_remark":sender as Any
+                ]
+                AuditFail(dict, success: { (data) in
+                    self.delegate?.CRKXiangQVCFinishAction()
+                     self.navigationController?.popViewController(animated: true)
+                }) { (error) in
                     
                 }
-                
-                //            let dict = ["user_token":UserToken as Any,"io_id":model?.io_id,"audit_remark":sender,"goods_info":]
-                //                      GoodsOutputAudit(<#T##params: [String : Any]##[String : Any]#>, success: <#T##(Any) -> ()#>, failture: <#T##(Error) -> ()#>)
+                return
             }
-            
+            //出库通过
+                var batchInfo:Array<Any> = []
+                piCiArr.forEach { (batchArr) in
+                    batchArr.forEach { (model) in
+                        let batch = [
+                            "w_id":model.w_id as Any,
+                            "p_id":model.p_id as Any,
+                            "number":model.chuHuoLiang as Any,
+                            "production_data":model.production_data as Any,
+                            "shelf_life":model.shelf_life as Any,
+                            "valid_date":model.valid_date as Any,
+                            "batch_id":model.batch_id as Any,
+                            "report_id":model.report_id as Any
+                        ]
+                        batchInfo.append(batch)
+                    }
+                }
+                var goodsInfoArr : Array<Any> = []
+                outGoodsModels?.forEach({ (item) in
+                    let goods = [
+                        "goods_id":item.goods_id as Any,
+                        "goods_name":item.goods_name as Any,
+                        "goods_spec":item.goods_spec as Any,
+                        "sku_id":item.sku_id as Any,
+                        "number":item.number as Any,
+                        "batch_info":batchInfo
+                        ] as [String : Any]
+                    goodsInfoArr.append(goods)
+                })
+                let goods_info = dataChangeString(sender: goodsInfoArr)
+                let dict = [
+                    "user_token":UserToken as Any,
+                    "io_id":model?.io_id as Any,
+                    "audit_remark":sender,
+                    "goods_info":goods_info]
+                GoodsOutputAudit(dict, success: { (data) in
+                    self.delegate?.CRKXiangQVCFinishAction()
+                     self.navigationController?.popViewController(animated: true)
+                }) { (error) in
+                }
             
         }else{
             HUD.flash(.label("请填写备注"), delay: 1.2)
@@ -403,8 +492,9 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
         if isGm == false {
             return 264
         }
-        if piCiArr.count > 0 {
-            return CGFloat(214 + 35 + piCiArr.count * 43)
+        let arr = piCiArr[indexPath.row]
+        if arr.count > 0 {
+            return CGFloat(214 + 35 + arr.count * 43)
         }else{
             return 214
         }
@@ -427,7 +517,7 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
         piCiArr.insert(data, at: p_id)
         piCiArr.remove(at: p_id + 1)
         listView.reloadData()
-      }
+    }
     
     func GLAlertSelectViewClick(selectNum: Int, view: GLAlertSelectView) {
         selectIdx = selectNum

Pods/Pods.xcodeproj/xcuserdata/nordin.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,112 +7,112 @@
 		<key>Alamofire.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>12</integer>
+			<integer>9</integer>
 		</dict>
 		<key>CryptoSwift.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>14</integer>
+			<integer>8</integer>
 		</dict>
 		<key>Dollar.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>20</integer>
+			<integer>1</integer>
 		</dict>
 		<key>ESTabBarController-swift.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>8</integer>
+			<integer>5</integer>
 		</dict>
 		<key>Hue.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>13</integer>
+			<integer>3</integer>
 		</dict>
 		<key>IQKeyboardManagerSwift.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>9</integer>
+			<integer>14</integer>
 		</dict>
 		<key>Kingfisher.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>17</integer>
+			<integer>4</integer>
 		</dict>
 		<key>LGButton.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>11</integer>
 		</dict>
 		<key>MJRefresh.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>11</integer>
+			<integer>15</integer>
 		</dict>
 		<key>ObjectMapper.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>18</integer>
 		</dict>
 		<key>Pods-GeliBusinessPlatform.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>22</integer>
+			<integer>7</integer>
 		</dict>
 		<key>ReachabilitySwift.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>6</integer>
 		</dict>
 		<key>Realm.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>16</integer>
 		</dict>
 		<key>RealmSwift.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>15</integer>
+			<integer>17</integer>
 		</dict>
 		<key>SVProgressHUD.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>19</integer>
 		</dict>
 		<key>SkeletonView.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>21</integer>
+			<integer>10</integer>
 		</dict>
 		<key>SnapKit.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>18</integer>
+			<integer>21</integer>
 		</dict>
 		<key>SwiftDate.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>16</integer>
+			<integer>20</integer>
 		</dict>
 		<key>SwifterSwift.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>10</integer>
+			<integer>2</integer>
 		</dict>
 		<key>SwiftyJSON.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>12</integer>
 		</dict>
 		<key>ViewAnimator.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>19</integer>
+			<integer>22</integer>
 		</dict>
 		<key>WYAutoLayout.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>7</integer>
+			<integer>13</integer>
 		</dict>
 	</dict>
 </dict>