Skip to content

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

完善新增仓库逻辑

parent da1655ec
Show whitespace changes
Inline Side-by-side
Showing with 160 additions and 58 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ b99ac8a6
......@@ -200,6 +200,7 @@
E0A7548B244A8F0F00A84B67 /* CheckWareHourseViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0A75489244A8F0F00A84B67 /* CheckWareHourseViewController.xib */; };
E0B5307E247266F400FFCC15 /* DKXDAdrCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B5307C247266F400FFCC15 /* DKXDAdrCell.swift */; };
E0B5307F247266F400FFCC15 /* DKXDAdrCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0B5307D247266F400FFCC15 /* DKXDAdrCell.xib */; };
E0B5308124727ED600FFCC15 /* WareHourseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B5308024727ED600FFCC15 /* WareHourseModel.swift */; };
E0B6036E244D376900A56B38 /* KuWeiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B6036C244D376900A56B38 /* KuWeiCell.swift */; };
E0B6036F244D376900A56B38 /* KuWeiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0B6036D244D376900A56B38 /* KuWeiCell.xib */; };
E0B9461E24566B3100FBEC9A /* TitleAndTFAndBtnCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B9461C24566B3100FBEC9A /* TitleAndTFAndBtnCell.swift */; };
......@@ -676,6 +677,7 @@
E0A75489244A8F0F00A84B67 /* CheckWareHourseViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CheckWareHourseViewController.xib; sourceTree = "<group>"; };
E0B5307C247266F400FFCC15 /* DKXDAdrCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DKXDAdrCell.swift; sourceTree = "<group>"; };
E0B5307D247266F400FFCC15 /* DKXDAdrCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DKXDAdrCell.xib; sourceTree = "<group>"; };
E0B5308024727ED600FFCC15 /* WareHourseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WareHourseModel.swift; sourceTree = "<group>"; };
E0B6036C244D376900A56B38 /* KuWeiCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KuWeiCell.swift; sourceTree = "<group>"; };
E0B6036D244D376900A56B38 /* KuWeiCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KuWeiCell.xib; sourceTree = "<group>"; };
E0B9461C24566B3100FBEC9A /* TitleAndTFAndBtnCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleAndTFAndBtnCell.swift; sourceTree = "<group>"; };
......@@ -1659,6 +1661,7 @@
children = (
E0A75488244A8F0F00A84B67 /* CheckWareHourseViewController.swift */,
E0A75489244A8F0F00A84B67 /* CheckWareHourseViewController.xib */,
E0B5308024727ED600FFCC15 /* WareHourseModel.swift */,
);
path = "新增、编辑（查看）仓库";
sourceTree = "<group>";
......@@ -2849,6 +2852,7 @@
F956D5B5246A2D9C003FF510 /* LMNStore.m in Sources */,
F956D5A7246A2D9C003FF510 /* LMNLineChain+Numbering.m in Sources */,
E0A7548A244A8F0F00A84B67 /* CheckWareHourseViewController.swift in Sources */,
E0B5308124727ED600FFCC15 /* WareHourseModel.swift in Sources */,
F9023F62244999F500DD5A63 /* WarehoseMangementCell.swift in Sources */,
F956D5B1246A2D9C003FF510 /* LMNFolder.m in Sources */,
E0A409D424640B8300CFF109 /* DZGLViewController.swift in Sources */,
......
GeliBusinessPlatform/View/Cell/KuWeiCell.xib
View file @ b99ac8a6
......@@ -17,7 +17,7 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="36000" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nNe-LK-eKR">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nNe-LK-eKR">
<rect key="frame" x="125" y="0.0" width="56" height="44"/>
<constraints>
<constraint firstAttribute="width" constant="56" id="Jx9-39-YYw"/>
......@@ -26,7 +26,7 @@
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="7库4楼2号" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dMX-NM-Bar">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="库位" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dMX-NM-Bar">
<rect key="frame" x="20" y="0.0" width="95" height="44"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
......
GeliBusinessPlatform/ViewController/仓库管理/WarehoseMangementCell.swift
View file @ b99ac8a6
......@@ -10,6 +10,10 @@ import UIKit
import SwipeCellKit
class WarehoseMangementCell: SwipeTableViewCell {
@IBOutlet weak var adrLbl: UILabel!
@IBOutlet weak var kuCunLbl: UILabel!
@IBOutlet weak var statusLbl: UILabel!
@IBOutlet weak var nameLbl: UILabel!
override func awakeFromNib() {
super.awakeFromNib()
self.selectionStyle = .none
......
GeliBusinessPlatform/ViewController/仓库管理/WarehoseMangementCell.xib
View file @ b99ac8a6
......@@ -126,6 +126,12 @@
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="adrLbl" destination="voP-B3-BGZ" id="yKJ-8X-6xP"/>
<outlet property="kuCunLbl" destination="bj5-q9-e71" id="ogC-qs-3L8"/>
<outlet property="nameLbl" destination="zy2-GT-oMd" id="cN5-EF-Wy5"/>
<outlet property="statusLbl" destination="S67-Hn-Sjn" id="ZJM-FP-Bb9"/>
</connections>
<point key="canvasLocation" x="213" y="129"/>
</tableViewCell>
</objects>
......
GeliBusinessPlatform/ViewController/仓库管理/WarehoseMangementListVC.swift
View file @ b99ac8a6
......@@ -10,7 +10,23 @@ import UIKit
import ViewAnimator
import SwipeCellKit
class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableViewDelegate, UITableViewDataSource, SearchBarViewDelegate,SwipeTableViewCellDelegate {
class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableViewDelegate, UITableViewDataSource, SearchBarViewDelegate,SwipeTableViewCellDelegate,CheckWareHourseViewControllerDelegate {
func CheckWareHourseViewControllerDelAction(Idx: Int) {
warehourseArr.remove(at: Idx)
tableV.reloadData()
}
func CheckWareHourseViewControllerEditAction(data: WareHourseModel, Idx: Int) {
warehourseArr.insert(data, at: Idx)
warehourseArr.remove(at: Idx+1)
tableV.reloadData()
}
func CheckWareHourseViewControllerSaveAction(data: WareHourseModel) {
warehourseArr.append(data)
tableV.reloadData()
}
weak var searchV: SearchBarView? = nil
@IBOutlet weak var contentView: UIView!
@IBOutlet weak var searchView: UIView!
......@@ -90,9 +106,13 @@ class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableV
searchV!.resignFirstResponder()
}
let vc = CheckWareHourseViewController()
vc.delegate = self
vc.titleStr = "新增仓库"
self.navigationController?.pushViewController(vc, animated: false)
}
var warehourseArr:Array<WareHourseModel> = []//仓库数组
var tableV :UITableView!
var tableSearchV :UITableView! = nil
......@@ -116,21 +136,25 @@ class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableV
}, completion: nil)
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
if tableView == tableSearchV {
return 3
}
return 10
}
let typeArr = ["冷冻","冷藏","常温"]
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "WarehoseMangementCell") as! WarehoseMangementCell
cell.delegate = self
let model = warehourseArr[indexPath.row]
cell.nameLbl.text = model.cangKuName
cell.statusLbl.text = typeArr[model.warehourseType!]
cell.adrLbl.text = model.cangKuAdr
cell.kuCunLbl.text = model.kuWeiName
return cell
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
print(indexPath)
let vc = CheckWareHourseViewController()
vc.delegate = self
vc.titleStr = "编辑仓库"
vc.dataModel = warehourseArr[indexPath.row]
vc.editIdx = indexPath.row
self.navigationController?.pushViewController(vc, animated: false)
}
......@@ -160,4 +184,10 @@ class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableV
//返回右侧事件按钮
return [deleteAction,]
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
if tableView == tableSearchV {
return 3
}
return warehourseArr.count
}
}
GeliBusinessPlatform/ViewController/新增、编辑（查看）仓库/CheckWareHourseViewController.swift
View file @ b99ac8a6
......@@ -10,21 +10,32 @@ import UIKit
import LGButton
import IQKeyboardManagerSwift
protocol CheckWareHourseViewControllerDelegate {
func CheckWareHourseViewControllerSaveAction(data:WareHourseModel)
func CheckWareHourseViewControllerEditAction(data:WareHourseModel,Idx:Int)
func CheckWareHourseViewControllerDelAction(Idx:Int)
}
class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,WareHouseSpCellDelegate,GLAlertSelectViewDelegate,UITextFieldDelegate{
func GLASClose(view: GLAlertSelectView, selectnum: Int, selectArr: Array<Int>) {
if view.titleLbl.text == "请选择仓库类型"{
if selectnum != 10086 {
warehourseType = selectnum
}
var delegate:CheckWareHourseViewControllerDelegate?
var dataModel = WareHourseModel(){
didSet{
shiFouMoRen = dataModel.shiFouMoRen
lianXiRen = dataModel.lianXiRen
mianJi = dataModel.mianJi
rongJi = dataModel.rongJi
phone = dataModel.phone
cangKuAdr = dataModel.cangKuAdr
cangKuName = dataModel.cangKuName
kuWeiName = dataModel.kuWeiName
warehourseType = dataModel.warehourseType
kuWeiSelect = dataModel.kuWeiSelect
}
if view.titleLbl.text == "请选择或填写包含库位"{
kuWeiSelect = selectnum
}
view.removeFromSuperview()
glSelectView = nil
}
var editIdx:Int?
@IBOutlet weak var btnTitleLbl: UILabel!
@IBOutlet weak var listView: UITableView!
var titleStr:String?
......@@ -39,7 +50,6 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
var statusStr = ""
var warehourseType:Int?
var cangKuName = ""//仓库名称
var kuWeiName = ""//库位名
var cangKuAdr = ""//仓库地址
......@@ -139,6 +149,9 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
case 0:
cangKuName = sender
break
case 2:
kuWeiName = sender
break
case 3:
cangKuAdr = sender
break
......@@ -158,49 +171,49 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
break
}
}
@IBAction func submitAction(_ sender: LGButton) {
if titleStr == "新增仓库" {
print(shiFouMoRen)
print(lianXiRen)
print(mianJi)
print(rongJi)
print(phone)
print(cangKuAdr)
print(cangKuName)
print(kuWeiName)
print("仓库类型：\(warehourseType) (0:冷冻、1:冷藏、2:常温)")
if warehourseType != nil {
print(listArray[warehourseType!])
func pdContent(sender:String,str:String){
if sender.count == 0 {
HUD.flash(.label(str), delay: 1.2)
return
}
if kuWeiSelect != nil {
print(kuWeiArr![kuWeiSelect!])
}
}else{
if btnTitleLbl.text == "保存" {
btnTitleLbl.text = "编辑"
statusStr = btnTitleLbl.text!
//MARK: - 提交修改后的数据
print(shiFouMoRen)
print(lianXiRen)
print(mianJi)
print(rongJi)
print(phone)
print(cangKuAdr)
print(cangKuName)
print(kuWeiName)
print("仓库类型：\(warehourseType) (0:冷冻、1:冷藏、2:常温)")
if warehourseType != nil {
print(listArray[warehourseType!])
func pdSelect(select:Int?,str:String){
if select == nil {
HUD.flash(.label(str), delay: 1.2)
return
}
if kuWeiSelect != nil {
print(kuWeiArr![kuWeiSelect!])
}
@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
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)
}else{
btnTitleLbl.text = "保存"
statusStr = btnTitleLbl.text!
}
listView.reloadData()
}
......@@ -233,6 +246,8 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
//MARK: - delegate
func rightBtnClick() {
print("删除")
delegate?.CheckWareHourseViewControllerDelAction(Idx: editIdx!)
self.navigationController?.popViewController(animated: true)
}
@objc func removeActin(sender:UIButton){
......@@ -388,4 +403,16 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
func whSwitchChange(sender: UISwitch) {
shiFouMoRen = sender.isOn
}
func GLASClose(view: GLAlertSelectView, selectnum: Int, selectArr: Array<Int>) {
if view.titleLbl.text == "请选择仓库类型"{
if selectnum != 10086 {
warehourseType = selectnum
}
}
if view.titleLbl.text == "请选择或填写包含库位"{
kuWeiSelect = selectnum
}
view.removeFromSuperview()
glSelectView = nil
}
}
GeliBusinessPlatform/ViewController/新增、编辑（查看）仓库/WareHourseModel.swift 0 → 100644
View file @ b99ac8a6
//
// WareHourseModel.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/5/18.
// Copyright © 2020 junye lu. All rights reserved.
//
import Foundation
class WareHourseModel: NSObject {
///仓库类型
var warehourseType : Int?
///仓库名称
var cangKuName : String = ""
///库位名
var kuWeiName : String = ""
///仓库地址
var cangKuAdr : String = ""
///容积
var rongJi : String = ""
///面积
var mianJi : String = ""
///联系人
var lianXiRen : String = ""
///电话
var phone :String = ""
///是否默认
var shiFouMoRen : Bool = false
///库位选择
var kuWeiSelect:Int?
}
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