Commit e8accc1b authored by 曹云霄's avatar 曹云霄

修改油价接口

parent a3842d2c
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
2995492D1D9E18C200A83F7B /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2995492C1D9E18C200A83F7B /* AppDelegate.swift */; };
2995492F1D9E18C200A83F7B /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2995492E1D9E18C200A83F7B /* ViewController.swift */; };
299549321D9E18C200A83F7B /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 299549301D9E18C200A83F7B /* Main.storyboard */; };
299549341D9E18C200A83F7B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 299549331D9E18C200A83F7B /* Assets.xcassets */; };
299549371D9E18C200A83F7B /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 299549351D9E18C200A83F7B /* LaunchScreen.storyboard */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
299549291D9E18C200A83F7B /* testNew.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testNew.app; sourceTree = BUILT_PRODUCTS_DIR; };
2995492C1D9E18C200A83F7B /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
2995492E1D9E18C200A83F7B /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
299549311D9E18C200A83F7B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
299549331D9E18C200A83F7B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
299549361D9E18C200A83F7B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
299549381D9E18C200A83F7B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
299549261D9E18C200A83F7B /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
299549201D9E18C200A83F7B = {
isa = PBXGroup;
children = (
2995492B1D9E18C200A83F7B /* testNew */,
2995492A1D9E18C200A83F7B /* Products */,
);
sourceTree = "<group>";
};
2995492A1D9E18C200A83F7B /* Products */ = {
isa = PBXGroup;
children = (
299549291D9E18C200A83F7B /* testNew.app */,
);
name = Products;
sourceTree = "<group>";
};
2995492B1D9E18C200A83F7B /* testNew */ = {
isa = PBXGroup;
children = (
2995492C1D9E18C200A83F7B /* AppDelegate.swift */,
2995492E1D9E18C200A83F7B /* ViewController.swift */,
299549301D9E18C200A83F7B /* Main.storyboard */,
299549331D9E18C200A83F7B /* Assets.xcassets */,
299549351D9E18C200A83F7B /* LaunchScreen.storyboard */,
299549381D9E18C200A83F7B /* Info.plist */,
);
path = testNew;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
299549281D9E18C200A83F7B /* testNew */ = {
isa = PBXNativeTarget;
buildConfigurationList = 2995493B1D9E18C200A83F7B /* Build configuration list for PBXNativeTarget "testNew" */;
buildPhases = (
299549251D9E18C200A83F7B /* Sources */,
299549261D9E18C200A83F7B /* Frameworks */,
299549271D9E18C200A83F7B /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = testNew;
productName = testNew;
productReference = 299549291D9E18C200A83F7B /* testNew.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
299549211D9E18C200A83F7B /* Project object */ = {
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0800;
LastUpgradeCheck = 0800;
ORGANIZATIONNAME = "上海勾芒科技有限公司";
TargetAttributes = {
299549281D9E18C200A83F7B = {
CreatedOnToolsVersion = 8.0;
DevelopmentTeam = 6VMCD64Z88;
ProvisioningStyle = Automatic;
};
};
};
buildConfigurationList = 299549241D9E18C200A83F7B /* Build configuration list for PBXProject "testNew" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = 299549201D9E18C200A83F7B;
productRefGroup = 2995492A1D9E18C200A83F7B /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
299549281D9E18C200A83F7B /* testNew */,
);
};
/* End PBXProject section */
/* Begin PBXResourcesBuildPhase section */
299549271D9E18C200A83F7B /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
299549371D9E18C200A83F7B /* LaunchScreen.storyboard in Resources */,
299549341D9E18C200A83F7B /* Assets.xcassets in Resources */,
299549321D9E18C200A83F7B /* Main.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
299549251D9E18C200A83F7B /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
2995492F1D9E18C200A83F7B /* ViewController.swift in Sources */,
2995492D1D9E18C200A83F7B /* AppDelegate.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXVariantGroup section */
299549301D9E18C200A83F7B /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (
299549311D9E18C200A83F7B /* Base */,
);
name = Main.storyboard;
sourceTree = "<group>";
};
299549351D9E18C200A83F7B /* LaunchScreen.storyboard */ = {
isa = PBXVariantGroup;
children = (
299549361D9E18C200A83F7B /* Base */,
);
name = LaunchScreen.storyboard;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
299549391D9E18C200A83F7B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVES = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
name = Debug;
};
2995493A1D9E18C200A83F7B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVES = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
VALIDATE_PRODUCT = YES;
};
name = Release;
};
2995493C1D9E18C200A83F7B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = 6VMCD64Z88;
INFOPLIST_FILE = testNew/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.gomoe.total.testNew;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
2995493D1D9E18C200A83F7B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = 6VMCD64Z88;
INFOPLIST_FILE = testNew/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.gomoe.total.testNew;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
299549241D9E18C200A83F7B /* Build configuration list for PBXProject "testNew" */ = {
isa = XCConfigurationList;
buildConfigurations = (
299549391D9E18C200A83F7B /* Debug */,
2995493A1D9E18C200A83F7B /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
2995493B1D9E18C200A83F7B /* Build configuration list for PBXNativeTarget "testNew" */ = {
isa = XCConfigurationList;
buildConfigurations = (
2995493C1D9E18C200A83F7B /* Debug */,
2995493D1D9E18C200A83F7B /* Release */,
);
defaultConfigurationIsVisible = 0;
};
/* End XCConfigurationList section */
};
rootObject = 299549211D9E18C200A83F7B /* Project object */;
}
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:testNew.xcodeproj">
</FileRef>
</Workspace>
//
// AppDelegate.swift
// testNew
//
// Created by 曹云霄 on 2016/9/30.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
import UIKit
@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
return true
}
func applicationWillResignActive(_ application: UIApplication) {
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
// Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
}
func applicationDidEnterBackground(_ application: UIApplication) {
// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
}
func applicationWillEnterForeground(_ application: UIApplication) {
// Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
}
func applicationDidBecomeActive(_ application: UIApplication) {
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
}
func applicationWillTerminate(_ application: UIApplication) {
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
}
}
{
"images" : [
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11106"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="53" y="375"/>
</scene>
</scenes>
</document>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11106"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="tne-QT-ifu">
<objects>
<viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
</objects>
</scene>
</scenes>
</document>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
</dict>
</plist>
//
// ViewController.swift
// testNew
//
// Created by 曹云霄 on 2016/9/30.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
import UIKit
class ViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
// Do any additional setup after loading the view, typically from a nib.
}
override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
// Dispose of any resources that can be recreated.
}
}
......@@ -3123,8 +3123,8 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_IDENTITY = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
......@@ -3140,7 +3140,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.gomoe.total;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE = "c2d977b5-adac-45f6-bfbb-3a53616b54d7";
SWIFT_OBJC_BRIDGING_HEADER = "total/total-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
TARGETED_DEVICE_FAMILY = 1;
......@@ -3154,8 +3154,8 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_IDENTITY = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
......@@ -3171,7 +3171,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.gomoe.total;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE = "c2d977b5-adac-45f6-bfbb-3a53616b54d7";
SWIFT_OBJC_BRIDGING_HEADER = "total/total-Bridging-Header.h";
TARGETED_DEVICE_FAMILY = 1;
USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
......
......@@ -208,6 +208,7 @@
#pragma mark -获取选择油站下油罐信息
- (void)getUserTankDatas:(NSDictionary *)dict
{
WS(weakSelf);
QueryDefinition2 *condtion = [[QueryDefinition2 alloc]init];
//油站
QueryCondition *query = [[QueryCondition alloc]init];
......@@ -223,7 +224,7 @@
[HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/mdata/gasTank/queryDefinition",HTTP_REST_API_BASE_URL] withRequestType:ZERO withParameter:[condtion toDictionary] withSuccess:^(id returnValue) {
if ([returnValue[@"success"] isEqualToNumber:@1]) {
self.tankResult = [[QueryResult alloc]initWithDictionary:returnValue[@"data"] error:nil];
weakSelf.tankResult = [[QueryResult alloc]initWithDictionary:returnValue[@"data"] error:nil];
} else {
[IBTLoadingView showTextOnly:returnValue[@"message"]];
}
......@@ -236,7 +237,7 @@
#pragma mark -通过UUID获取收油单详情
- (void)getOrderBillDetails
{
__weak typeof(self) weakSelf = self;
WS(weakSelf);
[IBTLoadingView showProgressLabel:@"加载中..."];
[HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/receiveBill/get/%@",HTTP_REST_API_BASE_URL,self.orderUUIDString] withRequestType:ONE withParameter:nil withSuccess:^(id returnValue) {
......@@ -247,16 +248,16 @@
weakSelf.orderStateBoolValue = YES;
}
//加入数据源
self.userInputArray[ONE][ZERO] = weakSelf.orderDetails.truckNo?weakSelf.orderDetails.truckNo:@"";//车牌号
self.userInputArray[ONE][ONE] = weakSelf.orderDetails.carter?weakSelf.orderDetails.carter:@"";//司机
self.userInputArray[ONE][2] = weakSelf.orderDetails.realReceiveTime?weakSelf.orderDetails.realReceiveTime:@"请选择";//实际到油时间
self.userInputArray[ONE][3] = weakSelf.orderDetails.receiveBusinessDate?[[weakSelf.orderDetails.receiveBusinessDate componentsSeparatedByString:@" "] firstObject]:@"请选择";//到油营业时间
self.userInputArray[ONE][4] = weakSelf.orderDetails.serviceNumber;//班次号
self.userInputArray[ONE][5] = [NSString stringWithFormat:@"%.6lf",[weakSelf.orderDetails.realMeasure doubleValue]];//发油公斤数
self.userInputArray[ONE][6] = [NSString stringWithFormat:@"%.6lf",[weakSelf.orderDetails.pickFuelDensity doubleValue]];//发油密度
self.userInputArray[ONE][7] = [NSString stringWithFormat:@"%.6lf",[weakSelf.orderDetails.pickFuelDensityCapacity doubleValue]];//发油升数
self.userInputArray[ONE][8] = [NSString stringWithFormat:@"%.6lf",[weakSelf.orderDetails.wasterCapacity doubleValue]];//损耗升数
self.userInputArray[ONE][9] = weakSelf.orderDetails.remark?weakSelf.orderDetails.remark:@"";//备注;
weakSelf.userInputArray[ONE][ZERO] = weakSelf.orderDetails.truckNo?weakSelf.orderDetails.truckNo:@"";//车牌号
weakSelf.userInputArray[ONE][ONE] = weakSelf.orderDetails.carter?weakSelf.orderDetails.carter:@"";//司机
weakSelf.userInputArray[ONE][2] = weakSelf.orderDetails.realReceiveTime?weakSelf.orderDetails.realReceiveTime:@"请选择";//实际到油时间
weakSelf.userInputArray[ONE][3] = weakSelf.orderDetails.receiveBusinessDate?[[weakSelf.orderDetails.receiveBusinessDate componentsSeparatedByString:@" "] firstObject]:@"请选择";//到油营业时间
weakSelf.userInputArray[ONE][4] = weakSelf.orderDetails.serviceNumber;//班次号
weakSelf.userInputArray[ONE][5] = [NSString stringWithFormat:@"%.6lf",[weakSelf.orderDetails.realMeasure doubleValue]];//发油公斤数
weakSelf.userInputArray[ONE][6] = [NSString stringWithFormat:@"%.6lf",[weakSelf.orderDetails.pickFuelDensity doubleValue]];//发油密度
weakSelf.userInputArray[ONE][7] = [NSString stringWithFormat:@"%.6lf",[weakSelf.orderDetails.pickFuelDensityCapacity doubleValue]];//发油升数
weakSelf.userInputArray[ONE][8] = [NSString stringWithFormat:@"%.6lf",[weakSelf.orderDetails.wasterCapacity doubleValue]];//损耗升数
weakSelf.userInputArray[ONE][9] = weakSelf.orderDetails.remark?weakSelf.orderDetails.remark:@"";//备注;
//默认数据源个数
for (int i=0; i<weakSelf.orderDetails.tankDtls.count; i++) {
NSInteger index = weakSelf.orderStateBoolValue?1:2;//区分收油单状态
......@@ -266,7 +267,7 @@
for (int i=0; i<6; i++) {
[weakSelf.userInputArray[weakSelf.userInputArray.count-2] addObject:@""];
}
if (self.orderStateBoolValue) {//区分收油单状态
if (weakSelf.orderStateBoolValue) {//区分收油单状态
[weakSelf.imageAndTitleArray addObject:weakSelf.oilDatasArray[0]];
} else {
[weakSelf.imageAndTitleArray addObjectsFromArray:weakSelf.oilDatasArray];
......@@ -288,7 +289,6 @@
weakSelf.userInputArray[index][5] = [NSString stringWithFormat:@"%.6lf",[details.measureRealDelivery.quality doubleValue]];
}];
[weakSelf OilOrderDetailsHeaderAndFootView];
__weak typeof(self) weakSelf = self;
[weakSelf getDistributionOrderDetails:returnValue[@"data"][@"pickingBillNumber"] completeBlock:^(PickingBill *orderBill) {
weakSelf.userInputArray[ZERO][ZERO] = orderBill?orderBill:@"";
[weakSelf.seeObtainTableView reloadData];
......
......@@ -92,7 +92,7 @@
#pragma mark -获取配送区域数据、获取行政区域数据
- (void)netWorkRequest
{
__weak typeof(self) weakSelf = self;
WS(weakSelf);
[IBTLoadingView showProgressLabel:@"正在加载..."];
dispatch_queue_t aQueue = dispatch_queue_create("顺序执行", DISPATCH_QUEUE_SERIAL);
//创建1个queue group
......@@ -144,13 +144,29 @@
});
//任务4->获取油价列表/默认加载全部
dispatch_group_async(queueGroup, aQueue, ^{
NSDictionary *queryDictionary = @{@"pageSize" : @0,
NSDictionary *queryDictionary = nil;
if ([[ICRUserUtil sharedInstance].position isEqualToString:@"storer"]) {
queryDictionary = @{@"pageSize" : @0,
@"orders" : @[@{@"field" : @"string",
@"direction" : @"asc"}],
@"conditions" : @[@{
@"operation" : [NSNull null],
@"parameters" : [NSNull null]}],
@"conditions" : @[
@{@"operation":@"userId",
@"parameters":@[[ICRUserUtil sharedInstance].f_user_uuid]
}
],
@"pageNumber" : @0};
}else
{
queryDictionary = @{@"pageSize" : @0,
@"orders" : @[@{@"field" : @"string",
@"direction" : @"asc"}],
@"conditions" : @[
@{@"operation":[NSNull null],
@"parameters":[NSNull null]
}
],
@"pageNumber" : @0};
}
[self getOilPriceDatas:queryDictionary];
});
}
......@@ -158,13 +174,14 @@
#pragma mark -获取油价数据
- (void)getOilPriceDatas:(NSDictionary *)dict
{
WS(weakSelf);
[HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@%@",HTTP_REST_API_BASE_URL,OILPRICE] withRequestType:ZERO withParameter:dict withSuccess:^(id returnValue) {
[IBTLoadingView hideHUDWithText:nil];
if ([returnValue[@"success"] isEqualToNumber:@1]) {
QueryResult *oilPrice = [[QueryResult alloc]initWithDictionary:returnValue[@"data"] error:nil];
self.oilPriceObjec = oilPrice;
[self.seePriceTableview reloadData];
weakSelf.oilPriceObjec = oilPrice;
[weakSelf.seePriceTableview reloadData];
}else {
[IBTLoadingView showTextOnly:returnValue[@"message"]];
}
......@@ -203,6 +220,16 @@
{
cell.backgroundColor = [UIColor whiteColor];
}
//区分是否是油站经理调用
if (self.oilListDatas.count == 1 && [[ICRUserUtil sharedInstance].position isEqualToString:@"storer"]) {
if (indexPath.row == 0) {
cell.distributionAreaContent.text = self.oilListDatas[0][@"deliveryArea"][@"name"];
}
if (indexPath.row == 1) {
cell.distributionAreaContent.text = [NSString stringWithFormat:@"[%@]%@",self.oilListDatas[0][@"area"][@"uuid"],self.oilListDatas[0][@"area"][@"name"]];
}
cell.userInteractionEnabled = NO;
}
return cell;
}
return nil;
......@@ -224,7 +251,7 @@
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
SeePriceTableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
__weak typeof(self) weakSelf = self;
WS(weakSelf);
if (indexPath.row == 0) {
PromptTableViewController *selectArea = [[PromptTableViewController alloc]init];
selectArea.title = @"选择配送区域";
......@@ -243,7 +270,7 @@
}];
IBTUINavigationController *nav = [[IBTUINavigationController alloc]initWithRootViewController:selectArea];
dispatch_async(dispatch_get_main_queue(), ^{
[self presentViewController:nav animated:YES completion:nil];
[weakSelf presentViewController:nav animated:YES completion:nil];
});
}
if (indexPath.row == 1) {
......
......@@ -3,6 +3,82 @@
#import "JSONModel.h"
/**
* 单据状态
*
* @author wsx
*
*/
/**
* 未提交
*/
extern NSString * const BILLSTATE_INITIAL;
/**
* 已提交
*/
extern NSString * const BILLSTATE_SUBMIT;
/**
* 已完成
*/
extern NSString * const BILLSTATE_ACCOMPLISHED;
/**
* 合约状态。
*
* @author Debenson
* @since 0.1
*/
/**
* 增加
*/
extern NSString * const CONTRACTLOGACTIONTYPE_ADD;
/**
* 减少
*/
extern NSString * const CONTRACTLOGACTIONTYPE_SUB;
/**
* 合约状态。
*
* @author Debenson
* @since 0.1
*/
/**
* 配油单
*/
extern NSString * const CONTRACTLOGSOURCETYPE_PICKINGBILL;
/**
* 收油单
*/
extern NSString * const CONTRACTLOGSOURCETYPE_RECEIVEBILL;
/**
* 修改数量类型。
*
* @author Debenson
* @since 0.1
*/
/**
* 账面余额
*/
extern NSString * const CONTRACTLOGQUANTITYTYPE_VIRTUAL;
/**
* 实际余额
*/
extern NSString * const CONTRACTLOGQUANTITYTYPE_REAL;
/**
* 建仓单状态。
*
......@@ -56,31 +132,23 @@ extern NSString * const PAYMETHOD_TRANSFER;
/**
* 申请状态
*
* @author wsx
* 合约状态。
*
* @author Debenson
* @since 0.1
*/
/**
* 未提交
* 保存
*/
extern NSString * const DEPOTREQUESTBILLSTATE_INITIAL;
extern NSString * const CONTRACTSTATE_SAVE;
/**
* 已提交
*/
extern NSString * const DEPOTREQUESTBILLSTATE_SUBMIT;
/**
* 已取消
*/
extern NSString * const DEPOTREQUESTBILLSTATE_CANCELED;
/**
* 已生效
*/
extern NSString * const DEPOTREQUESTBILLSTATE_EFFECTIVED;
extern NSString * const CONTRACTSTATE_SUBMIT;
/**
* 已完成
* 已关闭
*/
extern NSString * const DEPOTREQUESTBILLSTATE_ACCOMPLISHED;
extern NSString * const CONTRACTSTATE_CLOSE;
......@@ -103,6 +171,36 @@ extern NSString * const DEPOTTYPE_SPECIAL;
/**
* 申请状态
*
* @author wsx
*
*/
/**
* 未提交
*/
extern NSString * const DEPOTREQUESTBILLSTATE_INITIAL;
/**
* 已提交
*/
extern NSString * const DEPOTREQUESTBILLSTATE_SUBMIT;
/**
* 已取消
*/
extern NSString * const DEPOTREQUESTBILLSTATE_CANCELED;
/**
* 已生效
*/
extern NSString * const DEPOTREQUESTBILLSTATE_EFFECTIVED;
/**
* 已完成
*/
extern NSString * const DEPOTREQUESTBILLSTATE_ACCOMPLISHED;
/**
* (no documentation provided)
*/
......@@ -176,28 +274,6 @@ extern NSString * const STORESTATE_INVALID;
/**
* 订油单明细状态
*
* @author Debenson
* @since 0.1
*/
/**
* 未配送
*/
extern NSString * const ORDERBILLDTLSTATE_INITIAL;
/**
* 配送中
*/
extern NSString * const ORDERBILLDTLSTATE_SHIPPING;
/**
* 已完成
*/
extern NSString * const ORDERBILLDTLSTATE_ACCOMPLISHED;
/**
* 订油单状态
*
......@@ -255,31 +331,49 @@ extern NSString * const PICKINGBILLSTATE_ACCOMPLISHED;
/**
* 收油单状态。
* 订油单明细状态
*
* @author Debenson
* @since 0.1
*/
/**
* 未导出
* 未配送
*/
extern NSString * const RECEIVEBILLEXPOTSTATE_NOEXPOT;
extern NSString * const ORDERBILLDTLSTATE_INITIAL;
/**
* 已导出库存入库单
* 配送中
*/
extern NSString * const RECEIVEBILLEXPOTSTATE_EXPORTENVIN;
extern NSString * const ORDERBILLDTLSTATE_SHIPPING;
/**
* 已导出销售订单
* 已完成
*/
extern NSString * const RECEIVEBILLEXPOTSTATE_EXPORTSALE;
extern NSString * const ORDERBILLDTLSTATE_ACCOMPLISHED;
/**
* 已导出发货单
* 油价类别。
*
* @author Debenson
* @since 0.1
*/
extern NSString * const RECEIVEBILLEXPOTSTATE_EXPORTPICKING;
/**
* 已导出库存出库单
* 售价
*/
extern NSString * const RECEIVEBILLEXPOTSTATE_EXPORTENVOUT;
extern NSString * const PRICECATEGORY_SALEPRICE;
/**
* 普通建仓批发价
*/
extern NSString * const PRICECATEGORY_GENERALTRADEPRICE;
/**
* 特殊建仓批发价
*/
extern NSString * const PRICECATEGORY_SPECTRADEPRICE;
/**
* 内部配送价
*/
extern NSString * const PRICECATEGORY_INTERALSHIPPINGPRICE;
......@@ -303,27 +397,63 @@ extern NSString * const RECEIVEBILLSTATE_SUBMIT;
/**
* 油价类别
* 收油单状态
*
* @author Debenson
* @since 0.1
*/
/**
* 售价
* 未导出
*/
extern NSString * const PRICECATEGORY_SALEPRICE;
extern NSString * const RECEIVEBILLEXPOTSTATE_NOEXPOT;
/**
* 普通建仓批发价
* 已导出库存入库单
*/
extern NSString * const PRICECATEGORY_GENERALTRADEPRICE;
extern NSString * const RECEIVEBILLEXPOTSTATE_EXPORTENVIN;
/**
* 特殊建仓批发价
* 已导出销售订单
*/
extern NSString * const PRICECATEGORY_SPECTRADEPRICE;
extern NSString * const RECEIVEBILLEXPOTSTATE_EXPORTSALE;
/**
* 内部配送价
* 已导出发货单
*/
extern NSString * const PRICECATEGORY_INTERALSHIPPINGPRICE;
extern NSString * const RECEIVEBILLEXPOTSTATE_EXPORTPICKING;
/**
* 已导出库存出库单
*/
extern NSString * const RECEIVEBILLEXPOTSTATE_EXPORTENVOUT;
/**
* 提醒类型。
*
* @author Debenson
* @since 0.1
*/
/**
* 合约数量
*/
extern NSString * const REMINDTYPE_CONTRACTNUMBER;
/**
* 配油单状态
*
* @author wsx
*
*/
/**
* 已保存
*/
extern NSString * const FUELPRICESTATE_INITIAL;
/**
* 已提交
*/
extern NSString * const FUELPRICESTATE_SUBMIT;
......@@ -378,47 +508,55 @@ extern NSString * const POSITIONTYPE_NONE;
@class QueryResult;
@class QueryDefinition2;
@class DateTimeRange;
@class QueryResultPaging;
@class AreaMap;
@class QueryResultPaging;
@class QueryDefinition;
@class GasMeasureValue;
@class OperateInfo2;
@class RsOperateInfo;
@class POperateInfo;
@class RsOperateInfo;
@class OperateInfo2;
@class Entity;
@class BeanOperateInfo;
@class GasFueler;
@class GasTransInfo;
@class DeliveryArea;
@class Carrier;
@class GasDepot;
@class Area;
@class BasicBillDtl;
@class StandardEntity2;
@class Area;
@class PStandardEntity;
@class GasFueler;
@class GasTransInfo;
@class GasItem;
@class GasTank;
@class StandardEntity;
@class ReceiveTankDtl;
@class OrderBillDtl;
@class FuelPrice;
@class Role;
@class EnterpriseEntity2;
@class ReceiveTankDtl;
@class PEnterpriseEntity;
@class DepotBillPayDtl;
@class OrderBillDtl;
@class DepotPickingDtl;
@class EnterpriseEntity2;
@class Role;
@class DepotBillPayDtl;
@class EnterpriseEntity;
@class Store;
@class BasicEnterpriseBill2;
@class User;
@class Organization;
@class PBasicEnterpriseBill;
@class DepotInv;
@class PickingBill;
@class ReceiveBill;
@class Remind;
@class RemindLog;
@class TotalOption;
@class POBill;
@class OrderBill;
@class CarryInfo;
@class DepotRequestBill;
@class ContractNumber;
@class DepotInv;
@class DepotBill;
@class POBill;
@class ContractLog;
@class Contract;
@protocol BeanOperator @end
@protocol OperateInfo @end
......@@ -431,47 +569,55 @@ extern NSString * const POSITIONTYPE_NONE;
@protocol QueryResult @end
@protocol QueryDefinition2 @end
@protocol DateTimeRange @end
@protocol QueryResultPaging @end
@protocol AreaMap @end
@protocol QueryResultPaging @end
@protocol QueryDefinition @end
@protocol GasMeasureValue @end
@protocol OperateInfo2 @end
@protocol RsOperateInfo @end
@protocol POperateInfo @end
@protocol RsOperateInfo @end
@protocol OperateInfo2 @end
@protocol Entity @end
@protocol BeanOperateInfo @end
@protocol GasFueler @end
@protocol GasTransInfo @end
@protocol DeliveryArea @end
@protocol Carrier @end
@protocol GasDepot @end
@protocol Area @end
@protocol BasicBillDtl @end
@protocol StandardEntity2 @end
@protocol Area @end
@protocol PStandardEntity @end
@protocol GasFueler @end
@protocol GasTransInfo @end
@protocol GasItem @end
@protocol GasTank @end
@protocol StandardEntity @end
@protocol ReceiveTankDtl @end
@protocol OrderBillDtl @end
@protocol FuelPrice @end
@protocol Role @end
@protocol EnterpriseEntity2 @end
@protocol ReceiveTankDtl @end
@protocol PEnterpriseEntity @end
@protocol DepotBillPayDtl @end
@protocol OrderBillDtl @end
@protocol DepotPickingDtl @end
@protocol EnterpriseEntity2 @end
@protocol Role @end
@protocol DepotBillPayDtl @end
@protocol EnterpriseEntity @end
@protocol Store @end
@protocol BasicEnterpriseBill2 @end
@protocol User @end
@protocol Organization @end
@protocol PBasicEnterpriseBill @end
@protocol DepotInv @end
@protocol PickingBill @end
@protocol ReceiveBill @end
@protocol Remind @end
@protocol RemindLog @end
@protocol TotalOption @end
@protocol POBill @end
@protocol OrderBill @end
@protocol CarryInfo @end
@protocol DepotRequestBill @end
@protocol ContractNumber @end
@protocol DepotInv @end
@protocol DepotBill @end
@protocol POBill @end
@protocol ContractLog @end
@protocol Contract @end
/**
......@@ -483,13 +629,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 */
......@@ -529,13 +675,13 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, copy) NSString *fid;
@property (nonatomic, copy) NSString *operName;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *operName;
@property (nonatomic, copy) NSString *fid;
@end /* interface Operator */
......@@ -549,7 +695,7 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, copy) NSString *name;
@property (nonatomic, copy) NSString *code;
/**
* (no documentation provided)
*
......@@ -561,7 +707,7 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, copy) NSString *code;
@property (nonatomic, copy) NSString *name;
@end /* interface UCN */
......@@ -606,16 +752,16 @@ extern NSString * const POSITIONTYPE_NONE;
@interface QueryCondition : JSONModel
/**
* (no documentation provided)
*
* @see NSObject
*
*/
@property (nonatomic, copy) NSString *operation;
@property (nonatomic, strong) NSArray<NSObject> *parameters;
/**
* (no documentation provided)
* @see NSObject
*
*
*/
@property (nonatomic, strong) NSArray<NSObject *> *parameters;
@property (nonatomic, copy) NSString *operation;
/**
* (no documentation provided)
*
......@@ -633,15 +779,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 */
......@@ -655,37 +801,37 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) QueryResultPaging *paging;
@property (nonatomic, assign) NSInteger page;
/**
* (no documentation provided)
* @see NSObject
*
*
*/
@property (nonatomic, strong) NSArray<NSObject> *records;
@property (nonatomic, strong) QueryResultPaging *paging;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) NSInteger pageSize;
@property (nonatomic, assign) NSInteger pageCount;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) NSInteger page;
@property (nonatomic, assign) long long recordCount;
/**
* (no documentation provided)
*
* @see NSObject
*
*/
@property (nonatomic, assign) long long recordCount;
@property (nonatomic, strong) NSArray<NSObject> *records;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) NSInteger pageCount;
@property (nonatomic, assign) NSInteger pageSize;
@end /* interface QueryResult */
......@@ -705,19 +851,19 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, assign) NSInteger pageSize;
@property (nonatomic, assign) NSInteger pageNumber;
/**
* (no documentation provided)
*
* @see QueryOrder
*
*/
@property (nonatomic, assign) NSInteger pageNumber;
@property (nonatomic, strong) NSArray<QueryOrder> *orders;
/**
* (no documentation provided)
* @see QueryOrder
*
*
*/
@property (nonatomic, strong) NSArray<QueryOrder> *orders;
@property (nonatomic, assign) NSInteger pageSize;
@end /* interface QueryDefinition2 */
......@@ -747,21 +893,33 @@ extern NSString * const POSITIONTYPE_NONE;
/**
* (no documentation provided)
* 行政单位树。
@author Debenson
@since 0.1
*/
@interface QueryResultPaging : JSONModel
@interface AreaMap : JSONModel
/**
* (no documentation provided)
* 行政区域
*
*
*/
@property (nonatomic, assign) NSInteger pageSize;
@property (nonatomic, strong) Area *area;
/**
* (no documentation provided)
*
* @see Area
*
*/
@property (nonatomic, assign) long long recordCount;
@property (nonatomic, strong) NSArray<Area> *childrenUnits;
@end /* interface AreaMap */
/**
* (no documentation provided)
*/
@interface QueryResultPaging : JSONModel
/**
* (no documentation provided)
*
......@@ -773,32 +931,20 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, assign) NSInteger pageCount;
@end /* interface QueryResultPaging */
/**
* 行政单位树。
@author Debenson
@since 0.1
*/
@interface AreaMap : JSONModel
@property (nonatomic, assign) NSInteger pageSize;
/**
* 行政区域
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) Area *area;
@property (nonatomic, assign) long long recordCount;
/**
* (no documentation provided)
* @see Area
*
*
*/
@property (nonatomic, strong) NSArray<Area> *childrenUnits;
@end /* interface AreaMap */
@property (nonatomic, assign) NSInteger pageCount;
@end /* interface QueryResultPaging */
......@@ -808,28 +954,28 @@ extern NSString * const POSITIONTYPE_NONE;
@interface QueryDefinition : JSONModel
/**
* (no documentation provided)
* @see QueryOrder
*
*
*/
@property (nonatomic, strong) NSArray<QueryOrder> *orders;
@property (nonatomic, assign) NSInteger limit;
/**
* (no documentation provided)
* @see QueryCondition
* @see QueryOrder
*
*/
@property (nonatomic, strong) NSArray<QueryCondition> *conditions;
@property (nonatomic, strong) NSArray<QueryOrder> *orders;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) NSInteger limit;
@property (nonatomic, assign) NSInteger offset;
/**
* (no documentation provided)
*
* @see QueryCondition
*
*/
@property (nonatomic, assign) NSInteger offset;
@property (nonatomic, strong) NSArray<QueryCondition> *conditions;
@end /* interface QueryDefinition */
......@@ -847,50 +993,46 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *capacity;
@property (nonatomic, strong) NSDecimalNumber *capacity;
/**
* 质量,单位公斤
*
*
*/
@property (nonatomic, strong) NSNumber *quality;
@property (nonatomic, strong) NSDecimalNumber *quality;
/**
* 密度
*
*
*/
@property (nonatomic, strong) NSNumber *density;
@property (nonatomic, strong) NSDecimalNumber *density;
/**
* 标准体积
*
*
*/
@property (nonatomic, strong) NSNumber *volume;
@property (nonatomic, strong) NSDecimalNumber *volume;
@end /* interface GasMeasureValue */
/**
* 操作上下文。
@author Debenson
@since 0.1
* (no documentation provided)
*/
@interface OperateInfo2 : JSONModel
@interface POperateInfo : JSONModel
/**
* 操作时间
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *time;
@property (nonatomic, strong) POperator *operator;
/**
* 操作人信息
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) Operator *operator;
@end /* interface OperateInfo2 */
@property (nonatomic, copy) NSString *time;
@end /* interface POperateInfo */
......@@ -935,22 +1077,26 @@ extern NSString * const POSITIONTYPE_NONE;
/**
* (no documentation provided)
* 操作上下文。
@author Debenson
@since 0.1
*/
@interface POperateInfo : JSONModel
@interface OperateInfo2 : JSONModel
/**
* (no documentation provided)
* 操作时间
*
*
*/
@property (nonatomic, copy) NSString *time;
/**
* (no documentation provided)
* 操作人信息
*
*
*/
@property (nonatomic, strong) POperator *operator;
@end /* interface POperateInfo */
@property (nonatomic, strong) Operator *operator;
@end /* interface OperateInfo2 */
......@@ -977,250 +1123,286 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, copy) NSString *enterprise;
@property (nonatomic, copy) NSString *time;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *time;
@property (nonatomic, strong) BeanOperator *operator;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) BeanOperator *operator;
@property (nonatomic, copy) NSString *enterprise;
@end /* interface BeanOperateInfo */
/**
* 配送区域
* 发油商
@author Debenson
@author cyy24
@since 0.1
*/
@interface DeliveryArea : Entity
@interface GasFueler : Entity
/**
*
* 发油商代
*
*
*/
@property (nonatomic, copy) NSString *code;
/**
* 名称
* 发油商名称
*
*
*/
@property (nonatomic, copy) NSString *name;
@end /* interface DeliveryArea */
@end /* interface GasFueler */
/**
* 油库
* 配油默认信息维护
@author cyy24
@since 0.1
*/
@interface GasDepot : Entity
@interface GasTransInfo : Entity
/**
* 油库代码
* 配油默认信息维护门店信息
*
*
*/
@property (nonatomic, copy) NSString *code;
@property (nonatomic, strong) UCN *store;
/**
* 油库代码
* 配油默认信息维护油品信息
*
*
*/
@property (nonatomic, copy) NSString *name;
@end /* interface GasDepot */
@property (nonatomic, strong) UCN *item;
/**
* 行政区域。
@author wsx
* 配油默认信息维护类型
*
* 取值: TRANSINFOTYPE_SELFSHIPPING, TRANSINFOTYPE_DIRECTSENDING,
*/
@interface Area : Entity
@property (nonatomic, copy) NSString *type;
/**
* 区域编码
* 配油默认信息维护仓库信息
*
*
*/
@property (nonatomic, copy) NSString *code;
@property (nonatomic, strong) UCN *depot;
/**
* 区域名称
* 配油默认信息维护供应商
*
*
*/
@property (nonatomic, copy) NSString *name;
@end /* interface Area */
@property (nonatomic, copy) NSString *provider;
/**
* 配油默认信息维护发油商
*
*
*/
@property (nonatomic, strong) UCN *fueler;
/**
* 配油默认信息维护级别
*
*
*/
@property (nonatomic, assign) NSInteger level;
@end /* interface GasTransInfo */
/**
* 单据明细基类。
* 配送区域
@author Debenson
@since 0.1
*/
@interface BasicBillDtl : Entity
@interface DeliveryArea : Entity
/**
* 行号
* 编码
*
*
*/
@property (nonatomic, assign) NSInteger lineNumber;
@property (nonatomic, copy) NSString *code;
/**
* 创建信息
* 名称
*
*
*/
@property (nonatomic, strong) OperateInfo2 *createInfo;
@end /* interface BasicBillDtl */
@property (nonatomic, copy) NSString *name;
@end /* interface DeliveryArea */
/**
* 标准实体。
@author thor
* 油库
@author cyy24
@since 0.1
*/
@interface StandardEntity2 : Entity
@interface Carrier : Entity
/**
* 版本号
* 油库代码
*
*
*/
@property (nonatomic, assign) long long version;
@property (nonatomic, copy) NSString *code;
/**
* 操作人信息
* 油库代码
*
*
*/
@property (nonatomic, strong) OperateInfo2 *createInfo;
/**
* 最后修改信息
*
*
*/
@property (nonatomic, strong) OperateInfo2 *lastModifyInfo;
@end /* interface StandardEntity2 */
@property (nonatomic, copy) NSString *name;
@end /* interface Carrier */
/**
* (no documentation provided)
* 油库
@author cyy24
@since 0.1
*/
@interface PStandardEntity : PEntity
@interface GasDepot : Entity
/**
* (no documentation provided)
* 油库代码
*
*
*/
@property (nonatomic, strong) POperateInfo *lastModifyInfo;
@property (nonatomic, copy) NSString *code;
/**
* (no documentation provided)
* 油库代码
*
*
*/
@property (nonatomic, strong) POperateInfo *createInfo;
@property (nonatomic, copy) NSString *name;
/**
* (no documentation provided)
* 经度
*
*
*/
@property (nonatomic, assign) long long version;
@end /* interface PStandardEntity */
@property (nonatomic, copy) NSString *longitude;
/**
* 纬度
*
*
*/
@property (nonatomic, copy) NSString *latitude;
@end /* interface GasDepot */
/**
* 发油商
* 单据明细基类。
@author cyy24
@author Debenson
@since 0.1
*/
@interface GasFueler : Entity
@interface BasicBillDtl : Entity
/**
* 发油商代码
* 行号
*
*
*/
@property (nonatomic, copy) NSString *code;
@property (nonatomic, assign) NSInteger lineNumber;
/**
* 发油商名称
* 创建信息
*
*
*/
@property (nonatomic, copy) NSString *name;
@end /* interface GasFueler */
@property (nonatomic, strong) OperateInfo2 *createInfo;
@end /* interface BasicBillDtl */
/**
* 配油默认信息维护
* 标准实体。
@author thor
@author cyy24
@since 0.1
*/
@interface GasTransInfo : Entity
@interface StandardEntity2 : Entity
/**
* 配油默认信息维护门店信息
* 版本号
*
*
*/
@property (nonatomic, strong) UCN *store;
@property (nonatomic, assign) long long version;
/**
* 配油默认信息维护油品信息
* 操作人信息
*
*
*/
@property (nonatomic, strong) UCN *item;
@property (nonatomic, strong) OperateInfo2 *createInfo;
/**
* 配油默认信息维护类型
* 最后修改信息
*
*
* 取值: TRANSINFOTYPE_SELFSHIPPING, TRANSINFOTYPE_DIRECTSENDING,
*/
@property (nonatomic, copy) NSString *type;
@property (nonatomic, strong) OperateInfo2 *lastModifyInfo;
@end /* interface StandardEntity2 */
/**
* 配油默认信息维护仓库信息
* 行政区域。
@author wsx
*/
@interface Area : Entity
/**
* 区域编码
*
*
*/
@property (nonatomic, strong) UCN *depot;
@property (nonatomic, copy) NSString *code;
/**
* 配油默认信息维护供应商
* 区域名称
*
*
*/
@property (nonatomic, copy) NSString *provider;
@property (nonatomic, copy) NSString *name;
@end /* interface Area */
/**
* 配油默认信息维护发油商
* (no documentation provided)
*/
@interface PStandardEntity : PEntity
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) UCN *fueler;
@property (nonatomic, strong) POperateInfo *lastModifyInfo;
/**
* 配油默认信息维护级别
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) NSInteger level;
@end /* interface GasTransInfo */
@property (nonatomic, strong) POperateInfo *createInfo;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) long long version;
@end /* interface PStandardEntity */
......@@ -1311,74 +1493,69 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) OperateInfo *lastModifyInfo;
@property (nonatomic, strong) OperateInfo *createInfo;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) OperateInfo *createInfo;
@property (nonatomic, assign) long long version;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) long long version;
@property (nonatomic, strong) OperateInfo *lastModifyInfo;
@end /* interface StandardEntity */
/**
* 收油单油罐明细
* 订单明细。
@author wsx
@author Debenson
@since 0.1
*/
@interface ReceiveTankDtl : BasicBillDtl
/**
* 油罐
*
*
*/
@property (nonatomic, strong) UCN *tank;
@interface OrderBillDtl : BasicBillDtl
/**
* 卸油前的测液位计量数
* 油品
*
*
*/
@property (nonatomic, strong) GasMeasureValue *measureBeforeUnload;
@property (nonatomic, strong) UCN *item;
/**
* 卸油后的测液位计量数
* 数量
*
*
*/
@property (nonatomic, strong) GasMeasureValue *measureAfterUnload;
@property (nonatomic, strong) NSDecimalNumber *quantity;
/**
* 期间销售计量数
*
* 明细状态
*
* 取值: ORDERBILLDTLSTATE_INITIAL, ORDERBILLDTLSTATE_SHIPPING, ORDERBILLDTLSTATE_ACCOMPLISHED,
*/
@property (nonatomic, strong) GasMeasureValue *measureOnSale;
@property (nonatomic, copy) NSString *state;
/**
* 计算测量值
* 配送单号
*
*
*/
@property (nonatomic, strong) GasMeasureValue *measureCalc;
@property (nonatomic, copy) NSString *pickingBillNumber;
/**
* 配送单计量数
* 配送时间
*
*
*/
@property (nonatomic, strong) GasMeasureValue *measureBill;
@property (nonatomic, copy) NSString *pickedTime;
/**
* 实际配送数
* 要求到油时间
*
*
*/
@property (nonatomic, strong) GasMeasureValue *measureRealDelivery;
@end /* interface ReceiveTankDtl */
@property (nonatomic, copy) NSString *receiveTime;
@end /* interface OrderBillDtl */
......@@ -1393,6 +1570,12 @@ extern NSString * const POSITIONTYPE_NONE;
*/
@interface FuelPrice : StandardEntity2
/**
* 状态
*
* 取值: FUELPRICESTATE_INITIAL, FUELPRICESTATE_SUBMIT,
*/
@property (nonatomic, copy) NSString *state;
/**
* 价格类别
*
......@@ -1410,7 +1593,7 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *guidancePrice;
@property (nonatomic, strong) NSDecimalNumber *guidancePrice;
/**
* 售价
* <p>
......@@ -1443,7 +1626,7 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *salePrice;
@property (nonatomic, strong) NSDecimalNumber *salePrice;
/**
* 生效时间
*
......@@ -1477,34 +1660,56 @@ extern NSString * const POSITIONTYPE_NONE;
/**
* (no documentation provided)
* 收油单油罐明细
@author wsx
*/
@interface Role : StandardEntity
@interface ReceiveTankDtl : BasicBillDtl
/**
* (no documentation provided)
* 油罐
*
*
*/
@property (nonatomic, copy) NSString *name;
@end /* interface Role */
@property (nonatomic, strong) UCN *tank;
/**
* 带企业字段的entity
@author Administrator
* 卸油前的测液位计量数
*
*
*/
@interface EnterpriseEntity2 : StandardEntity2
@property (nonatomic, strong) GasMeasureValue *measureBeforeUnload;
/**
* 企业标识
* 卸油后的测液位计量数
*
*
*/
@property (nonatomic, copy) NSString *enterprise;
@end /* interface EnterpriseEntity2 */
@property (nonatomic, strong) GasMeasureValue *measureAfterUnload;
/**
* 期间销售计量数
*
*
*/
@property (nonatomic, strong) GasMeasureValue *measureOnSale;
/**
* 计算测量值
*
*
*/
@property (nonatomic, strong) GasMeasureValue *measureCalc;
/**
* 配送单计量数
*
*
*/
@property (nonatomic, strong) GasMeasureValue *measureBill;
/**
* 实际配送数
*
*
*/
@property (nonatomic, strong) GasMeasureValue *measureRealDelivery;
@end /* interface ReceiveTankDtl */
......@@ -1523,141 +1728,124 @@ extern NSString * const POSITIONTYPE_NONE;
/**
* 建仓单付款明细
* 配油明细,在建仓单已生效状态下可以被配油处理回写
@author Debenson
@since 0.1
*/
@interface DepotBillPayDtl : BasicBillDtl
@interface DepotPickingDtl : BasicBillDtl
/**
* 付款方式
* 配油数量(吨)
*
*
* 取值: PAYMETHOD_CASH, PAYMETHOD_CHEQUE, PAYMETHOD_TRANSFER,
*/
@property (nonatomic, copy) NSString *payMethod;
@property (nonatomic, strong) NSDecimalNumber *qty;
/**
* 付款金额
* 配油金额(元)
*
*
*/
@property (nonatomic, strong) NSNumber *total;
@property (nonatomic, strong) NSDecimalNumber *amount;
/**
* 付款凭证
* 配油单号
*
*
*/
@property (nonatomic, copy) NSString *payTicket;
@property (nonatomic, copy) NSString *pickingBillNumber;
/**
* 付款时间
* 配油时间
*
*
*/
@property (nonatomic, copy) NSString *payTime;
@property (nonatomic, copy) NSString *pickingTime;
/**
* 备注
*
*
*/
@property (nonatomic, copy) NSString *remark;
/**
* 是否已生效
*
*
*/
@property (nonatomic, assign) BOOL effectived;
@end /* interface DepotBillPayDtl */
@end /* interface DepotPickingDtl */
/**
* 订单明细。
* 带企业字段的entity
@author Administrator
@author wsx
@author Debenson
@since 0.1
*/
@interface OrderBillDtl : BasicBillDtl
@interface EnterpriseEntity2 : StandardEntity2
/**
* 油品
*
*
*/
@property (nonatomic, strong) UCN *item;
/**
* 数量
*
*
*/
@property (nonatomic, strong) NSNumber *quantity;
/**
* 明细状态
*
* 取值: ORDERBILLDTLSTATE_INITIAL, ORDERBILLDTLSTATE_SHIPPING, ORDERBILLDTLSTATE_ACCOMPLISHED,
*/
@property (nonatomic, copy) NSString *state;
/**
* 配送单号
* 企业标识
*
*
*/
@property (nonatomic, copy) NSString *pickingBillNumber;
@property (nonatomic, copy) NSString *enterprise;
@end /* interface EnterpriseEntity2 */
/**
* 配送时间
*
*
* (no documentation provided)
*/
@property (nonatomic, copy) NSString *pickedTime;
@interface Role : StandardEntity
/**
* 要求到油时间
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *receiveTime;
@end /* interface OrderBillDtl */
@property (nonatomic, copy) NSString *name;
@end /* interface Role */
/**
* 配油明细,在建仓单已生效状态下可以被配油处理回写
* 建仓单付款明细
@author Debenson
@since 0.1
*/
@interface DepotPickingDtl : BasicBillDtl
@interface DepotBillPayDtl : BasicBillDtl
/**
* 配油数量(吨)
*
* 付款方式
*
* 取值: PAYMETHOD_CASH, PAYMETHOD_CHEQUE, PAYMETHOD_TRANSFER,
*/
@property (nonatomic, strong) NSNumber *qty;
@property (nonatomic, copy) NSString *payMethod;
/**
* 配油金额(元)
* 付款金额
*
*
*/
@property (nonatomic, strong) NSNumber *amount;
@property (nonatomic, strong) NSDecimalNumber *total;
/**
* 配油单号
* 付款凭证
*
*
*/
@property (nonatomic, copy) NSString *pickingBillNumber;
@property (nonatomic, copy) NSString *payTicket;
/**
* 配油时间
* 付款时间
*
*
*/
@property (nonatomic, copy) NSString *pickingTime;
@property (nonatomic, copy) NSString *payTime;
/**
* 备注
*
*
*/
@property (nonatomic, copy) NSString *remark;
@end /* interface DepotPickingDtl */
/**
* 是否已生效
*
*
*/
@property (nonatomic, assign) BOOL effectived;
@end /* interface DepotBillPayDtl */
......@@ -1801,6 +1989,18 @@ extern NSString * const POSITIONTYPE_NONE;
*
*/
@property (nonatomic, copy) NSString *factory;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) NSInteger days;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) NSInteger hours;
@end /* interface Store */
......@@ -1832,13 +2032,13 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, copy) NSString *address;
@property (nonatomic, copy) NSString *state;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *state;
@property (nonatomic, strong) Organization *belongOrg;
/**
* (no documentation provided)
*
......@@ -1847,10 +2047,10 @@ extern NSString * const POSITIONTYPE_NONE;
@property (nonatomic, copy) NSString *businessType;
/**
* (no documentation provided)
* @see Organization
*
*
*/
@property (nonatomic, strong) NSArray<Organization> *organizations;
@property (nonatomic, copy) NSString *name;
/**
* (no documentation provided)
*
......@@ -1862,55 +2062,55 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, copy) NSString *email;
@property (nonatomic, copy) NSString *password;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) BOOL enabled;
@property (nonatomic, copy) NSString *address;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *mobile;
@property (nonatomic, copy) NSString *remark;
/**
* (no documentation provided)
*
*
* 取值: POSITIONTYPE_MANAGER, POSITIONTYPE_INSPECTOR, POSITIONTYPE_STORER, POSITIONTYPE_ENGINEER, POSITIONTYPE_PURCHASEMAN, POSITIONTYPE_PURCHASER, POSITIONTYPE_VENDOR, POSITIONTYPE_NONE,
*/
@property (nonatomic, copy) NSString *password;
@property (nonatomic, copy) NSString *position;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *name;
@property (nonatomic, copy) NSString *mobile;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) Organization *belongOrg;
@property (nonatomic, copy) NSString *email;
/**
* (no documentation provided)
*
* @see Role
*
*/
@property (nonatomic, copy) NSString *remark;
@property (nonatomic, strong) NSArray<Role> *roles;
/**
* (no documentation provided)
* @see Organization
*
* 取值: POSITIONTYPE_MANAGER, POSITIONTYPE_INSPECTOR, POSITIONTYPE_STORER, POSITIONTYPE_ENGINEER, POSITIONTYPE_PURCHASEMAN, POSITIONTYPE_PURCHASER, POSITIONTYPE_VENDOR, POSITIONTYPE_NONE,
*/
@property (nonatomic, copy) NSString *position;
@property (nonatomic, strong) NSArray<Organization> *organizations;
/**
* (no documentation provided)
* @see Role
*
*
*/
@property (nonatomic, strong) NSArray<Role> *roles;
@property (nonatomic, assign) BOOL enabled;
@end /* interface User */
......@@ -1924,97 +2124,97 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, copy) NSString *contact;
@property (nonatomic, copy) NSString *orgType;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *authentication;
@property (nonatomic, copy) NSString *shortName;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) BOOL isLeaf;
@property (nonatomic, copy) NSString *name;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *path;
@property (nonatomic, assign) BOOL enabled;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) NSInteger level;
@property (nonatomic, assign) BOOL isLeaf;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *address;
@property (nonatomic, copy) NSString *contact;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *storeType;
@property (nonatomic, copy) NSString *attachmentId;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *phone;
@property (nonatomic, copy) NSString *storeType;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) Organization *upper;
@property (nonatomic, copy) NSString *address;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *shortName;
@property (nonatomic, strong) Organization *upper;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *orgType;
@property (nonatomic, copy) NSString *authentication;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) BOOL enabled;
@property (nonatomic, copy) NSString *namePath;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *name;
@property (nonatomic, copy) NSString *phone;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *namePath;
@property (nonatomic, copy) NSString *code;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *code;
@property (nonatomic, copy) NSString *path;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *attachmentId;
@property (nonatomic, assign) NSInteger level;
@end /* interface Organization */
......@@ -2033,63 +2233,6 @@ extern NSString * const POSITIONTYPE_NONE;
/**
* 建仓单。
<p>
建仓单来源于建仓申请单。
@author Debenson
@since 0.1
*/
@interface DepotInv : BasicEnterpriseBill2
/**
* (no documentation provided)
*
* 取值: DEPOTTYPE_GENERAL, DEPOTTYPE_SPECIAL,
*/
@property (nonatomic, copy) NSString *type;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *depotBillUuid;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *depotBillNumber;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) UCN *org;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) UCN *item;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) DateTimeRange *deliveryTime;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) NSNumber *total;
@end /* interface DepotInv */
/**
* 配油单。
......@@ -2105,7 +2248,7 @@ extern NSString * const POSITIONTYPE_NONE;
*/
@property (nonatomic, strong) UCN *org;
/**
* 来订单,保存时只设置uuid字段即可,其它字段可不传。
* 来���订单,保存时只设置uuid字段即可,其它字段可不传。
*
*
*/
......@@ -2145,7 +2288,7 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *quantity;
@property (nonatomic, strong) NSDecimalNumber *quantity;
/**
* 油库
*
......@@ -2193,19 +2336,31 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *price;
@property (nonatomic, strong) NSDecimalNumber *price;
/**
* 金额
*
*
*/
@property (nonatomic, strong) NSNumber *total;
@property (nonatomic, strong) NSDecimalNumber *total;
/**
* 是否已导出
* SO单是否已导出
*
*
*/
@property (nonatomic, copy) NSString *expotState;
/**
* Excel是否已导出
*
*
*/
@property (nonatomic, copy) NSString *excelState;
/**
* 承运商信息
*
*
*/
@property (nonatomic, strong) UCN *carrier;
@end /* interface PickingBill */
......@@ -2307,13 +2462,13 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *billMeasure;
@property (nonatomic, strong) NSDecimalNumber *billMeasure;
/**
* 发油公斤数
*
*
*/
@property (nonatomic, strong) NSNumber *realMeasure;
@property (nonatomic, strong) NSDecimalNumber *realMeasure;
/**
* 备注
*
......@@ -2349,97 +2504,481 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *pickFuelDensity;
@property (nonatomic, strong) NSDecimalNumber *pickFuelDensity;
/**
* 发油升数
*
*
*/
@property (nonatomic, strong) NSNumber *pickFuelDensityCapacity;
@property (nonatomic, strong) NSDecimalNumber *pickFuelDensityCapacity;
/**
* 损耗升数
*
*
*/
@property (nonatomic, strong) NSNumber *wasterCapacity;
@property (nonatomic, strong) NSDecimalNumber *wasterCapacity;
/**
* 收油营业日期
*
*
*/
@property (nonatomic, copy) NSString *receiveBusinessDate;
@end /* interface ReceiveBill */
/**
* 订油单。
@author wsx
@since 0.1
*/
@interface OrderBill : BasicEnterpriseBill2
/**
* 所属业主公司
*
* 损耗率
*
*/
@property (nonatomic, strong) UCN *org;
/**
* 状态
*
* 取值: ORDERBILLSTATE_INITIAL, ORDERBILLSTATE_SUBMIT, ORDERBILLSTATE_CANCELED, ORDERBILLSTATE_SHIPPING, ORDERBILLSTATE_SHIPPED, ORDERBILLSTATE_ACCOMPLISHED,
*/
@property (nonatomic, copy) NSString *state;
@property (nonatomic, strong) NSDecimalNumber *wasterRate;
/**
* 油站
* 承运商
*
*
*/
@property (nonatomic, strong) UCN *store;
@property (nonatomic, strong) UCN *carrier;
/**
* 申请数量
* 单价
*
*
*/
@property (nonatomic, strong) NSNumber *quantity;
@property (nonatomic, strong) NSDecimalNumber *price;
@end /* interface ReceiveBill */
/**
* 备注
*
*
* 提醒对象
@author cyy24
@since 0.1
*/
@property (nonatomic, copy) NSString *remark;
@interface Remind : BasicEnterpriseBill2
/**
* 订单明细
* @see OrderBillDtl
* (no documentation provided)
*
* 取值: REMINDTYPE_CONTRACTNUMBER,
*/
@property (nonatomic, strong) NSArray<OrderBillDtl> *dtls;
@property (nonatomic, copy) NSString *remindType;
/**
* 经营方式
* (no documentation provided)
*
*
* 取值: OPERATINGTYPE_SELFSUPPORT, OPERATINGTYPE_LEAGUE,
*/
@property (nonatomic, copy) NSString *operatingType;
@property (nonatomic, copy) NSString *receiver;
/**
* 价格
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) NSNumber *price;
@property (nonatomic, copy) NSString *phoneNumber;
/**
* 配送区域
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) UCN *deliveryArea;
@end /* interface OrderBill */
@property (nonatomic, copy) NSString *email;
@end /* interface Remind */
/**
* 建仓申请单。
* 提醒日志
@author cyy24
@since 0.1
*/
@interface RemindLog : BasicEnterpriseBill2
/**
* (no documentation provided)
*
*
*/
@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 */
/**
* 全局参数
@author cyy24
@since 0.1
*/
@interface TotalOption : BasicEnterpriseBill2
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *optionKey;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *optionValue;
@end /* interface TotalOption */
/**
* PO单。
@author Debenson
@since 0.1
*/
@interface POBill : PBasicEnterpriseBill
/**
* 状态
*
*
*/
@property (nonatomic, copy) NSString *state;
/**
* 订单类型
*
*
*/
@property (nonatomic, copy) NSString *billType;
/**
* 采购订单日期
*
*
*/
@property (nonatomic, copy) NSString *buyBillTime;
/**
* 供应商
*
*
*/
@property (nonatomic, copy) NSString *provider;
/**
* 采购组织
*
*
*/
@property (nonatomic, copy) NSString *buyOrg;
/**
* 采购组
*
*
*/
@property (nonatomic, copy) NSString *buyGroup;
/**
* 公司代码
*
*
*/
@property (nonatomic, copy) NSString *org;
/**
* 客户采购订单编号
*
*
*/
@property (nonatomic, copy) NSString *storeBuyBillCode;
/**
* 采购合约
*
*
*/
@property (nonatomic, copy) NSString *buyContract;
/**
* 采购合约行项目
*
*
*/
@property (nonatomic, copy) NSString *buyContractRowProject;
/**
* 科目分配类别
*
*
*/
@property (nonatomic, copy) NSString *projectPickType;
/**
* 物料
*
*
*/
@property (nonatomic, copy) NSString *materiel;
/**
* 短文本
*
*
*/
@property (nonatomic, copy) NSString *shortText;
/**
* 采购订单数量
*
*
*/
@property (nonatomic, copy) NSString *buyBillQuantity;
/**
* 基本计量单位
*
*
*/
@property (nonatomic, copy) NSString *basicUtils;
/**
* 净价
*
*
*/
@property (nonatomic, copy) NSString *netPrice;
/**
* 货币
*
*
*/
@property (nonatomic, copy) NSString *currency;
/**
* 物料组
*
*
*/
@property (nonatomic, copy) NSString *materielGroup;
/**
* 工厂
*
*
*/
@property (nonatomic, copy) NSString *factory;
/**
* 订单
*
*
*/
@property (nonatomic, copy) NSString *orderBill;
/**
* 资产
*
*
*/
@property (nonatomic, copy) NSString *asset;
/**
* 次级编号
*
*
*/
@property (nonatomic, copy) NSString *secondaryCode;
/**
* 需求跟踪号
*
*
*/
@property (nonatomic, copy) NSString *needFollowingBill;
/**
* 货物收据标识
*
*
*/
@property (nonatomic, copy) NSString *goodsReceiveSign;
/**
* SLED的期间标识
*
*
*/
@property (nonatomic, copy) NSString *SLEDSign;
/**
* 物料开票周期
*
*
*/
@property (nonatomic, copy) NSString *materielTicketCycle;
/**
* 总账账目
*
*
*/
@property (nonatomic, copy) NSString *generalLedgerAccounts;
/**
* 成本中心
*
*
*/
@property (nonatomic, copy) NSString *costCenter;
/**
* 交货日期
*
*
*/
@property (nonatomic, copy) NSString *deliveryTime;
/**
* 框架协议
*
*
*/
@property (nonatomic, copy) NSString *frameContract;
/**
* 主要协议项目
*
*
*/
@property (nonatomic, copy) NSString *mainContractProject;
/**
* 采购凭证
*
*
*/
@property (nonatomic, copy) NSString *buyEvidence;
/**
* 项目
*
*
*/
@property (nonatomic, copy) NSString *project;
/**
* 消息
*
*
*/
@property (nonatomic, copy) NSString *fnews;
@end /* interface POBill */
/**
* 订油单。
@author wsx
@since 0.1
*/
@interface OrderBill : BasicEnterpriseBill2
/**
* 所属业主公司
*
*
*/
@property (nonatomic, strong) UCN *org;
/**
* 状态
*
* 取值: ORDERBILLSTATE_INITIAL, ORDERBILLSTATE_SUBMIT, ORDERBILLSTATE_CANCELED, ORDERBILLSTATE_SHIPPING, ORDERBILLSTATE_SHIPPED, ORDERBILLSTATE_ACCOMPLISHED,
*/
@property (nonatomic, copy) NSString *state;
/**
* 油站
*
*
*/
@property (nonatomic, strong) UCN *store;
/**
* 申请数量
*
*
*/
@property (nonatomic, strong) NSDecimalNumber *quantity;
/**
* 备注
*
*
*/
@property (nonatomic, copy) NSString *remark;
/**
* 订单明细
* @see OrderBillDtl
*
*/
@property (nonatomic, strong) NSArray<OrderBillDtl> *dtls;
/**
* 经营方式
*
* 取值: OPERATINGTYPE_SELFSUPPORT, OPERATINGTYPE_LEAGUE,
*/
@property (nonatomic, copy) NSString *operatingType;
/**
* 价格
*
*
*/
@property (nonatomic, strong) NSDecimalNumber *price;
/**
* 配送区域
*
*
*/
@property (nonatomic, strong) UCN *deliveryArea;
@end /* interface OrderBill */
/**
* 承运信息
@author cyy24
@since 0.1
*/
@interface CarryInfo : BasicEnterpriseBill2
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) UCN *depot;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) UCN *store;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) UCN *fueler;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) UCN *item;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) UCN *carrier;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) NSDecimalNumber *price;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) NSInteger level;
@end /* interface CarryInfo */
/**
* 建仓申请单。
@author wsx
@since 0.1
......@@ -2487,13 +3026,13 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *reqPrice;
@property (nonatomic, strong) NSDecimalNumber *reqPrice;
/**
* 申请数量
*
*
*/
@property (nonatomic, strong) NSNumber *quantity;
@property (nonatomic, strong) NSDecimalNumber *quantity;
/**
* 备注
*
......@@ -2504,6 +3043,93 @@ extern NSString * const POSITIONTYPE_NONE;
/**
* 合约
@author cyy24
@since 0.1
*/
@interface ContractNumber : BasicEnterpriseBill2
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) UCN *fueler;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) UCN *deliveryArea;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) NSDecimalNumber *minQuantity;
@end /* interface ContractNumber */
/**
* 建仓单。
<p>
建仓单来源于建仓申请单。
@author Debenson
@since 0.1
*/
@interface DepotInv : BasicEnterpriseBill2
/**
* (no documentation provided)
*
* 取值: DEPOTTYPE_GENERAL, DEPOTTYPE_SPECIAL,
*/
@property (nonatomic, copy) NSString *type;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *depotBillUuid;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *depotBillNumber;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) UCN *org;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) UCN *item;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) DateTimeRange *deliveryTime;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) NSDecimalNumber *total;
@end /* interface DepotInv */
/**
* 建仓单。
......@@ -2562,19 +3188,19 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *price;
@property (nonatomic, strong) NSDecimalNumber *price;
/**
* 建仓数量(吨)
*
*
*/
@property (nonatomic, strong) NSNumber *quantity;
@property (nonatomic, strong) NSDecimalNumber *quantity;
/**
* 建仓金额
*
*
*/
@property (nonatomic, strong) NSNumber *amount;
@property (nonatomic, strong) NSDecimalNumber *amount;
/**
* 付款时间范围
*
......@@ -2604,241 +3230,187 @@ extern NSString * const POSITIONTYPE_NONE;
*
*
*/
@property (nonatomic, strong) NSNumber *unpayAmount;
@property (nonatomic, strong) NSDecimalNumber *unpayAmount;
/**
* 未增加库存数
*
*
*/
@property (nonatomic, strong) NSNumber *undepotInv;
@property (nonatomic, strong) NSDecimalNumber *undepotInv;
/**
* 已缴纳保证金额
*
*
*/
@property (nonatomic, strong) NSNumber *payMarginAmount;
@property (nonatomic, strong) NSDecimalNumber *payMarginAmount;
/**
* 剩余库存
*
*
*/
@property (nonatomic, strong) NSNumber *total;
@property (nonatomic, strong) NSDecimalNumber *total;
@end /* interface DepotBill */
/**
* PO单。
* 合约日志
@author Debenson
@author cyy24
@since 0.1
*/
@interface POBill : PBasicEnterpriseBill
/**
* 状态
*
*
*/
@property (nonatomic, copy) NSString *state;
/**
* 订单类型
*
*
*/
@property (nonatomic, copy) NSString *billType;
/**
* 采购订单日期
*
*
*/
@property (nonatomic, copy) NSString *buyBillTime;
/**
* 供应商
*
*
*/
@property (nonatomic, copy) NSString *provider;
/**
* 采购组织
*
*
*/
@property (nonatomic, copy) NSString *buyOrg;
/**
* 采购组
*
*
*/
@property (nonatomic, copy) NSString *buyGroup;
/**
* 公司代码
*
*
*/
@property (nonatomic, copy) NSString *org;
/**
* 客户采购订单编号
*
*
*/
@property (nonatomic, copy) NSString *storeBuyBillCode;
/**
* 采购合约
*
*
*/
@property (nonatomic, copy) NSString *buyContract;
/**
* 采购合约行项目
*
*
*/
@property (nonatomic, copy) NSString *buyContractRowProject;
@interface ContractLog : BasicEnterpriseBill2
/**
* 科目分配类别
*
* (no documentation provided)
*
* 取值: CONTRACTLOGACTIONTYPE_ADD, CONTRACTLOGACTIONTYPE_SUB,
*/
@property (nonatomic, copy) NSString *projectPickType;
@property (nonatomic, copy) NSString *actionType;
/**
* 物料
*
* (no documentation provided)
*
* 取值: CONTRACTLOGQUANTITYTYPE_VIRTUAL, CONTRACTLOGQUANTITYTYPE_REAL,
*/
@property (nonatomic, copy) NSString *materiel;
@property (nonatomic, copy) NSString *quantityType;
/**
* 短文本
*
* (no documentation provided)
*
* 取值: CONTRACTLOGSOURCETYPE_PICKINGBILL, CONTRACTLOGSOURCETYPE_RECEIVEBILL,
*/
@property (nonatomic, copy) NSString *shortText;
@property (nonatomic, copy) NSString *sourceType;
/**
* 采购订单数量
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *buyBillQuantity;
@property (nonatomic, copy) NSString *contractBillNumber;
/**
* 基本计量单位
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *basicUtils;
@property (nonatomic, copy) NSString *sourceBillNumber;
/**
* 净价
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *netPrice;
@property (nonatomic, strong) NSDecimalNumber *beforeTotal;
/**
* 货币
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *currency;
@property (nonatomic, strong) NSDecimalNumber *subTotal;
/**
* 物料组
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *materielGroup;
@property (nonatomic, strong) NSDecimalNumber *nowTotal;
/**
* 工厂
*
* (no documentation provided)
*
* 取值: BILLSTATE_INITIAL, BILLSTATE_SUBMIT, BILLSTATE_ACCOMPLISHED,
*/
@property (nonatomic, copy) NSString *factory;
@property (nonatomic, copy) NSString *billState;
/**
* 订单
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *orderBill;
@property (nonatomic, strong) UCN *store;
/**
* 资产
*
* (no documentation provided)
*
* 取值: OPERATINGTYPE_SELFSUPPORT, OPERATINGTYPE_LEAGUE,
*/
@property (nonatomic, copy) NSString *asset;
@property (nonatomic, copy) NSString *operatingType;
/**
* 次级编号
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *secondaryCode;
@property (nonatomic, strong) UCN *item;
/**
* 需求跟踪号
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *needFollowingBill;
@property (nonatomic, strong) UCN *depot;
/**
* 货物收据标识
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *goodsReceiveSign;
@property (nonatomic, copy) NSString *provider;
/**
* SLED的期间标识
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *SLEDSign;
@property (nonatomic, strong) UCN *fueler;
/**
* 物料开票周期
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *materielTicketCycle;
@property (nonatomic, strong) UCN *carrier;
@end /* interface ContractLog */
/**
* 总账账目
*
*
* 合约
@author cyy24
@since 0.1
*/
@property (nonatomic, copy) NSString *generalLedgerAccounts;
@interface Contract : BasicEnterpriseBill2
/**
* 成本中心
*
* (no documentation provided)
*
* 取值: CONTRACTSTATE_SAVE, CONTRACTSTATE_SUBMIT, CONTRACTSTATE_CLOSE,
*/
@property (nonatomic, copy) NSString *costCenter;
@property (nonatomic, copy) NSString *state;
/**
* 交货日期
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *deliveryTime;
@property (nonatomic, strong) UCN *fueler;
/**
* 框架协议
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *frameContract;
@property (nonatomic, strong) UCN *deliveryArea;
/**
* 主要协议项目
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *mainContractProject;
@property (nonatomic, strong) UCN *item;
/**
* 采购凭证
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *buyEvidence;
@property (nonatomic, strong) NSDecimalNumber *quantity;
/**
* 项目
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *project;
@property (nonatomic, strong) NSDecimalNumber *realQuantity;
/**
* 消息
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *fnews;
@end /* interface POBill */
@property (nonatomic, assign) NSInteger level;
@end /* interface Contract */
......@@ -2,8 +2,8 @@
#import "total_objc_json_client.h"
@implementation BeanOperator
@synthesize operName;
@synthesize operId;
@synthesize operName;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -27,8 +27,8 @@
@end
@implementation Operator
@synthesize fid;
@synthesize operName;
@synthesize fid;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -47,9 +47,9 @@
@end
@implementation UCN
@synthesize name;
@synthesize uuid;
@synthesize code;
@synthesize uuid;
@synthesize name;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -91,8 +91,8 @@
@end
@implementation QueryCondition
@synthesize operation;
@synthesize parameters;
@synthesize operation;
@synthesize parameter;
+(BOOL)propertyIsOptional:(NSString*)propertyName
......@@ -104,8 +104,8 @@
@end
@implementation QueryOrder
@synthesize direction;
@synthesize field;
@synthesize direction;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -116,12 +116,12 @@
@end
@implementation QueryResult
@synthesize page;
@synthesize paging;
@synthesize pageCount;
@synthesize recordCount;
@synthesize records;
@synthesize pageSize;
@synthesize page;
@synthesize recordCount;
@synthesize pageCount;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -133,9 +133,9 @@
@implementation QueryDefinition2
@synthesize conditions;
@synthesize pageSize;
@synthesize pageNumber;
@synthesize orders;
@synthesize pageSize;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -157,19 +157,22 @@
@end
@implementation QueryResultPaging
@synthesize pageSize;
@synthesize recordCount;
@synthesize page;
@synthesize pageCount;
NSString * const BILLSTATE_INITIAL = @"initial";
NSString * const BILLSTATE_SUBMIT = @"submit";
NSString * const BILLSTATE_ACCOMPLISHED = @"accomplished";
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
NSString * const CONTRACTLOGACTIONTYPE_ADD = @"add";
NSString * const CONTRACTLOGACTIONTYPE_SUB = @"sub";
NSString * const CONTRACTLOGSOURCETYPE_PICKINGBILL = @"pickingbill";
NSString * const CONTRACTLOGSOURCETYPE_RECEIVEBILL = @"receivebill";
NSString * const CONTRACTLOGQUANTITYTYPE_VIRTUAL = @"virtual";
NSString * const CONTRACTLOGQUANTITYTYPE_REAL = @"real";
@end
NSString * const DEPOTBILLSTATE_INITIAL = @"initial";
NSString * const DEPOTBILLSTATE_SUBMIT = @"submit";
......@@ -183,11 +186,9 @@ NSString * const PAYMETHOD_CHEQUE = @"cheque";
NSString * const PAYMETHOD_TRANSFER = @"transfer";
NSString * const DEPOTREQUESTBILLSTATE_INITIAL = @"initial";
NSString * const DEPOTREQUESTBILLSTATE_SUBMIT = @"submit";
NSString * const DEPOTREQUESTBILLSTATE_CANCELED = @"canceled";
NSString * const DEPOTREQUESTBILLSTATE_EFFECTIVED = @"effectived";
NSString * const DEPOTREQUESTBILLSTATE_ACCOMPLISHED = @"accomplished";
NSString * const CONTRACTSTATE_SAVE = @"save";
NSString * const CONTRACTSTATE_SUBMIT = @"submit";
NSString * const CONTRACTSTATE_CLOSE = @"close";
NSString * const DEPOTTYPE_GENERAL = @"general";
......@@ -204,6 +205,27 @@ NSString * const DEPOTTYPE_SPECIAL = @"special";
}
@end
NSString * const DEPOTREQUESTBILLSTATE_INITIAL = @"initial";
NSString * const DEPOTREQUESTBILLSTATE_SUBMIT = @"submit";
NSString * const DEPOTREQUESTBILLSTATE_CANCELED = @"canceled";
NSString * const DEPOTREQUESTBILLSTATE_EFFECTIVED = @"effectived";
NSString * const DEPOTREQUESTBILLSTATE_ACCOMPLISHED = @"accomplished";
@implementation QueryResultPaging
@synthesize page;
@synthesize pageSize;
@synthesize recordCount;
@synthesize pageCount;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end
NSString * const QUERYORDERDIRECTION_ASC = @"asc";
......@@ -224,10 +246,10 @@ NSString * const STORESTATE_INVALID = @"invalid";
@implementation QueryDefinition
@synthesize orders;
@synthesize conditions;
@synthesize limit;
@synthesize orders;
@synthesize offset;
@synthesize conditions;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -237,11 +259,6 @@ NSString * const STORESTATE_INVALID = @"invalid";
@end
NSString * const ORDERBILLDTLSTATE_INITIAL = @"initial";
NSString * const ORDERBILLDTLSTATE_SHIPPING = @"shipping";
NSString * const ORDERBILLDTLSTATE_ACCOMPLISHED = @"accomplished";
NSString * const ORDERBILLSTATE_INITIAL = @"initial";
NSString * const ORDERBILLSTATE_SUBMIT = @"submit";
NSString * const ORDERBILLSTATE_CANCELED = @"canceled";
......@@ -255,6 +272,17 @@ NSString * const PICKINGBILLSTATE_SUBMIT = @"submit";
NSString * const PICKINGBILLSTATE_ACCOMPLISHED = @"accomplished";
NSString * const ORDERBILLDTLSTATE_INITIAL = @"initial";
NSString * const ORDERBILLDTLSTATE_SHIPPING = @"shipping";
NSString * const ORDERBILLDTLSTATE_ACCOMPLISHED = @"accomplished";
NSString * const PRICECATEGORY_SALEPRICE = @"salePrice";
NSString * const PRICECATEGORY_GENERALTRADEPRICE = @"generalTradePrice";
NSString * const PRICECATEGORY_SPECTRADEPRICE = @"specTradePrice";
NSString * const PRICECATEGORY_INTERALSHIPPINGPRICE = @"interalShippingPrice";
@implementation GasMeasureValue
@synthesize capacity;
@synthesize quality;
......@@ -269,6 +297,10 @@ NSString * const PICKINGBILLSTATE_ACCOMPLISHED = @"accomplished";
@end
NSString * const RECEIVEBILLSTATE_INITIAL = @"initial";
NSString * const RECEIVEBILLSTATE_SUBMIT = @"submit";
NSString * const RECEIVEBILLEXPOTSTATE_NOEXPOT = @"noExpot";
NSString * const RECEIVEBILLEXPOTSTATE_EXPORTENVIN = @"exportEnvIn";
NSString * const RECEIVEBILLEXPOTSTATE_EXPORTSALE = @"exportSale";
......@@ -276,19 +308,16 @@ NSString * const RECEIVEBILLEXPOTSTATE_EXPORTPICKING = @"exportPicking";
NSString * const RECEIVEBILLEXPOTSTATE_EXPORTENVOUT = @"exportEnvOut";
NSString * const RECEIVEBILLSTATE_INITIAL = @"initial";
NSString * const RECEIVEBILLSTATE_SUBMIT = @"submit";
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 FUELPRICESTATE_INITIAL = @"initial";
NSString * const FUELPRICESTATE_SUBMIT = @"submit";
@implementation OperateInfo2
@synthesize time;
@implementation POperateInfo
@synthesize operator;
@synthesize time;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -312,7 +341,7 @@ NSString * const PRICECATEGORY_INTERALSHIPPINGPRICE = @"interalShippingPrice";
@end
@implementation POperateInfo
@implementation OperateInfo2
@synthesize time;
@synthesize operator;
......@@ -346,9 +375,9 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation BeanOperateInfo
@synthesize enterprise;
@synthesize time;
@synthesize operator;
@synthesize enterprise;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -358,7 +387,7 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation DeliveryArea
@implementation GasFueler
@synthesize code;
@synthesize name;
......@@ -370,7 +399,24 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation GasDepot
@implementation GasTransInfo
@synthesize store;
@synthesize item;
@synthesize type;
@synthesize depot;
@synthesize provider;
@synthesize fueler;
@synthesize level;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end
@implementation DeliveryArea
@synthesize code;
@synthesize name;
......@@ -382,7 +428,7 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation Area
@implementation Carrier
@synthesize code;
@synthesize name;
......@@ -394,9 +440,11 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation BasicBillDtl
@synthesize lineNumber;
@synthesize createInfo;
@implementation GasDepot
@synthesize code;
@synthesize name;
@synthesize longitude;
@synthesize latitude;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -406,10 +454,9 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation StandardEntity2
@synthesize version;
@implementation BasicBillDtl
@synthesize lineNumber;
@synthesize createInfo;
@synthesize lastModifyInfo;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -419,10 +466,10 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation PStandardEntity
@synthesize lastModifyInfo;
@synthesize createInfo;
@implementation StandardEntity2
@synthesize version;
@synthesize createInfo;
@synthesize lastModifyInfo;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -432,7 +479,7 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation GasFueler
@implementation Area
@synthesize code;
@synthesize name;
......@@ -444,14 +491,10 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation GasTransInfo
@synthesize store;
@synthesize item;
@synthesize type;
@synthesize depot;
@synthesize provider;
@synthesize fueler;
@synthesize level;
@implementation PStandardEntity
@synthesize lastModifyInfo;
@synthesize createInfo;
@synthesize version;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -491,9 +534,9 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation StandardEntity
@synthesize lastModifyInfo;
@synthesize createInfo;
@synthesize version;
@synthesize lastModifyInfo;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -503,14 +546,13 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation ReceiveTankDtl
@synthesize tank;
@synthesize measureBeforeUnload;
@synthesize measureAfterUnload;
@synthesize measureOnSale;
@synthesize measureCalc;
@synthesize measureBill;
@synthesize measureRealDelivery;
@implementation OrderBillDtl
@synthesize item;
@synthesize quantity;
@synthesize state;
@synthesize pickingBillNumber;
@synthesize pickedTime;
@synthesize receiveTime;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -521,6 +563,7 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation FuelPrice
@synthesize state;
@synthesize category;
@synthesize item;
@synthesize guidancePrice;
......@@ -538,8 +581,14 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation Role
@synthesize name;
@implementation ReceiveTankDtl
@synthesize tank;
@synthesize measureBeforeUnload;
@synthesize measureAfterUnload;
@synthesize measureOnSale;
@synthesize measureCalc;
@synthesize measureBill;
@synthesize measureRealDelivery;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -549,7 +598,7 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation EnterpriseEntity2
@implementation PEnterpriseEntity
@synthesize enterprise;
+(BOOL)propertyIsOptional:(NSString*)propertyName
......@@ -560,8 +609,12 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation PEnterpriseEntity
@synthesize enterprise;
@implementation DepotPickingDtl
@synthesize qty;
@synthesize amount;
@synthesize pickingBillNumber;
@synthesize pickingTime;
@synthesize remark;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -571,13 +624,8 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation DepotBillPayDtl
@synthesize payMethod;
@synthesize total;
@synthesize payTicket;
@synthesize payTime;
@synthesize remark;
@synthesize effectived;
@implementation EnterpriseEntity2
@synthesize enterprise;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -587,13 +635,8 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation OrderBillDtl
@synthesize item;
@synthesize quantity;
@synthesize state;
@synthesize pickingBillNumber;
@synthesize pickedTime;
@synthesize receiveTime;
@implementation Role
@synthesize name;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -603,12 +646,13 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation DepotPickingDtl
@synthesize qty;
@synthesize amount;
@synthesize pickingBillNumber;
@synthesize pickingTime;
@implementation DepotBillPayDtl
@synthesize payMethod;
@synthesize total;
@synthesize payTicket;
@synthesize payTime;
@synthesize remark;
@synthesize effectived;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -650,6 +694,8 @@ NSString * const POSITIONTYPE_NONE = @"none";
@synthesize buyOrg;
@synthesize companyCode;
@synthesize factory;
@synthesize days;
@synthesize hours;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -671,20 +717,20 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation User
@synthesize address;
@synthesize state;
@synthesize belongOrg;
@synthesize businessType;
@synthesize organizations;
@synthesize name;
@synthesize login;
@synthesize email;
@synthesize enabled;
@synthesize mobile;
@synthesize password;
@synthesize name;
@synthesize belongOrg;
@synthesize address;
@synthesize remark;
@synthesize position;
@synthesize mobile;
@synthesize email;
@synthesize roles;
@synthesize organizations;
@synthesize enabled;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -695,22 +741,22 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation Organization
@synthesize contact;
@synthesize authentication;
@synthesize orgType;
@synthesize shortName;
@synthesize name;
@synthesize enabled;
@synthesize isLeaf;
@synthesize path;
@synthesize level;
@synthesize address;
@synthesize contact;
@synthesize attachmentId;
@synthesize storeType;
@synthesize phone;
@synthesize address;
@synthesize upper;
@synthesize shortName;
@synthesize orgType;
@synthesize enabled;
@synthesize name;
@synthesize authentication;
@synthesize namePath;
@synthesize phone;
@synthesize code;
@synthesize attachmentId;
@synthesize path;
@synthesize level;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -729,23 +775,6 @@ NSString * const POSITIONTYPE_NONE = @"none";
}
@end
@implementation DepotInv
@synthesize type;
@synthesize depotBillUuid;
@synthesize depotBillNumber;
@synthesize org;
@synthesize item;
@synthesize deliveryTime;
@synthesize total;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end
@implementation PickingBill
......@@ -767,6 +796,8 @@ NSString * const POSITIONTYPE_NONE = @"none";
@synthesize price;
@synthesize total;
@synthesize expotState;
@synthesize excelState;
@synthesize carrier;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -802,6 +833,93 @@ NSString * const POSITIONTYPE_NONE = @"none";
@synthesize pickFuelDensityCapacity;
@synthesize wasterCapacity;
@synthesize receiveBusinessDate;
@synthesize wasterRate;
@synthesize carrier;
@synthesize price;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end
@implementation Remind
@synthesize remindType;
@synthesize receiver;
@synthesize phoneNumber;
@synthesize email;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end
@implementation RemindLog
@synthesize fueler;
@synthesize receiverNumber;
@synthesize context;
@synthesize result;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end
@implementation TotalOption
@synthesize optionKey;
@synthesize optionValue;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end
@implementation POBill
@synthesize state;
@synthesize billType;
@synthesize buyBillTime;
@synthesize provider;
@synthesize buyOrg;
@synthesize buyGroup;
@synthesize org;
@synthesize storeBuyBillCode;
@synthesize buyContract;
@synthesize buyContractRowProject;
@synthesize projectPickType;
@synthesize materiel;
@synthesize shortText;
@synthesize buyBillQuantity;
@synthesize basicUtils;
@synthesize netPrice;
@synthesize currency;
@synthesize materielGroup;
@synthesize factory;
@synthesize orderBill;
@synthesize asset;
@synthesize secondaryCode;
@synthesize needFollowingBill;
@synthesize goodsReceiveSign;
@synthesize SLEDSign;
@synthesize materielTicketCycle;
@synthesize generalLedgerAccounts;
@synthesize costCenter;
@synthesize deliveryTime;
@synthesize frameContract;
@synthesize mainContractProject;
@synthesize buyEvidence;
@synthesize project;
@synthesize fnews;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -809,6 +927,14 @@ NSString * const POSITIONTYPE_NONE = @"none";
}
+(JSONKeyMapper*)keyMapper
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"news": @"fnews",
}];
}
@end
@implementation OrderBill
......@@ -828,6 +954,23 @@ NSString * const POSITIONTYPE_NONE = @"none";
}
@end
@implementation CarryInfo
@synthesize depot;
@synthesize store;
@synthesize fueler;
@synthesize item;
@synthesize carrier;
@synthesize price;
@synthesize level;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end
@implementation DepotRequestBill
......@@ -847,6 +990,36 @@ NSString * const POSITIONTYPE_NONE = @"none";
}
@end
@implementation ContractNumber
@synthesize fueler;
@synthesize deliveryArea;
@synthesize minQuantity;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end
@implementation DepotInv
@synthesize type;
@synthesize depotBillUuid;
@synthesize depotBillNumber;
@synthesize org;
@synthesize item;
@synthesize deliveryTime;
@synthesize total;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end
@implementation DepotBill
......@@ -877,41 +1050,23 @@ NSString * const POSITIONTYPE_NONE = @"none";
@end
@implementation POBill
@synthesize state;
@synthesize billType;
@synthesize buyBillTime;
@implementation ContractLog
@synthesize actionType;
@synthesize quantityType;
@synthesize sourceType;
@synthesize contractBillNumber;
@synthesize sourceBillNumber;
@synthesize beforeTotal;
@synthesize subTotal;
@synthesize nowTotal;
@synthesize billState;
@synthesize store;
@synthesize operatingType;
@synthesize item;
@synthesize depot;
@synthesize provider;
@synthesize buyOrg;
@synthesize buyGroup;
@synthesize org;
@synthesize storeBuyBillCode;
@synthesize buyContract;
@synthesize buyContractRowProject;
@synthesize projectPickType;
@synthesize materiel;
@synthesize shortText;
@synthesize buyBillQuantity;
@synthesize basicUtils;
@synthesize netPrice;
@synthesize currency;
@synthesize materielGroup;
@synthesize factory;
@synthesize orderBill;
@synthesize asset;
@synthesize secondaryCode;
@synthesize needFollowingBill;
@synthesize goodsReceiveSign;
@synthesize SLEDSign;
@synthesize materielTicketCycle;
@synthesize generalLedgerAccounts;
@synthesize costCenter;
@synthesize deliveryTime;
@synthesize frameContract;
@synthesize mainContractProject;
@synthesize buyEvidence;
@synthesize project;
@synthesize fnews;
@synthesize fueler;
@synthesize carrier;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -919,11 +1074,20 @@ NSString * const POSITIONTYPE_NONE = @"none";
}
+(JSONKeyMapper*)keyMapper
@end
@implementation Contract
@synthesize state;
@synthesize fueler;
@synthesize deliveryArea;
@synthesize item;
@synthesize quantity;
@synthesize realQuantity;
@synthesize level;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"news": @"fnews",
}];
return YES;
}
......
......@@ -67,6 +67,7 @@
//选中的颜色
#define BASESELECT_COLOR RGBA(255, 127, 0, 1)
#define GXF_CONTENT_COLOR HexColor(@"444444")
#define WS(weakSelf) __weak __typeof(&*self)weakSelf = self
......
......@@ -479,6 +479,7 @@ acceptTypeJson:(BOOL)bAcceptJson
userUtil.f_enterprise_name = dictResult[ @"enterprise_name" ];
userUtil.f_enterprise_uuid = dictResult[ @"enterprise_uuid" ];
userUtil.f_permissions = dictResult[ @"permissions" ];
userUtil.position = dictResult[@"position"];
userUtil.hasAffichePermission = [GTOCommonTools hasPermissionWithPermissionId:500601] || [GTOCommonTools hasPermissionWithPermissionId:500602];
userUtil.hasProjectPatrolPermission = [GTOCommonTools hasPermissionWithPermissionId:500101] || [GTOCommonTools hasPermissionWithPermissionId:500102];
userUtil.hasHSEPatrolPermission = [GTOCommonTools hasPermissionWithPermissionId:500201] || [GTOCommonTools hasPermissionWithPermissionId:500202];
......
......@@ -67,7 +67,7 @@
/**
* 油价
*/
#define OILPRICE @"/fuelPrice/query"
#define OILPRICE @"/fuelPrice/filterQuery"
/**
* 行政区域
......
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