Skip to content

G
GeliBusinessPlatform
Commit 64d44745 authored by lujunye's avatar lujunye
Browse files
Options

补充新逻辑

parent 29f9ccc3
Show whitespace changes
Inline Side-by-side
Showing with 105 additions and 107 deletions
GeliBusinessPlatform/Model/WarehouseInterface.swift
View file @ 64d44745
......@@ -33,7 +33,7 @@ user_token(验证token)
w_id(仓库id)
*/
func WarehouseDetail(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("商家仓库详情", params, { (rep:DataResponse<ShopWarehouseDetailDataModel>) in
NetworkRequest.sharedInstance.postRequest("商家仓库详情", params, { (rep:DataResponse<ShopWarehouseDetailModel>) in
}, success: { (data) in
success(data)
}) { (error) in
......
GeliBusinessPlatform/Model/WarehouseManageModel/ShopWarehouseDetailModel.swift
View file @ 64d44745
......@@ -45,8 +45,8 @@ class ShopWarehouseDetailDataBasicModel: Mappable {
var w_name:String?//仓库名
var w_type:Int? //仓库类型，1常温、2冷藏、3冷冻
var w_address:String?//地址
var volume:Int?//容积
var area:Int?//面积
var volume:Float?//容积
var area:Float?//面积
var contact:String?//联系人
var contact_number:String?//联系电话
var mail:String?//电子邮箱
......@@ -81,7 +81,7 @@ class ShopWarehouseDetailDataPositionModel: Mappable {
var p_name:String?//库位名
var is_default:Int?//是否默认
var inventory_count:Int?//库存数
var status = 1//状态
required init?( map: Map) {
}
......@@ -91,7 +91,21 @@ class ShopWarehouseDetailDataPositionModel: Mappable {
p_name <- map["p_name"]
is_default <- map["is_default"]
inventory_count <- map["inventory_count"]
status <- map["status"]
}
}
class ShopWarehouseDetailDataPositionDetailModel: Mappable {
var p_id :Int?//库位id
var p_name:String?//库位名
var status:Int?//库位修改状态，1未修改2已修改3删除4新增，库位中有库存时则不能删除
required init?( map: Map) {
}
func mapping(map: Map) {
p_id <- map["p_id"]
p_name <- map["p_name"]
status <- map["status"]
}
}
GeliBusinessPlatform/View/AlertView/GLAlertSelectView.swift
View file @ 64d44745
......@@ -203,7 +203,10 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
return cell
}
@IBAction func submitClick(_ sender: Any) {
if (titleLbl.text?.contains("库位"))! {
delegate?.KuWeiDataArr?(sender: kuWeiArr)
return
}
if isMultipleS == false {
if selectNum == nil {
HUD.flash(.label("\(titleLbl.text!)"), delay: 1.2)
......@@ -227,6 +230,24 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
if isMultipleS == false {
selectNum = cell.tag
}else{
if isShangPinType {
if cell.tag == 0 {
if selectArray![0] == 99 {
selectArray?.insert(0, at: 0)
selectArray?.remove(at: 1)
}else{
selectArray?.insert(99, at: 0)
selectArray?.remove(at: 1)
}
}else{
for i in 1 ..< selectArray!.count {
selectArray?.insert(99, at: i)
selectArray?.remove(at: i+1)
}
selectArray?.insert(cell.tag, at: cell.tag)
selectArray?.remove(at: cell.tag+1)
}
}else{
if cell.selectBtn.isSelected == true {
selectArray?.insert(99, at: cell.tag)
......@@ -236,6 +257,8 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
selectArray?.remove(at: cell.tag+1)
}
}
}
print("sele",selectArray,cell.tag)
selectTbv.reloadData()
}
//库位
......@@ -349,8 +372,6 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
}
@objc func addKuWei(){
IQKeyboardManager.shared.resignFirstResponder()
if (inputTextTF?.text!.count)! > 0 {
......@@ -361,7 +382,6 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
self.btmVHeight.constant = fullScreenHeight*0.75
}
inputTextTF?.text = ""
delegate?.KuWeiDataArr?(sender: kuWeiArr)
selectTbv?.reloadData()
}else{
HUD.flash(.label("请输入库位名称"), delay: 1.2)
......
GeliBusinessPlatform/ViewController/仓库管理/WarehoseMangementListVC.swift
View file @ 64d44745
......@@ -10,22 +10,7 @@ import UIKit
import ViewAnimator
import SwipeCellKit
class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableViewDelegate, UITableViewDataSource, SearchBarViewDelegate,SwipeTableViewCellDelegate,CheckWareHourseViewControllerDelegate {
func CheckWareHourseViewControllerDelAction(Idx: Int) {
warehourseArr.remove(at: Idx)
tableV.reloadData()
}
func CheckWareHourseViewControllerEditAction(data: ShopWarehouseListDataModel, Idx: Int) {
warehourseArr.insert(data, at: Idx)
warehourseArr.remove(at: Idx+1)
tableV.reloadData()
}
func CheckWareHourseViewControllerSaveAction(data: ShopWarehouseListDataModel) {
warehourseArr.append(data)
tableV.reloadData()
}
class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableViewDelegate, UITableViewDataSource, SearchBarViewDelegate,SwipeTableViewCellDelegate {
weak var searchV: SearchBarView? = nil
@IBOutlet weak var contentView: UIView!
......@@ -156,7 +141,6 @@ class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableV
searchV!.resignFirstResponder()
}
let vc = CheckWareHourseViewController()
vc.delegate = self
vc.titleStr = "新增仓库"
self.navigationController?.pushViewController(vc, animated: false)
}
......@@ -200,7 +184,6 @@ class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableV
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
print(indexPath)
let vc = CheckWareHourseViewController()
vc.delegate = self
vc.titleStr = "编辑仓库"
let model = warehourseArr[indexPath.row]
vc.w_id = model.w_id
......
GeliBusinessPlatform/ViewController/新增、编辑（查看）仓库/CheckWareHourseViewController.swift
View file @ 64d44745
......@@ -10,18 +10,11 @@ import UIKit
import LGButton
import IQKeyboardManagerSwift
protocol CheckWareHourseViewControllerDelegate {
func CheckWareHourseViewControllerSaveAction(data:ShopWarehouseListDataModel)
func CheckWareHourseViewControllerEditAction(data:ShopWarehouseListDataModel,Idx:Int)
func CheckWareHourseViewControllerDelAction(Idx:Int)
}
class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,WareHouseSpCellDelegate,GLAlertSelectViewDelegate,UITextFieldDelegate,GeliAlertViewDelegate{
class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,WareHouseSpCellDelegate,GLAlertSelectViewDelegate,UITextFieldDelegate,GeliAlertViewDelegate{
var delegate:CheckWareHourseViewControllerDelegate?
var dataModel:ShopWarehouseListDataModel?
var dataModel:ShopWarehouseDetailModel?
var w_id:Int?//仓库id
var editIdx:Int?
@IBOutlet weak var btnTitleLbl: UILabel!
......@@ -46,7 +39,7 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
var lianXiRen = ""//联系人
var phone = ""//电话
var shiFouMoRen = false//是否默认
var kuWeiSelect:Int? //库位选择
// var kuWeiSelect:Int? //库位选择
override func viewDidLoad() {
super.viewDidLoad()
......@@ -77,30 +70,25 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
if w_id != nil {
let UserToken = UserDefaults.standard.value(forKey: "user_token")
WarehouseDetail(["user_token":UserToken as Any,"w_id":w_id as Any], success: { (data) in
let dataModel = data as! ShopWarehouseDetailDataModel
print(dataModel.warehouse_res?.area)
// self.shiFouMoRen = false
// print(dataModel.warehouse_res!.is_default)
//// if dataModel.warehouse_res!.is_default! == 1 {
//// self.shiFouMoRen = true
//// }
//
//
//
// self.lianXiRen = dataModel.warehouse_res!.contact!
// self.mianJi = "\(dataModel.warehouse_res!.area!)"
// self.rongJi = "\(dataModel.warehouse_res!.volume!)"
// self.phone = dataModel.warehouse_res!.contact_number!
// let strArr = NSMutableArray()
// for item in dataModel.position_res! {
// strArr.add(item.p_name!)
// }
// self.kuWeiName = strArr.componentsJoined(by: ",")
// self.cangKuAdr = dataModel.warehouse_res!.w_address!
// self.cangKuName = dataModel.warehouse_res!.w_name!
// self.warehourseType = dataModel.warehouse_res!.w_type!
// self.listView.reloadData()
let dataModel = data as! ShopWarehouseDetailModel
self.shiFouMoRen = false
if dataModel.data!.warehouse_res!.is_default! == 1 {
self.shiFouMoRen = true
}
self.lianXiRen = dataModel.data!.warehouse_res!.contact!
self.mianJi = "\(dataModel.data!.warehouse_res!.area!)"
self.rongJi = "\(dataModel.data!.warehouse_res!.volume!)"
self.phone = dataModel.data!.warehouse_res!.contact_number!
let strArr = NSMutableArray()
for item in dataModel.data!.position_res! {
strArr.add(item.p_name!)
}
self.kuWeiName = strArr.componentsJoined(by: ",")
self.cangKuAdr = dataModel.data!.warehouse_res!.w_address!
self.cangKuName = dataModel.data!.warehouse_res!.w_name!
self.warehourseType = dataModel.data!.warehouse_res!.w_type!
self.listView.reloadData()
}) { (error) in
}
......@@ -210,36 +198,36 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
}
}
@IBAction func submitAction(_ sender: LGButton) {
// dataModel.shiFouMoRen = shiFouMoRen
// pdContent(sender: cangKuName, str: "请填写仓库名称")
// dataModel.cangKuName = cangKuName
// pdSelect(select: warehourseType, str: "请选择仓库类型")
// dataModel.warehourseType = warehourseType
// pdContent(sender: kuWeiName, str: "请选择库位")
// dataModel.kuWeiName = kuWeiName
// pdContent(sender: cangKuAdr, str: "请填写仓库地址")
// dataModel.cangKuAdr = cangKuAdr
// pdContent(sender: rongJi, str: "请填写仓库容积")
// dataModel.rongJi = rongJi
// pdContent(sender: mianJi, str: "请填写仓库面积")
// dataModel.mianJi = mianJi
// pdContent(sender: lianXiRen, str: "请填写联系人")
// dataModel.lianXiRen = lianXiRen
// pdContent(sender: phone, str: "请填写联系人电话")
// dataModel.phone = phone
//
// dataModel.kuWeiSelect = kuWeiSelect
pdContent(sender: cangKuName, str: "请填写仓库名称")
pdSelect(select: warehourseType, str: "请选择仓库类型")
pdContent(sender: kuWeiName, str: "请选择库位")
pdContent(sender: cangKuAdr, str: "请填写仓库地址")
pdContent(sender: rongJi, str: "请填写仓库容积")
pdContent(sender: mianJi, str: "请填写仓库面积")
pdContent(sender: lianXiRen, str: "请填写联系人")
pdContent(sender: phone, str: "请填写联系人电话")
let rj = rongJi as NSString
let mj = mianJi as NSString
var num = 0
if shiFouMoRen == true {
num = 1
}
let UserToken = UserDefaults.standard.value(forKey: "user_token")
if titleStr == "新增仓库" {
// delegate?.CheckWareHourseViewControllerSaveAction(data: dataModel)
self.navigationController?.popViewController(animated: true)
}else{
if btnTitleLbl.text == "保存" {
// delegate?.CheckWareHourseViewControllerEditAction(data: dataModel, Idx: editIdx!)
self.navigationController?.popViewController(animated: true)
//
// ShopWarehouseEdit(["user_token":UserToken,"w_name":cangKuName,"w_type":warehourseType,"position_str":kuWeiName,"w_address":cangKuAdr,"volume":rj.floatValue,"area":mj.floatValue,"contact":lianXiRen,"contact_number":phone,"mail":"","is_default":num,"warehouse_position":""], success: { (data) in
//
// }) { (error) in
//
// }
// self.navigationController?.popViewController(animated: true)
}else{
btnTitleLbl.text = "保存"
statusStr = btnTitleLbl.text!
}
listView.reloadData()
}
......@@ -248,13 +236,7 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
//库位
func GLAlertSelectViewClick(selectNum:Int,view:GLAlertSelectView){
if view.titleLbl.text!.contains("库位") {
kuWeiSelect = selectNum
kuWeiName = kuWeiArr![kuWeiSelect!] as! String
}else{
warehourseType = selectNum
}
glSelectView?.removeFromSuperview()
glSelectView = nil
listView.reloadData()
......@@ -281,7 +263,6 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
}
func sureAction(sender: UIButton) {
delegate?.CheckWareHourseViewControllerDelAction(Idx: editIdx!)
self.navigationController?.popViewController(animated: true)
}
@objc func removeActin(sender:UIButton){
......@@ -309,11 +290,9 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
}
if sender.tag == 2 {//MARK: -包含库位
if glSelectView == nil {
let view = GLAlertSelectView(frame: self.view.bounds,title:"请选择或填写包含库位")
let view = GLAlertSelectView(frame: self.view.bounds,title:"请选择或填写库位资料")
view.delegate = self
view.kuWeiArr = kuWeiArr!
view.selectNum = kuWeiSelect
view.tempNum = kuWeiSelect
self.view.addSubview(view)
glSelectView = view
}
......@@ -353,10 +332,6 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
}
}
}
override func backAction() {
print("重写back")
self.navigationController?.popViewController(animated: true)
}
// MARK: - cell delegate
func numberOfSections(in tableView: UITableView) -> Int {
if tableView == listView {
......@@ -431,8 +406,17 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
IQKeyboardManager.shared.resignFirstResponder()
}
func KuWeiDataArr(sender: Array<Any>) {
print(sender)
kuWeiArr = sender
print(sender)
if kuWeiArr!.count > 0 {
if (titleStr?.contains("新增"))! {
}else{//编辑
}
}
glSelectView!.removeFromSuperview()
glSelectView = nil
}
func whSwitchChange(sender: UISwitch) {
shiFouMoRen = sender.isOn
......@@ -443,9 +427,6 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
warehourseType = selectnum
}
}
if view.titleLbl.text == "请选择或填写包含库位"{
kuWeiSelect = selectnum
}
view.removeFromSuperview()
glSelectView = nil
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment