修改项说明：修复后台更新解析文件，导致对的崩溃

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;

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;

total/GTOApp/UserUtil/total_objc_json_client.h

@@ -430,20 +430,6 @@ extern NSString * const RECEIVEBILLSTATE_CANCEL;
 
 
 
-/**
- *  提醒类型。
- *
- *  @author Debenson
- *  @since 0.1
- */
-/**
- * 合约数量
- */
-extern NSString * const REMINDTYPE_CONTRACTNUMBER;
-
-
-
-
 /**
  *  油价类别。
  *
@@ -470,6 +456,20 @@ extern NSString * const PRICECATEGORY_INTERALSHIPPINGPRICE;
 
 
 
+/**
+ *  提醒类型。
+ *
+ *  @author Debenson
+ *  @since 0.1
+ */
+/**
+ * 合约数量
+ */
+extern NSString * const REMINDTYPE_CONTRACTNUMBER;
+
+
+
+
 /**
  * (no documentation provided)
  */
@@ -525,9 +525,9 @@ extern NSString * const POSITIONTYPE_NONE;
 @class QueryDefinition;
 @class GasMeasureValue;
 @class POperateInfo;
-@class OperateInfo2;
-@class RsOperateInfo;
 @class Entity;
+@class RsOperateInfo;
+@class OperateInfo2;
 @class BeanOperateInfo;
 @class GasDepot;
 @class GasFueler;
@@ -536,8 +536,8 @@ extern NSString * const POSITIONTYPE_NONE;
 @class DeliveryArea;
 @class Carrier;
 @class BasicBillDtl;
-@class StandardEntity2;
 @class ChangePasswordLog;
+@class StandardEntity2;
 @class PStandardEntity;
 @class GasItem;
 @class GasTank;
@@ -547,20 +547,21 @@ extern NSString * const POSITIONTYPE_NONE;
 @class FuelPrice;
 @class DepotBillPayDtl;
 @class DepotPickingDtl;
-@class Role;
 @class EnterpriseEntity2;
+@class Role;
 @class PEnterpriseEntity;
 @class EnterpriseEntity;
-@class Store;
 @class BasicEnterpriseBill2;
-@class User;
+@class Store;
 @class Organization;
+@class User;
 @class PBasicEnterpriseBill;
 @class PickingBill;
 @class ReceiveBill;
-@class Remind;
-@class TotalOption;
+@class ReceiveBillContractLog;
 @class RemindLog;
+@class TotalOption;
+@class Remind;
 @class POBill;
 @class OrderBill;
 @class CarryInfo;
@@ -587,9 +588,9 @@ extern NSString * const POSITIONTYPE_NONE;
 @protocol QueryDefinition @end
 @protocol GasMeasureValue @end
 @protocol POperateInfo @end
-@protocol OperateInfo2 @end
-@protocol RsOperateInfo @end
 @protocol Entity @end
+@protocol RsOperateInfo @end
+@protocol OperateInfo2 @end
 @protocol BeanOperateInfo @end
 @protocol GasDepot @end
 @protocol GasFueler @end
@@ -598,8 +599,8 @@ extern NSString * const POSITIONTYPE_NONE;
 @protocol DeliveryArea @end
 @protocol Carrier @end
 @protocol BasicBillDtl @end
-@protocol StandardEntity2 @end
 @protocol ChangePasswordLog @end
+@protocol StandardEntity2 @end
 @protocol PStandardEntity @end
 @protocol GasItem @end
 @protocol GasTank @end
@@ -609,20 +610,21 @@ extern NSString * const POSITIONTYPE_NONE;
 @protocol FuelPrice @end
 @protocol DepotBillPayDtl @end
 @protocol DepotPickingDtl @end
-@protocol Role @end
 @protocol EnterpriseEntity2 @end
+@protocol Role @end
 @protocol PEnterpriseEntity @end
 @protocol EnterpriseEntity @end
-@protocol Store @end
 @protocol BasicEnterpriseBill2 @end
-@protocol User @end
+@protocol Store @end
 @protocol Organization @end
+@protocol User @end
 @protocol PBasicEnterpriseBill @end
 @protocol PickingBill @end
 @protocol ReceiveBill @end
-@protocol Remind @end
-@protocol TotalOption @end
+@protocol ReceiveBillContractLog @end
 @protocol RemindLog @end
+@protocol TotalOption @end
+@protocol Remind @end
 @protocol POBill @end
 @protocol OrderBill @end
 @protocol CarryInfo @end
@@ -643,13 +645,13 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, copy) NSString *operName;
+@property (nonatomic, copy) NSString *operId;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *operId;
+@property (nonatomic, copy) NSString *operName;
 @end /* interface BeanOperator */
 
 
@@ -663,7 +665,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, copy) NSString *enterprise;
+@property (nonatomic, strong) Operator *operator;
 /**
  * (no documentation provided)
  *
@@ -675,7 +677,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) Operator *operator;
+@property (nonatomic, copy) NSString *enterprise;
 @end /* interface OperateInfo */
 
 
@@ -709,19 +711,19 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, copy) NSString *code;
+@property (nonatomic, copy) NSString *name;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *uuid;
+@property (nonatomic, copy) NSString *code;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *name;
+@property (nonatomic, copy) NSString *uuid;
 @end /* interface UCN */
 
 
@@ -793,15 +795,15 @@ extern NSString * const POSITIONTYPE_NONE;
 /**
  * (no documentation provided)
  *
- * 取值: QUERYORDERDIRECTION_ASC, QUERYORDERDIRECTION_DESC,
+ *
  */
-@property (nonatomic, copy) NSString *direction;
+@property (nonatomic, copy) NSString *field;
 /**
  * (no documentation provided)
  *
- *
+ * 取值: QUERYORDERDIRECTION_ASC, QUERYORDERDIRECTION_DESC,
  */
-@property (nonatomic, copy) NSString *field;
+@property (nonatomic, copy) NSString *direction;
 @end /* interface QueryOrder */
 
 
@@ -815,7 +817,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) QueryResultPaging *paging;
+@property (nonatomic, assign) long long recordCount;
 /**
  * (no documentation provided)
  *
@@ -833,7 +835,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, assign) long long recordCount;
+@property (nonatomic, strong) QueryResultPaging *paging;
 /**
  * (no documentation provided)
  *
@@ -856,28 +858,28 @@ extern NSString * const POSITIONTYPE_NONE;
 @interface QueryDefinition2 : JSONModel
 /**
  * (no documentation provided)
- * @see QueryOrder
+ *
  *
  */
-@property (nonatomic, strong) NSArray<QueryOrder> *orders;
+@property (nonatomic, assign) NSInteger pageNumber;
 /**
  * (no documentation provided)
- * @see QueryCondition
+ *
  *
  */
-@property (nonatomic, strong) NSArray<QueryCondition> *conditions;
+@property (nonatomic, assign) NSInteger pageSize;
 /**
  * (no documentation provided)
- *
+ * @see QueryCondition
  *
  */
-@property (nonatomic, assign) NSInteger pageNumber;
+@property (nonatomic, strong) NSArray<QueryCondition> *conditions;
 /**
  * (no documentation provided)
- *
+ * @see QueryOrder
  *
  */
-@property (nonatomic, assign) NSInteger pageSize;
+@property (nonatomic, strong) NSArray<QueryOrder> *orders;
 @end /* interface QueryDefinition2 */
 
 
@@ -939,25 +941,25 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, assign) NSInteger pageSize;
+@property (nonatomic, assign) NSInteger pageCount;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, assign) NSInteger pageCount;
+@property (nonatomic, assign) NSInteger pageSize;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, assign) NSInteger page;
+@property (nonatomic, assign) long long recordCount;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, assign) long long recordCount;
+@property (nonatomic, assign) NSInteger page;
 @end /* interface QueryResultPaging */
 
 
@@ -968,10 +970,10 @@ extern NSString * const POSITIONTYPE_NONE;
 @interface QueryDefinition : JSONModel
 /**
  * (no documentation provided)
- * @see QueryCondition
+ *
  *
  */
-@property (nonatomic, strong) NSArray<QueryCondition> *conditions;
+@property (nonatomic, assign) NSInteger limit;
 /**
  * (no documentation provided)
  * @see QueryOrder
@@ -980,16 +982,16 @@ extern NSString * const POSITIONTYPE_NONE;
 @property (nonatomic, strong) NSArray<QueryOrder> *orders;
 /**
  * (no documentation provided)
- *
+ * @see QueryCondition
  *
  */
-@property (nonatomic, assign) NSInteger offset;
+@property (nonatomic, strong) NSArray<QueryCondition> *conditions;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, assign) NSInteger limit;
+@property (nonatomic, assign) NSInteger offset;
 @end /* interface QueryDefinition */
 
 
@@ -1007,25 +1009,25 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *capacity;
+@property (nonatomic, strong) NSNumber *capacity;
 /**
  * 质量，单位公斤
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *quality;
+@property (nonatomic, strong) NSNumber *quality;
 /**
  * 密度
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *density;
+@property (nonatomic, strong) NSNumber *density;
 /**
  * 标准体积
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *volume;
+@property (nonatomic, strong) NSNumber *volume;
 @end /* interface GasMeasureValue */
 
 
@@ -1039,38 +1041,28 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) POperator *operator;
+@property (nonatomic, copy) NSString *time;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *time;
+@property (nonatomic, strong) POperator *operator;
 @end /* interface POperateInfo */
 
 
 
 /**
- *  操作上下文。
- 
- @author Debenson
- @since 0.1
- 
- */
-@interface OperateInfo2 : JSONModel
-/**
- * 操作时间
- *
- *
+ * (no documentation provided)
  */
-@property (nonatomic, copy) NSString *time;
+@interface Entity : JSONModel
 /**
- * 操作人信息
+ * (no documentation provided)
  *
  *
  */
-@property (nonatomic, strong) Operator *operator;
-@end /* interface OperateInfo2 */
+@property (nonatomic, copy) NSString *uuid;
+@end /* interface Entity */
 
 
 
@@ -1115,16 +1107,26 @@ extern NSString * const POSITIONTYPE_NONE;
 
 
 /**
- * (no documentation provided)
+ *  操作上下文。
+ 
+ @author Debenson
+ @since 0.1
+ 
  */
-@interface Entity : JSONModel
+@interface OperateInfo2 : JSONModel
 /**
- * (no documentation provided)
+ * 操作时间
  *
  *
  */
-@property (nonatomic, copy) NSString *uuid;
-@end /* interface Entity */
+@property (nonatomic, copy) NSString *time;
+/**
+ * 操作人信息
+ *
+ *
+ */
+@property (nonatomic, strong) Operator *operator;
+@end /* interface OperateInfo2 */
 
 
 
@@ -1137,7 +1139,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) BeanOperator *operator;
+@property (nonatomic, copy) NSString *enterprise;
 /**
  * (no documentation provided)
  *
@@ -1149,7 +1151,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, copy) NSString *enterprise;
+@property (nonatomic, strong) BeanOperator *operator;
 @end /* interface BeanOperateInfo */
 
 
@@ -1377,62 +1379,62 @@ extern NSString * const POSITIONTYPE_NONE;
 
 
 /**
- *  标准实体。
- 
- @author thor
+ *  合约日志
  
+ @author cyy24
+ @since 0.1
  
  */
-@interface StandardEntity2 : Entity
+@interface ChangePasswordLog : Entity
 /**
- * 版本号
+ * (no documentation provided)
  *
  *
  */
-@property (nonatomic, assign) long long version;
+@property (nonatomic, copy) NSString *userUuid;
 /**
- * 操作人信息
+ * (no documentation provided)
  *
  *
  */
-@property (nonatomic, strong) OperateInfo2 *createInfo;
+@property (nonatomic, copy) NSString *userName;
 /**
- * 最后修改信息
+ * (no documentation provided)
  *
  *
  */
-@property (nonatomic, strong) OperateInfo2 *lastModifyInfo;
-@end /* interface StandardEntity2 */
+@property (nonatomic, copy) NSString *changeDate;
+@end /* interface ChangePasswordLog */
 
 
 
 /**
- *  合约日志
+ *  标准实体。
+ 
+ @author thor
  
- @author cyy24
- @since 0.1
  
  */
-@interface ChangePasswordLog : Entity
+@interface StandardEntity2 : Entity
 /**
- * (no documentation provided)
+ * 版本号
  *
  *
  */
-@property (nonatomic, copy) NSString *userUuid;
+@property (nonatomic, assign) long long version;
 /**
- * (no documentation provided)
+ * 操作人信息
  *
  *
  */
-@property (nonatomic, copy) NSString *userName;
+@property (nonatomic, strong) OperateInfo2 *createInfo;
 /**
- * (no documentation provided)
+ * 最后修改信息
  *
  *
  */
-@property (nonatomic, copy) NSString *changeDate;
-@end /* interface ChangePasswordLog */
+@property (nonatomic, strong) OperateInfo2 *lastModifyInfo;
+@end /* interface StandardEntity2 */
 
 
 
@@ -1445,19 +1447,19 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) POperateInfo *lastModifyInfo;
+@property (nonatomic, assign) long long version;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, strong) POperateInfo *createInfo;
+@property (nonatomic, strong) POperateInfo *lastModifyInfo;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, assign) long long version;
+@property (nonatomic, strong) POperateInfo *createInfo;
 @end /* interface PStandardEntity */
 
 
@@ -1555,7 +1557,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, assign) long long version;
+@property (nonatomic, strong) OperateInfo *lastModifyInfo;
 /**
  * (no documentation provided)
  *
@@ -1567,7 +1569,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) OperateInfo *lastModifyInfo;
+@property (nonatomic, assign) long long version;
 @end /* interface StandardEntity */
 
 
@@ -1592,7 +1594,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *quantity;
+@property (nonatomic, strong) NSNumber *quantity;
 /**
  * 明细状态
  *
@@ -1709,7 +1711,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *guidancePrice;
+@property (nonatomic, strong) NSNumber *guidancePrice;
 /**
  * 售价
  * <p>
@@ -1742,7 +1744,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *salePrice;
+@property (nonatomic, strong) NSNumber *salePrice;
 /**
  * 生效时间
  *
@@ -1794,7 +1796,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *total;
+@property (nonatomic, strong) NSNumber *total;
 /**
  * 付款凭证
  *
@@ -1836,13 +1838,13 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *qty;
+@property (nonatomic, strong) NSNumber *qty;
 /**
  * 配油金额（元）
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *amount;
+@property (nonatomic, strong) NSNumber *amount;
 /**
  * 配油单号
  *
@@ -1865,20 +1867,6 @@ extern NSString * const POSITIONTYPE_NONE;
 
 
 
-/**
- * (no documentation provided)
- */
-@interface Role : StandardEntity
-/**
- * (no documentation provided)
- *
- *
- */
-@property (nonatomic, copy) NSString *name;
-@end /* interface Role */
-
-
-
 /**
  *  带企业字段的entity
  
@@ -1897,6 +1885,20 @@ extern NSString * const POSITIONTYPE_NONE;
 
 
 
+/**
+ * (no documentation provided)
+ */
+@interface Role : StandardEntity
+/**
+ * (no documentation provided)
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *name;
+@end /* interface Role */
+
+
+
 /**
  * (no documentation provided)
  */
@@ -1925,6 +1927,24 @@ extern NSString * const POSITIONTYPE_NONE;
 
 
 
+/**
+ *  基本单据实体。
+ 
+ @author Debenson
+ @since 0.1
+ 
+ */
+@interface BasicEnterpriseBill2 : EnterpriseEntity2
+/**
+ * 单号
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *billnumber;
+@end /* interface BasicEnterpriseBill2 */
+
+
+
 /**
  *  @author thor
  
@@ -2068,39 +2088,27 @@ extern NSString * const POSITIONTYPE_NONE;
 
 
 /**
- *  基本单据实体。
- 
- @author Debenson
- @since 0.1
- 
+ * (no documentation provided)
  */
-@interface BasicEnterpriseBill2 : EnterpriseEntity2
+@interface Organization : EnterpriseEntity
 /**
- * 单号
+ * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *billnumber;
-@end /* interface BasicEnterpriseBill2 */
-
-
-
-/**
- * (no documentation provided)
- */
-@interface User : EnterpriseEntity
+@property (nonatomic, copy) NSString *contact;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *businessType;
+@property (nonatomic, assign) BOOL isLeaf;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *remark;
+@property (nonatomic, copy) NSString *shortName;
 /**
  * (no documentation provided)
  *
@@ -2112,172 +2120,166 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, copy) NSString *password;
+@property (nonatomic, copy) NSString *orgType;
 /**
  * (no documentation provided)
- * @see Organization
  *
- */
-@property (nonatomic, strong) NSArray<Organization> *organizations;
-/**
- * (no documentation provided)
- * @see Role
  *
  */
-@property (nonatomic, strong) NSArray<Role> *roles;
+@property (nonatomic, copy) NSString *authentication;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *login;
+@property (nonatomic, assign) NSInteger level;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *name;
+@property (nonatomic, strong) Organization *upper;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *email;
+@property (nonatomic, copy) NSString *namePath;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *mobile;
+@property (nonatomic, copy) NSString *attachmentId;
 /**
  * (no documentation provided)
  *
- * 取值: POSITIONTYPE_MANAGER, POSITIONTYPE_INSPECTOR, POSITIONTYPE_STORER, POSITIONTYPE_ENGINEER, POSITIONTYPE_PURCHASEMAN, POSITIONTYPE_PURCHASER, POSITIONTYPE_VENDOR, POSITIONTYPE_NONE,
+ *
  */
-@property (nonatomic, copy) NSString *position;
+@property (nonatomic, copy) NSString *code;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *state;
+@property (nonatomic, copy) NSString *storeType;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, strong) Organization *belongOrg;
+@property (nonatomic, copy) NSString *name;
 /**
  * (no documentation provided)
  *
  *
  */
 @property (nonatomic, copy) NSString *address;
-@end /* interface User */
-
-
-
-/**
- * (no documentation provided)
- */
-@interface Organization : EnterpriseEntity
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, assign) BOOL enabled;
+@property (nonatomic, copy) NSString *path;
 /**
  * (no documentation provided)
  *
  *
  */
 @property (nonatomic, copy) NSString *phone;
+@end /* interface Organization */
+
+
+
+/**
+ * (no documentation provided)
+ */
+@interface User : EnterpriseEntity
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *shortName;
+@property (nonatomic, copy) NSString *state;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *path;
+@property (nonatomic, copy) NSString *businessType;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *orgType;
+@property (nonatomic, strong) Organization *belongOrg;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, assign) NSInteger level;
+@property (nonatomic, copy) NSString *address;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *attachmentId;
+@property (nonatomic, copy) NSString *mobile;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *authentication;
+@property (nonatomic, copy) NSString *remark;
 /**
  * (no documentation provided)
- *
+ * @see Organization
  *
  */
-@property (nonatomic, copy) NSString *address;
+@property (nonatomic, strong) NSArray<Organization> *organizations;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *name;
+@property (nonatomic, copy) NSString *login;
 /**
  * (no documentation provided)
  *
- *
+ * 取值: POSITIONTYPE_MANAGER, POSITIONTYPE_INSPECTOR, POSITIONTYPE_STORER, POSITIONTYPE_ENGINEER, POSITIONTYPE_PURCHASEMAN, POSITIONTYPE_PURCHASER, POSITIONTYPE_VENDOR, POSITIONTYPE_NONE,
  */
-@property (nonatomic, strong) Organization *upper;
+@property (nonatomic, copy) NSString *position;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, assign) BOOL isLeaf;
+@property (nonatomic, copy) NSString *email;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *namePath;
+@property (nonatomic, copy) NSString *password;
 /**
  * (no documentation provided)
- *
+ * @see Role
  *
  */
-@property (nonatomic, copy) NSString *contact;
+@property (nonatomic, strong) NSArray<Role> *roles;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *code;
+@property (nonatomic, copy) NSString *name;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *storeType;
-@end /* interface Organization */
+@property (nonatomic, assign) BOOL enabled;
+@end /* interface User */
 
 
 
@@ -2350,7 +2352,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *quantity;
+@property (nonatomic, strong) NSNumber *quantity;
 /**
  * 油库
  *
@@ -2398,13 +2400,13 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *price;
+@property (nonatomic, strong) NSNumber *price;
 /**
  * 金额
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *total;
+@property (nonatomic, strong) NSNumber *total;
 /**
  * SO单是否已导出
  *
@@ -2524,13 +2526,13 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *billMeasure;
+@property (nonatomic, strong) NSNumber *billMeasure;
 /**
  * 发油公斤数
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *realMeasure;
+@property (nonatomic, strong) NSNumber *realMeasure;
 /**
  * 备注
  *
@@ -2566,19 +2568,19 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *pickFuelDensity;
+@property (nonatomic, strong) NSNumber *pickFuelDensity;
 /**
  * 发油升数
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *pickFuelDensityCapacity;
+@property (nonatomic, strong) NSNumber *pickFuelDensityCapacity;
 /**
  * 损耗升数
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *wasterCapacity;
+@property (nonatomic, strong) NSNumber *wasterCapacity;
 /**
  * 收油营业日期
  *
@@ -2590,7 +2592,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *wasterRate;
+@property (nonatomic, strong) NSNumber *wasterRate;
 /**
  * 承运商
  *
@@ -2602,44 +2604,80 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *price;
+@property (nonatomic, strong) NSNumber *price;
+/**
+ * 合约号
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *contractNumber;
 @end /* interface ReceiveBill */
 
 
 
 /**
- *  提醒对象
+ *  合约日志
  
  @author cyy24
  @since 0.1
  
  */
-@interface Remind : BasicEnterpriseBill2
+@interface ReceiveBillContractLog : BasicEnterpriseBill2
 /**
  * (no documentation provided)
  *
- * 取值: REMINDTYPE_CONTRACTNUMBER,
+ *
  */
