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
913bf261
Commit
913bf261
authored
Sep 29, 2016
by
Sandy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
1de8d0af
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
18 deletions
+20
-18
project.pbxproj
XFFruit.xcodeproj/project.pbxproj
+6
-4
Info.plist
XFFruit/Info.plist
+1
-1
ICRAppMacro.h
XFFruit/Macro/ICRAppMacro.h
+1
-1
NewPurchaseViewController.m
...trollers/Purchase/Controllers/NewPurchaseViewController.m
+4
-4
NewTransferViewController.m
...trollers/Transfer/Controllers/NewTransferViewController.m
+4
-4
NewTransportViewController.m
...ollers/Transport/Controllers/NewTransportViewController.m
+4
-4
No files found.
XFFruit.xcodeproj/project.pbxproj
View file @
913bf261
...
...
@@ -1617,13 +1617,14 @@
path
=
ChooseViewController
;
sourceTree
=
"<group>"
;
};
72805CED1BB79D68009E1F82
/* Transfer */
=
{
72805CED1BB79D68009E1F82
/* Transfer
(转运单)
*/
=
{
isa
=
PBXGroup
;
children
=
(
72805CEE1BB79D68009E1F82
/* Controllers */
,
72805CEF1BB79D68009E1F82
/* Models */
,
72805CF01BB79D68009E1F82
/* Views */
,
);
name
=
"Transfer(转运单)"
;
path
=
Transfer
;
sourceTree
=
"<group>"
;
};
...
...
@@ -1849,13 +1850,14 @@
path
=
Views
;
sourceTree
=
"<group>"
;
};
72B3C0A91B9D3C7300025D81
/* Transport */
=
{
72B3C0A91B9D3C7300025D81
/* Transport
(发运单)
*/
=
{
isa
=
PBXGroup
;
children
=
(
72B3C0AA1B9D3C7300025D81
/* Controllers */
,
72B3C0B31B9D3C7300025D81
/* Models */
,
72B3C0B81B9D3C7300025D81
/* Views */
,
);
name
=
"Transport(发运单)"
;
path
=
Transport
;
sourceTree
=
"<group>"
;
};
...
...
@@ -2574,8 +2576,8 @@
35EECB741C868A5A00BE1B40
/* FeedBack */
,
728899C71BEC8766003CC41E
/* Report */
,
72A813F11BCD3117003631F3
/* Receiving */
,
72805CED1BB79D68009E1F82
/* Transfer */
,
72B3C0A91B9D3C7300025D81
/* Transport */
,
72805CED1BB79D68009E1F82
/* Transfer
(转运单)
*/
,
72B3C0A91B9D3C7300025D81
/* Transport
(发运单)
*/
,
724171641B9D30660094DF55
/* ChooseViewController */
,
35CF33911B95B419001211EF
/* GXFCommon */
,
35CF33721B953E8D001211EF
/* Process(加工单) */
,
...
...
XFFruit/Info.plist
View file @
913bf261
...
...
@@ -15,7 +15,7 @@
<
k
e
y
>
CFBundlePackageType
<
/k
e
y
>
<
string
>
APPL
<
/string
>
<
k
e
y
>
CFBundleShortVersionString
<
/k
e
y
>
<
string
>
1.2.1
0
<
/string
>
<
string
>
1.2.1
2
<
/string
>
<
k
e
y
>
CFBundleSignature
<
/k
e
y
>
<
string
>
????
<
/string
>
<
k
e
y
>
CFBundleVersion
<
/k
e
y
>
...
...
XFFruit/Macro/ICRAppMacro.h
View file @
913bf261
...
...
@@ -31,7 +31,7 @@
//********正式环境*********
#define HTTP_REST_API_BASE_URL @"http://122.224.171.126:7380/cruiser-server/rest"
//
#define HTTP_REST_REPORT_BASE_URL @"http://122.224.171.126:7380"
// HTTP
//#define HTTP_REST_API_BASE_URL @"http://115.28.191.44:8080/IPatrol/rest"
...
...
XFFruit/ViewControllers/Purchase/Controllers/NewPurchaseViewController.m
View file @
913bf261
...
...
@@ -394,10 +394,10 @@ typedef enum : NSUInteger {
ShowMessage
(
@"有数量等于0的商品明细,请编辑后保存"
);
return
NO
;
}
if
([
billProduct
.
price
floatValue
]
<=
0
||
[
billProduct
.
basePrice
floatValue
]
<=
0
)
{
ShowMessage
(
@"有价格未填写的商品明细,请编辑后保存"
);
return
NO
;
}
//
if ([billProduct.price floatValue] <=0 || [billProduct.basePrice floatValue] <= 0) {
//
ShowMessage(@"有价格未填写的商品明细,请编辑后保存");
//
return NO;
//
}
}
return
YES
;
...
...
XFFruit/ViewControllers/Transfer/Controllers/NewTransferViewController.m
View file @
913bf261
...
...
@@ -270,10 +270,10 @@ typedef enum : NSUInteger {
ShowMessage
(
@"有数量等于0的商品明细,请编辑后保存"
);
return
NO
;
}
if
([
billProduct
.
price
floatValue
]
<=
0
||
[
billProduct
.
packprice
floatValue
]
<=
0
)
{
ShowMessage
(
@"有价格未填写的商品明细,请编辑后保存"
);
return
NO
;
}
//
if ([billProduct.price floatValue] <=0 || [billProduct.packprice floatValue] <= 0) {
//
ShowMessage(@"有价格未填写的商品明细,请编辑后保存");
//
return NO;
//
}
}
// 校验手机号码
if
(
!
[
RegexUtil
isValidatePhone
:
_sheetView
.
carphone
]
||
!
[
RegexUtil
isValidatePhoneNew
:
_sheetView
.
carphone
]){
...
...
XFFruit/ViewControllers/Transport/Controllers/NewTransportViewController.m
View file @
913bf261
...
...
@@ -275,10 +275,10 @@ typedef enum : NSUInteger {
ShowMessage
(
@"有数量等于0的商品明细,请编辑后保存"
);
return
NO
;
}
if
([
billProduct
.
price
floatValue
]
<=
0
||
[
billProduct
.
packprice
floatValue
]
<=
0
)
{
ShowMessage
(
@"有价格未填写的商品明细,请编辑后保存"
);
return
NO
;
}
//
if ([billProduct.price floatValue] <=0 || [billProduct.packprice floatValue] <= 0) {
//
ShowMessage(@"有价格未填写的商品明细,请编辑后保存");
//
return NO;
//
}
}
// 校验手机号码
if
(
!
[
RegexUtil
isValidatePhone
:
_sheetView
.
carphone
]
||
!
[
RegexUtil
isValidatePhoneNew
:
_sheetView
.
carphone
]){
...
...
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