浏览代码

ERP MOBILE
修复delete temp order 后,cart按钮上数字标示没有清除的bug
Granite expo
更换2018合同。

Ray Zhang 7 年之前
父节点
当前提交
f3a9a34f1e

二进制
Ants Contract/AntsContract.xcworkspace/xcuserdata/Ray.xcuserdatad/UserInterfaceState.xcuserstate


+ 4 - 4
Ants Contract/AntsContract.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -378,7 +378,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/RootViewController.m"
-            timestampString = "529376864.043615"
+            timestampString = "556103047.752061"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "285"
@@ -394,7 +394,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/RootViewController.m"
-            timestampString = "529376864.043713"
+            timestampString = "556103047.752159"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "320"
@@ -410,7 +410,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/RootViewController.m"
-            timestampString = "529376864.043775"
+            timestampString = "556103047.752226"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "349"
@@ -426,7 +426,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/RootViewController.m"
-            timestampString = "529376864.043828"
+            timestampString = "556103047.752282"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "715"

文件差异内容过多而无法显示
+ 0 - 0
Ants Contract/Granite Expo eSign/GECI - Home Improvement Contract 2018.json


二进制
Ants Contract/Granite Expo eSign/GECI - Home Improvement Contract 2018.pdf


+ 8 - 0
Ants Contract/Granite Expo eSign/Granite Expo eSign.xcodeproj/project.pbxproj

@@ -87,6 +87,8 @@
 		71B152EF1E66C87F00D2E5EC /* AddExtDocumentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71B152EE1E66C87F00D2E5EC /* AddExtDocumentViewController.m */; };
 		71BBFC371E6419D4008668A7 /* ExtDocumentsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71BBFC361E6419D4008668A7 /* ExtDocumentsViewController.m */; };
 		71BBFC3A1E651CC4008668A7 /* DocnotesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71BBFC391E651CC4008668A7 /* DocnotesViewController.m */; };
+		71C19D22212523F1002F859F /* GECI - Home Improvement Contract 2018.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 71C19D21212523F0002F859F /* GECI - Home Improvement Contract 2018.pdf */; };
+		71C19D2421252423002F859F /* GECI - Home Improvement Contract 2018.json in Resources */ = {isa = PBXBuildFile; fileRef = 71C19D2321252423002F859F /* GECI - Home Improvement Contract 2018.json */; };
 		71CDA0901F75EE400079F8E6 /* DocumentTemplateViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71CDA08F1F75EE400079F8E6 /* DocumentTemplateViewController.m */; };
 		71CDA0931F75EEBF0079F8E6 /* TemplateViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71CDA0921F75EEBF0079F8E6 /* TemplateViewController.m */; };
 		71D5734F1F723260008179ED /* GEIC - Home Improvement Contract 2017 Desktop.json in Resources */ = {isa = PBXBuildFile; fileRef = 71D5734E1F723260008179ED /* GEIC - Home Improvement Contract 2017 Desktop.json */; };
@@ -243,6 +245,8 @@
 		71BBFC361E6419D4008668A7 /* ExtDocumentsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ExtDocumentsViewController.m; path = ../../common/ExtDocumentsViewController.m; sourceTree = "<group>"; };
 		71BBFC381E651CC4008668A7 /* DocnotesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DocnotesViewController.h; path = ../../common/DocnotesViewController.h; sourceTree = "<group>"; };
 		71BBFC391E651CC4008668A7 /* DocnotesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DocnotesViewController.m; path = ../../common/DocnotesViewController.m; sourceTree = "<group>"; };
+		71C19D21212523F0002F859F /* GECI - Home Improvement Contract 2018.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "GECI - Home Improvement Contract 2018.pdf"; sourceTree = "<group>"; };
+		71C19D2321252423002F859F /* GECI - Home Improvement Contract 2018.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "GECI - Home Improvement Contract 2018.json"; sourceTree = "<group>"; };
 		71CDA08E1F75EE400079F8E6 /* DocumentTemplateViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentTemplateViewController.h; sourceTree = "<group>"; };
 		71CDA08F1F75EE400079F8E6 /* DocumentTemplateViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DocumentTemplateViewController.m; sourceTree = "<group>"; };
 		71CDA0911F75EEBF0079F8E6 /* TemplateViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TemplateViewController.h; sourceTree = "<group>"; };
@@ -543,6 +547,8 @@
 				7188C2881E8E435500938FFC /* GEIC - Home Improvement Contract 2017 Update.json */,
 				713B9AE61F8C941B002F8E8B /* GEIC - Home Improvement Contract 2017 Desktop_2.pdf */,
 				71D5734E1F723260008179ED /* GEIC - Home Improvement Contract 2017 Desktop.json */,
+				71C19D21212523F0002F859F /* GECI - Home Improvement Contract 2018.pdf */,
+				71C19D2321252423002F859F /* GECI - Home Improvement Contract 2018.json */,
 				714B870A1E24CAE200A40D18 /* debug.json */,
 				425A00F31F8F0EC200286D6F /* attribute_template.json */,
 				42DDB87B1F91E351002CCE22 /* template_type.json */,
@@ -633,6 +639,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				42DDB87E1F91E949002CCE22 /* template_example.json in Resources */,
+				71C19D2421252423002F859F /* GECI - Home Improvement Contract 2018.json in Resources */,
 				42DDB87C1F91E367002CCE22 /* template_type.json in Resources */,
 				425A00F41F8F196900286D6F /* attribute_template.json in Resources */,
 				713B9AE71F8C9446002F8E8B /* GEIC - Home Improvement Contract 2017 Desktop_2.pdf in Resources */,
@@ -646,6 +653,7 @@
 				7128C27D1E12500B00FF635B /* signature.storyboard in Resources */,
 				7128C2E81E12511B00FF635B /* LICENSE in Resources */,
 				42DDB8751F91C081002CCE22 /* ControlTemplateVC.xib in Resources */,
+				71C19D22212523F1002F859F /* GECI - Home Improvement Contract 2018.pdf in Resources */,
 				714B870B1E24CAE300A40D18 /* debug.json in Resources */,
 				714B37081E70FCFE00E99B90 /* cam_scan.storyboard in Resources */,
 			);

+ 10 - 10
Ants Contract/Granite Expo eSign/Granite Expo eSign/config.h

@@ -23,7 +23,7 @@
     #define NO_SAVE_VERIFY false
 # endif
 
-#define DEBUG_PDFSIG false
+#define DEBUG_PDFSIG true
 
 #define PDF_DEBUG false
 
@@ -31,21 +31,21 @@
 
 #ifdef test_server
 //    #define  URL_ERR_LOG  @""
-//    #define  URL_UPDATE_AUTH  @"http://192.168.0.177/esign/admin.php"
-//    #define  URL_UPLOAD_PDF  @"http://192.168.0.177/esign/admin.php"
+//    #define  URL_UPDATE_AUTH  @"http://192.168.0.112/phpcms/index.php"
+//    #define  URL_UPLOAD_PDF  @"http://192.168.0.112/phpcms/index.php"
 //    #define  URL_LOGOUT  @"http://192.168.0.177/esign/admin.php"
 //    #define  URL_NEW_DOCUMENT  @"http://192.168.0.177/esign/admin.php"
 //    #define  URL_REQUEST_DOC  @"http://192.168.0.177/esign/admin.php"
 
 
     #define  URL_ERR_LOG  @""
-    #define  URL_UPDATE_AUTH  @"http://192.168.0.155/cms/phpcms/admin_v2.php"
-    #define  URL_UPLOAD_PDF  @"http://192.168.0.155/cms/phpcms/admin_v2.php"
-    #define  URL_LOGOUT  @"http://192.168.0.155/cms/phpcms/admin_v2.php"
-    #define  URL_NEW_DOCUMENT  @"http://192.168.0.155/cms/phpcms/admin_v2.php"
-    #define  URL_UPDATE_NOTES  @"http://192.168.0.155/cms/phpcms/admin_v2.php"
-    #define  URL_REQUEST_DOC  @"http://192.168.0.155/cms/phpcms/admin_v2.php"
-    #define URL_HEART_BEAT @"http://192.168.0.155/cms/phpcms/admin_v2.php"
+    #define  URL_UPDATE_AUTH  @"http://192.168.0.112/phpcms/admin_v2.php"
+    #define  URL_UPLOAD_PDF  @"http://192.168.0.112/phpcms/admin_v2.php"
+    #define  URL_LOGOUT  @"http://192.168.0.112/phpcms/admin_v2.php"
+    #define  URL_NEW_DOCUMENT  @"http://192.168.0.112/phpcms/admin_v2.php"
+    #define  URL_UPDATE_NOTES  @"http://192.168.0.112/phpcms/admin_v2.php"
+    #define  URL_REQUEST_DOC  @"http://192.168.0.112/phpcms/admin_v2.php"
+    #define URL_HEART_BEAT @"http://192.168.0.112/phpcms/admin_v2.php"
 #else
     #define  URL_ERR_LOG  @""
     #define  URL_UPDATE_AUTH  @"https://www.thegraniteexpo.com/admin_v2.php"

+ 8 - 8
Ants Contract/common/RootViewController.m

@@ -281,8 +281,8 @@
         DocumentPageViewController* dvc = [self.storyboard instantiateViewControllerWithIdentifier:@"DocumentPageViewController" ];
         
         //                dvc.templateName = @"debug.json";
-        dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Desktop.json" ofType:nil];
-        dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Desktop_2.pdf" ofType:nil];
+        dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"GECI - Home Improvement Contract 2018.json" ofType:nil];
+        dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GECI - Home Improvement Contract 2018.pdf" ofType:nil];
 
         dvc.docment_id =  offline_docnumber;
         dvc.OnSave=^(NSString* file, NSString* subject)
@@ -316,8 +316,8 @@
                     DocumentPageViewController* dvc = [self.storyboard instantiateViewControllerWithIdentifier:@"DocumentPageViewController" ];
                     
                     //                dvc.templateName = @"debug.json";
-                    dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Desktop.json" ofType:nil];
-                    dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Desktop_2.pdf" ofType:nil];
+                    dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"GECI - Home Improvement Contract 2018.json" ofType:nil];
+                    dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GECI - Home Improvement Contract 2018.pdf" ofType:nil];
                     dvc.docment_id = json[@"doc_number"];
                     dvc.OnSave=^(NSString* file, NSString* subject)
                     {
@@ -345,8 +345,8 @@
                         DocumentPageViewController* dvc = [self.storyboard instantiateViewControllerWithIdentifier:@"DocumentPageViewController" ];
                         
                         //                dvc.templateName = @"debug.json";
-                        dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Desktop.json" ofType:nil];
-                        dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Desktop_2.pdf" ofType:nil];
+                        dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"GECI - Home Improvement Contract 2018.json" ofType:nil];
+                        dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GECI - Home Improvement Contract 2018.pdf" ofType:nil];
 
                         dvc.docment_id =  offline_docnumber;
                         dvc.OnSave=^(NSString* file, NSString* subject)
@@ -711,8 +711,8 @@
     
     DocumentTemplateViewController* dvc = [self.storyboard instantiateViewControllerWithIdentifier:@"DocumentTemplateViewController" ];
     
-    dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Desktop.json" ofType:nil];
-    dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GEIC - Home Improvement Contract 2017 Desktop_2.pdf" ofType:nil];
+    dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"GECI - Home Improvement Contract 2018.json" ofType:nil];
+    dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GECI - Home Improvement Contract 2018.pdf" ofType:nil];
     
     dvc.docment_id =  @"debug_template";
     dvc.OnSave=^(NSString* file, NSString* subject)