-@property (nonatomic, copy) NSString *remindType;
+@property (nonatomic, copy) NSString *contractBillNumber;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *receiver;
+@property (nonatomic, copy) NSString *sourceBillNumber;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *phoneNumber;
+@property (nonatomic, strong) NSNumber *subTotal;
+@end /* interface ReceiveBillContractLog */
+
+
+
+/**
+ *  提醒日志
+ 
+ @author cyy24
+ @since 0.1
+ 
+ */
+@interface RemindLog : BasicEnterpriseBill2
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *email;
-@end /* interface Remind */
+@property (nonatomic, strong) UCN *fueler;
+/**
+ * (no documentation provided)
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *receiverNumber;
+/**
+ * (no documentation provided)
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *context;
+/**
+ * (no documentation provided)
+ *
+ *
+ */
+@property (nonatomic, assign) BOOL result;
+@end /* interface RemindLog */
 
 
 
@@ -2674,38 +2712,38 @@ extern NSString * const POSITIONTYPE_NONE;
 
 
 /**
- *  提醒日志
+ *  提醒对象
  
  @author cyy24
  @since 0.1
  
  */
-@interface RemindLog : BasicEnterpriseBill2
+@interface Remind : BasicEnterpriseBill2
 /**
  * (no documentation provided)
  *
- *
+ * 取值: REMINDTYPE_CONTRACTNUMBER,
  */
-@property (nonatomic, strong) UCN *fueler;
+@property (nonatomic, copy) NSString *remindType;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *receiverNumber;
+@property (nonatomic, copy) NSString *receiver;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *context;
+@property (nonatomic, copy) NSString *phoneNumber;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, assign) BOOL result;
-@end /* interface RemindLog */
+@property (nonatomic, copy) NSString *email;
+@end /* interface Remind */
 
 
 
@@ -2956,7 +2994,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *quantity;
+@property (nonatomic, strong) NSNumber *quantity;
 /**
  * 备注
  *
@@ -2980,7 +3018,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *price;
+@property (nonatomic, strong) NSNumber *price;
 /**
  * 配送区域
  *
@@ -3034,7 +3072,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *price;
+@property (nonatomic, strong) NSNumber *price;
 /**
  * (no documentation provided)
  *
@@ -3094,13 +3132,13 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *reqPrice;
+@property (nonatomic, strong) NSNumber *reqPrice;
 /**
  * 申请数量
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *quantity;
+@property (nonatomic, strong) NSNumber *quantity;
 /**
  * 备注
  *
@@ -3136,7 +3174,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *minQuantity;
+@property (nonatomic, strong) NSNumber *minQuantity;
 @end /* interface ContractNumber */
 
 
@@ -3193,7 +3231,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *total;
+@property (nonatomic, strong) NSNumber *total;
 @end /* interface DepotInv */
 
 
@@ -3256,19 +3294,19 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *price;
+@property (nonatomic, strong) NSNumber *price;
 /**
  * 建仓数量（吨）
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *quantity;
+@property (nonatomic, strong) NSNumber *quantity;
 /**
  * 建仓金额
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *amount;
+@property (nonatomic, strong) NSNumber *amount;
 /**
  * 付款时间范围
  *
@@ -3298,25 +3336,25 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *unpayAmount;
+@property (nonatomic, strong) NSNumber *unpayAmount;
 /**
  * 未增加库存数
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *undepotInv;
+@property (nonatomic, strong) NSNumber *undepotInv;
 /**
  * 已缴纳保证金额
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *payMarginAmount;
+@property (nonatomic, strong) NSNumber *payMarginAmount;
 /**
  * 剩余库存
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *total;
+@property (nonatomic, strong) NSNumber *total;
 @end /* interface DepotBill */
 
 
@@ -3364,19 +3402,19 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *beforeTotal;
+@property (nonatomic, strong) NSNumber *beforeTotal;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *subTotal;
+@property (nonatomic, strong) NSNumber *subTotal;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *nowTotal;
+@property (nonatomic, strong) NSNumber *nowTotal;
 /**
  * (no documentation provided)
  *
@@ -3466,13 +3504,13 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *quantity;
+@property (nonatomic, strong) NSNumber *quantity;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *realQuantity;
+@property (nonatomic, strong) NSNumber *realQuantity;
 /**
  * (no documentation provided)
  *
@@ -3484,7 +3522,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *price;
+@property (nonatomic, strong) NSNumber *price;
 @end /* interface Contract */
 
 

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
 {

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>

total/Total-Prefix.pch

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