Skip to content

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

出库申请完成

parent 8089fed1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 44 deletions
GeliBusinessPlatform/Model/WarehouseManageModel/InputInitInfoModel.swift
View file @ 9e46857f
......@@ -123,6 +123,7 @@ class InputInitInfoGoodsInfoModel: Mappable { //商品信息
var RKJG:Float?
var DayType:Int = 1
var chuKuLiang:Int?
required init?( map: Map) {
}
......@@ -140,6 +141,7 @@ class InputInitInfoGoodsInfoModel: Mappable { //商品信息
RKSL <- map["RKSL"]
RKJG <- map["RKJG"]
DayType <- map["DayType"]
chuKuLiang <- map["chuKuLiang"]
}
}
......
GeliBusinessPlatform/ViewController/1.1入库&出库/入库/NewRKVc.swift
View file @ 9e46857f
......@@ -60,7 +60,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
GoodsInputApply(dict, success: { (data) in
HUD.hide()
HUD.flash(.labeledSubSuccess(subtitle: "提交成功"), delay: 1.2)
HUD.flash(.labeledSubSuccess(subtitle: "申请成功"), delay: 1.2)
self.navigationController?.popViewController(animated: true)
......@@ -117,7 +117,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
]
GoodsInput(dict, success: { (data) in
HUD.hide()
HUD.flash(.labeledSubSuccess(subtitle: "提交成功"), delay: 1.2)
HUD.flash(.labeledSubSuccess(subtitle: "入库成功"), delay: 1.2)
self.navigationController?.popViewController(animated: true)
}) { (error) in
......@@ -207,7 +207,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
// Do any additional setup after loading the view.
}
//MARK: - 提交任务方法
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if indexPath.section == 1 {
......
GeliBusinessPlatform/ViewController/1.1入库&出库/出库/CKGmCell.swift
View file @ 9e46857f
......@@ -15,7 +15,7 @@ class CKGmCell: UITableViewCell {
var dataArr:Array<GetGoodBatchDataModel>? = []
@IBOutlet weak var listBg: UIView!
@IBOutlet weak var titleViewH: NSLayoutConstraint!
@IBOutlet weak var detailLbl: UILabel!
@IBOutlet weak var titleView: UIView!
var delegate:CKGmCellDelegate?
......@@ -33,11 +33,10 @@ class CKGmCell: UITableViewCell {
// Initialization code
}
override func layoutIfNeeded() {
super.layoutIfNeeded()
listBg.subviews.forEach { (view) in
view.removeFromSuperview()
}
if dataArr!.count > 0 {
titleView.isHidden = false
titleViewH.constant = 35
for i in 0 ..< dataArr!.count {
let model = dataArr![i]
let view = UIView()
......@@ -55,7 +54,6 @@ class CKGmCell: UITableViewCell {
make.left.equalTo(30)
make.top.bottom.right.equalTo(0)
}
leftL.text = "\(model.batch_id!)"
let rightL = UILabel()
......@@ -70,6 +68,7 @@ class CKGmCell: UITableViewCell {
rightL.text = "\(model.chuHuoLiang!)"
}
}
super.layoutIfNeeded()
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
......
GeliBusinessPlatform/ViewController/1.1入库&出库/出库/CKNonGmCell.xib
View file @ 9e46857f
......@@ -60,7 +60,7 @@
<constraint firstAttribute="height" constant="1" id="L7s-cV-Dar"/>
</constraints>
</view>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="sMh-bS-LI1">
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="sMh-bS-LI1">
<rect key="frame" x="295" y="93.5" width="65" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="65" id="N7e-sM-yAu"/>
......
GeliBusinessPlatform/ViewController/出入库记录/CRKXiangQVC.swift
View file @ 9e46857f
......@@ -186,22 +186,21 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
let UserToken = UserDefaults.standard.value(forKey: "user_token")
//MARK: - 出入库列表 iog_id
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":dataChangeString(sender: iogArr) as Any
]
var goodInfoArr:Array<Any> = []
goodInfoArr.append(goods)
inGoodsModels?.forEach({ (item) in
let goods = [
"w_id":poi.w_id as Any,
"p_id":poi.p_id as Any,
"iog_id":item.iog_id as 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,
......
Pods/Pods.xcodeproj/xcuserdata/nordin.xcuserdatad/xcschemes/xcschememanagement.plist
View file @ 9e46857f
......@@ -7,112 +7,112 @@
<key>Alamofire.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>9</integer>
<integer>7</integer>
</dict>
<key>CryptoSwift.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>8</integer>
<integer>14</integer>
</dict>
<key>Dollar.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
<integer>2</integer>
</dict>
<key>ESTabBarController-swift.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>5</integer>
<integer>11</integer>
</dict>
<key>Hue.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>3</integer>
<integer>18</integer>
</dict>
<key>IQKeyboardManagerSwift.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>14</integer>
<integer>22</integer>
</dict>
<key>Kingfisher.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>4</integer>
<integer>12</integer>
</dict>
<key>LGButton.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>11</integer>
<integer>13</integer>
</dict>
<key>MJRefresh.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>15</integer>
<integer>4</integer>
</dict>
<key>ObjectMapper.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>18</integer>
<integer>8</integer>
</dict>
<key>Pods-GeliBusinessPlatform.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>7</integer>
<integer>15</integer>
</dict>
<key>ReachabilitySwift.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>6</integer>
<integer>16</integer>
</dict>
<key>Realm.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>16</integer>
<integer>20</integer>
</dict>
<key>RealmSwift.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>17</integer>
<integer>19</integer>
</dict>
<key>SVProgressHUD.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>19</integer>
<integer>9</integer>
</dict>
<key>SkeletonView.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>10</integer>
<integer>21</integer>
</dict>
<key>SnapKit.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>21</integer>
<integer>3</integer>
</dict>
<key>SwiftDate.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>20</integer>
<integer>17</integer>
</dict>
<key>SwifterSwift.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
<integer>1</integer>
</dict>
<key>SwiftyJSON.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>12</integer>
<integer>5</integer>
</dict>
<key>ViewAnimator.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>22</integer>
<integer>6</integer>
</dict>
<key>WYAutoLayout.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>13</integer>
<integer>10</integer>
</dict>
</dict>
</dict>
......
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