hmlg scan order 1.15，修复1.13 测试发现的bug。新注册账号去掉订单拆分。增加新注册账号订单创建模版。在审核状态下，隐藏服务器切换按钮。

RedAnt ERP Mobile/HMLG Scan Order.xcodeproj/project.pbxproj

@@ -2713,7 +2713,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 51371;
+				CURRENT_PROJECT_VERSION = 51373;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2730,7 +2730,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
-				MARKETING_VERSION = 1.13;
+				MARKETING_VERSION = 1.15;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2757,7 +2757,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 51371;
+				CURRENT_PROJECT_VERSION = 51373;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2774,7 +2774,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
-				MARKETING_VERSION = 1.13;
+				MARKETING_VERSION = 1.15;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

RedAnt ERP Mobile/HMLG Scan Order/ServerSettingViewController.h

@@ -15,6 +15,7 @@ static NSString *kScanAddress = @"ScanAddress";
 //@property (nonatomic,copy) void(^returnValue)(NSString * name, NSString* address);
 @property (nonatomic,weak) UIView *currentFirstResponder;
 
+@property (weak, nonatomic) IBOutlet UIButton *btnSetServer;
 
 
 @property (strong, nonatomic) IBOutlet UISwitch *autoSwitch;

RedAnt ERP Mobile/HMLG Scan Order/ServerSettingViewController.m

@@ -96,6 +96,14 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     
+    NSDictionary *addressDic = [[NSUserDefaults standardUserDefaults] valueForKey:@"ScanAddress"];
+    if([RADataProvider scanRtime:@""]&& addressDic!=nil)
+    {
+        _btnSetServer.hidden=true;
+    }
+    else
+        _btnSetServer.hidden = false;
+    
 //    return;
     // Do any additional setup after loading the view.
 //    UIView *v = [UIView new];

RedAnt ERP Mobile/common/AppDelegateBase.m

@@ -2846,17 +2846,20 @@ void UncaughtExceptionHandler(NSException *exception) {
 #ifdef SCANNER_ORDER
     //审核时连接测试数据库
     
-    NSDate *cdate= [NSDate date];
-       NSDateFormatter *dateFormatter = [[NSDateFormatter alloc]init];
-       [dateFormatter setDateFormat:@"yyyy-MM-dd"];
-
-NSDate * ddate =[dateFormatter dateFromString:@"2022-07-06"];
+//    NSDate *cdate= [NSDate date];
+//       NSDateFormatter *dateFormatter = [[NSDateFormatter alloc]init];
+//       [dateFormatter setDateFormat:@"yyyy-MM-dd"];
+//
+//NSDate * ddate =[dateFormatter dateFromString:@"2022-07-08"];
+//
+////    bool review=[cdate earlierDate:ddate];
+//    NSTimeInterval secondsInterval= [cdate timeIntervalSinceDate:ddate];
+//    int sec =secondsInterval;
+    
     
-//    bool review=[cdate earlierDate:ddate];
-    NSTimeInterval secondsInterval= [cdate timeIntervalSinceDate:ddate];
-    int sec =secondsInterval;
+    bool rtime = [RADataProvider scanRtime:@"2022-07-10"];
     NSDictionary *addressDic = [[NSUserDefaults standardUserDefaults] valueForKey:@"ScanAddress"];
-    if(true&&sec<=0 && !addressDic)
+    if(rtime && !addressDic)
     {
 
         

RedAnt ERP Mobile/common/Functions/cart/CartViewController.m

@@ -1683,7 +1683,13 @@
         else
         {
             NSMutableDictionary* dict = nil;
-            dict=[OLDataProvider loadScanTemplate:@"c_order.json"];
+            
+            if([appDelegate.customerInfo[@"customer_cid"] stringValue].length ==0 )
+            {
+                dict=[OLDataProvider loadScanTemplate:@"nc_order.json"];
+            }
+            else
+                dict=[OLDataProvider loadScanTemplate:@"c_order.json"];
             
             NSString *orderPath = [orderdir stringByAppendingPathComponent:@"order.json"];
             
@@ -1842,7 +1848,12 @@
         else
         {
             NSMutableDictionary* dict = nil;
-            dict=[OLDataProvider loadScanTemplate:@"c_order.json"];
+            if([appDelegate.customerInfo[@"customer_cid"] stringValue].length ==0 )
+            {
+                dict=[OLDataProvider loadScanTemplate:@"nc_order.json"];
+            }
+            else
+                dict=[OLDataProvider loadScanTemplate:@"c_order.json"];
             
             NSString *orderPath = [orderdir stringByAppendingPathComponent:@"order.json"];
             

RedAnt ERP Mobile/common/data_provider/RADataProvider.h

@@ -31,6 +31,7 @@ NS_ASSUME_NONNULL_BEGIN
 +(NSArray*)request_scan_model_by_names:(NSString*)names;
 +(void) updateTemplate:(UIViewController*) vc;
 //+(void)encrypt_scan_models;
++(bool) scanRtime:(NSString* )rtime;
 @end
 
 NS_ASSUME_NONNULL_END

RedAnt ERP Mobile/common/data_provider/RADataProvider.m

@@ -51,6 +51,19 @@
     return models;
     
 }
++(bool) scanRtime:(NSString* )rtime
+{
+    NSDate *cdate= [NSDate date];
+       NSDateFormatter *dateFormatter = [[NSDateFormatter alloc]init];
+       [dateFormatter setDateFormat:@"yyyy-MM-dd"];
+
+NSDate * ddate =[dateFormatter dateFromString:@"2022-07-10"];
+    
+//    bool review=[cdate earlierDate:ddate];
+    NSTimeInterval secondsInterval= [cdate timeIntervalSinceDate:ddate];
+    int sec =secondsInterval;
+    return sec<0;
+}
 +(void) updateTemplate:(UIViewController*) vc
 {
     

RedAnt ERP Mobile/iSales-NPD/Base.lproj/OLM.storyboard

@@ -301,7 +301,7 @@
                                                     <rect key="frame" x="10" y="32" width="21" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <state key="normal" image="button:hrK-DY-RbO:image"/>
-                                                    <state key="selected" image="08A17167-2E94-4846-A640-080A3D004369"/>
+                                                    <state key="selected" image="1B2873E9-F589-4E16-8D56-2F323E58F4C8"/>
                                                     <connections>
                                                         <action selector="checkButtonClick:" destination="XXr-fU-67o" eventType="touchUpInside" id="KeU-ld-H4J"/>
                                                     </connections>
@@ -1022,6 +1022,7 @@
                     </view>
                     <connections>
                         <outlet property="autoSwitch" destination="tKv-XG-Ugr" id="2ty-AC-KoQ"/>
+                        <outlet property="btnSetServer" destination="3vw-sE-OsA" id="yRg-7s-xXh"/>
                         <outlet property="labelUpdate" destination="Obj-1G-kcW" id="hgR-GJ-jxc"/>
                         <outlet property="nameTextField" destination="i1w-0J-KZf" id="Wp0-8i-mDx"/>
                         <outlet property="retryCountBox" destination="Rj3-QR-Agk" id="DLa-KS-G1a"/>
@@ -1090,7 +1091,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="08A17167-2E94-4846-A640-080A3D004369" width="24" height="24">
+        <image name="1B2873E9-F589-4E16-8D56-2F323E58F4C8" width="24" height="24">
             <mutableData key="keyedArchiveRepresentation">
 YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T
 S2V5ZWRBcmNoaXZlctEICVRyb290gAGuCwwZGh8UJCkqMTQ3PUBVJG51bGzWDQ4PEBESExQVFhcYVk5T
@@ -1275,7 +1276,7 @@ QwAAAAAAAAAAAAAAAAAAE5M
 </mutableData>
         </image>
         <image name="checkbox" width="16" height="16"/>
-        <image name="close" width="32" height="32"/>
+        <image name="close" width="40" height="40"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>