+ 47 - 47
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -122,7 +122,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "556017798.953625"
+            timestampString = "556104318.028958"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "230"
@@ -170,7 +170,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "556017798.953787"
+            timestampString = "556104318.029134"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "139"
@@ -186,7 +186,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "556017798.953871"
+            timestampString = "556104318.0292"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "53"
@@ -538,7 +538,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "556017798.9543951"
+            timestampString = "556104318.02991"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "444"
@@ -554,7 +554,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "556017798.954898"
+            timestampString = "556104318.029987"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "416"
@@ -602,7 +602,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "556017798.955025"
+            timestampString = "556104318.030131"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "133"
@@ -618,7 +618,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "556017798.95509"
+            timestampString = "556104318.030192"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "132"
@@ -634,7 +634,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "556017798.9551491"
+            timestampString = "556104318.030248"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "113"
@@ -650,7 +650,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "556017798.955206"
+            timestampString = "556104318.030303"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "118"
@@ -666,7 +666,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "556017798.955264"
+            timestampString = "556104318.030377"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "130"
@@ -730,7 +730,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/search+itemsearch/SearchViewController.m"
-            timestampString = "556017798.955393"
+            timestampString = "556104318.030545"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "190"
@@ -746,7 +746,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/search+itemsearch/SearchViewController.m"
-            timestampString = "556017798.9558769"
+            timestampString = "556104318.030615"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "2317"
@@ -762,7 +762,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/search+itemsearch/SearchViewController.m"
-            timestampString = "556017798.956274"
+            timestampString = "556104318.03067"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "49"
@@ -778,7 +778,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "556017798.956632"
+            timestampString = "556104318.030722"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "173"
@@ -794,7 +794,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "556017798.956718"
+            timestampString = "556104318.030777"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "226"
@@ -810,7 +810,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/search+itemsearch/SearchViewController.m"
-            timestampString = "556017798.956798"
+            timestampString = "556104318.030833"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "141"
@@ -874,7 +874,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "556017798.957226"
+            timestampString = "556104318.030974"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "260"
@@ -890,7 +890,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "556017798.957603"
+            timestampString = "556104318.0310431"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "279"
@@ -906,7 +906,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/sidemenu/LoginViewController.m"
-            timestampString = "556017798.957999"
+            timestampString = "556104318.031158"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "211"
@@ -922,7 +922,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/sidemenu/LoginViewController.m"
-            timestampString = "556017798.958115"
+            timestampString = "556104318.031248"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "402"
@@ -938,7 +938,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/sidemenu/LoginViewController.m"
-            timestampString = "556017798.958202"
+            timestampString = "556104318.031303"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "262"
@@ -954,7 +954,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/sidemenu/LoginViewController.m"
-            timestampString = "556017798.958304"
+            timestampString = "556104318.031358"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "251"
@@ -970,7 +970,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/sidemenu/LoginViewController.m"
-            timestampString = "556017798.9584039"
+            timestampString = "556104318.031408"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "256"
@@ -986,7 +986,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "556017798.958497"
+            timestampString = "556104318.0314749"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "261"
@@ -998,7 +998,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
@@ -1050,7 +1050,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/ActiveViewController.m"
-            timestampString = "556017798.959217"
+            timestampString = "556104318.031635"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "111"
@@ -1066,7 +1066,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/search+itemsearch/SearchViewController.m"
-            timestampString = "556017798.9593019"
+            timestampString = "556104318.031695"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "207"
@@ -1082,7 +1082,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/search+itemsearch/SearchViewController.m"
-            timestampString = "556017798.9597009"
+            timestampString = "556104318.03175"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "364"
@@ -1114,7 +1114,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/search+itemsearch/SearchViewController.m"
-            timestampString = "556017798.96022"
+            timestampString = "556104318.031853"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1490"
@@ -1130,7 +1130,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/search+itemsearch/SearchViewController.m"
-            timestampString = "556017798.960618"
+            timestampString = "556104318.0319149"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "196"
@@ -1162,7 +1162,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/iSalesNavigationController.m"
-            timestampString = "556017798.961059"
+            timestampString = "556104318.032016"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "49"
@@ -1178,7 +1178,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/iSalesNavigationController.m"
-            timestampString = "556017798.961131"
+            timestampString = "556104318.0320719"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "45"
@@ -1194,11 +1194,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "556017798.9611861"
+            timestampString = "556104318.032128"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1483"
-            endingLineNumber = "1483"
+            startingLineNumber = "1484"
+            endingLineNumber = "1484"
             landmarkName = "-showCategoryMenu:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1210,7 +1210,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/iSalesNavigationController.m"
-            timestampString = "556017798.961535"
+            timestampString = "556104318.032186"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "48"
@@ -1226,7 +1226,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/categoryMenu_RATree/RAViewController.m"
-            timestampString = "556017798.961591"
+            timestampString = "556104318.032257"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "56"
@@ -1242,11 +1242,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "556017798.961652"
+            timestampString = "556104318.032328"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1285"
-            endingLineNumber = "1285"
+            startingLineNumber = "1286"
+            endingLineNumber = "1286"
             landmarkName = "-switchToCart"
             landmarkType = "7">
          </BreakpointContent>
@@ -1258,11 +1258,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/order/OrderListViewController.m"
-            timestampString = "556017798.9619581"
+            timestampString = "556104318.032378"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2215"
-            endingLineNumber = "2215"
+            startingLineNumber = "2221"
+            endingLineNumber = "2221"
             landmarkName = "-reload_data"
             landmarkType = "7">
          </BreakpointContent>
@@ -1274,7 +1274,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "556017798.962015"
+            timestampString = "556104318.032743"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "531"
@@ -1290,11 +1290,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "556017798.962705"
+            timestampString = "556104318.032794"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1377"
-            endingLineNumber = "1377"
+            startingLineNumber = "1378"
+            endingLineNumber = "1378"
             landmarkName = "-switchToCart"
             landmarkType = "7">
          </BreakpointContent>

+ 6 - 0
RedAnt ERP Mobile/common/Functions/order/OrderListViewController.m

@@ -1326,6 +1326,12 @@
                                 [appDelegate SetSo:nil];
                                 
                                 
+                                appDelegate.cart_count=0;
+                                [appDelegate update_count_mark];
+                                
+//                                appDelegate.customerInfo = nil;
+//                                appDelegate.contact_id = nil;
+//                                appDelegate.order_customer_id = nil;
                             }
                             
                             [RAUtils message_alert:nil title:@"Order Delete" controller:self] ;

二进制
Redant Drivers/Redant Drivers.xcworkspace/xcuserdata/ray.xcuserdatad/UserInterfaceState.xcuserstate


部分文件因为文件数量过多而无法显示