Skip to content

X
xffruit
Commit 913bf261 authored by Sandy's avatar Sandy
Browse files
Options

no message

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