Skip to content

X
xffruit
Commit c31ce3be authored by 张杰's avatar 张杰
Browse files
Options

鲜丰正式版2.0.18 新建发运单修改商品数量总金额数量不变

parent 80825f5c
Pipeline #54 failed with stages
      Show whitespace changes
      Inline Side-by-side
      Showing with 771 additions and 112 deletions
      XFFruit.xcodeproj/project.pbxproj
      View file @ c31ce3be
      ......@@ -910,6 +910,10 @@
      8F250CD11F2891C60031B4BC /* mask.png in Resources */ = {isa = PBXBuildFile; fileRef = 7217E9F51B724A7600FE5C1D /* mask.png */; };
      8F250CD21F2891C60031B4BC /* PushConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = 35ADF29C1BDE62BA00E2A7E4 /* PushConfig.plist */; };
      8F3EB1A41F21AABC00F3A669 /* PurchaseReceiveProductViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F3EB1A31F21AABC00F3A669 /* PurchaseReceiveProductViewController.m */; };
      8F5FDAFA20A0284E007B4900 /* ChineseLogHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F5FDAF920A0284E007B4900 /* ChineseLogHelper.m */; };
      8F5FDAFB20A0284E007B4900 /* ChineseLogHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F5FDAF920A0284E007B4900 /* ChineseLogHelper.m */; };
      8F5FDAFC20A0284E007B4900 /* ChineseLogHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F5FDAF920A0284E007B4900 /* ChineseLogHelper.m */; };
      8F5FDAFD20A0284E007B4900 /* ChineseLogHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F5FDAF920A0284E007B4900 /* ChineseLogHelper.m */; };
      8F67988A1DB8CC9400348267 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F6798891DB8CC9400348267 /* WebKit.framework */; };
      8F67988C1DB8CC9E00348267 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F67988B1DB8CC9E00348267 /* WebKit.framework */; };
      8F8D43CB1F63C26C00E8636F /* CalculateHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F8D43CA1F63C26C00E8636F /* CalculateHelper.m */; };
      ......@@ -1265,6 +1269,18 @@
      8FEE27321DB60B570099B596 /* mask.png in Resources */ = {isa = PBXBuildFile; fileRef = 7217E9F51B724A7600FE5C1D /* mask.png */; };
      8FEE27331DB60B570099B596 /* PushConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = 35ADF29C1BDE62BA00E2A7E4 /* PushConfig.plist */; };
      8FEE273E1DB60DAB0099B596 /* ICRLoginContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = C167F9C01AC8615B00D2A098 /* ICRLoginContentView.m */; };
      8FFDD1172070EBA1003096EA /* BaseAlertCardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FFDD1162070EBA1003096EA /* BaseAlertCardViewController.m */; };
      8FFDD1182070EBA1003096EA /* BaseAlertCardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FFDD1162070EBA1003096EA /* BaseAlertCardViewController.m */; };
      8FFDD1192070EBA1003096EA /* BaseAlertCardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FFDD1162070EBA1003096EA /* BaseAlertCardViewController.m */; };
      8FFDD11A2070EBA1003096EA /* BaseAlertCardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FFDD1162070EBA1003096EA /* BaseAlertCardViewController.m */; };
      8FFDD11C2070ECB8003096EA /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8FFDD11B2070ECB8003096EA /* Main.storyboard */; };
      8FFDD11D2070ECB8003096EA /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8FFDD11B2070ECB8003096EA /* Main.storyboard */; };
      8FFDD11E2070ECB8003096EA /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8FFDD11B2070ECB8003096EA /* Main.storyboard */; };
      8FFDD11F2070ECB8003096EA /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8FFDD11B2070ECB8003096EA /* Main.storyboard */; };
      8FFDD1222070F094003096EA /* CheckAlertViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FFDD1212070F094003096EA /* CheckAlertViewController.m */; };
      8FFDD1232070F094003096EA /* CheckAlertViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FFDD1212070F094003096EA /* CheckAlertViewController.m */; };
      8FFDD1242070F094003096EA /* CheckAlertViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FFDD1212070F094003096EA /* CheckAlertViewController.m */; };
      8FFDD1252070F094003096EA /* CheckAlertViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FFDD1212070F094003096EA /* CheckAlertViewController.m */; };
      ABFA26061C87D38800274481 /* JavenImages.m in Sources */ = {isa = PBXBuildFile; fileRef = ABFA26051C87D38800274481 /* JavenImages.m */; };
      ABFA260C1C8832DF00274481 /* MarketSurveyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ABFA260B1C8832DF00274481 /* MarketSurveyViewController.m */; };
      C10214CD1AD8FE200024637E /* ICRStoreDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C10214CC1AD8FE200024637E /* ICRStoreDetailViewController.m */; };
      ......@@ -1941,6 +1957,8 @@
      8F250CD91F2891C70031B4BC /* XFFruit_DEV.plist */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; name = XFFruit_DEV.plist; path = /Users/Javen/Documents/MyProject/xffruit/XFFruit_DEV.plist; sourceTree = "<absolute>"; };
      8F3EB1A21F21AABC00F3A669 /* PurchaseReceiveProductViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PurchaseReceiveProductViewController.h; sourceTree = "<group>"; };
      8F3EB1A31F21AABC00F3A669 /* PurchaseReceiveProductViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PurchaseReceiveProductViewController.m; sourceTree = "<group>"; };
      8F5FDAF820A0284D007B4900 /* ChineseLogHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChineseLogHelper.h; sourceTree = "<group>"; };
      8F5FDAF920A0284E007B4900 /* ChineseLogHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChineseLogHelper.m; sourceTree = "<group>"; };
      8F6798891DB8CC9400348267 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/PrivateFrameworks/WebKit.framework; sourceTree = SDKROOT; };
      8F67988B1DB8CC9E00348267 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
      8F8D43C91F63C26C00E8636F /* CalculateHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CalculateHelper.h; sourceTree = "<group>"; };
      ......@@ -1953,6 +1971,11 @@
      8FDA63641F0F56FE00617495 /* TransportCreateProductCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TransportCreateProductCell.m; sourceTree = "<group>"; };
      8FEE27391DB60B570099B596 /* XFFruit copy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "XFFruit copy.app"; sourceTree = BUILT_PRODUCTS_DIR; };
      8FEE273A1DB60B570099B596 /* XFFruit copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "XFFruit copy-Info.plist"; path = "/Users/Javen/Documents/MyProject/xffruit/XFFruit copy-Info.plist"; sourceTree = "<absolute>"; };
      8FFDD1152070EBA0003096EA /* BaseAlertCardViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseAlertCardViewController.h; sourceTree = "<group>"; };
      8FFDD1162070EBA1003096EA /* BaseAlertCardViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BaseAlertCardViewController.m; sourceTree = "<group>"; };
      8FFDD11B2070ECB8003096EA /* Main.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
      8FFDD1202070F094003096EA /* CheckAlertViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CheckAlertViewController.h; sourceTree = "<group>"; };
      8FFDD1212070F094003096EA /* CheckAlertViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CheckAlertViewController.m; sourceTree = "<group>"; };
      ABFA26041C87D38800274481 /* JavenImages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavenImages.h; sourceTree = "<group>"; };
      ABFA26051C87D38800274481 /* JavenImages.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JavenImages.m; sourceTree = "<group>"; };
      ABFA260A1C8832DF00274481 /* MarketSurveyViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MarketSurveyViewController.h; sourceTree = "<group>"; };
      ......@@ -2769,6 +2792,8 @@
      72A8132C1BCA8BBA003631F3 /* ChooseTransportViewController.m */,
      72D645211BF1E9B80029E146 /* ChooseTransferViewController.h */,
      72D645221BF1E9B80029E146 /* ChooseTransferViewController.m */,
      8FFDD1202070F094003096EA /* CheckAlertViewController.h */,
      8FFDD1212070F094003096EA /* CheckAlertViewController.m */,
      );
      path = Controllers;
      sourceTree = "<group>";
      ......@@ -3353,6 +3378,8 @@
      C142D2911AC3A154000109A7 /* Categories */ = {
      isa = PBXGroup;
      children = (
      8F5FDAF820A0284D007B4900 /* ChineseLogHelper.h */,
      8F5FDAF920A0284E007B4900 /* ChineseLogHelper.m */,
      C142D2921AC3A154000109A7 /* NSDate+FormatterAdditions.h */,
      C142D2931AC3A154000109A7 /* NSDate+FormatterAdditions.m */,
      C159187E1AC4362D0013B391 /* UIApplication+CheckFirstRun.h */,
      ......@@ -3814,6 +3841,7 @@
      35A1C3541B8EFBBF004AC9F7 /* PermissionJson */,
      C1F696071AB870B400F9F5DD /* Info.plist */,
      C1F696081AB870B400F9F5DD /* main.m */,
      8FFDD11B2070ECB8003096EA /* Main.storyboard */,
      C15918571AC068110013B391 /* XFFruit-Prefix.pch */,
      C1E0930D1AC8FC94003B7126 /* Localizable.strings */,
      35ADF29C1BDE62BA00E2A7E4 /* PushConfig.plist */,
      ......@@ -3850,6 +3878,8 @@
      C1FE50291ADD887400C18080 /* Vendors */ = {
      isa = PBXGroup;
      children = (
      8FFDD1152070EBA0003096EA /* BaseAlertCardViewController.h */,
      8FFDD1162070EBA1003096EA /* BaseAlertCardViewController.m */,
      3557F9671BDF7E4A00078AF4 /* JiGuang */,
      C1E9F5751B2E440A00BF1356 /* JTRecordView */,
      C1E9F55B1B2E3B9200BF1356 /* ImagePreview */,
      ......@@ -4114,6 +4144,7 @@
      8F0F9B5E1F2A3AE7004FB434 /* ZYQAssetPicker.Bundle in Resources */,
      8F0F9B5F1F2A3AE7004FB434 /* half_selected_star@2x.png in Resources */,
      8F0F9B601F2A3AE7004FB434 /* Images.xcassets in Resources */,
      8FFDD11F2070ECB8003096EA /* Main.storyboard in Resources */,
      8F0F9B611F2A3AE7004FB434 /* not_selected_star@2x.png in Resources */,
      8F0F9B621F2A3AE7004FB434 /* not_selected_star.png in Resources */,
      8F0F9B631F2A3AE7004FB434 /* selected_star.png in Resources */,
      ......@@ -4135,6 +4166,7 @@
      8F250CC81F2891C60031B4BC /* ZYQAssetPicker.Bundle in Resources */,
      8F250CC91F2891C60031B4BC /* half_selected_star@2x.png in Resources */,
      8F250CCA1F2891C60031B4BC /* Images.xcassets in Resources */,
      8FFDD11E2070ECB8003096EA /* Main.storyboard in Resources */,
      8F250CCB1F2891C60031B4BC /* not_selected_star@2x.png in Resources */,
      8F250CCC1F2891C60031B4BC /* not_selected_star.png in Resources */,
      8F250CCD1F2891C60031B4BC /* selected_star.png in Resources */,
      ......@@ -4156,6 +4188,7 @@
      8FEE27291DB60B570099B596 /* ZYQAssetPicker.Bundle in Resources */,
      8FEE272A1DB60B570099B596 /* half_selected_star@2x.png in Resources */,
      8FEE272B1DB60B570099B596 /* Images.xcassets in Resources */,
      8FFDD11D2070ECB8003096EA /* Main.storyboard in Resources */,
      8FEE272C1DB60B570099B596 /* not_selected_star@2x.png in Resources */,
      8FEE272D1DB60B570099B596 /* not_selected_star.png in Resources */,
      8FEE272E1DB60B570099B596 /* selected_star.png in Resources */,
      ......@@ -4177,6 +4210,7 @@
      35EECB8A1C868B3A00BE1B40 /* ZYQAssetPicker.Bundle in Resources */,
      C123A9111B25CBAD003C0C36 /* half_selected_star@2x.png in Resources */,
      C1F696141AB870B400F9F5DD /* Images.xcassets in Resources */,
      8FFDD11C2070ECB8003096EA /* Main.storyboard in Resources */,
      C123A9151B25CBAD003C0C36 /* not_selected_star@2x.png in Resources */,
      C123A9131B25CBAD003C0C36 /* not_selected_star.png in Resources */,
      C123A9171B25CBAD003C0C36 /* selected_star.png in Resources */,
      ......@@ -4430,6 +4464,7 @@
      8F0F9A2E1F2A3AE7004FB434 /* IBTTableView.m in Sources */,
      8F0F9A2F1F2A3AE7004FB434 /* ICRAnnouncement.m in Sources */,
      8F0F9A301F2A3AE7004FB434 /* NSString+TrimmingAdditions.m in Sources */,
      8F5FDAFD20A0284E007B4900 /* ChineseLogHelper.m in Sources */,
      8F0F9A311F2A3AE7004FB434 /* IBTCommon.m in Sources */,
      8F0F9A321F2A3AE7004FB434 /* LBorderView.m in Sources */,
      8F0F9A331F2A3AE7004FB434 /* ICRAttachTitleView.m in Sources */,
      ......@@ -4513,6 +4548,7 @@
      8F0F9A801F2A3AE7004FB434 /* SaleViewController.m in Sources */,
      8F0F9A811F2A3AE7004FB434 /* UIAlertView+Blocks.m in Sources */,
      8F0F9A821F2A3AE7004FB434 /* GXFFunction.m in Sources */,
      8FFDD1252070F094003096EA /* CheckAlertViewController.m in Sources */,
      8F0F9A831F2A3AE7004FB434 /* IBTCustomButtom.m in Sources */,
      8F0F9A841F2A3AE7004FB434 /* ICRLoginViewController.m in Sources */,
      8F0F9A851F2A3AE7004FB434 /* IBTTableViewCell.m in Sources */,
      ......@@ -4532,6 +4568,7 @@
      8F0F9A931F2A3AE7004FB434 /* GXFProcessBill.m in Sources */,
      8F0F9A941F2A3AE7004FB434 /* NoticeDetailCell.m in Sources */,
      8F0F9A951F2A3AE7004FB434 /* Product.m in Sources */,
      8FFDD11A2070EBA1003096EA /* BaseAlertCardViewController.m in Sources */,
      8F0F9A961F2A3AE7004FB434 /* PurchaseBoltView.m in Sources */,
      8F0F9A971F2A3AE7004FB434 /* ICRHTTPController.m in Sources */,
      8F0F9A981F2A3AE7004FB434 /* ASStarRatingView.m in Sources */,
      ......@@ -4760,6 +4797,7 @@
      8F250B981F2891C60031B4BC /* IBTTableView.m in Sources */,
      8F250B991F2891C60031B4BC /* ICRAnnouncement.m in Sources */,
      8F250B9A1F2891C60031B4BC /* NSString+TrimmingAdditions.m in Sources */,
      8F5FDAFC20A0284E007B4900 /* ChineseLogHelper.m in Sources */,
      8F250B9B1F2891C60031B4BC /* IBTCommon.m in Sources */,
      8F250B9C1F2891C60031B4BC /* LBorderView.m in Sources */,
      8F250B9D1F2891C60031B4BC /* ICRAttachTitleView.m in Sources */,
      ......@@ -4843,6 +4881,7 @@
      8F250BEA1F2891C60031B4BC /* SaleViewController.m in Sources */,
      8F250BEB1F2891C60031B4BC /* UIAlertView+Blocks.m in Sources */,
      8F250BEC1F2891C60031B4BC /* GXFFunction.m in Sources */,
      8FFDD1242070F094003096EA /* CheckAlertViewController.m in Sources */,
      8F250BED1F2891C60031B4BC /* IBTCustomButtom.m in Sources */,
      8F250BEE1F2891C60031B4BC /* ICRLoginViewController.m in Sources */,
      8F250BEF1F2891C60031B4BC /* IBTTableViewCell.m in Sources */,
      ......@@ -4862,6 +4901,7 @@
      8F250BFD1F2891C60031B4BC /* GXFProcessBill.m in Sources */,
      8F250BFE1F2891C60031B4BC /* NoticeDetailCell.m in Sources */,
      8F250BFF1F2891C60031B4BC /* Product.m in Sources */,
      8FFDD1192070EBA1003096EA /* BaseAlertCardViewController.m in Sources */,
      8F250C001F2891C60031B4BC /* PurchaseBoltView.m in Sources */,
      8F250C011F2891C60031B4BC /* ICRHTTPController.m in Sources */,
      8F250C021F2891C60031B4BC /* ASStarRatingView.m in Sources */,
      ......@@ -5123,6 +5163,7 @@
      8FEE261D1DB60B570099B596 /* GXFWarehouseViewController.m in Sources */,
      8FEE261E1DB60B570099B596 /* ICRAnswer.m in Sources */,
      8FEE261F1DB60B570099B596 /* IBTSegmentedControl.m in Sources */,
      8FFDD1182070EBA1003096EA /* BaseAlertCardViewController.m in Sources */,
      8FEE26201DB60B570099B596 /* IBTDatePickerViewController.m in Sources */,
      8FEE26211DB60B570099B596 /* HeaderCell.m in Sources */,
      8FEE26221DB60B570099B596 /* PurchaseNoticeListCell.m in Sources */,
      ......@@ -5150,6 +5191,7 @@
      8FEE26381DB60B570099B596 /* TransportCell.m in Sources */,
      8FEE26391DB60B570099B596 /* BusinessViewController.m in Sources */,
      8FEE263A1DB60B570099B596 /* IBTWebViewController.m in Sources */,
      8F5FDAFB20A0284E007B4900 /* ChineseLogHelper.m in Sources */,
      8FEE263B1DB60B570099B596 /* ICRSyncViewController.m in Sources */,
      8FEE263C1DB60B570099B596 /* ZYQAssetPickerController.m in Sources */,
      8FEE263D1DB60B570099B596 /* ICRTaskEditViewController.m in Sources */,
      ......@@ -5367,6 +5409,7 @@
      8FEE27111DB60B570099B596 /* HGPhWViewController.m in Sources */,
      8FEE27121DB60B570099B596 /* NoticeProductViewController.m in Sources */,
      8FEE27131DB60B570099B596 /* IBTUIControl.m in Sources */,
      8FFDD1232070F094003096EA /* CheckAlertViewController.m in Sources */,
      8FEE27141DB60B570099B596 /* UserWarehouse.m in Sources */,
      8FEE27151DB60B570099B596 /* ICRPatrolDetailViewController.m in Sources */,
      8FEE27161DB60B570099B596 /* SeePurchaseNoticeViewController.m in Sources */,
      ......@@ -5417,6 +5460,7 @@
      C159184D1AC062460013B391 /* IBTTableView.m in Sources */,
      30D1859C1ADBB91000327997 /* ICRAnnouncement.m in Sources */,
      C142D2AE1AC3A155000109A7 /* NSString+TrimmingAdditions.m in Sources */,
      8F5FDAFA20A0284E007B4900 /* ChineseLogHelper.m in Sources */,
      C15918471AC062460013B391 /* IBTCommon.m in Sources */,
      C1FE502D1ADD887400C18080 /* LBorderView.m in Sources */,
      C1B810AF1ADF4D6A00BBC75A /* ICRAttachTitleView.m in Sources */,
      ......@@ -5500,6 +5544,7 @@
      728899D61BECB323003CC41E /* SaleViewController.m in Sources */,
      C1FE50521AE024FA00C18080 /* UIAlertView+Blocks.m in Sources */,
      351CFF5C1B90633700F30866 /* GXFFunction.m in Sources */,
      8FFDD1222070F094003096EA /* CheckAlertViewController.m in Sources */,
      C1E108691ADADB5500620375 /* IBTCustomButtom.m in Sources */,
      C15918131ABE89270013B391 /* ICRLoginViewController.m in Sources */,
      C159184F1AC062460013B391 /* IBTTableViewCell.m in Sources */,
      ......@@ -5519,6 +5564,7 @@
      35CF33781B953F07001211EF /* GXFProcessBill.m in Sources */,
      047C7E431BA9DF1800051DE7 /* NoticeDetailCell.m in Sources */,
      FE7155D91B7B328400595B0A /* Product.m in Sources */,
      8FFDD1172070EBA1003096EA /* BaseAlertCardViewController.m in Sources */,
      FE4678B61B8D986900B5EDA3 /* PurchaseBoltView.m in Sources */,
      C159188A1AC4615D0013B391 /* ICRHTTPController.m in Sources */,
      C123A90D1B25CBAD003C0C36 /* ASStarRatingView.m in Sources */,
      ......
      XFFruit/Controllers/DataBaseController/ICRDataBaseController.m
      View file @ c31ce3be
      ......@@ -352,6 +352,22 @@ static NSString *ICRDataBasePath = @"";
      [db executeUpdate:addTable];
      }
      /*
      2018-05-07
      Warehouse 增加了isspecial字段
      */
      if (![db columnExists:@"isspecial" inTableWithName:@"Warehouse"]) {
      CLog(@"没有isspecial字段");
      NSString *sql = @"DROP TABLE IF EXISTS 'Warehouse'";
      [db executeUpdate:sql];
      NSString *addTable = [Warehouse SQLForCreateTable];
      [db executeUpdate:addTable];
      }
      // [db close];
      ......
      XFFruit/Controllers/HTTPController/ICRHTTPController.h
      View file @ c31ce3be
      ......@@ -8,6 +8,8 @@
      #import "IBTObject.h"
      #import "ICRAnnouncement.h"
      #import "AFNetworking.h"
      #define HTTP [ICRHTTPController sharedController]
      typedef NS_ENUM(NSUInteger, ICRAttachmentType) {
      kAttachmentBoard = 0,
      ......@@ -23,6 +25,13 @@ typedef NS_ENUM(NSUInteger, ICRAttachmentType) {
      + (instancetype)sharedController;
      - (void)POST:(NSString *)urlStr
      parameters:(id)parameters
      needToken:(BOOL)bIsNeedToken
      acceptTypeJson:(BOOL)bAcceptJson
      success:(void (^)(AFHTTPRequestOperation *operation, id responseObject))succ
      failure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))fail;
      // Restful API
      // User
      ......
      XFFruit/Controllers/HTTPController/ICRHTTPController.m
      View file @ c31ce3be
      ......@@ -8,7 +8,6 @@
      #import "ICRHTTPController.h"
      #import "ICRUserUtil.h"
      #import "AFNetworking.h"
      #import "Base64.h"
      #import "AFNetworkActivityIndicatorManager.h"
      #import "NSDate+FormatterAdditions.h"
      ......
      XFFruit/General/Categories/ChineseLogHelper.h 0 → 100644
      View file @ c31ce3be
      //
      // ChineseLogHelper.h
      // RealEstateManagement
      //
      // Created by Javen on 2016/11/21.
      // Copyright © 2016年 上海勾芒信息科技. All rights reserved.
      //
      #import <Foundation/Foundation.h>
      @interface NSArray (Log)
      @end
      @interface NSDictionary (Log)
      @end
      XFFruit/General/Categories/ChineseLogHelper.m 0 → 100644
      View file @ c31ce3be
      //
      // ChineseLogHelper.m
      // RealEstateManagement
      //
      // Created by Javen on 2016/11/21.
      // Copyright © 2016年 上海勾芒信息科技. All rights reserved.
      //
      #import "ChineseLogHelper.h"
      @implementation NSArray (Log)
      - (NSString *)descriptionWithLocale:(id)locale
      {
      NSMutableString *strM = [NSMutableString stringWithString:@"(\n"];
      [self enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
      [strM appendFormat:@"\t%@,\n", obj];
      }];
      [strM appendString:@")"];
      return strM;
      }
      @end
      @implementation NSDictionary (Log)
      - (NSString *)descriptionWithLocale:(id)locale
      {
      NSMutableString *strM = [NSMutableString stringWithString:@"{\n"];
      [self enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
      [strM appendFormat:@"\t%@ = %@;\n", key, obj];
      }];
      [strM appendString:@"}\n"];
      return strM;
      }
      @end
      XFFruit/Info.plist
      View file @ c31ce3be
      ......@@ -15,11 +15,11 @@
      <key>CFBundlePackageType</key>
      <string>APPL</string>
      <key>CFBundleShortVersionString</key>
      <string>2.0.15</string>
      <string>2.0.19</string>
      <key>CFBundleSignature</key>
      <string>????</string>
      <key>CFBundleVersion</key>
      <string>2.0.15</string>
      <string>2.0.19</string>
      <key>NSAppTransportSecurity</key>
      <dict>
      <key>NSAllowsArbitraryLoads</key>
      ......
      XFFruit/Macro/ICRAppMacro.h
      View file @ c31ce3be
      ......@@ -37,8 +37,8 @@
      #elif XFFruit_DEV
      //********开发环境********
      #define HTTP_REST_API_BASE_URL @"http://gomoredev:8090/cruiser-server/rest"
      #define HTTP_REST_REPORT_BASE_URL @"http://gomoredev:8090"
      #define HTTP_REST_API_BASE_URL @"http://dev.gomoretech.com/cruiser-server/rest"
      #define HTTP_REST_REPORT_BASE_URL @"http://dev.gomoretech.com"
      #elif XFFruit_TEST
      //********测试环境********
      ......
      XFFruit/Main.storyboard 0 → 100644
      View file @ c31ce3be
      <?xml version="1.0" encoding="UTF-8"?>
      <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
      <device id="retina4_7" orientation="portrait">
      <adaptation id="fullscreen"/>
      </device>
      <dependencies>
      <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
      <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
      </dependencies>
      <scenes>
      <!--Check Alert View Controller-->
      <scene sceneID="QgN-nr-4Pc">
      <objects>
      <viewController storyboardIdentifier="CheckAlertViewController" id="Ise-aJ-dCV" customClass="CheckAlertViewController" sceneMemberID="viewController">
      <layoutGuides>
      <viewControllerLayoutGuide type="top" id="l0J-Ej-fXG"/>
      <viewControllerLayoutGuide type="bottom" id="cBa-Kt-f2y"/>
      </layoutGuides>
      <view key="view" contentMode="scaleToFill" id="X50-Df-EIn">
      <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
      <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
      <subviews>
      <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fSy-R6-RHt">
      <rect key="frame" x="37.5" y="243.5" width="300" height="180"/>
      <subviews>
      <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TSm-1Y-Ecw">
      <rect key="frame" x="0.0" y="0.0" width="300" height="40"/>
      <color key="backgroundColor" red="0.48627450979999998" green="0.75294117650000003" blue="0.4431372549" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
      <constraints>
      <constraint firstAttribute="height" constant="40" id="OoY-oX-nE6"/>
      </constraints>
      </view>
      <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="提示" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="34G-7r-nCh">
      <rect key="frame" x="0.0" y="0.0" width="300" height="40"/>
      <color key="backgroundColor" red="0.48627450980392156" green="0.75294117647058822" blue="0.44313725490196076" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
      <constraints>
      <constraint firstAttribute="height" constant="40" id="nTd-33-gYs"/>
      </constraints>
      <fontDescription key="fontDescription" type="system" pointSize="17"/>
      <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
      <nil key="highlightedColor"/>
      </label>
      <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="确定审核拒绝？" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vhm-sf-L10">
      <rect key="frame" x="15" y="40" width="270" height="40"/>
      <constraints>
      <constraint firstAttribute="height" constant="40" id="rY0-7V-kCy"/>
      </constraints>
      <fontDescription key="fontDescription" type="system" pointSize="17"/>
      <nil key="textColor"/>
      <nil key="highlightedColor"/>
      </label>
      <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入拒绝理由" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="wux-B6-6fz">
      <rect key="frame" x="15" y="88" width="270" height="40"/>
      <constraints>
      <constraint firstAttribute="height" constant="40" id="yyc-Z5-Gfe"/>
      </constraints>
      <nil key="textColor"/>
      <fontDescription key="fontDescription" type="system" pointSize="14"/>
      <textInputTraits key="textInputTraits"/>
      </textField>
      <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tAJ-jk-v4Y">
      <rect key="frame" x="15" y="136" width="131" height="36"/>
      <color key="backgroundColor" red="0.48627450979999998" green="0.75294117650000003" blue="0.4431372549" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
      <state key="normal" title="确定">
      <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
      </state>
      <connections>
      <action selector="actionConfirm:" destination="Ise-aJ-dCV" eventType="touchUpInside" id="y7H-Kt-MSB"/>
      </connections>
      </button>
      <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DvC-l2-v4M">
      <rect key="frame" x="154" y="136" width="131" height="36"/>
      <color key="backgroundColor" red="0.97254901960784312" green="0.5725490196078431" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
      <constraints>
      <constraint firstAttribute="height" constant="36" id="hb7-J1-tkV"/>
      </constraints>
      <state key="normal" title="取消">
      <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
      </state>
      <connections>
      <action selector="actionCancel:" destination="Ise-aJ-dCV" eventType="touchUpInside" id="r6V-ku-vck"/>
      </connections>
      </button>
      </subviews>
      <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
      <constraints>
      <constraint firstAttribute="width" constant="300" id="0Xs-yP-Xdl"/>
      <constraint firstAttribute="trailing" secondItem="vhm-sf-L10" secondAttribute="trailing" constant="15" id="2K0-Xe-h2f"/>
      <constraint firstAttribute="trailing" secondItem="34G-7r-nCh" secondAttribute="trailing" id="2zZ-Ob-7mT"/>
      <constraint firstAttribute="trailing" secondItem="TSm-1Y-Ecw" secondAttribute="trailing" id="3No-xk-KbA"/>
      <constraint firstItem="TSm-1Y-Ecw" firstAttribute="top" secondItem="fSy-R6-RHt" secondAttribute="top" id="3gx-hi-Wgv"/>
      <constraint firstAttribute="bottom" secondItem="tAJ-jk-v4Y" secondAttribute="bottom" constant="8" id="57Y-fE-Fht"/>
      <constraint firstAttribute="trailing" secondItem="DvC-l2-v4M" secondAttribute="trailing" constant="15" id="5xx-6z-Ndw"/>
      <constraint firstItem="34G-7r-nCh" firstAttribute="top" secondItem="fSy-R6-RHt" secondAttribute="top" id="Az9-gG-HZD"/>
      <constraint firstItem="34G-7r-nCh" firstAttribute="leading" secondItem="fSy-R6-RHt" secondAttribute="leading" id="BlY-81-YdC"/>
      <constraint firstAttribute="height" constant="180" id="Cv3-tO-6eI"/>
      <constraint firstItem="vhm-sf-L10" firstAttribute="leading" secondItem="fSy-R6-RHt" secondAttribute="leading" constant="15" id="GgL-HY-bPl"/>
      <constraint firstItem="wux-B6-6fz" firstAttribute="top" secondItem="vhm-sf-L10" secondAttribute="bottom" constant="8" id="Ito-kT-Viz"/>
      <constraint firstItem="vhm-sf-L10" firstAttribute="top" secondItem="34G-7r-nCh" secondAttribute="bottom" id="JOj-QC-WjR"/>
      <constraint firstItem="DvC-l2-v4M" firstAttribute="height" secondItem="tAJ-jk-v4Y" secondAttribute="height" id="Max-wx-6tA"/>
      <constraint firstItem="TSm-1Y-Ecw" firstAttribute="leading" secondItem="fSy-R6-RHt" secondAttribute="leading" id="OxC-os-7Ix"/>
      <constraint firstItem="wux-B6-6fz" firstAttribute="leading" secondItem="fSy-R6-RHt" secondAttribute="leading" constant="15" id="R9u-WX-vcx"/>
      <constraint firstItem="DvC-l2-v4M" firstAttribute="leading" secondItem="tAJ-jk-v4Y" secondAttribute="trailing" constant="8" id="UPL-aX-1lb"/>
      <constraint firstItem="tAJ-jk-v4Y" firstAttribute="leading" secondItem="fSy-R6-RHt" secondAttribute="leading" constant="15" id="dEE-o5-6Sc"/>
      <constraint firstAttribute="trailing" secondItem="wux-B6-6fz" secondAttribute="trailing" constant="15" id="jeY-Mx-v2x"/>
      <constraint firstItem="DvC-l2-v4M" firstAttribute="width" secondItem="tAJ-jk-v4Y" secondAttribute="width" id="sAq-Pa-Xdt"/>
      <constraint firstAttribute="bottom" secondItem="DvC-l2-v4M" secondAttribute="bottom" constant="8" id="yUY-UK-Q8Y"/>
      </constraints>
      </view>
      </subviews>
      <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
      <constraints>
      <constraint firstItem="fSy-R6-RHt" firstAttribute="centerX" secondItem="X50-Df-EIn" secondAttribute="centerX" id="Szd-fO-SRe"/>
      <constraint firstItem="fSy-R6-RHt" firstAttribute="centerY" secondItem="X50-Df-EIn" secondAttribute="centerY" id="a8M-3a-8b6"/>
      </constraints>
      </view>
      <connections>
      <outlet property="alertCard" destination="fSy-R6-RHt" id="0lj-F8-Jol"/>
      <outlet property="constraintHeight" destination="Cv3-tO-6eI" id="JuH-1g-xd4"/>
      <outlet property="labelContent" destination="vhm-sf-L10" id="Uov-hI-Yol"/>
      <outlet property="labelTitle" destination="34G-7r-nCh" id="bHc-JN-OTz"/>
      <outlet property="textField" destination="wux-B6-6fz" id="t4x-aG-ZQh"/>
      </connections>
      </viewController>
      <placeholder placeholderIdentifier="IBFirstResponder" id="2M8-M4-E3s" userLabel="First Responder" sceneMemberID="firstResponder"/>
      </objects>
      <point key="canvasLocation" x="-396" y="179"/>
      </scene>
      </scenes>
      </document>
      XFFruit/Utilities/IBTUIKit/IBTConstants.h
      View file @ c31ce3be
      ......@@ -206,6 +206,8 @@
      //转运单状态
      #define TRANSFER_STATE_INITIAL @"initial" //未提交
      #define TRANSFER_STATE_WAITCHECK @"waitCheck" //未提交
      #define TRANSFER_STATE_REJECT @"rejected" //未提交
      #define TRANSFER_STATE_UNRECEIVED @"unreceived"//待收货
      #define TRANSFER_STATE_RECEIVED @"received" //已收货
      #define TRANSFER_STATE_ABORTED @"aborted" //已废用
      ......@@ -226,6 +228,7 @@
      //转运单
      #define TRANSFER_ACTION_ABORT @"500605" //作废权
      #define TRANSFER_ACTION_CHECK @"500606" //审批权
      #define RECEIVE_ACTION_RECEIVE @"500803" //收货权
      #define TRANSFER_ACTION_NEW @"500601" //新建权
      ......
      XFFruit/Vendors/BaseAlertCardViewController.h 0 → 100644
      View file @ c31ce3be
      //
      // BaseAlertCardViewController.h
      // patrol
      //
      // Created by Javen on 2017/3/3.
      // Copyright © 2017年 上海勾芒科技有限公司. All rights reserved.
      //
      #import <UIKit/UIKit.h>
      static NSInteger const shadowTag = 1111;
      @interface BaseAlertCardViewController : UIViewController
      @property (weak, nonatomic) UIViewController *superVC;
      /** 弹出框 */
      @property (weak, nonatomic) IBOutlet UIView *alertCard;
      - (void)show;
      - (void)hide;
      /** 提前触发viewDidLoad方法*/
      - (void)layoutAlertView;
      - (IBAction)actionHide:(id)sender;
      - (void)actionTap:(UITapGestureRecognizer *)tap;
      @end
      XFFruit/Vendors/BaseAlertCardViewController.m 0 → 100644
      View file @ c31ce3be
      //
      // BaseAlertCardViewController.m
      // patrol
      //
      // Created by Javen on 2017/3/3.
      // Copyright © 2017年 上海勾芒科技有限公司. All rights reserved.
      //
      #import "BaseAlertCardViewController.h"
      @interface BaseAlertCardViewController () <UIGestureRecognizerDelegate>
      @end
      @implementation BaseAlertCardViewController
      - (void)viewDidLoad {
      [super viewDidLoad];
      self.alertCard.transform = CGAffineTransformMakeScale(0.1, 0.1);
      self.view.backgroundColor = [UIColor colorWithWhite:0.3 alpha:0];
      // Do any additional setup after loading the view.
      self.view.tag = shadowTag;
      UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(actionTap:)];
      UIView *tapView = [[UIView alloc] initWithFrame:self.view.bounds];
      tapView.backgroundColor = [UIColor colorWithWhite:0.01 alpha:0.01];
      [self.view insertSubview:tapView belowSubview:self.alertCard];
      [tapView addGestureRecognizer:tap];
      }
      - (void)actionTap:(UITapGestureRecognizer *)tap {
      [self hide];
      }
      - (IBAction)actionHide:(id)sender {
      [self hide];
      [self.superVC.view endEditing:true];
      }
      - (void)setSuperVC:(UIViewController *)superVC {
      _superVC = superVC;
      [superVC addChildViewController:self];
      }
      /**
      显示整个确认框
      */
      - (void)show {
      self.view.frame = self.superVC.view.bounds;
      [self.superVC.view addSubview:self.view];
      [UIView animateWithDuration:0.5
      delay:0
      usingSpringWithDamping:0.7
      initialSpringVelocity:1.0
      options:UIViewAnimationOptionCurveEaseOut
      animations:^{
      self.view.backgroundColor = [UIColor colorWithWhite:0.3 alpha:0.5];
      self.alertCard.transform = CGAffineTransformMakeScale(1, 1);
      }
      completion:nil];
      }
      /**
      隐藏整个确认框
      */
      - (void)hide {
      [UIView animateWithDuration:0.5
      delay:0
      usingSpringWithDamping:0.9
      initialSpringVelocity:1.0
      options:UIViewAnimationOptionCurveEaseOut
      animations:^{
      self.view.backgroundColor = [UIColor colorWithWhite:0.3 alpha:0.0];
      self.alertCard.transform = CGAffineTransformMakeScale(0.01, 0.01);
      }
      completion:^(BOOL finished) {
      [self.view removeFromSuperview];
      }];
      }
      - (void)layoutAlertView {
      [self view];
      }
      - (void)didReceiveMemoryWarning {
      [super didReceiveMemoryWarning];
      // Dispose of any resources that can be recreated.
      }
      /*
      #pragma mark - Navigation
      // In a storyboard-based application, you will often want to do a little preparation before navigation
      - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
      // Get the new view controller using [segue destinationViewController].
      // Pass the selected object to the new view controller.
      }
      */
      @end
      XFFruit/ViewControllers/ChooseViewController/ChooseWarehouseViewController.m
      View file @ c31ce3be
      ......@@ -50,7 +50,7 @@
      NSInteger pageCount = [pageDict[@"pageCount"] integerValue];
      if (pageCount <= self.currentPage) {
      [self endRefreshing];
      [IBTLoadingView hideHUDWithText:nil];
      // [IBTLoadingView hideHUDWithText:nil];
      // [self fetchDataList:@"" tableStr:GXF_BASECLASS_WAREHOUSE];
      self.currentPage = 0;
      ......
      XFFruit/ViewControllers/Purchase/Controllers/NewPurchaseViewController.m
      View file @ c31ce3be
      ......@@ -488,11 +488,11 @@ typedef enum : NSUInteger {
      shopDetail.product_uuid = billProduct.product_uuid;
      shopDetail.product_code = billProduct.product_code;
      shopDetail.merchandise = billProduct.product_name;
      shopDetail.packageSpecification = [CalculateHelper getMoneyStringFrom:billProduct.qpc Lenth:0 isSeparate:NO];
      shopDetail.packageSpecification = [CalculateHelper decimalNumber:billProduct.qpc].stringValue;
      shopDetail.packageUnit = billProduct.unit;
      shopDetail.packageQuantity = [CalculateHelper getMoneyStringFrom:billProduct.qty Lenth:0 isSeparate:NO];
      shopDetail.packageQuantity = [CalculateHelper decimalNumber:billProduct.qty].stringValue;
      shopDetail.packageUnitPrice = billProduct.price;
      shopDetail.foundationQuantity= [CalculateHelper getMoneyStringFrom:billProduct.baseQty Lenth:0 isSeparate:NO];
      shopDetail.foundationQuantity= [CalculateHelper decimalNumber:billProduct.baseQty].stringValue;
      shopDetail.foundationUnitPrice= billProduct.basePrice;
      shopDetail.totalMoney= billProduct.total;
      shopDetail.remark = billProduct.remark;
      ......
      XFFruit/ViewControllers/Purchase/Models/Warehouse.h
      View file @ c31ce3be
      ......@@ -22,4 +22,5 @@
      //20170508z增加是否wms仓和是否产品中心仓的判断字段
      @property (nonatomic, assign) BOOL iswms;
      @property (nonatomic, assign) BOOL isProductCenter;
      @property (nonatomic, assign) BOOL isSpecial;
      @end
      XFFruit/ViewControllers/PurchaseNotice/Views/ShopDetaileViewController.h
      View file @ c31ce3be
      ......@@ -33,4 +33,9 @@ typedef void(^ChoseShopDetail)(ShopDetail *shopDetail);
      @property (nonatomic,strong)ChoseShopDetail choseShopDetail;
      @property (nonatomic,strong)NSString *navTitle;
      @property (assign, nonatomic) ShopDetailInterType intertype;
      /**
      是否禁止编辑基础单价
      */
      @property (assign, nonatomic) BOOL isLockBasePrice;
      @end
      XFFruit/ViewControllers/PurchaseNotice/Views/ShopDetaileViewController.m
      View file @ c31ce3be
      ......@@ -174,8 +174,9 @@ typedef enum : NSUInteger {
      }
      _checkTotalTextField.text = self.shopDetail.checkTotal.doubleValue > 0 ? self.shopDetail.checkTotal.stringValue : @"0.0000";
      self.checkTotal = self.shopDetail.checkTotal;
      _checkPriceTextField.text = self.shopDetail.checkPrice.doubleValue > 0 ? self.shopDetail.checkPrice.stringValue : @"0.0000";
      self.checkPrice = self.shopDetail.checkPrice;
      self.totalPrice = self.shopDetail.totalMoney;
      //备注
      ......@@ -346,12 +347,12 @@ typedef enum : NSUInteger {
      return NO;
      }
      // double max = self.shopDetail.receivedQty.doubleValue - self.shopDetail.shippedQty.doubleValue;
      // if (packageQuantity.text.doubleValue > max && self.shopDetail.receivedQty != nil && self.shopDetail.shippedQty != nil){
      // NSString *info = [NSString stringWithFormat:@"包装数量不得大于可运包装数[%.0f]", max];
      // ShowMessage(info);
      // return NO;
      // }
      // double max = self.shopDetail.receivedQty.doubleValue - self.shopDetail.shippedQty.doubleValue;
      // if (packageQuantity.text.doubleValue > max && self.shopDetail.receivedQty != nil && self.shopDetail.shippedQty != nil){
      // NSString *info = [NSString stringWithFormat:@"包装数量不得大于可运包装数[%.0f]", max];
      // ShowMessage(info);
      // return NO;
      // }
      if (self.packageUintStr.length == 0) {
      ShowMessage(@"包装单位不能为空");
      return NO;
      ......@@ -495,7 +496,7 @@ typedef enum : NSUInteger {
      [textField addTarget:self action:@selector(textChange:) forControlEvents:UIControlEventAllEditingEvents];
      foundationUnitPrice=textField; //基础单价
      if (self.intertype == ShopDetailInterTypeTranfer){
      cell.userInteractionEnabled = YES;
      cell.userInteractionEnabled = !self.isLockBasePrice;
      }
      }else if ([title isEqualToString:@"包装单价"]) {
      label.text = @"元";
      ......@@ -673,7 +674,7 @@ typedef enum : NSUInteger {
      self.totalPrice = [CalculateHelper decimalNumber:totalMoney.text];
      [self setUnitAndPackPrice];
      }else if (textField == _checkPriceTextField){
      self.checkPrice = [CalculateHelper decimalNumber:_checkPriceTextField.text];
      self.checkPrice = [CalculateHelper calculateNum1:_checkPriceTextField.text num2:@(1) type:CalculateTypeMul roundingType:NSRoundBankers cutLenth:2];
      self.checkTotal = [CalculateHelper calculateNum1:_checkPriceTextField.text num2:foundationQuantity.text type:CalculateTypeMul roundingType:NSRoundBankers cutLenth:2];
      _checkTotalTextField.text = self.checkTotal.stringValue;
      ......
      XFFruit/ViewControllers/Transfer/Controllers/CheckAlertViewController.h 0 → 100644
      View file @ c31ce3be
      //
      // CheckAlertViewController.h
      // XFFruit
      //
      // Created by Javen on 2018/4/1.
      // Copyright © 2018年 Xummer. All rights reserved.
      //
      #import "BaseAlertCardViewController.h"
      @interface CheckAlertViewController : BaseAlertCardViewController
      //@property (strong, nonatomic) NSString *content;
      @property (strong, nonatomic) NSString *text;
      @property (copy, nonatomic) void (^blockConfirm)(void);
      - (void)configWithContent:(NSString *)content isHasTextField:(BOOL)isHasTextField;
      @end
      XFFruit/ViewControllers/Transfer/Controllers/CheckAlertViewController.m 0 → 100644
      View file @ c31ce3be
      //
      // CheckAlertViewController.m
      // XFFruit
      //
      // Created by Javen on 2018/4/1.
      // Copyright © 2018年 Xummer. All rights reserved.
      //
      #import "CheckAlertViewController.h"
      @interface CheckAlertViewController ()
      @property (weak, nonatomic) IBOutlet UILabel *labelContent;
      @property (weak, nonatomic) IBOutlet UITextField *textField;
      @property (weak, nonatomic) IBOutlet NSLayoutConstraint *constraintHeight;
      @property (weak, nonatomic) IBOutlet UILabel *labelTitle;
      @end
      @implementation CheckAlertViewController
      - (void)viewDidLoad {
      [super viewDidLoad];
      for (UIButton *view in self.alertCard.subviews) {
      if ([view isKindOfClass:[UIButton class]]){
      view.layer.cornerRadius = 4;
      }
      }
      // Do any additional setup after loading the view.
      }
      - (void)configWithContent:(NSString *)content isHasTextField:(BOOL)isHasTextField {
      [self layoutAlertView];
      if (!isHasTextField) {
      self.constraintHeight.constant = 140;
      self.textField.hidden = true;
      }
      self.labelTitle.backgroundColor = [UIColor redColor];
      self.labelContent.text = content;
      }
      - (IBAction)actionConfirm:(id)sender {
      [self.view endEditing:true];
      if (self.blockConfirm) {
      self.blockConfirm();
      }
      }
      - (NSString *)text {
      return self.textField.text;
      }
      - (IBAction)actionCancel:(id)sender {
      [self hide];
      }
      - (void)didReceiveMemoryWarning {
      [super didReceiveMemoryWarning];
      // Dispose of any resources that can be recreated.
      }
      /*
      #pragma mark - Navigation
      // In a storyboard-based application, you will often want to do a little preparation before navigation
      - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
      // Get the new view controller using [segue destinationViewController].
      // Pass the selected object to the new view controller.
      }
      */
      @end
      XFFruit/ViewControllers/Transfer/Controllers/NewTransferViewController.m
      View file @ c31ce3be
      ......@@ -483,6 +483,7 @@ typedef enum : NSUInteger {
      ShopDetaileViewController *svc = [[ShopDetaileViewController alloc] init];
      svc.intertype = ShopDetailInterTypeTranfer;
      svc.isLockBasePrice = _sheetView.selectedWareHouse.isSpecial;
      if (billProduct) {
      svc.navTitle = @"编辑商品";
      ShopDetail *shopDetail=[self coverShopDetail:billProduct];
      ......@@ -491,10 +492,10 @@ typedef enum : NSUInteger {
      TransferPdtDetail *tdetail = [self coverTransportPdtDetail:Detail];
      if (Detail.IsDeleted) {
      [_bottomView refreshDelProduct:tdetail tag:indexTag];
      [self resetCache];
      }else{
      [_bottomView refreshEditProduct:tdetail tag:indexTag];
      }
      [self resetCache];
      };
      svc.shopDetail=shopDetail;
      }else{
      ......
      XFFruit/ViewControllers/Transfer/Controllers/TransferDetailViewController.m
      View file @ c31ce3be
      ......@@ -8,6 +8,7 @@
      #import "TransferDetailViewController.h"
      #import "BottomTransferView.h"
      #import "CheckAlertViewController.h"
      #define BottomHeight 50
      #define LeftMargin 15
      ......@@ -17,7 +18,9 @@
      typedef enum : NSUInteger {
      AbortTag = 20000,
      EndTag,
      SubmitTag
      SubmitTag,
      PassTag,
      RejectTag
      } BtnTag;
      @interface TransferDetailViewController (){
      ......@@ -28,6 +31,9 @@ typedef enum : NSUInteger {
      UIButton *_secondBtn;
      BottomTransferView *_transView;
      }
      @property (strong, nonatomic) CheckAlertViewController *rejectView;
      @property (strong, nonatomic) CheckAlertViewController *passView;
      @property (nonatomic,strong)UILabel *billNumberLabel;
      @property (nonatomic,strong)UILabel *purchaseLabel;
      @property (nonatomic,strong)UILabel *stateLabel;
      ......@@ -38,6 +44,9 @@ typedef enum : NSUInteger {
      @property (nonatomic,strong)UILabel *createOperLabel;
      @property (nonatomic,strong)UILabel *arriveDateLabel;
      @property (nonatomic,strong)UILabel *noteLabel;
      @property (nonatomic,strong)UILabel *aprovedLabel;
      @property (nonatomic,strong)UILabel *aproverLabel;
      @property (nonatomic,strong)UILabel *rejectCauseLabel;
      @property (nonatomic,strong)UILabel *leftBillNumberLabel;
      @property (nonatomic,strong)UILabel *leftPurchaseLabel;
      ......@@ -49,6 +58,10 @@ typedef enum : NSUInteger {
      @property (nonatomic,strong)UILabel *leftCreateOperLabel;
      @property (nonatomic,strong)UILabel *leftArriveDateLabel;
      @property (nonatomic,strong)UILabel *leftNoteLabel;
      @property (nonatomic,strong)UILabel *leftAprovedLabel;
      @property (nonatomic,strong)UILabel *leftAproverLabel;
      @property (nonatomic,strong)UILabel *leftRejectCauseLabel;
      @property (strong, nonatomic) NSMutableArray *leftArr;
      @end
      @implementation TransferDetailViewController
      ......@@ -104,6 +117,13 @@ typedef enum : NSUInteger {
      }else if ([self.transfer.state isEqualToString:TRANSFER_STATE_PROCESSFAIL]) {
      self.stateLabel.textColor = [UIColor blackColor];
      self.stateLabel.text = @"系统处理失败";
      }else if ([self.transfer.state isEqualToString:TRANSFER_STATE_WAITCHECK]) {
      self.stateLabel.textColor = [UIColor greenColor];
      self.stateLabel.text = @"待审核";
      }
      else if ([self.transfer.state isEqualToString:TRANSFER_STATE_REJECT]) {
      self.stateLabel.textColor = [UIColor blackColor];
      self.stateLabel.text = @"已拒绝";
      }
      self.purchaseLabel.text = [self getPurchaseWith:self.transfer.pdtDetails];
      self.warehouseLabel.text = [IBTCommon checkString:self.transfer.warehouseName];
      ......@@ -113,6 +133,9 @@ typedef enum : NSUInteger {
      self.noteLabel.text = [NSString stringWithFormat:@"%@",self.transfer.note?self.transfer.note:@"无"];
      self.createOperLabel.text = [NSString stringWithFormat:@"%@%@",[IBTCommon checkString:self.transfer.create_operName],self.transfer.create_time.length > 10 ? [self.transfer.create_time substringToIndex:10] : self.transfer.create_time];
      self.arriveDateLabel.text = [NSString stringWithFormat:@"%@",self.transfer.arriveDate?[[IBTCommon checkString:self.transfer.arriveDate]substringToIndex:10]:@"无"];
      self.aproverLabel.text = self.transfer.approver;
      self.aprovedLabel.text = self.transfer.approved;
      self.rejectCauseLabel.text = self.transfer.rejectCause;
      [_transView refreshTranProduct:self.transfer.pdtDetails];
      [_transView refreshCost:self.transfer.accountDetails];
      [self setNoteHeight];
      ......@@ -150,6 +173,16 @@ typedef enum : NSUInteger {
      self.leftNoteLabel.top = self.leftArriveDateLabel.bottom;
      self.noteLabel.top = self.leftArriveDateLabel.bottom;
      self.leftAproverLabel.top = self.leftNoteLabel.bottom;
      self.aprovedLabel.top = self.leftNoteLabel.bottom;
      self.leftAprovedLabel.top = self.leftAproverLabel.bottom;
      self.aprovedLabel.top = self.leftAproverLabel.bottom;
      self.leftRejectCauseLabel.top = self.leftAprovedLabel.bottom;
      self.rejectCauseLabel.top = self.leftAprovedLabel.bottom;
      CGFloat height = [self.noteLabel calculateHeight];
      if (height < LeftHeight) {
      height = LeftHeight;
      ......@@ -157,11 +190,11 @@ typedef enum : NSUInteger {
      self.noteLabel.height = height;
      CGFloat totalHeight = height + LeftHeight*8 + purchaseHeight;
      CGFloat totalHeight = height + LeftHeight*self.leftArr.count + purchaseHeight;
      CGRect purchaseFrame = _transportView.frame;
      purchaseFrame.size.height = totalHeight + LeftMargin;
      _transportView.frame = purchaseFrame;
      // CGRect purchaseFrame = _transportView.frame;
      // purchaseFrame.size.height = totalHeight + LeftMargin;
      // _transportView.frame = purchaseFrame;
      CGRect bottomFrame = _bottomView.frame;
      ......@@ -200,6 +233,10 @@ typedef enum : NSUInteger {
      btnTag = AbortTag;
      }else if ([arr[i] isEqualToString:@"收货"]) {
      btnTag = SubmitTag;
      } else if ([arr[i] isEqualToString:@"审核通过"]) {
      btnTag = PassTag;
      } else if ([arr[i] isEqualToString:@"审核拒绝"]) {
      btnTag = RejectTag;
      } else {
      }
      ......@@ -224,24 +261,21 @@ typedef enum : NSUInteger {
      }else{
      [self hiddenBottomView];
      }
      }else if ([self.transfer.state isEqualToString:TRANSFER_STATE_PROCESSFAIL]){
      // NSMutableArray *arr = [NSMutableArray array]; //系统处理失败
      // if ([IBTCommon checkIsPermission:TRANSPORT_ACTION_ABORT]) {
      // [arr addObject:@"作废"];
      // }if ([IBTCommon checkIsPermission:TRANSPORT_ACTION_NEW]) {
      // //[arr addObject:@"提交"];
      // [arr addObject:@"收货"];
      // }
      // if (arr.count == 0) {
      // [self hiddenBottomView];
      // }else{
      // [self createBtnWithArr:arr];
      // }
      }else if ([self.transfer.state isEqualToString:TRANSFER_STATE_WAITCHECK]){
      if ([IBTCommon checkIsPermission:TRANSFER_ACTION_CHECK]) {
      [self createBtnWithArr:@[@"审核通过", @"审核拒绝"]];
      }
      }else{
      [self hiddenBottomView];
      }
      NSArray *leftArr = @[@"单号:",@"来源单据:",@"状态:",@"发货仓库:",@"收货仓库:",@"车辆:",@"司机电话:",@"创建:",@"预计到货时间:",@"备注:"];
      NSMutableArray *leftArr = @[@"单号:",@"来源单据:",@"状态:",@"发货仓库:",@"收货仓库:",@"车辆:",@"司机电话:",@"创建:",@"预计到货时间:",@"备注:"].mutableCopy;
      if (self.transfer.rejectCause) {
      [leftArr addObjectsFromArray:@[@"审批人:",@"审批时间:",@"拒绝原因:"]];
      }else if (self.transfer.approved){
      [leftArr addObjectsFromArray:@[@"审批人:",@"审批时间:"]];
      }
      self.leftArr = leftArr;
      _transportView= [[UIView alloc]initWithFrame:CGRectMake(0, TopMargin, ScreenSize.width, LeftHeight*leftArr.count +LeftMargin)];
      _transportView.backgroundColor = [UIColor whiteColor];
      [_scrollView addSubview:_transportView];
      ......@@ -257,42 +291,55 @@ typedef enum : NSUInteger {
      UILabel *rightLabel = [[UILabel alloc]initWithFrame:CGRectMake(CGRectGetMaxX(leftLabel.frame), 10 + LeftHeight *i, _transportView.frame.size.width - LeftMargin - LeftWidth, LeftHeight)];
      rightLabel.font = GXF_SEVENTEENTH_SIZE;
      rightLabel.textColor = GXF_DETAIL_COLOR;
      NSString *title = leftArr[i];
      if (i == 0) {
      if ([title isEqualToString:@"单号:"]) {
      self.billNumberLabel = rightLabel;
      self.leftBillNumberLabel = leftLabel;
      }else if (i == 1) {
      }else if ([title isEqualToString:@"来源单据:"]) {
      self.purchaseLabel = rightLabel;
      self.purchaseLabel.numberOfLines = 0;
      self.leftPurchaseLabel = leftLabel;
      }else if(i == 2){
      }else if([title isEqualToString:@"状态:"]){
      self.stateLabel = rightLabel;
      self.leftStateLabel = leftLabel;
      }else if(i == 3){
      }else if([title isEqualToString:@"发货仓库:"]){
      self.warehouseLabel = rightLabel;
      self.leftWarehouseLabel = leftLabel;
      }else if(i == 4){
      }else if([title isEqualToString:@"收货仓库:"]){
      self.rwarehouseLabel = rightLabel;
      self.leftRwarehouseLabel = leftLabel;
      }else if(i == 5){
      }else if([title isEqualToString:@"车辆:"]){
      self.carnumberLabel = rightLabel;
      self.leftCarnumberLabel = leftLabel;
      }else if(i == 6){
      }else if([title isEqualToString:@"司机电话:"]){
      self.carhoneLabel = rightLabel;
      self.leftCarhoneLabel = leftLabel;
      }else if(i == 7){
      }else if([title isEqualToString:@"创建:"]){
      self.createOperLabel = rightLabel;
      self.leftCreateOperLabel = leftLabel;
      }else if(i == 8){
      }else if([title isEqualToString:@"预计到货时间:"]){
      leftLabel.width = LeftWidth + 10;
      rightLabel.left = leftLabel.right;
      rightLabel.width = ScreenSize.width - leftLabel.width - LeftMargin;
      self.arriveDateLabel = rightLabel;
      self.leftArriveDateLabel = leftLabel;
      }else if(i == leftArr.count - 1){
      }else if([title isEqualToString:@"备注:"]){
      rightLabel.numberOfLines = 0;
      self.noteLabel = rightLabel;
      self.leftNoteLabel = leftLabel;
      }else if([title isEqualToString:@"审批人:"]){
      rightLabel.numberOfLines = 0;
      self.aproverLabel = rightLabel;
      self.leftAproverLabel = leftLabel;
      }else if([title isEqualToString:@"审批时间:"]){
      rightLabel.numberOfLines = 0;
      self.aprovedLabel = rightLabel;
      self.leftAprovedLabel = leftLabel;
      }else if([title isEqualToString:@"拒绝原因:"]){
      rightLabel.numberOfLines = 0;
      self.rejectCauseLabel = rightLabel;
      self.leftRejectCauseLabel = leftLabel;
      }
      [_transportView addSubview:rightLabel];
      }
      ......@@ -341,6 +388,19 @@ typedef enum : NSUInteger {
      alertView.delegate = self;
      alertView.tag = SubmitTag;
      [alertView show];
      }
      break;
      case PassTag:
      {
      CLog(@"审核通过");
      [self.passView show];
      }
      break;
      case RejectTag:
      {
      CLog(@"审核拒绝");
      [self.rejectView show];
      }
      break;
      ......@@ -394,7 +454,7 @@ typedef enum : NSUInteger {
      }
      }
      #pragma mark - 提交数据
      - (void)getDataFromServer:(NSString *)state msg:(NSString *)msg{
      - (void)getDataFromServer:(NSString *)state msg:(NSString *)msg {
      //保存
      void(^succ)(id) = ^(id data) {
      [IBTLoadingView hideHUDWithText:nil];
      ......@@ -414,28 +474,6 @@ typedef enum : NSUInteger {
      [IBTLoadingView showTips:data];
      };
      // NSDictionary *dict = @{@"uuid":self.transfer.uuid,
      // @"version":self.transfer.version,
      // @"billnumber":self.transfer.billnumber,
      // @"enterprise":[ICRUserUtil sharedInstance].orgId,
      // @"state":TRANSFER_STATE_UNRECEIVED,
      // @"warehouseUuid":[IBTCommon checkString:self.transfer.warehouseUuid],
      // @"warehouseCode":[IBTCommon checkString:self.transfer.warehouseCode],
      // @"warehouseName":[IBTCommon checkString:self.transfer.warehouseName],
      // @"rwarehouseUuid":[IBTCommon checkString:self.transfer.rwarehouseUuid],
      // @"rwarehouseCode":[IBTCommon checkString:self.transfer.rwarehouseCode],
      // @"rwarehouseName":[IBTCommon checkString:self.transfer.rwarehouseName],
      // @"carnumber":[IBTCommon checkString:self.transfer.carnumber],
      // @"type":[IBTCommon checkString:self.transfer.type],
      // @"carphone":[IBTCommon checkString:self.transfer.carphone],
      // @"arriveDate":[IBTCommon checkString:self.transfer.arriveDate],
      // @"note":[IBTCommon checkString:self.transfer.note],
      // @"pdtDetails":self.transfer.pdtDetails,
      // @"accountDetails":self.transfer.accountDetails
      // };
      // [IBTLoadingView showProgressLabel:msg];
      // [[ICRHTTPController sharedController] saveTransferWithData:dict success:succ failure:fail];
      NSDictionary *dict = @{@"uuid":self.transfer.uuid,
      @"version":self.transfer.version,
      @"billnumber":self.transfer.billnumber,
      ......@@ -457,6 +495,126 @@ typedef enum : NSUInteger {
      [[ICRHTTPController sharedController] saveReceiptAndReceiveWithData:dict success:succ failure:fail];
      }
      - (void)httpApprove {
      ICRUserUtil *userUtil = [ICRUserUtil sharedInstance];
      NSString *currentTime = [[NSDate date] httpParameterString];
      NSString *urlStr = [[HTTP_REST_API_BASE_URL stringByAppendingFormat:@"/%@", @"transfer/approve"] stringByAppendingFormat:@"?time=%@&operId=%@&operName=%@",currentTime,userUtil.userCode,userUtil.displayName];
      NSString *encodeUrlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
      NSDictionary *dict = @{@"uuid":self.transfer.uuid,
      @"version":self.transfer.version,
      @"billnumber":self.transfer.billnumber,
      @"enterprise":[ICRUserUtil sharedInstance].orgId,
      @"state":self.transfer.state,
      @"warehouseUuid":[IBTCommon checkString:self.transfer. warehouseUuid],
      @"warehouseCode":[IBTCommon checkString:self.transfer.warehouseCode],
      @"warehouseName":[IBTCommon checkString:self.transfer.warehouseName],
      @"rwarehouseUuid":[IBTCommon checkString:self.transfer.rwarehouseUuid],
      @"rwarehouseCode":[IBTCommon checkString:self.transfer.rwarehouseCode],
      @"rwarehouseName":[IBTCommon checkString:self.transfer.rwarehouseName],
      @"carnumber":[IBTCommon checkString:self.transfer.carnumber],
      @"type":[IBTCommon checkString:self.transfer.type],
      @"carphone":[IBTCommon checkString:self.transfer.carphone],
      @"note":[IBTCommon checkString:self.transfer.note],
      @"pdtDetails":self.transfer.pdtDetails,
      @"approver":userUtil.displayName,
      @"approvId":userUtil.userId,
      @"approved":currentTime
      };
      [IBTLoadingView showProgressLabel:@"处理中…"];
      [[ICRHTTPController sharedController] POST:encodeUrlStr parameters:dict needToken:NO acceptTypeJson:YES success:^(AFHTTPRequestOperation *operation, id data) {
      [IBTLoadingView hideHUDWithText:@""];
      NSInteger success = [data[@"success"] integerValue];
      NSString *message = data[@"message"];
      if (success == 1) {
      [ICRUserUtil sharedInstance].needFresh = YES;
      [self PopViewControllerAnimated:YES];
      }else{
      [IBTLoadingView showTips:message];
      }
      } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
      [IBTLoadingView showTips:error];
      }];
      }
      - (void)httpReject {
      ICRUserUtil *userUtil = [ICRUserUtil sharedInstance];
      NSString *currentTime = [[NSDate date] httpParameterString];
      NSString *urlStr = [[HTTP_REST_API_BASE_URL stringByAppendingFormat:@"/%@", @"transfer/reject"] stringByAppendingFormat:@"?time=%@&operId=%@&operName=%@",currentTime,userUtil.userCode,userUtil.displayName];
      NSString *encodeUrlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
      NSDictionary *dict = @{@"uuid":self.transfer.uuid,
      @"version":self.transfer.version,
      @"billnumber":self.transfer.billnumber,
      @"enterprise":[ICRUserUtil sharedInstance].orgId,
      @"state":self.transfer.state,
      @"warehouseUuid":[IBTCommon checkString:self.transfer. warehouseUuid],
      @"warehouseCode":[IBTCommon checkString:self.transfer.warehouseCode],
      @"warehouseName":[IBTCommon checkString:self.transfer.warehouseName],
      @"rwarehouseUuid":[IBTCommon checkString:self.transfer.rwarehouseUuid],
      @"rwarehouseCode":[IBTCommon checkString:self.transfer.rwarehouseCode],
      @"rwarehouseName":[IBTCommon checkString:self.transfer.rwarehouseName],
      @"carnumber":[IBTCommon checkString:self.transfer.carnumber],
      @"type":[IBTCommon checkString:self.transfer.type],
      @"carphone":[IBTCommon checkString:self.transfer.carphone],
      @"note":[IBTCommon checkString:self.transfer.note],
      @"pdtDetails":self.transfer.pdtDetails,
      @"rejectCause":self.rejectView.text,
      @"approver":userUtil.displayName,
      @"approvId":userUtil.userId,
      @"approved":currentTime
      };
      [IBTLoadingView showProgressLabel:@"处理中…"];
      [[ICRHTTPController sharedController] POST:encodeUrlStr parameters:dict needToken:NO acceptTypeJson:YES success:^(AFHTTPRequestOperation *operation, id data) {
      [IBTLoadingView hideHUDWithText:@""];
      NSInteger success = [data[@"success"] integerValue];
      NSString *message = data[@"message"];
      if (success == 1) {
      [ICRUserUtil sharedInstance].needFresh = YES;
      [self PopViewControllerAnimated:YES];
      }else{
      [IBTLoadingView showTips:message];
      }
      } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
      [IBTLoadingView showTips:error];
      }];
      }
      - (CheckAlertViewController *)rejectView {
      if (!_rejectView) {
      _rejectView = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"CheckAlertViewController"];
      _rejectView.superVC = self;
      [_rejectView configWithContent:@"确定审核拒绝？" isHasTextField:true];
      WS(weakSelf);
      _rejectView.blockConfirm = ^{
      if (weakSelf.rejectView.text.length == 0) {
      [IBTLoadingView showTextOnly:@"请输入拒绝原因！"];
      return ;
      }
      [weakSelf.rejectView hide];
      [weakSelf httpReject];
      };
      }
      return _rejectView;
      }
      - (CheckAlertViewController *)passView {
      if (!_passView) {
      _passView = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"CheckAlertViewController"];
      _passView.superVC = self;
      [_passView configWithContent:@"确定审核通过？" isHasTextField:false];
      WS(weakSelf);
      _passView.blockConfirm = ^{
      [weakSelf.passView hide];
      [weakSelf httpApprove];
      };
      }
      return _passView;
      }
      - (void)didReceiveMemoryWarning {
      [super didReceiveMemoryWarning];
      ......@@ -464,13 +622,13 @@ typedef enum : NSUInteger {
      }
      /*
      #pragma mark - Navigation
      #pragma mark - Navigation
      // In a storyboard-based application, you will often want to do a little preparation before navigation
      - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
      // In a storyboard-based application, you will often want to do a little preparation before navigation
      - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
      // Get the new view controller using [segue destinationViewController].
      // Pass the selected object to the new view controller.
      }
      */
      }
      */
      @end
      XFFruit/ViewControllers/Transfer/Controllers/TransferViewController.m
      View file @ c31ce3be
      ......@@ -277,7 +277,7 @@ typedef enum : NSUInteger {
      _boltView.backgroundColor = XXFBgColor;
      _boltView.delegate = self;
      _boltView.dataArr = [[NSMutableArray alloc]initWithObjects:@"未提交",@"待收货",@"已收货",@"已作废",@"提交系统处理",@"系统处理失败",nil];
      _boltView.dataArr = [[NSMutableArray alloc]initWithObjects:@"未提交",@"待审核", @"已拒绝", @"待收货", @"提交系统处理",@"系统处理失败", @"已收货",@"已作废",nil];
      [_maskView addSubview:_boltView];
      [UIView animateWithDuration:0.25 animations:^{
      CGRect sortFrame = _boltView.frame;
      ......
      XFFruit/ViewControllers/Transfer/Models/Transfer.h
      View file @ c31ce3be
      ......@@ -35,6 +35,8 @@
      @property (nonatomic,strong)NSString *lastModify_time;//最后修改时间
      @property (nonatomic,strong)NSString *lastModify_id; //最后修改人代码
      @property (nonatomic,strong)NSString *lastModify_operName;//最后修改人名称
      @property (nonatomic,strong)NSString *rejectCause;//拒绝原因
      @property (nonatomic,strong)NSString *approved;//批准时间
      @property (nonatomic,strong)NSString *approvId;//
      @property (nonatomic,strong)NSString *approver;
      @end
      XFFruit/ViewControllers/Transfer/Views/TopTransferView.h
      View file @ c31ce3be
      ......@@ -28,7 +28,7 @@
      @property (nonatomic,weak)id <TopTransferViewDelegate>delegate;
      @property (strong, nonatomic) Warehouse *selectedWareHouse;
      @property (nonatomic,strong)NSString *warehouseUuid;
      @property (nonatomic,strong)NSString *warehouseCode;
      @property (nonatomic,strong)NSString *warehouseName;
      ......
      XFFruit/ViewControllers/Transfer/Views/TopTransferView.m
      View file @ c31ce3be
      ......@@ -193,6 +193,7 @@
      cvc.choseBaseInfo = ^(NSArray *warehouses){
      if (warehouses.count > 0) {
      Warehouse *warehouse = warehouses[0];
      self.selectedWareHouse = warehouse;
      self.warehouseLabel.text = [NSString stringWithFormat:@"%@[%@]",warehouse.name,warehouse.code];
      self.warehouseLabel.textColor = GXF_CONTENT_COLOR;
      self.warehouseUuid = warehouse.uuid;
      ......
      XFFruit/ViewControllers/Transfer/Views/TransferBoltView.m
      View file @ c31ce3be
      ......@@ -249,20 +249,24 @@
      _currentIndexPath = indexPath;
      //initial(未提交)submitted(已提交)rejected(已拒绝)approved(已审批)shipping(发运中)finished(已完成)
      NSString *title = self.dataArr[indexPath.row];
      NSString *stateStr = @"";
      if (indexPath.row == 0) {
      if ([title isEqualToString:@"未提交"]) {
      stateStr = TRANSFER_STATE_INITIAL;
      }else if(indexPath.row == 1){
      }else if([title isEqualToString:@"待收货"]){
      stateStr = TRANSFER_STATE_UNRECEIVED;
      }else if(indexPath.row == 2){
      }else if([title isEqualToString:@"已收货"]){
      stateStr = TRANSFER_STATE_RECEIVED;
      }else if(indexPath.row == 3){
      }else if([title isEqualToString:@"已作废"]){
      stateStr = TRANSFER_STATE_ABORTED;
      }else if(indexPath.row == 4){
      }else if([title isEqualToString:@"提交系统处理"]){
      stateStr = TRANSFER_STATE_PROCESS;
      }else if(indexPath.row == 5){
      }else if([title isEqualToString:@"系统处理失败"]){
      stateStr = TRANSFER_STATE_PROCESSFAIL;
      }else if([title isEqualToString:@"待审核"]){
      stateStr = TRANSFER_STATE_WAITCHECK;
      }else if([title isEqualToString:@"已拒绝"]){
      stateStr = TRANSFER_STATE_REJECT;
      }
      [self.delegate getBoltValueSelectRow:stateStr];
      }
      ......
      XFFruit/ViewControllers/Transfer/Views/TransferCell.m
      View file @ c31ce3be
      ......@@ -103,6 +103,12 @@
      }else if ([transfer.state isEqualToString:TRANSFER_STATE_PROCESSFAIL]) {
      stateStr = @"系统处理失败";
      [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
      }else if ([transfer.state isEqualToString:TRANSFER_STATE_WAITCHECK]) {
      stateStr = @"待审核";
      [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"insurvey"] forState:UIControlStateDisabled];
      }else if ([transfer.state isEqualToString:TRANSFER_STATE_REJECT]) {
      stateStr = @"已拒绝";
      [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
      }
      [self.stateBtn setTitle:stateStr forState:UIControlStateNormal];
      }
      ......
      XFFruit/ViewControllers/Transport/Controllers/NewTransportViewController.m
      View file @ c31ce3be
      ......@@ -539,7 +539,7 @@ typedef enum : NSUInteger {
      billProduct.packprice = shopDetail.packageUnitPrice;
      billProduct.price = shopDetail.foundationUnitPrice;
      billProduct.baseQty = [NSDecimalNumber decimalNumberWithString:shopDetail.foundationQuantity];
      billProduct.total = shopDetail.total;
      billProduct.total = shopDetail.totalMoney;
      billProduct.note = shopDetail.remark;
      billProduct.qpcStr = shopDetail.packageQpcStr ? shopDetail.packageQpcStr : @"无" ;
      billProduct.baseUnit = shopDetail.packageQpcUnit;
      ......
      XFFruit/ViewControllers/Transport/Controllers/TransportPurchaseViewController.m
      View file @ c31ce3be
      ......@@ -350,6 +350,9 @@ NSInteger purchaseStockCheckNumber = 0;
      detail.total = [CalculateHelper calculateNum1:detail.qty num2:detail.packprice type:(CalculateTypeMul) roundingType:NSRoundBankers cutLenth:4];
      detail.checkPrice = detail.price;
      detail.checkTotal = detail.total;
      detail.price = [CalculateHelper calculateNum1:detail.price num2:@(1) type:CalculateTypeMul roundingType:NSRoundBankers cutLenth:4];
      detail.checkPrice = [CalculateHelper calculateNum1:detail.checkPrice num2:@(1) type:CalculateTypeMul roundingType:NSRoundBankers cutLenth:4];
      detail.checkTotal = [CalculateHelper calculateNum1:detail.checkTotal num2:@(1) type:CalculateTypeMul roundingType:NSRoundBankers cutLenth:4];
      [arr addObject:detail];
      }
      ......
      XFFruit_TEST.plist
      View file @ c31ce3be
      ......@@ -15,11 +15,11 @@
      <key>CFBundlePackageType</key>
      <string>APPL</string>
      <key>CFBundleShortVersionString</key>
      <string>2.0.15</string>
      <string>2.0.17</string>
      <key>CFBundleSignature</key>
      <string>????</string>
      <key>CFBundleVersion</key>
      <string>2.0.15</string>
      <string>2.0.17</string>
      <key>NSAppTransportSecurity</key>
      <dict>
      <key>NSAllowsArbitraryLoads</key>
      ......
      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