Merge branch 'master' of https://git.oschina.net/gomore/total

3a540349 · Sandy · 2274530b · 0ce0941c · 3a540349 · 3a540349
Commit 3a540349 authored Dec 22, 2016 by Sandy
6 changed files
--- a/total.xcodeproj/project.pbxproj
+++ b/total.xcodeproj/project.pbxproj
@@ -3146,7 +3146,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "total/total-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
 			};
 			name = Debug;
@@ -3178,7 +3178,7 @@
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "total/total-Bridging-Header.h";
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
 			};
 			name = Release;

--- a/total/GTOApp/Business/NewObtainViewController.m
+++ b/total/GTOApp/Business/NewObtainViewController.m
@@ -602,6 +602,9 @@
 #pragma mark -油站选择
 - (void)selectedGasStation:(UIButton *)btn
 {
+    if (!self.recordSelectOrder) {
+        [IBTLoadingView showTextOnly:@"请先选择配油单"];return;
+    }
    PromptTableViewController *promptVoew = [[PromptTableViewController alloc]init];
    promptVoew.isBoolValue = YES;
    __weak typeof(self) weakSelf = self;

--- a/total/GTOApp/UserUtil/total_objc_json_client.h
+++ b/total/GTOApp/UserUtil/total_objc_json_client.h
--- a/total/GTOApp/UserUtil/total_objc_json_client.m
+++ b/total/GTOApp/UserUtil/total_objc_json_client.m
@@ -2,8 +2,8 @@
 #import "total_objc_json_client.h"

 @implementation BeanOperator
-@synthesize operName;
 @synthesize operId;
+@synthesize operName;

 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -14,9 +14,9 @@
 @end

 @implementation OperateInfo
-@synthesize enterprise;
-@synthesize time;
 @synthesize operator;
+@synthesize time;
+@synthesize enterprise;

 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -47,9 +47,9 @@
 @end

 @implementation UCN
+@synthesize name;
 @synthesize code;
 @synthesize uuid;
-@synthesize name;

 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -104,8 +104,8 @@
 @end

 @implementation QueryOrder
-@synthesize direction;
 @synthesize field;
+@synthesize direction;

 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -116,10 +116,10 @@
 @end

 @implementation QueryResult
-@synthesize paging;
+@synthesize recordCount;
 @synthesize page;
 @synthesize records;
-@synthesize recordCount;
+@synthesize paging;
 @synthesize pageSize;
 @synthesize pageCount;

@@ -132,10 +132,10 @@
 @end

 @implementation QueryDefinition2
-@synthesize orders;
-@synthesize conditions;
 @synthesize pageNumber;
 @synthesize pageSize;
+@synthesize conditions;
+@synthesize orders;

 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -217,10 +217,10 @@ NSString * const DEPOTTYPE_SPECIAL = @"special";
 @end

 @implementation QueryResultPaging
-@synthesize pageSize;
 @synthesize pageCount;
-@synthesize page;
+@synthesize pageSize;
 @synthesize recordCount;
+@synthesize page;

 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -248,10 +248,10 @@ NSString * const STORESTATE_INVALID = @"invalid";


 @implementation QueryDefinition
-@synthesize conditions;
+@synthesize limit;
 @synthesize orders;
+@synthesize conditions;
 @synthesize offset;
-@synthesize limit;

 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -309,18 +309,18 @@ NSString * const RECEIVEBILLSTATE_SUBMIT = @"submit";
 NSString * const RECEIVEBILLSTATE_CANCEL = @"cancel";


-NSString * const REMINDTYPE_CONTRACTNUMBER = @"contractNumber";
-
-
 NSString * const PRICECATEGORY_SALEPRICE = @"salePrice";
 NSString * const PRICECATEGORY_GENERALTRADEPRICE = @"generalTradePrice";
 NSString * const PRICECATEGORY_SPECTRADEPRICE = @"specTradePrice";
 NSString * const PRICECATEGORY_INTERALSHIPPINGPRICE = @"interalShippingPrice";


+NSString * const REMINDTYPE_CONTRACTNUMBER = @"contractNumber";
+
+
 @implementation POperateInfo
-@synthesize operator;
 @synthesize time;
+@synthesize operator;

 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -330,9 +330,8 @@ NSString * const PRICECATEGORY_INTERALSHIPPINGPRICE = @"interalShippingPrice";

 @end

-@implementation OperateInfo2
-@synthesize time;
-@synthesize operator;
+@implementation Entity
+@synthesize uuid;

 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -356,8 +355,9 @@ NSString * const PRICECATEGORY_INTERALSHIPPINGPRICE = @"interalShippingPrice";

 @end

-@implementation Entity
-@synthesize uuid;
+@implementation OperateInfo2
+@synthesize time;
+@synthesize operator;

 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -378,9 +378,9 @@ NSString * const POSITIONTYPE_NONE = @"none";


 @implementation BeanOperateInfo
-@synthesize operator;
-@synthesize time;
 @synthesize enterprise;
+@synthesize time;
+@synthesize operator;

 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -483,10 +483,10 @@ NSString * const POSITIONTYPE_NONE = @"none";

 @end

-@implementation StandardEntity2
-@synthesize version;
-@synthesize createInfo;
-@synthesize lastModifyInfo;
+@implementation ChangePasswordLog
+@synthesize userUuid;
+@synthesize userName;
+@synthesize changeDate;

 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -496,10 +496,10 @@ NSString * const POSITIONTYPE_NONE = @"none";

 @end

-@implementation ChangePasswordLog
-@synthesize userUuid;
-@synthesize userName;
-@synthesize changeDate;
+@implementation StandardEntity2
+@synthesize version;
+@synthesize createInfo;
+@synthesize lastModifyInfo;

 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -510,9 +510,9 @@ NSString * const POSITIONTYPE_NONE = @"none";
 @end

 @implementation PStandardEntity
+@synthesize version;
 @synthesize lastModifyInfo;
 @synthesize createInfo;
-@synthesize version;

 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -553,9 +553,9 @@ NSString * const POSITIONTYPE_NONE = @"none";
 @end

 @implementation StandardEntity
-@synthesize version;
-@synthesize createInfo;
 @synthesize lastModifyInfo;
+@synthesize createInfo;
+@synthesize version;

 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -648,8 +648,8 @@ NSString * const POSITIONTYPE_NONE = @"none";

 @end

-@implementation Role
-@synthesize name;
+@implementation EnterpriseEntity2
+@synthesize enterprise;

 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -659,8 +659,8 @@ NSString * const POSITIONTYPE_NONE = @"none";

 @end

-@implementation EnterpriseEntity2
-@synthesize enterprise;
+@implementation Role
+@synthesize name;

 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -690,6 +690,17 @@ NSString * const POSITIONTYPE_NONE = @"none";
 }


