Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
GeliBusinessPlatform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
CI / CD Analytics
Repository Analytics
Value Stream Analytics
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ljy
GeliBusinessPlatform
Commits
0bc87989
Commit
0bc87989
authored
Jun 04, 2020
by
lujunye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复数据支撑
parent
532305e8
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
64 additions
and
12 deletions
+64
-12
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
...erdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/View/AlertView/GLAlertSelectView.swift
GeliBusinessPlatform/View/AlertView/GLAlertSelectView.swift
+34
-1
GeliBusinessPlatform/ViewController/1.1入库&出库/入库/NewRKVc.swift
...BusinessPlatform/ViewController/1.1入库&出库/入库/NewRKVc.swift
+16
-1
GeliBusinessPlatform/ViewController/1.1入库&出库/出库/NewCKVc.swift
...BusinessPlatform/ViewController/1.1入库&出库/出库/NewCKVc.swift
+6
-1
GeliBusinessPlatform/ViewController/入库/PiCiXuanZeCell.swift
GeliBusinessPlatform/ViewController/入库/PiCiXuanZeCell.swift
+4
-0
GeliBusinessPlatform/ViewController/商品管理/GoodsManageListVC.swift
...inessPlatform/ViewController/商品管理/GoodsManageListVC.swift
+4
-9
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
View file @
0bc87989
No preview for this file type
GeliBusinessPlatform/View/AlertView/GLAlertSelectView.swift
View file @
0bc87989
...
...
@@ -165,10 +165,43 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
}
func
tableView
(
_
tableView
:
UITableView
,
didSelectRowAt
indexPath
:
IndexPath
)
{
if
(
titleLbl
.
text
?
.
contains
(
"库位"
))
!
&&
isOnlySelectKuWei
==
false
{
selectNum
=
indexPath
.
row
selectTbv
.
reloadData
()
}
let
cell
=
tableView
.
cellForRow
(
at
:
indexPath
)
as!
TitleAndSelectCell
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
)
selectArray
?
.
remove
(
at
:
cell
.
tag
+
1
)
}
else
{
selectArray
?
.
insert
(
cell
.
tag
,
at
:
cell
.
tag
)
selectArray
?
.
remove
(
at
:
cell
.
tag
+
1
)
}
}
}
selectTbv
.
reloadData
()
}
func
tableView
(
_
tableView
:
UITableView
,
cellForRowAt
indexPath
:
IndexPath
)
->
UITableViewCell
{
...
...
@@ -214,7 +247,7 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
return
cell
}
@IBAction
func
submitClick
(
_
sender
:
Any
)
{
if
(
titleLbl
.
text
?
.
contains
(
"库位"
))
!
&&
isOnlySelectKuWei
==
false
{
delegate
?
.
KuWeiDataArr
?(
sender
:
kuWeiArr
)
return
...
...
GeliBusinessPlatform/ViewController/1.1入库&出库/入库/NewRKVc.swift
View file @
0bc87989
...
...
@@ -272,7 +272,22 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
let
data
=
rkSelectArr
[
indexPath
.
row
]
cell
.
nameLbl
.
text
=
data
.
goods_name
cell
.
detailLbl
.
text
=
data
.
spec_str
!
+
" "
+
"¥
\(
data
.
price
!
)
"
if
data
.
RKJG
!=
nil
{
cell
.
rkPriceTf
.
text
=
"
\(
data
.
RKJG
!
)
"
}
if
data
.
RKSL
!=
nil
{
cell
.
rkCountTf
.
text
=
"
\(
data
.
RKSL
!
)
"
}
if
data
.
BZQ
!=
nil
{
cell
.
bzqTf
.
text
=
"
\(
data
.
BZQ
!
)
"
}
if
data
.
DayType
==
1
{
cell
.
rightBtn
.
isSelected
=
true
cell
.
leftBtn
.
isSelected
=
false
}
else
{
cell
.
rightBtn
.
isSelected
=
false
cell
.
leftBtn
.
isSelected
=
true
}
return
cell
}
...
...
GeliBusinessPlatform/ViewController/1.1入库&出库/出库/NewCKVc.swift
View file @
0bc87989
...
...
@@ -46,6 +46,7 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
let
alterView
=
GeliAlertTextView
(
frame
:
self
.
view
.
window
!.
bounds
)
alterView
.
delegate
=
self
self
.
view
.
window
?
.
addSubview
(
alterView
)
}
...
...
@@ -221,7 +222,7 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
cell
.
delegate
=
self
cell
.
nameLbl
.
text
=
data
.
goods_name
cell
.
detailLbl
.
text
=
data
.
spec_str
let
arr
=
piCiArr
?[
cell
.
tag
]
if
arr
!.
count
>
0
{
cell
.
dataArr
=
arr
...
...
@@ -246,6 +247,9 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
cell
.
delegate
=
self
cell
.
nameLbl
.
text
=
data
.
goods_name
cell
.
detailLbl
.
text
=
data
.
spec_str
if
data
.
chuKuLiang
!=
nil
{
cell
.
ckCountTf
.
text
=
"
\(
data
.
chuKuLiang
!
)
"
}
return
cell
}
...
...
@@ -409,6 +413,7 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
//MARK: - 权限操作
func
CKGmCellDelAction
(
cell
:
CKGmCell
)
{
//删除
piCiArr
?
.
remove
(
at
:
cell
.
tag
)
rkSelectArr
.
remove
(
at
:
cell
.
tag
)
listView
.
reloadData
()
}
...
...
GeliBusinessPlatform/ViewController/入库/PiCiXuanZeCell.swift
View file @
0bc87989
...
...
@@ -48,6 +48,10 @@ class PiCiXuanZeCell: UITableViewCell,UITextFieldDelegate {
HUD
.
flash
(
.
label
(
"超出库存"
),
delay
:
1.2
)
textTF
.
text
=
SLLbl
.
text
}
if
num1
.
integerValue
==
0
{
HUD
.
flash
(
.
label
(
"出库数量不能为0"
),
delay
:
1.2
)
textTF
.
text
=
""
}
delegate
?
.
PiCiXuanZeCellBtnTextChange
(
sender
:
textTF
.
text
!
,
cell
:
self
)
}
}
...
...
GeliBusinessPlatform/ViewController/商品管理/GoodsManageListVC.swift
View file @
0bc87989
...
...
@@ -498,8 +498,8 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
print
(
"入库哦哦"
)
// HUD.flash(.label("敬请期待"),delay: 1.2)
// return
let
vc
=
NewRKVc
()
//
let vc = NewCKVc()
//
let vc = NewRKVc()
let
vc
=
NewCKVc
()
vc
.
sku_id
=
changeGoodsResModel
?
.
sku_id
vc
.
goods_id
=
changeGoodsResModel
?
.
goods_id
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
...
...
@@ -531,16 +531,11 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
}
else
{
print
(
"入库哦哦"
)
let
vc
=
NewRKVc
()
//
let vc = NewCKVc()
//
let vc = NewRKVc()
let
vc
=
NewCKVc
()
vc
.
sku_id
=
changeGoodsResModel
?
.
sku_id
vc
.
goods_id
=
changeGoodsResModel
?
.
goods_id
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
// HUD.flash(.label("敬请期待"),delay: 1.2)
// return
// let vc = RuKuViewController()
// vc.barTitle = "入库"
// self.navigationController?.pushViewController(vc, animated: true)
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment