Skip to content

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

出库申请完成

parent 8089fed1
Hide whitespace changes
Inline Side-by-side
Showing with 253 additions and 139 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入库&出库/出库/CKGmCell.xib
View file @ 9e46857f
......@@ -11,29 +11,29 @@
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="158" id="KGk-i7-Jjw" customClass="CKGmCell" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="377" height="125"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="314" id="KGk-i7-Jjw" customClass="CKGmCell" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="376" height="125"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
<rect key="frame" x="0.0" y="0.0" width="377" height="125"/>
<rect key="frame" x="0.0" y="0.0" width="376" height="125"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ktk-mw-IGw">
<rect key="frame" x="0.0" y="0.0" width="377" height="1"/>
<rect key="frame" x="0.0" y="0.0" width="376" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="f3H-se-xBH"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="von-qo-7FQ">
<rect key="frame" x="0.0" y="124" width="377" height="1"/>
<rect key="frame" x="0.0" y="124" width="376" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="QX9-6A-DHR"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BNG-HE-P3H">
<rect key="frame" x="321" y="1" width="56" height="56"/>
<rect key="frame" x="320" y="1" width="56" height="56"/>
<constraints>
<constraint firstAttribute="height" constant="56" id="bQj-z0-Phy"/>
<constraint firstAttribute="width" constant="56" id="xxr-RY-wMd"/>
......@@ -47,7 +47,7 @@
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="标题" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d4N-n8-5II">
<rect key="frame" x="15" y="16" width="296" height="37"/>
<rect key="frame" x="15" y="16" width="295" height="37"/>
<constraints>
<constraint firstAttribute="height" constant="37" id="Xps-Kh-91n"/>
</constraints>
......@@ -56,19 +56,19 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oxJ-qd-UEI">
<rect key="frame" x="15" y="63" width="29" height="14"/>
<rect key="frame" x="15" y="63" width="29" height="8"/>
<fontDescription key="fontDescription" type="system" pointSize="11"/>
<color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="分配批次" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yRi-If-85q">
<rect key="frame" x="15" y="92" width="53.5" height="16"/>
<rect key="frame" x="15" y="86" width="53.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="E5j-Un-JlW">
<rect key="frame" x="322" y="86" width="40" height="28"/>
<rect key="frame" x="321" y="80" width="40" height="28"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<state key="normal" title="请选择">
<color key="titleColor" name="蓝色字体颜色"/>
......@@ -77,8 +77,12 @@
<action selector="selectAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="0pU-7y-TF0"/>
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="d5T-uL-vW9">
<rect key="frame" x="15" y="123" width="346" height="0.0"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
</view>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fta-n1-NF1">
<rect key="frame" x="15" y="123" width="347" height="0.0"/>
<rect key="frame" x="15" y="123" width="346" height="0.0"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="批次ID" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xMo-gh-5Ix">
<rect key="frame" x="30" y="-8" width="40" height="16"/>
......@@ -87,7 +91,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="出库数量" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yz0-KW-fga">
<rect key="frame" x="263.5" y="-8" width="53.5" height="16"/>
<rect key="frame" x="262.5" y="-8" width="53.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
......@@ -95,42 +99,38 @@
</subviews>
<color key="backgroundColor" name="app底色"/>
<constraints>
<constraint firstItem="xMo-gh-5Ix" firstAttribute="leading" secondItem="fta-n1-NF1" secondAttribute="leading" constant="30" id="XOR-sM-Mda"/>
<constraint firstAttribute="height" id="Ypb-A9-PH0"/>
<constraint firstItem="xMo-gh-5Ix" firstAttribute="centerY" secondItem="fta-n1-NF1" secondAttribute="centerY" id="kjl-mk-yOR"/>
<constraint firstItem="yz0-KW-fga" firstAttribute="centerY" secondItem="fta-n1-NF1" secondAttribute="centerY" id="nrb-ei-i1T"/>
<constraint firstAttribute="trailing" secondItem="yz0-KW-fga" secondAttribute="trailing" constant="30" id="y1E-zY-swx"/>
<constraint firstItem="xMo-gh-5Ix" firstAttribute="centerY" secondItem="fta-n1-NF1" secondAttribute="centerY" id="EGE-6w-Mfq"/>
<constraint firstAttribute="height" id="Njp-P8-QFO"/>
<constraint firstItem="xMo-gh-5Ix" firstAttribute="leading" secondItem="fta-n1-NF1" secondAttribute="leading" constant="30" id="cBm-9y-3KX"/>
<constraint firstItem="yz0-KW-fga" firstAttribute="centerY" secondItem="fta-n1-NF1" secondAttribute="centerY" id="lqQ-Wx-jZu"/>
<constraint firstAttribute="trailing" secondItem="yz0-KW-fga" secondAttribute="trailing" constant="30" id="nN9-dr-JLO"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="d5T-uL-vW9">
<rect key="frame" x="15" y="123" width="347" height="2"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
</view>
</subviews>
<constraints>
<constraint firstItem="yRi-If-85q" firstAttribute="top" secondItem="oxJ-qd-UEI" secondAttribute="bottom" constant="15" id="28C-8f-FnC"/>
<constraint firstItem="fta-n1-NF1" firstAttribute="top" secondItem="E5j-Un-JlW" secondAttribute="bottom" constant="15" id="3PE-Ih-taM"/>
<constraint firstItem="BNG-HE-P3H" firstAttribute="leading" secondItem="d4N-n8-5II" secondAttribute="trailing" constant="10" id="6MZ-eG-moD"/>
<constraint firstItem="oxJ-qd-UEI" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="6WB-pr-z7I"/>
<constraint firstItem="fta-n1-NF1" firstAttribute="top" secondItem="yRi-If-85q" secondAttribute="bottom" constant="15" id="75n-1R-fUs"/>
<constraint firstItem="BNG-HE-P3H" firstAttribute="top" secondItem="Ktk-mw-IGw" secondAttribute="bottom" id="8Ck-iv-OHW"/>
<constraint firstItem="d5T-uL-vW9" firstAttribute="top" secondItem="fta-n1-NF1" secondAttribute="bottom" id="FET-1k-bxh"/>
<constraint firstItem="yRi-If-85q" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="DiU-hw-S15"/>
<constraint firstAttribute="trailing" secondItem="von-qo-7FQ" secondAttribute="trailing" id="Fj9-k6-hac"/>
<constraint firstItem="E5j-Un-JlW" firstAttribute="centerY" secondItem="yRi-If-85q" secondAttribute="centerY" id="H2q-jn-3Jd"/>
<constraint firstAttribute="trailing" secondItem="d5T-uL-vW9" secondAttribute="trailing" constant="15" id="Is6-y0-xAc"/>
<constraint firstItem="d5T-uL-vW9" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="Keb-sj-UQl"/>
<constraint firstItem="fta-n1-NF1" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="OsL-Qm-k86"/>
<constraint firstItem="d5T-uL-vW9" firstAttribute="top" secondItem="fta-n1-NF1" secondAttribute="bottom" id="HlG-Bw-01z"/>
<constraint firstItem="E5j-Un-JlW" firstAttribute="centerY" secondItem="yRi-If-85q" secondAttribute="centerY" id="Mw4-ki-DaG"/>
<constraint firstItem="oxJ-qd-UEI" firstAttribute="top" secondItem="d4N-n8-5II" secondAttribute="bottom" constant="10" id="Pvl-5J-evd"/>
<constraint firstItem="Ktk-mw-IGw" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="QbH-Ht-wqs"/>
<constraint firstAttribute="trailing" secondItem="BNG-HE-P3H" secondAttribute="trailing" id="SUm-fR-5DQ"/>
<constraint firstItem="yRi-If-85q" firstAttribute="top" secondItem="oxJ-qd-UEI" secondAttribute="bottom" constant="15" id="WqA-B6-dIS"/>
<constraint firstAttribute="trailing" secondItem="d5T-uL-vW9" secondAttribute="trailing" constant="15" id="T51-sj-kC9"/>
<constraint firstAttribute="trailing" secondItem="Ktk-mw-IGw" secondAttribute="trailing" id="aC5-Gw-175"/>
<constraint firstItem="d4N-n8-5II" firstAttribute="top" secondItem="Ktk-mw-IGw" secondAttribute="bottom" constant="15" id="dbz-Fp-BLr"/>
<constraint firstAttribute="bottom" secondItem="von-qo-7FQ" secondAttribute="bottom" id="g1K-YL-6d0"/>
<constraint firstItem="d4N-n8-5II" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="hgZ-SX-UvV"/>
<constraint firstItem="yRi-If-85q" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="qoW-2W-wiu"/>
<constraint firstItem="fta-n1-NF1" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="itt-z6-OIx"/>
<constraint firstAttribute="trailing" secondItem="fta-n1-NF1" secondAttribute="trailing" constant="15" id="oWL-EC-M0r"/>
<constraint firstItem="von-qo-7FQ" firstAttribute="top" secondItem="d5T-uL-vW9" secondAttribute="bottom" constant="1" id="qVE-co-lEx"/>
<constraint firstAttribute="trailing" secondItem="E5j-Un-JlW" secondAttribute="trailing" constant="15" id="rod-s1-Uwg"/>
<constraint firstItem="d5T-uL-vW9" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="ssn-IH-cB3"/>
<constraint firstItem="von-qo-7FQ" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="vPg-Y9-SFA"/>
<constraint firstAttribute="bottom" secondItem="d5T-uL-vW9" secondAttribute="bottom" id="wRa-xU-kGG"/>
<constraint firstAttribute="trailing" secondItem="fta-n1-NF1" secondAttribute="trailing" constant="15" id="xO6-sw-KjM"/>
<constraint firstItem="Ktk-mw-IGw" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="ykG-vR-rtE"/>
</constraints>
</tableViewCellContentView>
......@@ -140,9 +140,9 @@
<outlet property="listBg" destination="d5T-uL-vW9" id="SVo-od-Th4"/>
<outlet property="nameLbl" destination="d4N-n8-5II" id="bI7-ba-Voz"/>
<outlet property="titleView" destination="fta-n1-NF1" id="JJL-vJ-1vN"/>
<outlet property="titleViewH" destination="Ypb-A9-PH0" id="naw-VZ-a6f"/>
<outlet property="titleViewH" destination="Njp-P8-QFO" id="Rbv-Zy-B0b"/>
</connections>
<point key="canvasLocation" x="134.05797101449275" y="143.30357142857142"/>
<point key="canvasLocation" x="131.8840579710145" y="195.20089285714286"/>
</tableViewCell>
</objects>
<resources>
......
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/1.1入库&出库/出库/NewCKVc.swift
View file @ 9e46857f
......@@ -9,70 +9,19 @@
import UIKit
import LGButton
class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNonGmCellDelegate,CKGmCellDelegate, PiCiXuanZeViewControllerDelegate,GLAlertSelectViewDelegate,NewSelectItemVcDelegate{
func NewSelectItemVcSelect(datas: Array<InputInitInfoGoodsInfoModel>) {
rkSelectArr.removeAll()
datas.forEach { (item) in
rkSelectArr.append(item)
}
listView.reloadData()
}
func PiCiXuanZeViewControllerPiCiSelect(data: Array<GetGoodBatchDataModel>, p_id: Int) {
print(data.count)
piCiArr?.insert(data, at: p_id)
piCiArr?.remove(at: p_id + 1)
listView.reloadData()
}
//MARK: - 普通流程
func CKNonGmCellDelAction(cell: CKNonGmCell) {
//删除
rkSelectArr.remove(at: cell.tag)
listView.reloadData()
}
class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNonGmCellDelegate,CKGmCellDelegate, PiCiXuanZeViewControllerDelegate,GLAlertSelectViewDelegate,NewSelectItemVcDelegate,GeliAlertTextViewDelegate{
func CKNonGmCellInputCount(sender: String, cell: CKNonGmCell) {
//输入数据
}
//MARK: - 权限操作
func CKGmCellDelAction(cell: CKGmCell) {
//删除
rkSelectArr.remove(at: cell.tag)
listView.reloadData()
}
var piCiArr:Array<Array<GetGoodBatchDataModel>>? = []
func CKGmCellSelectAction(cell: CKGmCell) {
//跳转选择批次
let data = rkSelectArr[cell.tag]
let vc = PiCiXuanZeViewController()
vc.sku_id = data.sku_id
vc.delegate = self
vc.tag = cell.tag
if piCiArr!.count > 0 {
let arr = piCiArr![cell.tag]
vc.recordArr = arr
}
self.navigationController?.pushViewController(vc, animated: true)
}
func GLASClose(view: GLAlertSelectView, selectnum: Int, selectArr: Array<Int>) {
typeSelect = selectnum
view.removeFromSuperview()
glSelectView = nil
}
let titleArr = ["出库类型：","出库时间："]
var holderArr = ["请选择出库类型","时间"]
var glSelectView:GLAlertSelectView?
let ckTypeArr = ["销售","调出","报损","赠品","自用","生产使用","过期处理","用户试用","采购退货","其他"]
var typeSelect:Int?
var isGm = true
var isGm = false
var goods_id:Int?
var rkSelectArr:Array<InputInitInfoGoodsInfoModel> = []//产品选择
......@@ -82,12 +31,124 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
@IBAction func submitAction(_ sender: Any) {
if holderArr.first == "请选择出库类型" {
HUD.flash(.label("请选择出库类型"), delay: 1.2)
return
}
if isGm == false {
rkSelectArr.forEach { (model) in
if model.chuKuLiang == nil {
HUD.flash(.label("请填写出库数量"), delay: 1.2)
return
}
}
}
let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
alterView.delegate = self
self.view.window?.addSubview(alterView)
}
func sureGeliAlertTextViewAction(sender: String) {
let UserToken = UserDefaults.standard.value(forKey: "user_token")
if isGm {//直接出库
HUD.show(.progress)
if sender.count == 0 {
HUD.flash(.label("请填写备注"), delay: 1.2)
return
}
var goodsInfoArr:Array<Any> = []
for i in 0 ..< rkSelectArr.count {
let item = rkSelectArr[i]
var count = 0
let pici = piCiArr![i]
for data in pici {
count += data.chuHuoLiang!
}
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)
}
}
let goods = [
"goods_id":item.goods_id as Any,
"goods_name":item.goods_name as Any,
"goods_spec":item.spec_str as Any,
"sku_id":item.sku_id as Any,
"number":count as Any,
"batch_info":batchInfo as Any,
]
goodsInfoArr.append(goods)
}
let dict = [
"user_token":UserToken as Any,
"o_type":typeSelect! + 1 as Any,
"audit_remark":sender as Any,
"goods_info":dataChangeString(sender: goodsInfoArr) as Any
]
GoodsOutput(dict, success: { (data) in
HUD.hide()
HUD.flash(.labeledSubSuccess(subtitle: "出库成功"), delay: 1.2)
self.navigationController?.popViewController(animated: true)
}) { (error) in
}
}else{//提交申请
var goodsInfoArr:Array<Any> = []
rkSelectArr.forEach { (model) in
let goods = [
"goods_id":model.goods_id as Any,
"goods_name":model.goods_name as Any,
"goods_spec":model.spec_str as Any,
"sku_id":model.sku_id as Any,
"number":model.chuKuLiang as Any
]
goodsInfoArr.append(goods)
}
let dict = [
"user_token":UserToken as Any,
"o_type":typeSelect! + 1 as Any,
"audit_remark":sender as Any,
"goods_info":dataChangeString(sender: goodsInfoArr) as Any
]
GoodsOutputApply(dict, success: { (data) in
HUD.hide()
HUD.flash(.labeledSubSuccess(subtitle: "申请成功"), delay: 1.2)
self.navigationController?.popViewController(animated: true)
}) { (error) in
}
}
}
func CKNonGmCellInputCount(sender: String, cell: CKNonGmCell) {
//输入数据
let num = sender as NSString
let data = rkSelectArr[cell.tag]
data.chuKuLiang = num.integerValue
}
@IBOutlet weak var btmBtn: LGButton!
@IBOutlet weak var btmLbl: UILabel!
@IBOutlet weak var listView: UITableView!
......@@ -110,8 +171,6 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
let model = data as! InputInitInfoModel
model.data?.goods_info?.forEach({ (item) in
self.rkDatas.append(item)
self.piCiArr?.append([])
......@@ -121,6 +180,7 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
self.authArr.append(str)
})
if self.authArr.contains("64") == false && self.authArr.contains("66") == false {
self.listView.isHidden = true
self.btmLbl.isHidden = true
......@@ -130,10 +190,10 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
}
self.btmLbl.text = "提交申请"
if self.authArr.contains("64"){
self.isGm = true
self.btmLbl.text = "直接出库"
}
// if self.authArr.contains("64"){
// self.isGm = true
// self.btmLbl.text = "直接出库"
// }
self.listView.reloadData()
}) { (error) in
......@@ -148,8 +208,6 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
self.navigationController?.pushViewController(vc, animated: true)
}
//MARK: - cell delegate
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if indexPath.section == 1 {
......@@ -167,18 +225,26 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
cell.titleView.alpha = 1
cell.titleView.isHidden = false
cell.titleViewH.constant = 35
cell.listBg.isHidden = false
cell.listBg.alpha = 1
}else{
cell.listBg.isHidden = true
cell.titleView.isHidden = true
cell.titleViewH.constant = 0
cell.titleView.alpha = 0
cell.listBg.alpha = 0
}
return cell
}
let cell = tableView.dequeueReusableCell(withIdentifier: "CKNonGmCell") as! CKNonGmCell
cell.tag = indexPath.row
let data = rkSelectArr[cell.tag]
cell.delegate = self
cell.nameLbl.text = data.goods_name
cell.detailLbl.text = data.spec_str
return cell
}
let cell = tableView.dequeueReusableCell(withIdentifier: "CRKBtnCell") as! CRKBtnCell
......@@ -315,4 +381,52 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
glSelectView = nil
listView.reloadData()
}
func NewSelectItemVcSelect(datas: Array<InputInitInfoGoodsInfoModel>) {
rkSelectArr.removeAll()
datas.forEach { (item) in
rkSelectArr.append(item)
}
listView.reloadData()
}
func PiCiXuanZeViewControllerPiCiSelect(data: Array<GetGoodBatchDataModel>, p_id: Int) {
print(data.count)
piCiArr?.insert(data, at: p_id)
piCiArr?.remove(at: p_id + 1)
listView.reloadData()
}
//MARK: - 普通流程
func CKNonGmCellDelAction(cell: CKNonGmCell) {
//删除
rkSelectArr.remove(at: cell.tag)
listView.reloadData()
}
//MARK: - 权限操作
func CKGmCellDelAction(cell: CKGmCell) {
//删除
rkSelectArr.remove(at: cell.tag)
listView.reloadData()
}
func CKGmCellSelectAction(cell: CKGmCell) {
//跳转选择批次
let data = rkSelectArr[cell.tag]
let vc = PiCiXuanZeViewController()
vc.sku_id = data.sku_id
vc.delegate = self
vc.tag = cell.tag
if piCiArr!.count > 0 {
let arr = piCiArr![cell.tag]
vc.recordArr = arr
}
self.navigationController?.pushViewController(vc, animated: true)
}
func GLASClose(view: GLAlertSelectView, selectnum: Int, selectArr: Array<Int>) {
typeSelect = selectnum
view.removeFromSuperview()
glSelectView = nil
}
}
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