+@end
+
+@implementation BasicEnterpriseBill2
+@synthesize billnumber;
+
+(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+    return YES;
+}
+
+
 @end

 @implementation Store
@@ -724,8 +735,23 @@ NSString * const POSITIONTYPE_NONE = @"none";

 @end

-@implementation BasicEnterpriseBill2
-@synthesize billnumber;
+@implementation Organization
+@synthesize contact;
+@synthesize isLeaf;
+@synthesize shortName;
+@synthesize enabled;
+@synthesize orgType;
+@synthesize authentication;
+@synthesize level;
+@synthesize upper;
+@synthesize namePath;
+@synthesize attachmentId;
+@synthesize code;
+@synthesize storeType;
+@synthesize name;
+@synthesize address;
+@synthesize path;
+@synthesize phone;

 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -736,46 +762,20 @@ NSString * const POSITIONTYPE_NONE = @"none";
 @end

 @implementation User
+@synthesize state;
 @synthesize businessType;
+@synthesize belongOrg;
+@synthesize address;
+@synthesize mobile;
 @synthesize remark;
-@synthesize enabled;
-@synthesize password;
 @synthesize organizations;
-@synthesize roles;
 @synthesize login;
-@synthesize name;
-@synthesize email;
-@synthesize mobile;
 @synthesize position;
-@synthesize state;
-@synthesize belongOrg;
-@synthesize address;
-
-+(BOOL)propertyIsOptional:(NSString*)propertyName
-{
-    return YES;
-}
-
-
-@end
-
-@implementation Organization
-@synthesize enabled;
-@synthesize phone;
-@synthesize shortName;
-@synthesize path;
-@synthesize orgType;
-@synthesize level;
-@synthesize attachmentId;
-@synthesize authentication;
-@synthesize address;
+@synthesize email;
+@synthesize password;
+@synthesize roles;
 @synthesize name;
-@synthesize upper;
-@synthesize isLeaf;
-@synthesize namePath;
-@synthesize contact;
-@synthesize code;
-@synthesize storeType;
+@synthesize enabled;

 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -855,6 +855,7 @@ NSString * const POSITIONTYPE_NONE = @"none";
 @synthesize wasterRate;
 @synthesize carrier;
 @synthesize price;
+@synthesize contractNumber;

 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -864,11 +865,24 @@ NSString * const POSITIONTYPE_NONE = @"none";

 @end

-@implementation Remind
-@synthesize remindType;
-@synthesize receiver;
-@synthesize phoneNumber;
-@synthesize email;
+@implementation ReceiveBillContractLog
+@synthesize contractBillNumber;
+@synthesize sourceBillNumber;
+@synthesize subTotal;
+
+(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+    return YES;
+}
+
+
+@end
+
+@implementation RemindLog
+@synthesize fueler;
+@synthesize receiverNumber;
+@synthesize context;
+@synthesize result;

 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -891,11 +905,11 @@ NSString * const POSITIONTYPE_NONE = @"none";

 @end

-@implementation RemindLog
-@synthesize fueler;
-@synthesize receiverNumber;
-@synthesize context;
-@synthesize result;
+@implementation Remind
+@synthesize remindType;
+@synthesize receiver;
+@synthesize phoneNumber;
+@synthesize email;

 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {

--- a/total/Info.plist
+++ b/total/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.6</string>
+	<string>1.2.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.6</string>
+	<string>1.2.7</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

--- a/total/Total-Prefix.pch
+++ b/total/Total-Prefix.pch
@@ -37,15 +37,6 @@
 *  友好图片
 */
 #define  KNODATAIMAGE TCImage(@"圆角矩形-3-副本")
-//
-//
-///**
-// *  开发地址
-// */
-//#define HTTPADDRESS @"http://139.196.195.30:8093/total-server/rest"
-//
-//
-

 /**
 *  0