Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
X
xffruit
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张杰
xffruit
Commits
cf9cc8ba
Commit
cf9cc8ba
authored
9 years ago
by
陈俊俊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
转运单bug修复
parent
dfa77cfd
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
5 deletions
+14
-5
NewTransferViewController.m
...trollers/Transfer/Controllers/NewTransferViewController.m
+14
-5
No files found.
XFFruit/ViewControllers/Transfer/Controllers/NewTransferViewController.m
View file @
cf9cc8ba
...
...
@@ -298,8 +298,6 @@ typedef enum : NSUInteger {
if
(
products
.
count
>
0
)
{
NSMutableArray
*
arr
=
[
self
coverTransferFromTransportProduct
:
products
];
[
_bottomView
reProduct
:
arr
];
TransferPdtDetail
*
pdt
=
arr
[
0
];
[
self
setPhoneAndCar
:
pdt
.
carnumber
phone
:
pdt
.
carphone
];
}
};
[
self
PushViewController
:
tpv
animated
:
YES
];
...
...
@@ -309,9 +307,16 @@ typedef enum : NSUInteger {
ChooseTransferViewController
*
ctv
=
[
ChooseTransferViewController
new
];
ctv
.
chooseTransferProduct
=
^
(
NSArray
*
products
){
if
(
products
.
count
>
0
)
{
[
_bottomView
reProduct
:
products
];
TransferPdtDetail
*
pdt
=
products
[
0
];
[
self
setPhoneAndCar
:
pdt
.
carnumber
phone
:
pdt
.
carphone
];
NSMutableArray
*
newProducts
=
[
NSMutableArray
array
];
for
(
TransferPdtDetail
*
pdt
in
products
)
{
pdt
.
carphone
=
nil
;
pdt
.
carnumber
=
nil
;
[
newProducts
addObject
:
pdt
];
}
[
_bottomView
reProduct
:
newProducts
];
}
};
[
self
PushViewController
:
ctv
animated
:
YES
];
...
...
@@ -325,6 +330,7 @@ typedef enum : NSUInteger {
if
(
_sheetView
.
phoneTextFiled
.
text
.
length
<
1
)
{
_sheetView
.
phoneTextFiled
.
text
=
carphone
;
}
}
...
...
@@ -455,6 +461,7 @@ typedef enum : NSUInteger {
}
-
(
NSMutableArray
*
)
coverTransferFromTransportProduct
:
(
NSArray
*
)
products
{
NSMutableArray
*
transferP
=
[
NSMutableArray
new
];
NSInteger
index
=
0
;
for
(
TransportPdtDetail
*
pdt
in
products
)
{
TransferPdtDetail
*
ferPdt
=
[
TransferPdtDetail
new
];
ferPdt
.
uuid
=
pdt
.
uuid
;
...
...
@@ -474,9 +481,11 @@ typedef enum : NSUInteger {
ferPdt
.
baseUnit
=
pdt
.
baseUnit
;
ferPdt
.
total
=
pdt
.
total
;
ferPdt
.
note
=
pdt
.
note
;
ferPdt
.
carphone
=
pdt
.
carphone
;
ferPdt
.
carnumber
=
pdt
.
carnumber
;
if
(
index
==
0
)
{
[
self
setPhoneAndCar
:
pdt
.
carnumber
phone
:
pdt
.
carphone
];
}
[
transferP
addObject
:
ferPdt
];
index
++
;
}
return
transferP
;
}
...
...
This diff is collapsed.
Click to expand it.
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