Skip to content

G
GeliBusinessPlatform
Commit b04a7e28 authored by ljy's avatar ljy
Browse files
Options

出库缺提交

parent 71765617
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 295 additions and 29 deletions
GeliBusinessPlatform.xcodeproj/xcuserdata/nordin.xcuserdatad/xcschemes/xcschememanagement.plist 0 → 100644
View file @ b04a7e28
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>GeliBusinessPlatform.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
</dict>
</plist>
GeliBusinessPlatform.xcworkspace/xcuserdata/nordin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist 0 → 100644
View file @ b04a7e28
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
uuid = "7C8C9C73-DB42-483A-A373-7C64E270C4E4"
type = "0"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.SwiftErrorBreakpoint">
<BreakpointContent
uuid = "FD43E86D-38D7-4600-B0BB-79E6930D5DF0"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
<BreakpointContent
uuid = "B1D5CEF0-844F-4D3D-BAEB-9139DD392272"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
breakpointStackSelectionBehavior = "1"
scope = "1"
stopOnStyle = "0">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
GeliBusinessPlatform/Model/WarehouseManageModel/GetGoodBatchModel.swift
View file @ b04a7e28
......@@ -37,7 +37,7 @@ class GetGoodBatchDataModel: Mappable {
var shelf_life : Int? //保质期
var status : Int?//状态：1正常，2临期，3过期
var report_id : Int?//批次报告
var chuHuoLiang:Int?//出货量
required init?( map: Map) {
}
......@@ -53,6 +53,7 @@ class GetGoodBatchDataModel: Mappable {
shelf_life <- map["shelf_life"]
status <- map["status"]
report_id <- map["report_id"]
chuHuoLiang <- map["chuHuoLiang"]
}
}
GeliBusinessPlatform/Model/WarehouseManageModel/InGoodsDetailModel.swift
View file @ b04a7e28
......@@ -12,7 +12,7 @@ import ObjectMapper
class InGoodsDetailModel: Mappable {
var code:Int?
var message : String?
var data : Array<InGoodsDetailDataModel>?
var data : InGoodsDetailDataModel?
required init?( map: Map) {
......
GeliBusinessPlatform/SceneDelegate.swift
View file @ b04a7e28
......@@ -97,7 +97,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, UITabBarControllerDeleg
tabBarController.viewControllers = [v1, v2, v3, v4, v5]
// tabBarController.viewControllers = [v1, v2, v4, v5]
tabBarController.selectedIndex = 2
tabBarController.selectedIndex = 1
......
GeliBusinessPlatform/View/Cell/CRKCell.swift
View file @ b04a7e28
......@@ -32,7 +32,6 @@ class CRKCell: UITableViewCell {
// Initialization code
}
override func layoutIfNeeded() {
print("234")
if dataArr != nil {
var num = 0
if dataArr!.count > 4 {
......
GeliBusinessPlatform/ViewController/入库/PiCiXuanZeCell.swift
View file @ b04a7e28
......@@ -42,6 +42,12 @@ class PiCiXuanZeCell: UITableViewCell,UITextFieldDelegate {
}
@objc func textChange(sender:UITextField){
if isPurnInt(string: textTF.text!){
let num1 = textTF.text as! NSString
let num2 = SLLbl.text as! NSString
if num1.integerValue > num2.integerValue {
HUD.flash(.label("超出库存"), delay: 1.2)
textTF.text = SLLbl.text
}
delegate?.PiCiXuanZeCellBtnTextChange(sender: textTF.text!, cell: self)
}
}
......
GeliBusinessPlatform/ViewController/入库/PiCiXuanZeViewController.swift
View file @ b04a7e28
......@@ -8,7 +8,7 @@
import UIKit
protocol PiCiXuanZeViewControllerDelegate {
func PiCiXuanZeViewControllerPiCiSelect(data:Array<Any>)
func PiCiXuanZeViewControllerPiCiSelect(data:Array<GetGoodBatchDataModel>)
}
class PiCiXuanZeViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,PiCiXuanZeCellDelegate{
......@@ -18,14 +18,16 @@ class PiCiXuanZeViewController: BaseViewController,UITableViewDelegate,UITableVi
var sku_id:Int?
var totalCount = 0
var countArr:Array<Int> = []
var selectArr:Array<Int> = []
var recordArr:Array<GetGoodBatchDataModel> = []
var dataArray:Array<GetGoodBatchDataModel> = []
@IBOutlet weak var topView: UIView!
@IBOutlet weak var btmLbl: UILabel!
var delegate:PiCiXuanZeViewControllerDelegate?
@IBAction func submitAction(_ sender: Any) {
delegate?.PiCiXuanZeViewControllerPiCiSelect(data: recordArr)
self.navigationController?.popViewController(animated: true)
}
@IBOutlet weak var listView: UITableView!
override func viewDidLoad() {
......@@ -47,7 +49,6 @@ class PiCiXuanZeViewController: BaseViewController,UITableViewDelegate,UITableVi
let model = data as! GetGoodBatchModel
model.data?.forEach({ (item) in
self.dataArray.append(item)
self.countArr.append(0)
})
self.listView.reloadData()
}) { (error) in
......@@ -82,8 +83,8 @@ class PiCiXuanZeViewController: BaseViewController,UITableViewDelegate,UITableVi
case 1:
name = "正常"
break
case 2:
name = "临期"
case 2:
name = "临期"
break
default:
name = "过期"
......@@ -92,19 +93,33 @@ class PiCiXuanZeViewController: BaseViewController,UITableViewDelegate,UITableVi
cell.nameLbl.text = name
cell.SLLbl.text = "\(model.inventory!)"
cell.dateLbl.text = dayByDouble(sender: model.production_data!)
if recordArr.count > 0 {
for item in recordArr {
if model.batch_id == item.batch_id {
if item.chuHuoLiang != nil {
cell.textTF.text = "\(item.chuHuoLiang!)"
}
cell.iconBtn.isSelected = true
selectArr.append(cell.tag)
}
}
}
return cell
}
func PiCiXuanZeCellBtnTextChange(sender: String, cell: PiCiXuanZeCell) {
let num = sender as NSString
self.countArr.insert(num.integerValue, at: cell.tag)
self.countArr.remove(at: cell.tag+1)
let data = dataArray[cell.tag]
data.chuHuoLiang = num.integerValue
}
func PiCiXuanZeCellRefreshCount() {
totalCount = 0
for item in selectArr{
totalCount += countArr[item]
let data = dataArray[item]
if data.chuHuoLiang != nil {
totalCount += data.chuHuoLiang!
}
}
listView.reloadData()
}
......@@ -112,17 +127,22 @@ class PiCiXuanZeViewController: BaseViewController,UITableViewDelegate,UITableVi
if selectArr.contains(cell.tag) {
let idx = selectArr.index(of: cell.tag)
selectArr.remove(at: idx!)
recordArr.remove(at: idx!)
}else{
selectArr.append(cell.tag)
recordArr.append(dataArray[cell.tag])
}
totalCount = 0
for item in selectArr{
totalCount += countArr[item]
let data = dataArray[item]
if data.chuHuoLiang != nil {
totalCount += data.chuHuoLiang!
}
}
listView.reloadData()
}
func numberOfSections(in tableView: UITableView) -> Int {
return 2
}
......
GeliBusinessPlatform/ViewController/出入库记录/CRKXiangQVC.swift
View file @ b04a7e28
......@@ -8,17 +8,16 @@
import UIKit
class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,NewCKCellDelegate{
class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,NewCKCellDelegate,PiCiXuanZeViewControllerDelegate{
var piCiArr:Array<GetGoodBatchDataModel> = []
@IBOutlet weak var btmView: UIView!
@IBOutlet weak var listView: UITableView!
var model:WarehouseIoListDataModel?
@IBOutlet weak var btmViewH: NSLayoutConstraint!
// var inGoodsModels:Array<InGoodsDetailModel>? = []
var inGoodsModels:Array<InGoodsDetailDataGoodsResModel>? = []
var outGoodsModels:Array<OutGoodsDetailDataGoodsResModel>? = []
var titleArr:Array<String>?
......@@ -37,6 +36,11 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
holderArr = ["默认仓库","默认库位",str]
navbar.title = "商品入库详情"
InGoodsDetail(dict, success: { (data) in
let model = data as! InGoodsDetailModel
model.data?.goods_res?.forEach({ (item) in
self.inGoodsModels?.append(item)
})
self.listView.reloadData()
HUD.hide()
}) { (error) in
......@@ -93,8 +97,8 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if indexPath.section == 0 {
let cell = tableView.dequeueReusableCell(withIdentifier: "CRKBtnCell") as! CRKBtnCell
cell.nameLbl.text = titleArr![indexPath.row]
cell.contentLbl.text = holderArr![indexPath.row]
cell.nameLbl.text = titleArr![indexPath.row]
cell.contentLbl.text = holderArr![indexPath.row]
if model?.io_type == 1 {//入库
if indexPath.row == 2 {
......@@ -118,15 +122,29 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
cell.guiGeLbl.text = data.goods_spec
cell.chuKuLbl.text = "出库数量：" + "\(data.number!)"
cell.keChuKuLbl.text = "可出库数量：" + "\(data.inventory!)"
if piCiArr.count > 0 {
cell.piCiArr = piCiArr
cell.btmTitleView.alpha = 1
cell.btmListView.alpha = 1
}else{
cell.btmTitleViewH.constant = 0
cell.btmTitleView.isHidden = true
cell.btmListViewH.constant = 0
cell.btmTitleView.alpha = 0
cell.btmListView.alpha = 0
}
}
return cell
}
func NewCKCellBtnClick(cell: NewCKCell) {
if model?.io_type == 2 {
let data = outGoodsModels![cell.tag]
let vc = PiCiXuanZeViewController()
let vc = PiCiXuanZeViewController()
vc.sku_id = data.sku_id
self.navigationController?.pushViewController(vc, animated: true)
vc.delegate = self
vc.recordArr = piCiArr
self.navigationController?.pushViewController(vc, animated: true)
}
}
......@@ -138,7 +156,11 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
if model?.io_type == 1 {//入库
return 264
}
return 214 + 0
if piCiArr.count > 0 {
return CGFloat(214 + 35 + piCiArr.count * 43)
}else{
return 214
}
}
func numberOfSections(in tableView: UITableView) -> Int {
......@@ -153,4 +175,8 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
cell.nameLeft.constant = 0
cell.contentRight.constant = -7
}
func PiCiXuanZeViewControllerPiCiSelect(data: Array<GetGoodBatchDataModel>) {
piCiArr = data
listView.reloadData()
}
}
GeliBusinessPlatform/ViewController/出入库记录/NewCKCell.swift
View file @ b04a7e28
......@@ -11,19 +11,25 @@ protocol NewCKCellDelegate {
func NewCKCellBtnClick(cell:NewCKCell)
}
class NewCKCell: UITableViewCell {
@IBOutlet weak var ckslLbl: UILabel!
@IBOutlet weak var piCiIdLbl: UILabel!
@IBOutlet weak var nameLbl: UILabel!
@IBOutlet weak var btmTitleTop: NSLayoutConstraint!
@IBOutlet weak var btmTitleView: UIView!
@IBOutlet weak var btmListViewH: NSLayoutConstraint!
@IBOutlet weak var btmTitleViewH: NSLayoutConstraint!
@IBOutlet weak var btmListView: UIView!
var delegate:NewCKCellDelegate?
@IBOutlet weak var guiGeLbl: UILabel!
@IBOutlet weak var line: UIView!
@IBOutlet weak var chuKuLbl: UILabel!
@IBOutlet weak var keChuKuLbl: UILabel!
var piCiArr:Array<GetGoodBatchDataModel>? = []
@IBAction func btnClick(_ sender: UIButton) {
delegate?.NewCKCellBtnClick(cell: self)
}
......@@ -33,10 +39,56 @@ class NewCKCell: UITableViewCell {
// Initialization code
}
override func layoutIfNeeded() {
super.layoutIfNeeded()
btmListView.subviews.forEach { (view) in
view.removeFromSuperview()
}
if piCiArr!.count > 0 {
for i in 0 ..< piCiArr!.count {
btmListViewH.constant = CGFloat(43 * piCiArr!.count)
btmTitleViewH.constant = 35
btmTitleView.isHidden = false
let data = piCiArr![i]
let view = UIView()
btmListView.addSubview(view)
view.snp.makeConstraints { (make) in
make.top.equalTo(i * 43)
make.height.equalTo(43)
make.right.left.equalTo(0)
}
let leftLbl = UILabel()
view.addSubview(leftLbl)
leftLbl.font = UIFont.systemFont(ofSize: 13)
leftLbl.text = "\(data.batch_id!)"
leftLbl.textColor = UIColor(named: "个人中心灰色字体")
leftLbl.snp.makeConstraints { (make) in
make.centerY.equalTo(view.snp_centerY)
make.centerX.equalTo(piCiIdLbl.snp_centerX)
make.height.equalTo(13)
}
let rightLbl = UILabel()
view.addSubview(rightLbl)
rightLbl.font = UIFont.systemFont(ofSize: 13)
rightLbl.textAlignment = .right
if data.chuHuoLiang != nil {
rightLbl.text = "\(data.chuHuoLiang!)"
}
rightLbl.textColor = UIColor(named: "个人中心灰色字体")
rightLbl.snp.makeConstraints { (make) in
make.centerY.equalTo(view.snp_centerY)
make.centerX.equalTo(ckslLbl.snp_centerX)
make.height.equalTo(13)
}
}
}
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
......
Pods/Pods.xcodeproj/xcuserdata/nordin.xcuserdatad/xcschemes/xcschememanagement.plist 0 → 100644
View file @ b04a7e28
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>Alamofire.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>12</integer>
</dict>
<key>CryptoSwift.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>14</integer>
</dict>
<key>Dollar.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>20</integer>
</dict>
<key>ESTabBarController-swift.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>8</integer>
</dict>
<key>Hue.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>13</integer>
</dict>
<key>IQKeyboardManagerSwift.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>9</integer>
</dict>
<key>Kingfisher.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>17</integer>
</dict>
<key>LGButton.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
</dict>
<key>MJRefresh.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>11</integer>
</dict>
<key>ObjectMapper.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>5</integer>
</dict>
<key>Pods-GeliBusinessPlatform.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>22</integer>
</dict>
<key>ReachabilitySwift.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>3</integer>
</dict>
<key>Realm.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>4</integer>
</dict>
<key>RealmSwift.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>15</integer>
</dict>
<key>SVProgressHUD.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>6</integer>
</dict>
<key>SkeletonView.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>21</integer>
</dict>
<key>SnapKit.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>18</integer>
</dict>
<key>SwiftDate.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>16</integer>
</dict>
<key>SwifterSwift.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>10</integer>
</dict>
<key>SwiftyJSON.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
</dict>
<key>ViewAnimator.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>19</integer>
</dict>
<key>WYAutoLayout.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>7</integer>
</dict>
</dict>
</dict>
</plist>
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