diff --git a/Podfile b/Podfile
index 3fa688f3235b0796ef082d5318f98633bbe19d0a..e6b2def5c4c9cacf202c6d6a9bc11d8d2af66e00 100644
--- a/Podfile
+++ b/Podfile
@@ -6,6 +6,6 @@ pod 'SSKeychain', '~> 1.2.3'
pod 'FMDB', '~> 2.5'
pod 'Base64nl', '~> 1.2'
pod 'Reveal-iOS-SDK', '~> 1.5.1'
-pod 'BaiduMapAPI', '~> 2.7.0'
+pod 'BaiduMapAPI', '~> 2.7.0’
pod 'MJRefresh', '~> 2.2.0'
pod 'IQKeyboardManager', '~> 3.2.3'
\ No newline at end of file
diff --git a/XFFruit.xcodeproj/project.pbxproj b/XFFruit.xcodeproj/project.pbxproj
index a01f237be9cc23c99cc4254fe5f8574828d8dd0c..d1fa1ab6d08ba24d40132757b47e1544e8e8fa88 100644
--- a/XFFruit.xcodeproj/project.pbxproj
+++ b/XFFruit.xcodeproj/project.pbxproj
@@ -101,14 +101,13 @@
7217E9F31B72364300FE5C1D /* SurveyCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7217E9E11B72364300FE5C1D /* SurveyCell.m */; };
7217E9F41B72364300FE5C1D /* SurveyListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7217E9E31B72364300FE5C1D /* SurveyListCell.m */; };
7217E9F61B724A7600FE5C1D /* mask.png in Resources */ = {isa = PBXBuildFile; fileRef = 7217E9F51B724A7600FE5C1D /* mask.png */; };
- 725581D91B9C25B5001EB0E1 /* NewTransportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 725581D81B9C25B5001EB0E1 /* NewTransportViewController.m */; };
- 725581DC1B9C2666001EB0E1 /* TopTransportView.m in Sources */ = {isa = PBXBuildFile; fileRef = 725581DB1B9C2666001EB0E1 /* TopTransportView.m */; };
- 725581E21B9C26C5001EB0E1 /* BottomTransportView.m in Sources */ = {isa = PBXBuildFile; fileRef = 725581E11B9C26C5001EB0E1 /* BottomTransportView.m */; };
- 725581E51B9C3C05001EB0E1 /* TransportPurchaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 725581E41B9C3C05001EB0E1 /* TransportPurchaseViewController.m */; };
- 725581EB1B9C4095001EB0E1 /* TransportPurductCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 725581EA1B9C4095001EB0E1 /* TransportPurductCell.m */; };
- 725581EE1B9C4347001EB0E1 /* TransportPurchaseCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 725581ED1B9C4347001EB0E1 /* TransportPurchaseCell.m */; };
- 725581F11B9C7C70001EB0E1 /* Transport.m in Sources */ = {isa = PBXBuildFile; fileRef = 725581F01B9C7C70001EB0E1 /* Transport.m */; };
- 725581F41B9C7F23001EB0E1 /* FeeAcountDetail.m in Sources */ = {isa = PBXBuildFile; fileRef = 725581F31B9C7F23001EB0E1 /* FeeAcountDetail.m */; };
+ 721B5DA21B9FD523006CA199 /* RegexUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 721B5DA11B9FD523006CA199 /* RegexUtil.m */; };
+ 7241716F1B9D30660094DF55 /* ChooseProductViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 724171661B9D30660094DF55 /* ChooseProductViewController.m */; };
+ 724171701B9D30660094DF55 /* ChooseTypeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 724171681B9D30660094DF55 /* ChooseTypeViewController.m */; };
+ 724171711B9D30660094DF55 /* ChooseVendorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7241716A1B9D30660094DF55 /* ChooseVendorViewController.m */; };
+ 724171721B9D30660094DF55 /* ChooseWarehouseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7241716C1B9D30660094DF55 /* ChooseWarehouseViewController.m */; };
+ 724171731B9D30660094DF55 /* ChosePersonViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7241716E1B9D30660094DF55 /* ChosePersonViewController.m */; };
+ 724171761B9D30DE0094DF55 /* ChooseCostViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 724171751B9D30DE0094DF55 /* ChooseCostViewController.m */; };
7281A0B31B8974120052B1AC /* NewPurchaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7281A0AA1B8974120052B1AC /* NewPurchaseViewController.m */; };
7281A0B41B8974120052B1AC /* ProductBillViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7281A0AC1B8974120052B1AC /* ProductBillViewController.m */; };
7281A0B61B8974120052B1AC /* TopPurchaseView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7281A0B21B8974120052B1AC /* TopPurchaseView.m */; };
@@ -116,8 +115,24 @@
7281A0BC1B897EAB0052B1AC /* PurchaseCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7281A0BB1B897EAB0052B1AC /* PurchaseCell.m */; };
7281A0BF1B8980E60052B1AC /* PurchaseBill.m in Sources */ = {isa = PBXBuildFile; fileRef = 7281A0BE1B8980E60052B1AC /* PurchaseBill.m */; };
7281A0C21B898A040052B1AC /* PurchaseDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7281A0C11B898A040052B1AC /* PurchaseDetailViewController.m */; };
- 7281A0C51B89BF1C0052B1AC /* ChooseVendorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7281A0C41B89BF1C0052B1AC /* ChooseVendorViewController.m */; };
7281A0C81B89BFE60052B1AC /* Vendor.m in Sources */ = {isa = PBXBuildFile; fileRef = 7281A0C71B89BFE60052B1AC /* Vendor.m */; };
+ 72B3C0C11B9D3C7300025D81 /* CostViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0AC1B9D3C7300025D81 /* CostViewController.m */; };
+ 72B3C0C21B9D3C7300025D81 /* NewCostViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0AE1B9D3C7300025D81 /* NewCostViewController.m */; };
+ 72B3C0C31B9D3C7300025D81 /* NewTransportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0B01B9D3C7300025D81 /* NewTransportViewController.m */; };
+ 72B3C0C41B9D3C7300025D81 /* TransportPurchaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0B21B9D3C7300025D81 /* TransportPurchaseViewController.m */; };
+ 72B3C0C51B9D3C7300025D81 /* FeeAcountDetail.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0B51B9D3C7300025D81 /* FeeAcountDetail.m */; };
+ 72B3C0C61B9D3C7300025D81 /* Transport.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0B71B9D3C7300025D81 /* Transport.m */; };
+ 72B3C0C71B9D3C7300025D81 /* BottomTransportView.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0BA1B9D3C7300025D81 /* BottomTransportView.m */; };
+ 72B3C0C81B9D3C7300025D81 /* TopTransportView.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0BC1B9D3C7300025D81 /* TopTransportView.m */; };
+ 72B3C0C91B9D3C7300025D81 /* TransportPurchaseCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0BE1B9D3C7300025D81 /* TransportPurchaseCell.m */; };
+ 72B3C0CA1B9D3C7300025D81 /* TransportPurductCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0C01B9D3C7300025D81 /* TransportPurductCell.m */; };
+ 72B3C0CD1B9D3FDD00025D81 /* CostCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0CC1B9D3FDD00025D81 /* CostCell.m */; };
+ 72B3C0D01B9D6B9E00025D81 /* TransportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0CF1B9D6B9E00025D81 /* TransportViewController.m */; };
+ 72B3C0D31B9D72C600025D81 /* TransportPdtDetail.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0D21B9D72C600025D81 /* TransportPdtDetail.m */; };
+ 72B3C0D61B9D769A00025D81 /* TransportProductViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0D51B9D769A00025D81 /* TransportProductViewController.m */; };
+ 72B3C0D91B9DB83A00025D81 /* TransportBoltView.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0D81B9DB83A00025D81 /* TransportBoltView.m */; };
+ 72B3C0DC1B9DBD7500025D81 /* TransportCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0DB1B9DBD7500025D81 /* TransportCell.m */; };
+ 72B3C0DF1B9DC60D00025D81 /* TransportDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0DE1B9DC60D00025D81 /* TransportDetailViewController.m */; };
72C8034C1B7B72DB00990363 /* AddWorkSheetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72C8034B1B7B72DB00990363 /* AddWorkSheetViewController.m */; };
72C8034F1B7B735300990363 /* TopSheetView.m in Sources */ = {isa = PBXBuildFile; fileRef = 72C8034E1B7B735300990363 /* TopSheetView.m */; };
72C803521B7B897B00990363 /* DataManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 72C803511B7B897B00990363 /* DataManager.m */; };
@@ -399,21 +414,16 @@
C1FE50571AE3587F00C18080 /* ICRAttachmentUnit.m in Sources */ = {isa = PBXBuildFile; fileRef = C1FE50551AE3587F00C18080 /* ICRAttachmentUnit.m */; };
FE0C9B091B7C543D00335B39 /* User.m in Sources */ = {isa = PBXBuildFile; fileRef = FE0C9B081B7C543D00335B39 /* User.m */; };
FE17F6791B85847D0078CE96 /* QueryOrder.m in Sources */ = {isa = PBXBuildFile; fileRef = FE17F6781B85847D0078CE96 /* QueryOrder.m */; };
- FE2FCC7F1B74511000BBC6FB /* ChooseProductViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FE2FCC7E1B74511000BBC6FB /* ChooseProductViewController.m */; };
FE2FCC821B745E1A00BBC6FB /* SurveyDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FE2FCC811B745E1A00BBC6FB /* SurveyDetailViewController.m */; };
FE2FCC881B7492C500BBC6FB /* ResultDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FE2FCC871B7492C500BBC6FB /* ResultDetailViewController.m */; };
FE2FCC8B1B74A9EE00BBC6FB /* SurveyResultCell.m in Sources */ = {isa = PBXBuildFile; fileRef = FE2FCC8A1B74A9EE00BBC6FB /* SurveyResultCell.m */; };
- FE4678AA1B8D60F900B5EDA3 /* ChooseTypeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FE4678A91B8D60F900B5EDA3 /* ChooseTypeViewController.m */; };
- FE4678AD1B8D636300B5EDA3 /* ChooseWarehouseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FE4678AC1B8D636300B5EDA3 /* ChooseWarehouseViewController.m */; };
FE4678B01B8D63A100B5EDA3 /* Warehouse.m in Sources */ = {isa = PBXBuildFile; fileRef = FE4678AF1B8D63A100B5EDA3 /* Warehouse.m */; };
FE4678B61B8D986900B5EDA3 /* PurchaseBoltView.m in Sources */ = {isa = PBXBuildFile; fileRef = FE4678B51B8D986900B5EDA3 /* PurchaseBoltView.m */; };
- FE4F17251B72FAAB00924DED /* ChosePersonViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FE4F17241B72FAAB00924DED /* ChosePersonViewController.m */; };
FE7155D91B7B328400595B0A /* Product.m in Sources */ = {isa = PBXBuildFile; fileRef = FE7155D81B7B328400595B0A /* Product.m */; };
FE95FDDA1B93FC12008040D0 /* PurchaseBillProduct.m in Sources */ = {isa = PBXBuildFile; fileRef = FE95FDD91B93FC12008040D0 /* PurchaseBillProduct.m */; };
FEA2F2FD1B8423B900D64735 /* BottomSheetView.m in Sources */ = {isa = PBXBuildFile; fileRef = FEA2F2FC1B8423B900D64735 /* BottomSheetView.m */; };
FEA2F3001B842A1C00D64735 /* MaterialVIewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FEA2F2FF1B842A1C00D64735 /* MaterialVIewController.m */; };
FEA2F3031B8453C700D64735 /* GoodsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FEA2F3021B8453C700D64735 /* GoodsViewController.m */; };
- FEA2F3061B8453DE00D64735 /* CostViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FEA2F3051B8453DE00D64735 /* CostViewController.m */; };
FEA2F3091B8459DA00D64735 /* HeaderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = FEA2F3081B8459DA00D64735 /* HeaderCell.m */; };
FEA2F30C1B84687D00D64735 /* FooterCell.m in Sources */ = {isa = PBXBuildFile; fileRef = FEA2F30B1B84687D00D64735 /* FooterCell.m */; };
FEA2F30F1B846F0100D64735 /* MaterialCell.m in Sources */ = {isa = PBXBuildFile; fileRef = FEA2F30E1B846F0100D64735 /* MaterialCell.m */; };
@@ -580,22 +590,20 @@
7217E9E21B72364300FE5C1D /* SurveyListCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SurveyListCell.h; sourceTree = "<group>"; };
7217E9E31B72364300FE5C1D /* SurveyListCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SurveyListCell.m; sourceTree = "<group>"; };
7217E9F51B724A7600FE5C1D /* mask.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = mask.png; sourceTree = "<group>"; };
- 725581D71B9C25B5001EB0E1 /* NewTransportViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewTransportViewController.h; sourceTree = "<group>"; };
- 725581D81B9C25B5001EB0E1 /* NewTransportViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NewTransportViewController.m; sourceTree = "<group>"; };
- 725581DA1B9C2666001EB0E1 /* TopTransportView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopTransportView.h; sourceTree = "<group>"; };
- 725581DB1B9C2666001EB0E1 /* TopTransportView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopTransportView.m; sourceTree = "<group>"; };
- 725581E01B9C26C5001EB0E1 /* BottomTransportView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BottomTransportView.h; sourceTree = "<group>"; };
- 725581E11B9C26C5001EB0E1 /* BottomTransportView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BottomTransportView.m; sourceTree = "<group>"; };
- 725581E31B9C3C05001EB0E1 /* TransportPurchaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransportPurchaseViewController.h; sourceTree = "<group>"; };
- 725581E41B9C3C05001EB0E1 /* TransportPurchaseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TransportPurchaseViewController.m; sourceTree = "<group>"; };
- 725581E91B9C4095001EB0E1 /* TransportPurductCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransportPurductCell.h; sourceTree = "<group>"; };
- 725581EA1B9C4095001EB0E1 /* TransportPurductCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TransportPurductCell.m; sourceTree = "<group>"; };
- 725581EC1B9C4347001EB0E1 /* TransportPurchaseCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransportPurchaseCell.h; sourceTree = "<group>"; };
- 725581ED1B9C4347001EB0E1 /* TransportPurchaseCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TransportPurchaseCell.m; sourceTree = "<group>"; };
- 725581EF1B9C7C70001EB0E1 /* Transport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Transport.h; sourceTree = "<group>"; };
- 725581F01B9C7C70001EB0E1 /* Transport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Transport.m; sourceTree = "<group>"; };
- 725581F21B9C7F23001EB0E1 /* FeeAcountDetail.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FeeAcountDetail.h; sourceTree = "<group>"; };
- 725581F31B9C7F23001EB0E1 /* FeeAcountDetail.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FeeAcountDetail.m; sourceTree = "<group>"; };
+ 721B5DA01B9FD523006CA199 /* RegexUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegexUtil.h; sourceTree = "<group>"; };
+ 721B5DA11B9FD523006CA199 /* RegexUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RegexUtil.m; sourceTree = "<group>"; };
+ 724171651B9D30660094DF55 /* ChooseProductViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChooseProductViewController.h; sourceTree = "<group>"; };
+ 724171661B9D30660094DF55 /* ChooseProductViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChooseProductViewController.m; sourceTree = "<group>"; };
+ 724171671B9D30660094DF55 /* ChooseTypeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChooseTypeViewController.h; sourceTree = "<group>"; };
+ 724171681B9D30660094DF55 /* ChooseTypeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChooseTypeViewController.m; sourceTree = "<group>"; };
+ 724171691B9D30660094DF55 /* ChooseVendorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChooseVendorViewController.h; sourceTree = "<group>"; };
+ 7241716A1B9D30660094DF55 /* ChooseVendorViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChooseVendorViewController.m; sourceTree = "<group>"; };
+ 7241716B1B9D30660094DF55 /* ChooseWarehouseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChooseWarehouseViewController.h; sourceTree = "<group>"; };
+ 7241716C1B9D30660094DF55 /* ChooseWarehouseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChooseWarehouseViewController.m; sourceTree = "<group>"; };
+ 7241716D1B9D30660094DF55 /* ChosePersonViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChosePersonViewController.h; sourceTree = "<group>"; };
+ 7241716E1B9D30660094DF55 /* ChosePersonViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChosePersonViewController.m; sourceTree = "<group>"; };
+ 724171741B9D30DE0094DF55 /* ChooseCostViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChooseCostViewController.h; sourceTree = "<group>"; };
+ 724171751B9D30DE0094DF55 /* ChooseCostViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChooseCostViewController.m; sourceTree = "<group>"; };
7281A0A91B8974120052B1AC /* NewPurchaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewPurchaseViewController.h; sourceTree = "<group>"; };
7281A0AA1B8974120052B1AC /* NewPurchaseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NewPurchaseViewController.m; sourceTree = "<group>"; };
7281A0AB1B8974120052B1AC /* ProductBillViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProductBillViewController.h; sourceTree = "<group>"; };
@@ -610,10 +618,42 @@
7281A0BE1B8980E60052B1AC /* PurchaseBill.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PurchaseBill.m; sourceTree = "<group>"; };
7281A0C01B898A040052B1AC /* PurchaseDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PurchaseDetailViewController.h; sourceTree = "<group>"; };
7281A0C11B898A040052B1AC /* PurchaseDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PurchaseDetailViewController.m; sourceTree = "<group>"; };
- 7281A0C31B89BF1C0052B1AC /* ChooseVendorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChooseVendorViewController.h; sourceTree = "<group>"; };
- 7281A0C41B89BF1C0052B1AC /* ChooseVendorViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChooseVendorViewController.m; sourceTree = "<group>"; };
7281A0C61B89BFE60052B1AC /* Vendor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Vendor.h; sourceTree = "<group>"; };
7281A0C71B89BFE60052B1AC /* Vendor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Vendor.m; sourceTree = "<group>"; };
+ 72B3C0AB1B9D3C7300025D81 /* CostViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CostViewController.h; sourceTree = "<group>"; };
+ 72B3C0AC1B9D3C7300025D81 /* CostViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CostViewController.m; sourceTree = "<group>"; };
+ 72B3C0AD1B9D3C7300025D81 /* NewCostViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewCostViewController.h; sourceTree = "<group>"; };
+ 72B3C0AE1B9D3C7300025D81 /* NewCostViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NewCostViewController.m; sourceTree = "<group>"; };
+ 72B3C0AF1B9D3C7300025D81 /* NewTransportViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewTransportViewController.h; sourceTree = "<group>"; };
+ 72B3C0B01B9D3C7300025D81 /* NewTransportViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NewTransportViewController.m; sourceTree = "<group>"; };
+ 72B3C0B11B9D3C7300025D81 /* TransportPurchaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransportPurchaseViewController.h; sourceTree = "<group>"; };
+ 72B3C0B21B9D3C7300025D81 /* TransportPurchaseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TransportPurchaseViewController.m; sourceTree = "<group>"; };
+ 72B3C0B41B9D3C7300025D81 /* FeeAcountDetail.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FeeAcountDetail.h; sourceTree = "<group>"; };
+ 72B3C0B51B9D3C7300025D81 /* FeeAcountDetail.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FeeAcountDetail.m; sourceTree = "<group>"; };
+ 72B3C0B61B9D3C7300025D81 /* Transport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Transport.h; sourceTree = "<group>"; };
+ 72B3C0B71B9D3C7300025D81 /* Transport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Transport.m; sourceTree = "<group>"; };
+ 72B3C0B91B9D3C7300025D81 /* BottomTransportView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BottomTransportView.h; sourceTree = "<group>"; };
+ 72B3C0BA1B9D3C7300025D81 /* BottomTransportView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BottomTransportView.m; sourceTree = "<group>"; };
+ 72B3C0BB1B9D3C7300025D81 /* TopTransportView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopTransportView.h; sourceTree = "<group>"; };
+ 72B3C0BC1B9D3C7300025D81 /* TopTransportView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopTransportView.m; sourceTree = "<group>"; };
+ 72B3C0BD1B9D3C7300025D81 /* TransportPurchaseCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransportPurchaseCell.h; sourceTree = "<group>"; };
+ 72B3C0BE1B9D3C7300025D81 /* TransportPurchaseCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TransportPurchaseCell.m; sourceTree = "<group>"; };
+ 72B3C0BF1B9D3C7300025D81 /* TransportPurductCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransportPurductCell.h; sourceTree = "<group>"; };
+ 72B3C0C01B9D3C7300025D81 /* TransportPurductCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TransportPurductCell.m; sourceTree = "<group>"; };
+ 72B3C0CB1B9D3FDD00025D81 /* CostCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CostCell.h; sourceTree = "<group>"; };
+ 72B3C0CC1B9D3FDD00025D81 /* CostCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CostCell.m; sourceTree = "<group>"; };
+ 72B3C0CE1B9D6B9E00025D81 /* TransportViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransportViewController.h; sourceTree = "<group>"; };
+ 72B3C0CF1B9D6B9E00025D81 /* TransportViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TransportViewController.m; sourceTree = "<group>"; };
+ 72B3C0D11B9D72C600025D81 /* TransportPdtDetail.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransportPdtDetail.h; sourceTree = "<group>"; };
+ 72B3C0D21B9D72C600025D81 /* TransportPdtDetail.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TransportPdtDetail.m; sourceTree = "<group>"; };
+ 72B3C0D41B9D769A00025D81 /* TransportProductViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransportProductViewController.h; sourceTree = "<group>"; };
+ 72B3C0D51B9D769A00025D81 /* TransportProductViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TransportProductViewController.m; sourceTree = "<group>"; };
+ 72B3C0D71B9DB83A00025D81 /* TransportBoltView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransportBoltView.h; sourceTree = "<group>"; };
+ 72B3C0D81B9DB83A00025D81 /* TransportBoltView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TransportBoltView.m; sourceTree = "<group>"; };
+ 72B3C0DA1B9DBD7500025D81 /* TransportCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransportCell.h; sourceTree = "<group>"; };
+ 72B3C0DB1B9DBD7500025D81 /* TransportCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TransportCell.m; sourceTree = "<group>"; };
+ 72B3C0DD1B9DC60D00025D81 /* TransportDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransportDetailViewController.h; sourceTree = "<group>"; };
+ 72B3C0DE1B9DC60D00025D81 /* TransportDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TransportDetailViewController.m; sourceTree = "<group>"; };
72C8034A1B7B72DB00990363 /* AddWorkSheetViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddWorkSheetViewController.h; sourceTree = "<group>"; };
72C8034B1B7B72DB00990363 /* AddWorkSheetViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AddWorkSheetViewController.m; sourceTree = "<group>"; };
72C8034D1B7B735300990363 /* TopSheetView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopSheetView.h; sourceTree = "<group>"; };
@@ -913,24 +953,16 @@
FE0C9B081B7C543D00335B39 /* User.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = User.m; path = ../Views/User.m; sourceTree = "<group>"; };
FE17F6771B85847D0078CE96 /* QueryOrder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueryOrder.h; sourceTree = "<group>"; };
FE17F6781B85847D0078CE96 /* QueryOrder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QueryOrder.m; sourceTree = "<group>"; };
- FE2FCC7D1B74511000BBC6FB /* ChooseProductViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChooseProductViewController.h; sourceTree = "<group>"; };
- FE2FCC7E1B74511000BBC6FB /* ChooseProductViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChooseProductViewController.m; sourceTree = "<group>"; };
FE2FCC801B745E1A00BBC6FB /* SurveyDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SurveyDetailViewController.h; sourceTree = "<group>"; };
FE2FCC811B745E1A00BBC6FB /* SurveyDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SurveyDetailViewController.m; sourceTree = "<group>"; };
FE2FCC861B7492C500BBC6FB /* ResultDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResultDetailViewController.h; sourceTree = "<group>"; };
FE2FCC871B7492C500BBC6FB /* ResultDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ResultDetailViewController.m; sourceTree = "<group>"; };
FE2FCC891B74A9EE00BBC6FB /* SurveyResultCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SurveyResultCell.h; sourceTree = "<group>"; };
FE2FCC8A1B74A9EE00BBC6FB /* SurveyResultCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SurveyResultCell.m; sourceTree = "<group>"; };
- FE4678A81B8D60F900B5EDA3 /* ChooseTypeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChooseTypeViewController.h; sourceTree = "<group>"; };
- FE4678A91B8D60F900B5EDA3 /* ChooseTypeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChooseTypeViewController.m; sourceTree = "<group>"; };
- FE4678AB1B8D636300B5EDA3 /* ChooseWarehouseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChooseWarehouseViewController.h; sourceTree = "<group>"; };
- FE4678AC1B8D636300B5EDA3 /* ChooseWarehouseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChooseWarehouseViewController.m; sourceTree = "<group>"; };
FE4678AE1B8D63A100B5EDA3 /* Warehouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Warehouse.h; sourceTree = "<group>"; };
FE4678AF1B8D63A100B5EDA3 /* Warehouse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Warehouse.m; sourceTree = "<group>"; };
FE4678B41B8D986900B5EDA3 /* PurchaseBoltView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PurchaseBoltView.h; sourceTree = "<group>"; };
FE4678B51B8D986900B5EDA3 /* PurchaseBoltView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PurchaseBoltView.m; sourceTree = "<group>"; };
- FE4F17231B72FAAB00924DED /* ChosePersonViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChosePersonViewController.h; sourceTree = "<group>"; };
- FE4F17241B72FAAB00924DED /* ChosePersonViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChosePersonViewController.m; sourceTree = "<group>"; };
FE7155D71B7B328400595B0A /* Product.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Product.h; sourceTree = "<group>"; };
FE7155D81B7B328400595B0A /* Product.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Product.m; sourceTree = "<group>"; };
FE95FDD81B93FC12008040D0 /* PurchaseBillProduct.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PurchaseBillProduct.h; sourceTree = "<group>"; };
@@ -941,8 +973,6 @@
FEA2F2FF1B842A1C00D64735 /* MaterialVIewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MaterialVIewController.m; sourceTree = "<group>"; };
FEA2F3011B8453C700D64735 /* GoodsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GoodsViewController.h; sourceTree = "<group>"; };
FEA2F3021B8453C700D64735 /* GoodsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GoodsViewController.m; sourceTree = "<group>"; };
- FEA2F3041B8453DE00D64735 /* CostViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CostViewController.h; sourceTree = "<group>"; };
- FEA2F3051B8453DE00D64735 /* CostViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CostViewController.m; sourceTree = "<group>"; };
FEA2F3071B8459DA00D64735 /* HeaderCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HeaderCell.h; sourceTree = "<group>"; };
FEA2F3081B8459DA00D64735 /* HeaderCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HeaderCell.m; sourceTree = "<group>"; };
FEA2F30A1B84687D00D64735 /* FooterCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FooterCell.h; sourceTree = "<group>"; };
@@ -1174,10 +1204,6 @@
7217E9C51B72364300FE5C1D /* NewSurveyViewController.m */,
7217E9C61B72364300FE5C1D /* SurveyViewController.h */,
7217E9C71B72364300FE5C1D /* SurveyViewController.m */,
- FE4F17231B72FAAB00924DED /* ChosePersonViewController.h */,
- FE4F17241B72FAAB00924DED /* ChosePersonViewController.m */,
- FE2FCC7D1B74511000BBC6FB /* ChooseProductViewController.h */,
- FE2FCC7E1B74511000BBC6FB /* ChooseProductViewController.m */,
FE2FCC801B745E1A00BBC6FB /* SurveyDetailViewController.h */,
FE2FCC811B745E1A00BBC6FB /* SurveyDetailViewController.m */,
FE2FCC861B7492C500BBC6FB /* ResultDetailViewController.h */,
@@ -1250,52 +1276,23 @@
path = GrowingTextView;
sourceTree = "<group>";
};
- 725581D31B9C252D001EB0E1 /* Transport */ = {
+ 724171641B9D30660094DF55 /* ChooseViewController */ = {
isa = PBXGroup;
children = (
- 725581D41B9C252D001EB0E1 /* Controllers */,
- 725581D51B9C252D001EB0E1 /* Models */,
- 725581D61B9C252D001EB0E1 /* Views */,
+ 724171651B9D30660094DF55 /* ChooseProductViewController.h */,
+ 724171661B9D30660094DF55 /* ChooseProductViewController.m */,
+ 724171671B9D30660094DF55 /* ChooseTypeViewController.h */,
+ 724171681B9D30660094DF55 /* ChooseTypeViewController.m */,
+ 724171691B9D30660094DF55 /* ChooseVendorViewController.h */,
+ 7241716A1B9D30660094DF55 /* ChooseVendorViewController.m */,
+ 7241716B1B9D30660094DF55 /* ChooseWarehouseViewController.h */,
+ 7241716C1B9D30660094DF55 /* ChooseWarehouseViewController.m */,
+ 7241716D1B9D30660094DF55 /* ChosePersonViewController.h */,
+ 7241716E1B9D30660094DF55 /* ChosePersonViewController.m */,
+ 724171741B9D30DE0094DF55 /* ChooseCostViewController.h */,
+ 724171751B9D30DE0094DF55 /* ChooseCostViewController.m */,
);
- name = Transport;
- path = Survey/Transport;
- sourceTree = "<group>";
- };
- 725581D41B9C252D001EB0E1 /* Controllers */ = {
- isa = PBXGroup;
- children = (
- 725581D71B9C25B5001EB0E1 /* NewTransportViewController.h */,
- 725581D81B9C25B5001EB0E1 /* NewTransportViewController.m */,
- 725581E31B9C3C05001EB0E1 /* TransportPurchaseViewController.h */,
- 725581E41B9C3C05001EB0E1 /* TransportPurchaseViewController.m */,
- );
- path = Controllers;
- sourceTree = "<group>";
- };
- 725581D51B9C252D001EB0E1 /* Models */ = {
- isa = PBXGroup;
- children = (
- 725581EF1B9C7C70001EB0E1 /* Transport.h */,
- 725581F01B9C7C70001EB0E1 /* Transport.m */,
- 725581F21B9C7F23001EB0E1 /* FeeAcountDetail.h */,
- 725581F31B9C7F23001EB0E1 /* FeeAcountDetail.m */,
- );
- path = Models;
- sourceTree = "<group>";
- };
- 725581D61B9C252D001EB0E1 /* Views */ = {
- isa = PBXGroup;
- children = (
- 725581DA1B9C2666001EB0E1 /* TopTransportView.h */,
- 725581DB1B9C2666001EB0E1 /* TopTransportView.m */,
- 725581E01B9C26C5001EB0E1 /* BottomTransportView.h */,
- 725581E11B9C26C5001EB0E1 /* BottomTransportView.m */,
- 725581E91B9C4095001EB0E1 /* TransportPurductCell.h */,
- 725581EA1B9C4095001EB0E1 /* TransportPurductCell.m */,
- 725581EC1B9C4347001EB0E1 /* TransportPurchaseCell.h */,
- 725581ED1B9C4347001EB0E1 /* TransportPurchaseCell.m */,
- );
- path = Views;
+ path = ChooseViewController;
sourceTree = "<group>";
};
7281A0A71B8974120052B1AC /* Purchase */ = {
@@ -1319,12 +1316,6 @@
7281A0B81B897BB20052B1AC /* PurchaseViewController.m */,
7281A0C01B898A040052B1AC /* PurchaseDetailViewController.h */,
7281A0C11B898A040052B1AC /* PurchaseDetailViewController.m */,
- 7281A0C31B89BF1C0052B1AC /* ChooseVendorViewController.h */,
- 7281A0C41B89BF1C0052B1AC /* ChooseVendorViewController.m */,
- FE4678A81B8D60F900B5EDA3 /* ChooseTypeViewController.h */,
- FE4678A91B8D60F900B5EDA3 /* ChooseTypeViewController.m */,
- FE4678AB1B8D636300B5EDA3 /* ChooseWarehouseViewController.h */,
- FE4678AC1B8D636300B5EDA3 /* ChooseWarehouseViewController.m */,
);
path = Controllers;
sourceTree = "<group>";
@@ -1359,6 +1350,71 @@
path = Views;
sourceTree = "<group>";
};
+ 72B3C0A91B9D3C7300025D81 /* Transport */ = {
+ isa = PBXGroup;
+ children = (
+ 72B3C0AA1B9D3C7300025D81 /* Controllers */,
+ 72B3C0B31B9D3C7300025D81 /* Models */,
+ 72B3C0B81B9D3C7300025D81 /* Views */,
+ );
+ path = Transport;
+ sourceTree = "<group>";
+ };
+ 72B3C0AA1B9D3C7300025D81 /* Controllers */ = {
+ isa = PBXGroup;
+ children = (
+ 72B3C0AB1B9D3C7300025D81 /* CostViewController.h */,
+ 72B3C0AC1B9D3C7300025D81 /* CostViewController.m */,
+ 72B3C0AD1B9D3C7300025D81 /* NewCostViewController.h */,
+ 72B3C0AE1B9D3C7300025D81 /* NewCostViewController.m */,
+ 72B3C0AF1B9D3C7300025D81 /* NewTransportViewController.h */,
+ 72B3C0B01B9D3C7300025D81 /* NewTransportViewController.m */,
+ 72B3C0B11B9D3C7300025D81 /* TransportPurchaseViewController.h */,
+ 72B3C0B21B9D3C7300025D81 /* TransportPurchaseViewController.m */,
+ 72B3C0CE1B9D6B9E00025D81 /* TransportViewController.h */,
+ 72B3C0CF1B9D6B9E00025D81 /* TransportViewController.m */,
+ 72B3C0D41B9D769A00025D81 /* TransportProductViewController.h */,
+ 72B3C0D51B9D769A00025D81 /* TransportProductViewController.m */,
+ 72B3C0DD1B9DC60D00025D81 /* TransportDetailViewController.h */,
+ 72B3C0DE1B9DC60D00025D81 /* TransportDetailViewController.m */,
+ );
+ path = Controllers;
+ sourceTree = "<group>";
+ };
+ 72B3C0B31B9D3C7300025D81 /* Models */ = {
+ isa = PBXGroup;
+ children = (
+ 72B3C0B41B9D3C7300025D81 /* FeeAcountDetail.h */,
+ 72B3C0B51B9D3C7300025D81 /* FeeAcountDetail.m */,
+ 72B3C0B61B9D3C7300025D81 /* Transport.h */,
+ 72B3C0B71B9D3C7300025D81 /* Transport.m */,
+ 72B3C0D11B9D72C600025D81 /* TransportPdtDetail.h */,
+ 72B3C0D21B9D72C600025D81 /* TransportPdtDetail.m */,
+ );
+ path = Models;
+ sourceTree = "<group>";
+ };
+ 72B3C0B81B9D3C7300025D81 /* Views */ = {
+ isa = PBXGroup;
+ children = (
+ 72B3C0B91B9D3C7300025D81 /* BottomTransportView.h */,
+ 72B3C0BA1B9D3C7300025D81 /* BottomTransportView.m */,
+ 72B3C0BB1B9D3C7300025D81 /* TopTransportView.h */,
+ 72B3C0BC1B9D3C7300025D81 /* TopTransportView.m */,
+ 72B3C0BD1B9D3C7300025D81 /* TransportPurchaseCell.h */,
+ 72B3C0BE1B9D3C7300025D81 /* TransportPurchaseCell.m */,
+ 72B3C0BF1B9D3C7300025D81 /* TransportPurductCell.h */,
+ 72B3C0C01B9D3C7300025D81 /* TransportPurductCell.m */,
+ 72B3C0CB1B9D3FDD00025D81 /* CostCell.h */,
+ 72B3C0CC1B9D3FDD00025D81 /* CostCell.m */,
+ 72B3C0D71B9DB83A00025D81 /* TransportBoltView.h */,
+ 72B3C0D81B9DB83A00025D81 /* TransportBoltView.m */,
+ 72B3C0DA1B9DBD7500025D81 /* TransportCell.h */,
+ 72B3C0DB1B9DBD7500025D81 /* TransportCell.m */,
+ );
+ path = Views;
+ sourceTree = "<group>";
+ };
72C803431B7B6F0200990363 /* WorkSheet */ = {
isa = PBXGroup;
children = (
@@ -1379,8 +1435,6 @@
FEA2F2FF1B842A1C00D64735 /* MaterialVIewController.m */,
FEA2F3011B8453C700D64735 /* GoodsViewController.h */,
FEA2F3021B8453C700D64735 /* GoodsViewController.m */,
- FEA2F3041B8453DE00D64735 /* CostViewController.h */,
- FEA2F3051B8453DE00D64735 /* CostViewController.m */,
);
name = Controllers;
path = XFFruit/ViewControllers/WorkSheet/Controllers;
@@ -1873,6 +1927,8 @@
C123A8F51B254348003C0C36 /* IBTInputViewHandleDelegate.h */,
72C803501B7B897B00990363 /* DataManager.h */,
72C803511B7B897B00990363 /* DataManager.m */,
+ 721B5DA01B9FD523006CA199 /* RegexUtil.h */,
+ 721B5DA11B9FD523006CA199 /* RegexUtil.m */,
);
path = IBTUIKit;
sourceTree = "<group>";
@@ -2058,13 +2114,14 @@
C1C6FEED1AB88A3400D4C41A /* ViewControllers */ = {
isa = PBXGroup;
children = (
+ 72B3C0A91B9D3C7300025D81 /* Transport */,
+ 724171641B9D30660094DF55 /* ChooseViewController */,
35CF33911B95B419001211EF /* GXFCommon */,
35CF33721B953E8D001211EF /* Process(åŠ å·¥å•) */,
7281A0A71B8974120052B1AC /* Purchase */,
FE17F67A1B85CA5B0078CE96 /* PurchaseNotice */,
72C803431B7B6F0200990363 /* WorkSheet */,
7217E9C01B72364300FE5C1D /* Survey */,
- 725581D31B9C252D001EB0E1 /* Transport */,
C159180B1ABE88030013B391 /* Login */,
C159185D1AC078020013B391 /* Home */,
C159185E1AC078120013B391 /* Store */,
@@ -2442,8 +2499,8 @@
C10214DB1AD90A3F0024637E /* ICRFunctionBaseView.m in Sources */,
35B448DF1B9B0A73001209E2 /* ProductBillCell.m in Sources */,
35CF337B1B953F9A001211EF /* GXFProcessMaterial.m in Sources */,
- FE4F17251B72FAAB00924DED /* ChosePersonViewController.m in Sources */,
30D7495F1ACE8F4400C63BA1 /* ICRConfigurationViewController.m in Sources */,
+ 724171721B9D30660094DF55 /* ChooseWarehouseViewController.m in Sources */,
FE2FCC821B745E1A00BBC6FB /* SurveyDetailViewController.m in Sources */,
0414FF171B94959700C7B00E /* NewPurchaseNoticeViewController.m in Sources */,
35CF33901B95AF1B001211EF /* GXFBaseSearchViewController.m in Sources */,
@@ -2455,25 +2512,22 @@
C159184B1AC062460013B391 /* IBTTabBarController.m in Sources */,
C142D2BE1AC3A155000109A7 /* UIView+FindUIViewController.m in Sources */,
35C3C0BF1AE95F1D0035AC8A /* UIImage+Rotate.m in Sources */,
- 7281A0C51B89BF1C0052B1AC /* ChooseVendorViewController.m in Sources */,
04F6E70A1B9B08A500550849 /* PurchaseNoticeViewController.m in Sources */,
35CF337E1B953FFF001211EF /* GXFProcessProduct.m in Sources */,
C11A344D1B1BE27200079129 /* ICRPatrolAllStoreViewController.m in Sources */,
C10214DD1AD90A3F0024637E /* ICRFunctionEntity.m in Sources */,
- FE4678AA1B8D60F900B5EDA3 /* ChooseTypeViewController.m in Sources */,
- 725581E51B9C3C05001EB0E1 /* TransportPurchaseViewController.m in Sources */,
30DB92A61ADD039F00271835 /* ICRAnnocementContentView.m in Sources */,
- 725581F11B9C7C70001EB0E1 /* Transport.m in Sources */,
C142D2B21AC3A155000109A7 /* UIFont+Custom.m in Sources */,
C15295CE1B24741400DF60D1 /* ASValuePopUpView.m in Sources */,
C159184D1AC062460013B391 /* IBTTableView.m in Sources */,
30D1859C1ADBB91000327997 /* ICRAnnouncement.m in Sources */,
C142D2AE1AC3A155000109A7 /* NSString+TrimmingAdditions.m in Sources */,
C15918471AC062460013B391 /* IBTCommon.m in Sources */,
- 725581EB1B9C4095001EB0E1 /* TransportPurductCell.m in Sources */,
C1FE502D1ADD887400C18080 /* LBorderView.m in Sources */,
C1B810AF1ADF4D6A00BBC75A /* ICRAttachTitleView.m in Sources */,
C159186F1AC1A0510013B391 /* ICRSystemViewController.m in Sources */,
+ 72B3C0D31B9D72C600025D81 /* TransportPdtDetail.m in Sources */,
+ 72B3C0C91B9D3C7300025D81 /* TransportPurchaseCell.m in Sources */,
C142D2C51AC3A16C000109A7 /* ICRBaseViewController.m in Sources */,
351CFF5B1B90633700F30866 /* GXFDisplayFunction.m in Sources */,
FEA2F3001B842A1C00D64735 /* MaterialVIewController.m in Sources */,
@@ -2483,10 +2537,12 @@
C167F9BD1AC7BF5500D2A098 /* ICRUserUtil.m in Sources */,
C14BE3141ADB9C5B0049F1AA /* ICRURLProtocol.m in Sources */,
C14BE30A1ADB84720049F1AA /* ICRFileCache.m in Sources */,
+ 72B3C0C11B9D3C7300025D81 /* CostViewController.m in Sources */,
C1677FCC1AC28A26002613C5 /* ICRAppDelegate.m in Sources */,
C123A8F31B251284003C0C36 /* UIScrollView+Content.m in Sources */,
C1A05CBE1ACCE089006E827D /* ICRSystemHeaderView.m in Sources */,
C15918511AC062460013B391 /* IBTUILabel.m in Sources */,
+ 72B3C0C21B9D3C7300025D81 /* NewCostViewController.m in Sources */,
04040E001B6FE75800326D12 /* ICRPerson.m in Sources */,
C159183F1AC062460013B391 /* IBTTableViewInfo.m in Sources */,
7281A0BC1B897EAB0052B1AC /* PurchaseCell.m in Sources */,
@@ -2499,18 +2555,19 @@
35CF33981B96BB02001211EF /* GXFPaging.m in Sources */,
35CF338D1B95A442001211EF /* GXFSearchView.m in Sources */,
C123A9331B27BDCD003C0C36 /* ICRQResultViewController.m in Sources */,
- 725581EE1B9C4347001EB0E1 /* TransportPurchaseCell.m in Sources */,
C18AEA881AC8D31000A1DB7B /* IBTUIView.m in Sources */,
C1FE50501AE024FA00C18080 /* UIActionSheet+Blocks.m in Sources */,
C123A92B1B26EDDA003C0C36 /* ICRQuestionHelperView.m in Sources */,
7281A0BF1B8980E60052B1AC /* PurchaseBill.m in Sources */,
0414FF191B94959700C7B00E /* PurchaseNoticeCell.m in Sources */,
7217E9EB1B72364300FE5C1D /* HPGrowingTextView.m in Sources */,
+ 724171761B9D30DE0094DF55 /* ChooseCostViewController.m in Sources */,
72C803521B7B897B00990363 /* DataManager.m in Sources */,
C1C5643E1AD62BD8006A1050 /* ICRPlaceholderTextView.m in Sources */,
307059D21AF2211300E9DB8E /* ICRSyncCellContentView.m in Sources */,
35CF33811B9542BE001211EF /* GXFNewProcessViewController.m in Sources */,
FEA2F30F1B846F0100D64735 /* MaterialCell.m in Sources */,
+ 72B3C0DC1B9DBD7500025D81 /* TransportCell.m in Sources */,
0406BFD91B7C97E700DD65A7 /* BusinessViewController.m in Sources */,
C1374F581B33C40D00594D19 /* IBTWebViewController.m in Sources */,
C159186B1AC1A03B0013B391 /* ICRSyncViewController.m in Sources */,
@@ -2530,20 +2587,27 @@
C11A34521B1DE6E900079129 /* ICRQuestionBaseViewController.m in Sources */,
C15918491AC062460013B391 /* IBTObject.m in Sources */,
35CF339B1B96E41F001211EF /* GXFVendorViewController.m in Sources */,
+ 72B3C0CA1B9D3C7300025D81 /* TransportPurductCell.m in Sources */,
C142D2B01AC3A155000109A7 /* UIColor+Helper.m in Sources */,
C142D2AC1AC3A155000109A7 /* NSNull+OVNatural.m in Sources */,
300DD94A1B184B450080EE12 /* ICRPatrolPlan.m in Sources */,
+ 72B3C0C61B9D3C7300025D81 /* Transport.m in Sources */,
C12C24D11B0BA3C700E1FEBF /* ICRTaskHandleViewController.m in Sources */,
+ 72B3C0CD1B9D3FDD00025D81 /* CostCell.m in Sources */,
35CF33781B953F07001211EF /* GXFProcessBill.m in Sources */,
FE7155D91B7B328400595B0A /* Product.m in Sources */,
FE4678B61B8D986900B5EDA3 /* PurchaseBoltView.m in Sources */,
C159188A1AC4615D0013B391 /* ICRHTTPController.m in Sources */,
C123A90D1B25CBAD003C0C36 /* ASStarRatingView.m in Sources */,
+ 72B3C0C81B9D3C7300025D81 /* TopTransportView.m in Sources */,
+ 72B3C0C31B9D3C7300025D81 /* NewTransportViewController.m in Sources */,
C15295AF1B24296500DF60D1 /* ICRQSingleSelectViewController.m in Sources */,
C167F9C11AC8615B00D2A098 /* ICRLoginContentView.m in Sources */,
C142D2BA1AC3A155000109A7 /* UITabBarItem+Universal.m in Sources */,
+ 72B3C0DF1B9DC60D00025D81 /* TransportDetailViewController.m in Sources */,
C1374F561B33C40D00594D19 /* IBTWebProgressBar.m in Sources */,
351CFF5A1B90633700F30866 /* ICRHomeViewController.m in Sources */,
+ 721B5DA21B9FD523006CA199 /* RegexUtil.m in Sources */,
35B9B40E1B8FFB59009851CC /* GXFFunctionDBHelper.m in Sources */,
C1FE50391AE0218100C18080 /* IBTAudioRecorder.m in Sources */,
C1B810AD1ADF4D6A00BBC75A /* ICRAttachmentView.m in Sources */,
@@ -2562,33 +2626,37 @@
C17E50D91B09830200C15359 /* ICRPostAttachment.m in Sources */,
C18AEA911AC9B88F00A1DB7B /* ICRUIAppearance.m in Sources */,
C142D2B61AC3A155000109A7 /* UILabel+SizeCalculate.m in Sources */,
+ 72B3C0D01B9D6B9E00025D81 /* TransportViewController.m in Sources */,
+ 724171731B9D30660094DF55 /* ChosePersonViewController.m in Sources */,
+ 72B3C0C71B9D3C7300025D81 /* BottomTransportView.m in Sources */,
C15918551AC062460013B391 /* IBTUIViewController.m in Sources */,
C18AEA961AD1425D00A1DB7B /* ICRDataBaseController.m in Sources */,
C1E9F5781B2E440A00BF1356 /* JTRecordView.m in Sources */,
+ 724171711B9D30660094DF55 /* ChooseVendorViewController.m in Sources */,
7217E9F31B72364300FE5C1D /* SurveyCell.m in Sources */,
C112BC511AD971C500F75F58 /* ICRTaskItemView.m in Sources */,
7217E9EE1B72364300FE5C1D /* MaskCell.m in Sources */,
C15918671AC19FCF0013B391 /* ICRStoreViewController.m in Sources */,
C1FBC1291ACA9651007B1A44 /* ICRHTTPApiTestViewController.m in Sources */,
+ 724171701B9D30660094DF55 /* ChooseTypeViewController.m in Sources */,
72C8034C1B7B72DB00990363 /* AddWorkSheetViewController.m in Sources */,
C1D017231AD8F41400CD9CB8 /* IBTRefreshTableView.m in Sources */,
+ 7241716F1B9D30660094DF55 /* ChooseProductViewController.m in Sources */,
C15295BF1B24511F00DF60D1 /* ICRQStoreStudyViewController.m in Sources */,
30D749551ACE421A00C63BA1 /* IBTUITextField.m in Sources */,
7217E9EA1B72364300FE5C1D /* BoltMaskView.m in Sources */,
- 725581DC1B9C2666001EB0E1 /* TopTransportView.m in Sources */,
C11A346B1B2451D500079129 /* NALLabelsMatrix.m in Sources */,
+ 72B3C0C51B9D3C7300025D81 /* FeeAcountDetail.m in Sources */,
C17DE85A1AD81D1600581AA6 /* NSMutableArray+SafeInsert.m in Sources */,
35C3C0B91AE9567B0035AC8A /* ICRNavigationViewController.mm in Sources */,
35321F6A1B97EF3600E5C670 /* GXFPopNewProductViewController.m in Sources */,
C123A8FB1B2561E1003C0C36 /* JTPopOverWindow.m in Sources */,
- 725581F41B9C7F23001EB0E1 /* FeeAcountDetail.m in Sources */,
72F56CB21B76EC200077F0C9 /* SurveyUser.m in Sources */,
C142D2B41AC3A155000109A7 /* UIImage+Helper.m in Sources */,
C18AEA9E1AD2F48200A1DB7B /* ICRStore.m in Sources */,
C15295BB1B244C8E00DF60D1 /* ICRQScoreViewController.m in Sources */,
C123A9221B26ED85003C0C36 /* ICRQuestionManager.m in Sources */,
C15918801AC4362D0013B391 /* UIApplication+CheckFirstRun.m in Sources */,
- 725581D91B9C25B5001EB0E1 /* NewTransportViewController.m in Sources */,
C1F696091AB870B400F9F5DD /* main.m in Sources */,
30D9D8811AD3AC5A0086EEE7 /* ICRHelpAndFeedBackViewController.m in Sources */,
35CF33871B956CF7001211EF /* GXFBottomView.m in Sources */,
@@ -2598,13 +2666,13 @@
C10C90991AE56E8700B911CD /* JTOptionCell.m in Sources */,
35321F671B97EF1100E5C670 /* GXFPopNewMaterialViewController.m in Sources */,
C1E9F55E1B2E3B9200BF1356 /* JTImagePreviewer.m in Sources */,
+ 72B3C0D91B9DB83A00025D81 /* TransportBoltView.m in Sources */,
C15295B31B24297D00DF60D1 /* ICRQMutiSelectViewController.m in Sources */,
C123A8FD1B2561E1003C0C36 /* JTPopupView.m in Sources */,
300DD94E1B184EA70080EE12 /* ICRQuestion.m in Sources */,
35321F6D1B98C66400E5C670 /* GXFButtonAndLineView.m in Sources */,
7217E9E81B72364300FE5C1D /* Survey.m in Sources */,
FEAE16EC1B79CAA0009D9E01 /* TPCustomImageVIew.m in Sources */,
- FE4678AD1B8D636300B5EDA3 /* ChooseWarehouseViewController.m in Sources */,
35CF33951B95B492001211EF /* GXFSearchVendorViewController.m in Sources */,
C1FE50561AE3587F00C18080 /* ICRAttachmentUnit.m in Sources */,
30D7494C1ACE340D00C63BA1 /* ICRModifyPwdViewController.m in Sources */,
@@ -2624,7 +2692,6 @@
7217E9F21B72364300FE5C1D /* StartTimeView.m in Sources */,
C1FE50351AE020D400C18080 /* IBTAudioController.m in Sources */,
7281A0C21B898A040052B1AC /* PurchaseDetailViewController.m in Sources */,
- FEA2F3061B8453DE00D64735 /* CostViewController.m in Sources */,
C14BE3061ADB84350049F1AA /* IBTTextFieldCell.m in Sources */,
FE95FDDA1B93FC12008040D0 /* PurchaseBillProduct.m in Sources */,
30F7F5711ADE723100A9B24E /* ICRAttachmentCellContentView.m in Sources */,
@@ -2641,7 +2708,6 @@
72C8034F1B7B735300990363 /* TopSheetView.m in Sources */,
C1E108591ADA53C700620375 /* ICRTaskResultViewController.m in Sources */,
FEAE16EF1B79CAE3009D9E01 /* SingleScrollView.m in Sources */,
- 725581E21B9C26C5001EB0E1 /* BottomTransportView.m in Sources */,
C10C909D1AE56E8700B911CD /* JTOptionsViewController.m in Sources */,
351CFF5D1B90633700F30866 /* GXFFunctionCollectionViewCell.m in Sources */,
7281A0B91B897BB20052B1AC /* PurchaseViewController.m in Sources */,
@@ -2650,11 +2716,11 @@
C1E1085D1ADA577500620375 /* ICRTaskDetailContentView.m in Sources */,
C14BE30E1ADB86DB0049F1AA /* NSData+EncodeAdditions.m in Sources */,
FEA2F3031B8453C700D64735 /* GoodsViewController.m in Sources */,
+ 72B3C0D61B9D769A00025D81 /* TransportProductViewController.m in Sources */,
FE0C9B091B7C543D00335B39 /* User.m in Sources */,
C1E093041AC8E8E0003B7126 /* ICRCheckBox.m in Sources */,
C1864A561B0B0D9D00D11C4E /* ICRPostTask.m in Sources */,
358432F41B994EDD007E73ED /* GXFSeeProcessViewController.m in Sources */,
- FE2FCC7F1B74511000BBC6FB /* ChooseProductViewController.m in Sources */,
351CFF5E1B90633700F30866 /* GXFNoticeFunctionTableViewCell.m in Sources */,
FE2FCC881B7492C500BBC6FB /* ResultDetailViewController.m in Sources */,
7281A0B41B8974120052B1AC /* ProductBillViewController.m in Sources */,
@@ -2665,6 +2731,7 @@
351CFF591B90633700F30866 /* GXFFunctionsViewController.m in Sources */,
7217E9F11B72364300FE5C1D /* SortMaskView.m in Sources */,
7217E9E71B72364300FE5C1D /* Attachment.m in Sources */,
+ 72B3C0C41B9D3C7300025D81 /* TransportPurchaseViewController.m in Sources */,
30ECD6241B00948A0088C57A /* ICRPatrolPlanCellContentView.m in Sources */,
C123A9291B26EDDA003C0C36 /* ICRQInputPopup.m in Sources */,
30D702421ADE37D3008DC0BF /* ICRAnnouncementDetailViewController.m in Sources */,
@@ -2889,7 +2956,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
- PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
+ PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
@@ -2927,7 +2994,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = NO;
- PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
+ PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
@@ -2940,8 +3007,8 @@
baseConfigurationReference = 1B0B22845F5CD40B5CF655F2 /* Pods.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
- CODE_SIGN_IDENTITY = "iPhone Developer";
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+ CODE_SIGN_IDENTITY = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
+ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
INFOPLIST_FILE = XFFruit/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
@@ -2951,7 +3018,7 @@
"$(PROJECT_DIR)",
);
PRODUCT_NAME = XFFruit;
- PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
+ PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
name = Debug;
@@ -2961,8 +3028,8 @@
baseConfigurationReference = 7DDFB1D460448C3B45118195 /* Pods.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
- CODE_SIGN_IDENTITY = "iPhone Developer";
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+ CODE_SIGN_IDENTITY = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
+ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
INFOPLIST_FILE = XFFruit/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
@@ -2972,7 +3039,7 @@
"$(PROJECT_DIR)",
);
PRODUCT_NAME = XFFruit;
- PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
+ PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
name = Release;
@@ -2995,7 +3062,7 @@
INFOPLIST_FILE = XFFruitTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = XFFruitTests;
- PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
+ PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/XFFruit.app/XFFruit";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
@@ -3015,7 +3082,7 @@
INFOPLIST_FILE = XFFruitTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = XFFruitTests;
- PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
+ PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/XFFruit.app/XFFruit";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
diff --git a/XFFruit/Controllers/HTTPController/ICRHTTPController.h b/XFFruit/Controllers/HTTPController/ICRHTTPController.h
index 405d981c997d3ec809b4821db1a1a2b00a6d66b3..fc498a6deca81fd80e29397b7fd025a6e645c6b3 100644
--- a/XFFruit/Controllers/HTTPController/ICRHTTPController.h
+++ b/XFFruit/Controllers/HTTPController/ICRHTTPController.h
@@ -178,54 +178,56 @@ typedef NS_ENUM(NSUInteger, ICRAttachmentType) {
success:(void (^)(id))succ
failure:(void (^)(id))fail;
-//æ·»åŠ è¡Œæƒ…è°ƒç ”å•
+//1.æ·»åŠ è¡Œæƒ…è°ƒç ”å•
- (void)saveSurveyWithAuthenticode:(id)data
success:(void (^)(id))succ
failure:(void (^)(id))fail;
-//获å–è¡Œæƒ…è°ƒç ”å•åˆ—表
+//2.获å–è¡Œæƒ…è°ƒç ”å•åˆ—表
- (void)querySurveyWithBillData:(id)data
success:(void (^)(id))succ
failure:(void (^)(id))fail;
-//获å–è¡Œæƒ…è°ƒç ”å•è¯¦æƒ…
+//3.获å–è¡Œæƒ…è°ƒç ”å•è¯¦æƒ…
- (void)getResultWithSurveyUuid:(NSString *)surveyUuid
success:(void (^)(id))succ
failure:(void (^)(id))fail;
-//下载商å“ä¿¡æ¯
-- (void)getProductWithPage_number:(NSUInteger)page_number
- page_size:(NSUInteger)page_size
- success:(void (^)(id))succ
- failure:(void (^)(id))fail;
-//下载用户信æ¯
-- (void)getUserWithPage_number:(NSUInteger)page_number
- page_size:(NSUInteger)page_size
- success:(void (^)(id))succ
- failure:(void (^)(id))fail;
-//生æˆè¡Œæƒ…å馈图片
+//4.生æˆè¡Œæƒ…å馈图片
- (void)resultChartWithResultUuid:(NSString *)uuid
width:(NSNumber *)width
height:(NSNumber *)height
success:(void (^)(id))succ
failure:(void (^)(id))fail;
-//结æŸè¡Œæƒ…å馈(写)
+//5.结æŸè¡Œæƒ…å馈(写)
- (void)surveyFinishWithUuid:(NSString *)uuid
version:(NSNumber *)version
success:(void (^)(id))succ
failure:(void (^)(id))fail;
-//获å–è¡Œæƒ…è°ƒç ”å•å馈列表
+//6.获å–è¡Œæƒ…è°ƒç ”å•å馈列表
- (void)getResultsWithUuid:(NSString *)uuid
success:(void (^)(id))succ
failure:(void (^)(id))fail;
-//供应商
+//1.下载商å“ä¿¡æ¯
+- (void)getProductWithPage_number:(NSUInteger)page_number
+ page_size:(NSUInteger)page_size
+ success:(void (^)(id))succ
+ failure:(void (^)(id))fail;
+//2.下载用户信æ¯
+- (void)getUserWithPage_number:(NSUInteger)page_number
+ page_size:(NSUInteger)page_size
+ success:(void (^)(id))succ
+ failure:(void (^)(id))fail;
+
+
+//3.供应商
- (void)getVendorWithPage_number:(NSUInteger)page_number
page_size:(NSUInteger)page_size
success:(void (^)(id))succ
failure:(void (^)(id))fail;
-//仓库
+//4.仓库
- (void)getWarehouseWithPage_number:(NSUInteger)page_number
page_size:(NSUInteger)page_size
success:(void (^)(id))succ
@@ -288,19 +290,19 @@ typedef NS_ENUM(NSUInteger, ICRAttachmentType) {
failure:(void (^)(id))fail;
-//æ·»åŠ é‡‡è´å•
+//1.æ·»åŠ é‡‡è´å•
- (void)savePurchaseWithData:(id)data
success:(void (^)(id))succ
failure:(void (^)(id))fail;
-//获å–采è´å•åˆ—表
+//2.获å–采è´å•åˆ—表
- (void)queryPurchaseWithData:(id)data
success:(void (^)(id))succ
failure:(void (^)(id))fail;
-//获å–采è´å•è¯¦æƒ…
+//3.获å–采è´å•è¯¦æƒ…
- (void)getPurchaseResultWithPurchaseUuid:(NSString *)purchaseUuid
success:(void (^)(id))succ
failure:(void (^)(id))fail;
-//å®¡æ ¸/æ‹’ç»/供应商确认/结æŸ/作废采è´å•
+//4.å®¡æ ¸/æ‹’ç»/供应商确认/结æŸ/作废采è´å•
- (void)dealByActionWithPurchaseUuid:(NSString *)purchaseUuid
action:(NSString *)action
remark:(NSString *)remark
@@ -308,6 +310,30 @@ typedef NS_ENUM(NSUInteger, ICRAttachmentType) {
success:(void (^)(id))succ
failure:(void (^)(id))fail;
+//1.æ·»åŠ å‘è¿å•
+- (void)saveTransportWithData:(id)data
+ success:(void (^)(id))succ
+ failure:(void (^)(id))fail;
+
+//2.获å–å‘è¿å•åˆ—表
+- (void)queryTransPortWithData:(id)data
+ success:(void (^)(id))succ
+ failure:(void (^)(id))fail;
+
+//3.获å–å‘è¿å•è¯¦æƒ…
+- (void)getTransportResultWithTransportUuid:(NSString *)transportUuid
+ success:(void (^)(id))succ
+ failure:(void (^)(id))fail;
+//4.结æŸå‘è¿å•
+- (void)endTransportWithTransportUuid:(NSString *)transportUuid
+ version:(NSNumber *)version
+ success:(void (^)(id))succ
+ failure:(void (^)(id))fail;
+//5.作废å‘è¿å•
+- (void)abortTransportWithTransportUuid:(NSString *)transportUuid
+ version:(NSNumber *)version
+ success:(void (^)(id))succ
+ failure:(void (^)(id))fail;
@end
diff --git a/XFFruit/Controllers/HTTPController/ICRHTTPController.m b/XFFruit/Controllers/HTTPController/ICRHTTPController.m
index 20ca72c9beabbc4ec1ecf5e99309f39ba44f125b..827d40db85a4c7730a373c6da1d45f02f9420b2b 100644
--- a/XFFruit/Controllers/HTTPController/ICRHTTPController.m
+++ b/XFFruit/Controllers/HTTPController/ICRHTTPController.m
@@ -101,8 +101,14 @@ typedef NS_ENUM(NSUInteger, ICRHTTPAction) {
XFFHttp_PurchaseSave,
XFFHttp_QueryPurchase,
XFFHttp_GetPurchaseDetail,
- XFFHttp_DealByActionPurchase
-
+ XFFHttp_DealByActionPurchase,
+
+ //å‘è¿å•
+ XFFHttp_TransportSave,
+ XFFHttp_QueryTransport,
+ XFFHttp_GetTransportDetail,
+ XFFHttp_EndTransport,
+ XFFHttp_AbortTransport
};
static NSString * const ICRHTTPInterface[] = {
@@ -185,8 +191,15 @@ static NSString * const ICRHTTPInterface[] = {
[XFFHttp_PurchaseSave] = @"purchase/bill/save",
[XFFHttp_QueryPurchase] = @"purchase/bill/query",
[XFFHttp_GetPurchaseDetail] = @"purchase/bill/get",
- [XFFHttp_DealByActionPurchase] = @"purchase/bill/action"
+ [XFFHttp_DealByActionPurchase] = @"purchase/bill/action",
+
+ //å‘è¿å•
+ [XFFHttp_TransportSave] = @"transport/save_transport",
+ [XFFHttp_QueryTransport] = @"transport/query_transport",
+ [XFFHttp_GetTransportDetail] = @"transport/get_transport",
+ [XFFHttp_EndTransport] = @"transport/finish",
+ [XFFHttp_AbortTransport] = @"transport/abort",
};
static NSString * const ICRAttachmentTypeValue[] = {
@@ -1497,7 +1510,7 @@ acceptTypeJson:YES
}
};
- NSString *urlStr = [[[self class] UrlForPluginHTTPAction:XFFHttp_GetProduct] stringByAppendingFormat:@"?start_date=%@&page_number=%@&page_size=%@", [[NSDate date] httpParameterString],@(page_number),@(page_size)];
+ NSString *urlStr = [[[self class] UrlForPluginHTTPAction:XFFHttp_GetProduct] stringByAppendingFormat:@"?start_date=%@&page_number=%@&page_size=%@", @"2015-05-04",@(page_number),@(page_size)];
NSString *encodeUrlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
[self POST:encodeUrlStr
parameters:NULL
@@ -1903,7 +1916,7 @@ acceptTypeJson:YES
success:success
failure:failure];
}
-//获å–è¡Œæƒ…è°ƒç ”å•åˆ—表
+//获å–采è´å•åˆ—表
- (void)queryPurchaseWithData:(id)data
success:(void (^)(id))succ
failure:(void (^)(id))fail{
@@ -1963,6 +1976,7 @@ acceptTypeJson:YES
success:success
failure:failure];
}
+//采è´å•å¤„ç†
- (void)dealByActionWithPurchaseUuid:(NSString *)purchaseUuid
action:(NSString *)action
remark:(NSString *)remark
@@ -1989,17 +2003,190 @@ acceptTypeJson:YES
}
};
ICRUserUtil *userUtil = [ICRUserUtil sharedInstance];
- NSString *urlStr = [[[self class] UrlForPluginHTTPAction:XFFHttp_GetPurchaseDetail] stringByAppendingFormat:@"/%@?action=%@&remark=%@&version=%@&time=%@&operId=%@&operName=%@",purchaseUuid,action,remark,version,[[NSDate date] httpParameterString],userUtil.userCode,userUtil.displayName];
+ NSString *urlStr = [[[self class] UrlForPluginHTTPAction:XFFHttp_DealByActionPurchase] stringByAppendingFormat:@"/%@?action=%@&remark=%@&version=%@&time=%@&operId=%@&operName=%@",purchaseUuid,action,remark,version,[[NSDate date] httpParameterString],userUtil.userCode,userUtil.displayName];
+ NSString *encodeUrlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+
+ [self POST:encodeUrlStr
+ parameters:nil
+ needToken:NO
+acceptTypeJson:YES
+ success:success
+ failure:failure];
+
+}
+
+//æ·»åŠ å‘è¿å•
+- (void)saveTransportWithData:(id)data
+ success:(void (^)(id))succ
+ failure:(void (^)(id))fail
+{
+ if (!data) {
+ if (fail) {
+ fail( [[self class] ErrorWithMsg:ERROR_PARAMETER code:0] );
+ }
+ return;
+ }
+
+ void (^success)(AFHTTPRequestOperation *operation, id responseObject) = ^(AFHTTPRequestOperation *operation, id responseObject) {
+ CLog(@"%@", responseObject);
+ if (succ) {
+ succ( responseObject );
+ }
+ };
+ void (^failure)(AFHTTPRequestOperation *operation, NSError *error) = ^(AFHTTPRequestOperation *operation, NSError *error) {
+ CLog(@"%@", error);
+ if (fail) {
+ fail( error );
+ }
+ };
+ NSDictionary *dict = data;
+ NSString *currentTime = [[NSDate date] httpParameterString];
+ ICRUserUtil *userUtil = [ICRUserUtil sharedInstance];
+ NSString *urlStr = [[[self class] UrlForPluginHTTPAction:XFFHttp_TransportSave] stringByAppendingFormat:@"?time=%@&operId=%@&operName=%@",currentTime,userUtil.userCode,userUtil.displayName];
NSString *encodeUrlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+ [self POST:encodeUrlStr
+ parameters:dict
+ needToken:NO
+acceptTypeJson:YES
+ success:success
+ failure:failure];
+}
+
+
+//获å–å‘è¿å•åˆ—表
+- (void)queryTransPortWithData:(id)data
+ success:(void (^)(id))succ
+ failure:(void (^)(id))fail{
+
+ void (^success)(AFHTTPRequestOperation *operation, id responseObject) = ^(AFHTTPRequestOperation *operation, id responseObject) {
+ CLog(@"%@", responseObject);
+ if (succ) {
+ succ( responseObject );
+ }
+ };
+ void (^failure)(AFHTTPRequestOperation *operation, NSError *error) = ^(AFHTTPRequestOperation *operation, NSError *error) {
+ CLog(@"%@", error);
+ if (fail) {
+ fail( error );
+ }
+ };
+ NSDictionary *dict = data;
+ NSString *urlStr = [[self class] UrlForPluginHTTPAction:XFFHttp_QueryTransport];
+ [self POST:urlStr
+ parameters:dict
+ needToken:NO
+acceptTypeJson:YES
+ success:success
+ failure:failure];
+}
+//获å–å‘è¿å•è¯¦æƒ…
+- (void)getTransportResultWithTransportUuid:(NSString *)transportUuid
+ success:(void (^)(id))succ
+ failure:(void (^)(id))fail{
+ if (!transportUuid) {
+ if (fail) {
+ fail( [[self class] ErrorWithMsg:ERROR_PARAMETER code:0] );
+ }
+ return;
+ }
+
+ void (^success)(AFHTTPRequestOperation *operation, id responseObject) = ^(AFHTTPRequestOperation *operation, id responseObject) {
+ CLog(@"%@", responseObject);
+ if (succ) {
+ succ( responseObject );
+ }
+ };
+ void (^failure)(AFHTTPRequestOperation *operation, NSError *error) = ^(AFHTTPRequestOperation *operation, NSError *error) {
+ CLog(@"%@", error);
+ if (fail) {
+ fail( error );
+ }
+ };
+ NSString *urlStr = [[[self class] UrlForPluginHTTPAction:XFFHttp_GetTransportDetail] stringByAppendingFormat:@"/%@",transportUuid];
+ NSString *encodeUrlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
[self GET:encodeUrlStr
parameters:nil
needToken:NO
acceptTypeJson:YES
success:success
failure:failure];
+}
+
+- (void)endTransportWithTransportUuid:(NSString *)transportUuid
+ version:(NSNumber *)version
+ success:(void (^)(id))succ
+ failure:(void (^)(id))fail{
+ if (!transportUuid) {
+ if (fail) {
+ fail( [[self class] ErrorWithMsg:ERROR_PARAMETER code:0] );
+ }
+ return;
+ }
+
+ void (^success)(AFHTTPRequestOperation *operation, id responseObject) = ^(AFHTTPRequestOperation *operation, id responseObject) {
+ CLog(@"%@", responseObject);
+ if (succ) {
+ succ( responseObject );
+ }
+ };
+ void (^failure)(AFHTTPRequestOperation *operation, NSError *error) = ^(AFHTTPRequestOperation *operation, NSError *error) {
+ CLog(@"%@", error);
+ if (fail) {
+ fail( error );
+ }
+ };
+ ICRUserUtil *userUtil = [ICRUserUtil sharedInstance];
+ NSString *urlStr = [[[self class] UrlForPluginHTTPAction:XFFHttp_EndTransport] stringByAppendingFormat:@"/%@?version=%@&time=%@&operId=%@&operName=%@",transportUuid,version,[[NSDate date] httpParameterString],userUtil.userCode,userUtil.displayName];
+ NSString *encodeUrlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+
+ [self POST:encodeUrlStr
+ parameters:nil
+ needToken:NO
+acceptTypeJson:YES
+ success:success
+ failure:failure];
+
+}
+- (void)abortTransportWithTransportUuid:(NSString *)transportUuid
+ version:(NSNumber *)version
+ success:(void (^)(id))succ
+ failure:(void (^)(id))fail{
+ if (!transportUuid) {
+ if (fail) {
+ fail( [[self class] ErrorWithMsg:ERROR_PARAMETER code:0] );
+ }
+ return;
+ }
+
+ void (^success)(AFHTTPRequestOperation *operation, id responseObject) = ^(AFHTTPRequestOperation *operation, id responseObject) {
+ CLog(@"%@", responseObject);
+ if (succ) {
+ succ( responseObject );
+ }
+ };
+ void (^failure)(AFHTTPRequestOperation *operation, NSError *error) = ^(AFHTTPRequestOperation *operation, NSError *error) {
+ CLog(@"%@", error);
+ if (fail) {
+ fail( error );
+ }
+ };
+ ICRUserUtil *userUtil = [ICRUserUtil sharedInstance];
+ NSString *urlStr = [[[self class] UrlForPluginHTTPAction:XFFHttp_AbortTransport] stringByAppendingFormat:@"/%@?version=%@&time=%@&operId=%@&operName=%@",transportUuid,version,[[NSDate date] httpParameterString],userUtil.userCode,userUtil.displayName];
+ NSString *encodeUrlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+
+ [self POST:encodeUrlStr
+ parameters:nil
+ needToken:NO
+acceptTypeJson:YES
+ success:success
+ failure:failure];
+
}
+
+
+
//1·ä¿å˜é‡‡è´é€šçŸ¥å•
- (void)savePurchaseNoticeWithData:(id)data
success:(void (^)(id))succ
diff --git a/XFFruit/General/Classes/BaseViewController/ChooseParentViewController.m b/XFFruit/General/Classes/BaseViewController/ChooseParentViewController.m
index 9d3ffad90b920149d5b6100049d49481de332246..9df3155574525ce3496413b98e8cbfb34c721a74 100644
--- a/XFFruit/General/Classes/BaseViewController/ChooseParentViewController.m
+++ b/XFFruit/General/Classes/BaseViewController/ChooseParentViewController.m
@@ -14,12 +14,9 @@
@end
@implementation ChooseParentViewController
-- (void)dealloc{
- [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
+
- (void)viewDidLoad {
[super viewDidLoad];
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(boxValueChanged:) name:UITextFieldTextDidChangeNotification object:nil];
[self initData];
[self bulidLayout];
[self createRefresh];
@@ -37,6 +34,7 @@
self.selectTextFiled.textAlignment = NSTextAlignmentLeft;
self.selectTextFiled.background = [UIImage imageNamed:@"textFiled"];
self.selectTextFiled.delegate = self;
+ [self.selectTextFiled addTarget:self action:@selector(boxValueChanged:) forControlEvents:UIControlEventEditingChanged];
self.selectTextFiled.font = GXF_FIFTEENTEN_SIZE;
[self.view addSubview:self.selectTextFiled];
@@ -159,7 +157,7 @@
__weak typeof(self)weakSelf = self;
ICRDatabaseFetchResultsBlock fetchResultsBlk = ^(NSArray *fetchedObjects) {
__strong __typeof(weakSelf)strongSelf = weakSelf;
- if (![GXF_NSUSERFEFTAULTS objectForKey:self.tableView.header.lastUpdatedTimeKey]) {
+ if (fetchedObjects.count == 0 && titleStr.length == 0) {
[GXF_NSUSERFEFTAULTS setObject:[NSDate date] forKey:self.tableView.header.lastUpdatedTimeKey];
[GXF_NSUSERFEFTAULTS synchronize];
[self getBaseDataFromServer];
diff --git a/XFFruit/General/Classes/BaseViewController/ICRBaseViewController.m b/XFFruit/General/Classes/BaseViewController/ICRBaseViewController.m
index 1cae416b576f7caf05ef38dbe0b3b3d6df3932bc..441473bcb4d08ea25199e94b88f55fbd94100ab2 100644
--- a/XFFruit/General/Classes/BaseViewController/ICRBaseViewController.m
+++ b/XFFruit/General/Classes/BaseViewController/ICRBaseViewController.m
@@ -18,7 +18,7 @@
[super viewDidLoad];
// Do any additional setup after loading the view.
- self.view.backgroundColor = ICR_VIEW_BG_COLOR;
+// self.view.backgroundColor = ICR_VIEW_BG_COLOR;
}
- (void)didReceiveMemoryWarning {
diff --git a/XFFruit/Macro/ICRNotificationMacro.h b/XFFruit/Macro/ICRNotificationMacro.h
index 59a218c826f859cadf3cc639047f21b429ad683a..ee4e4aa906220f1e0463a7e186ef1ac0f0d8c9f2 100644
--- a/XFFruit/Macro/ICRNotificationMacro.h
+++ b/XFFruit/Macro/ICRNotificationMacro.h
@@ -11,7 +11,9 @@
#define SetProductTotalPrice @"setProductTotalPrice"
#define KNOTIFICATION_getSelectPurchaseProduct @"KNOTIFICATION_getSelectPurchaseProduct"
-
+#define KNOTIFICATION_ChoseTransportPurchase @"KNOTIFICATION_ChoseTransportPurchase"
+#define KNOTIFICATION_AddPurchaseProduct @"KNOTIFICATION_AddPurchaseProduct"
+#define KNOTIFICATION_AddTransportCost @"KNOTIFICATION_AddTransportCost"
diff --git a/XFFruit/Utilities/IBTUIKit/IBTConstants.h b/XFFruit/Utilities/IBTUIKit/IBTConstants.h
index 04f969a0141787a3a68dc227da7fdc72d262ee19..8f986bbc19f862d91e82a6d7b134949b91492972 100644
--- a/XFFruit/Utilities/IBTUIKit/IBTConstants.h
+++ b/XFFruit/Utilities/IBTUIKit/IBTConstants.h
@@ -118,6 +118,8 @@
#define ChooseVendorUpdateDate @"chooseVendorUpdateDate"
#define ChooseWarehouseUpdateDate @"chooseWarehouseUpdateDate"
#define PurchaseUpdateDate @"purchaseUpdateDate"
+#define TransportUpdateDate @"TransportUpdateDate"
+
//è¡Œæƒ…è°ƒç ”çŠ¶æ€
//initial(未æ交)，submitted(å·²æ交)，insurvey(è°ƒç ”ä¸)，finished(已完æˆ)
@@ -129,9 +131,9 @@
//采è´å•çŠ¶æ€
#define PURCHASE_STATE_INITIAL @"initial" //未æ交
-#define PURCHASE_STATE_SUBMITTED @"submitted"//å·²æ交
+#define PURCHASE_STATE_SUBMITTED @"submitted"//å·²æ交 未审批
#define PURCHASE_STATE_REJECTED @"rejected" //已拒ç»
-#define PURCHASE_STATE_APPROVED @"approved" //已审批
+#define PURCHASE_STATE_APPROVED @"approved" //已审批 å‘è¿ä¸
#define PURCHASE_STATE_SHIPPING @"shipping" //å‘è¿ä¸
#define PURCHASE_STATE_FINISHED @"finished" //已完æˆ
#define PURCHASE_STATE_ABORTED @"aborted" //已作废
@@ -163,5 +165,12 @@
#define GXF_BASECLASS_USER @"User"
+//å‘è¿å•çŠ¶æ€
+#define TRANSPORT_STATE_INITIAL @"initial" //未æ交
+#define TRANSPORT_STATE_UNRECEIVED @"unreceived"//未收货
+#define TRANSPORT_STATE_RECEIVED @"received" //已收货
+#define TRANSPORT_STATE_ABORTED @"aborted" //已废用
+
+
#endif
diff --git a/XFFruit/Utilities/IBTUIKit/RegexUtil.h b/XFFruit/Utilities/IBTUIKit/RegexUtil.h
new file mode 100644
index 0000000000000000000000000000000000000000..214089078e6199a299c92003d921938bce951eed
--- /dev/null
+++ b/XFFruit/Utilities/IBTUIKit/RegexUtil.h
@@ -0,0 +1,15 @@
+//
+// RegexUtil.h
+// XFFruit
+//
+// Created by 陈俊俊 on 15/9/9.
+// Copyright (c) 2015å¹´ Xummer. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface RegexUtil : NSObject
+//验è¯æ˜¯å¦æ˜¯æ•´æ•°ï¼Œå°æ•°
++ (BOOL)isValidateNmuberAndFloat:(NSString *)candidate;
+
+@end
diff --git a/XFFruit/Utilities/IBTUIKit/RegexUtil.m b/XFFruit/Utilities/IBTUIKit/RegexUtil.m
new file mode 100644
index 0000000000000000000000000000000000000000..7d49d33e6579a0fda57fb908fde78f14be3f1082
--- /dev/null
+++ b/XFFruit/Utilities/IBTUIKit/RegexUtil.m
@@ -0,0 +1,19 @@
+//
+// RegexUtil.m
+// XFFruit
+//
+// Created by 陈俊俊 on 15/9/9.
+// Copyright (c) 2015å¹´ Xummer. All rights reserved.
+//
+
+#import "RegexUtil.h"
+
+@implementation RegexUtil
+
++ (BOOL)isValidateNmuberAndFloat:(NSString *)candidate{
+ NSString *regStr=@"(^[0-9]+(\\.[0-9]+)?$)";
+ NSPredicate *numberTest = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", regStr];
+
+ return [numberTest evaluateWithObject:candidate];
+}
+@end
diff --git a/XFFruit/ViewControllers/Business/BusinessViewController.m b/XFFruit/ViewControllers/Business/BusinessViewController.m
index 2a52b8460e1deded64a435529f95a75bc2d9ba53..178b22049a908b5cab6ef208154cdd8712f0d17a 100644
--- a/XFFruit/ViewControllers/Business/BusinessViewController.m
+++ b/XFFruit/ViewControllers/Business/BusinessViewController.m
@@ -24,7 +24,7 @@
#import "NewPurchaseViewController.h"
#import "PurchaseViewController.h"
#import "NewTransportViewController.h"
-
+#import "TransportViewController.h"
#import"PurchaseNoticeViewController.h"
@@ -173,9 +173,18 @@
case kFunctionNewShipment://任务管ç†
{
NewTransportViewController *tVC = [[NewTransportViewController alloc] init];
+ tVC.title = @"新建å‘è¿å•";
+ [self PushViewController:tVC animated:YES];
+ }
+ break;
+ case kFunctionSeeShipment://任务管ç†
+ {
+ TransportViewController *tVC = [[TransportViewController alloc] init];
+ tVC.title = @"å‘è¿å•";
[self PushViewController:tVC animated:YES];
}
break;
+
// case kFunctionPatrolPlan://巡店计划
// {
// ICRPatrolPlanViewController *pVC = [[ICRPatrolPlanViewController alloc] initWithStore:nil isHomeShow:YES];
diff --git a/XFFruit/ViewControllers/ChooseViewController/ChooseCostViewController.h b/XFFruit/ViewControllers/ChooseViewController/ChooseCostViewController.h
new file mode 100644
index 0000000000000000000000000000000000000000..2fac572c04664a12cce2f1ae0ea05c10ed31d497
--- /dev/null
+++ b/XFFruit/ViewControllers/ChooseViewController/ChooseCostViewController.h
@@ -0,0 +1,13 @@
+//
+// ChooseCostViewController.h
+// XFFruit
+//
+// Created by 陈俊俊 on 15/9/7.
+// Copyright (c) 2015å¹´ Xummer. All rights reserved.
+//
+
+#import "ChooseParentViewController.h"
+
+@interface ChooseCostViewController : ChooseParentViewController
+
+@end
diff --git a/XFFruit/ViewControllers/ChooseViewController/ChooseCostViewController.m b/XFFruit/ViewControllers/ChooseViewController/ChooseCostViewController.m
new file mode 100644
index 0000000000000000000000000000000000000000..420f648b52f3dd7a460c01953da7dc015fc391cb
--- /dev/null
+++ b/XFFruit/ViewControllers/ChooseViewController/ChooseCostViewController.m
@@ -0,0 +1,78 @@
+//
+// ChooseCostViewController.m
+// XFFruit
+//
+// Created by 陈俊俊 on 15/9/7.
+// Copyright (c) 2015å¹´ Xummer. All rights reserved.
+//
+
+#import "ChooseCostViewController.h"
+#define TopMargin 50
+#define TableHeight 50
+@interface ChooseCostViewController ()
+
+@end
+
+@implementation ChooseCostViewController
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ self.title = @"类型";
+ [self.dataArr addObject:@"è¿è´¹"];
+ [self.dataArr addObject:@"人工费"];
+ [self.dataArr addObject:@"装å¸è´¹"];
+ [self.dataArr addObject:@"æ‚è´¹"];
+ self.selectTextFiled = nil;
+ self.tableView.frame = CGRectMake(0, 5, ScreenSize.width, ScreenSize.height - 64 - 5);
+}
+- (void)createRefresh{}
+
+#pragma mark - å议方法
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ static NSString *cellID = @"MaskCell";
+ MaskCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
+ if (cell == nil) {
+ cell = [[MaskCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID totalWidth:ScreenSize.width totalHeight:TableHeight];
+ tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+ cell.selectionStyle = UITableViewCellSelectionStyleNone;
+ cell.Commitbtn.hidden = YES;
+ }
+
+ if (self.currentIndexPath) {
+ if (indexPath.row == self.currentIndexPath.row) {
+ cell.Commitbtn.hidden = NO;
+ }else{
+ cell.Commitbtn.hidden = YES;
+ }
+ }else{
+ cell.Commitbtn.hidden = YES;
+ }
+ if (self.dataArr.count > 0) {
+ NSString *type = self.dataArr[indexPath.row];
+ [cell setTitleStr:type];
+ }
+ return cell;
+}
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
+ MaskCell *currentCell = (MaskCell *)[tableView cellForRowAtIndexPath:self.currentIndexPath];
+ currentCell.Commitbtn.hidden = YES;
+ MaskCell *cell = (MaskCell *)[tableView cellForRowAtIndexPath:indexPath];
+ cell.Commitbtn.hidden = NO;
+ self.currentIndexPath = indexPath;
+}
+- (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
diff --git a/XFFruit/ViewControllers/Survey/controllers/ChooseProductViewController.h b/XFFruit/ViewControllers/ChooseViewController/ChooseProductViewController.h
similarity index 100%
rename from XFFruit/ViewControllers/Survey/controllers/ChooseProductViewController.h
rename to XFFruit/ViewControllers/ChooseViewController/ChooseProductViewController.h
diff --git a/XFFruit/ViewControllers/Survey/controllers/ChooseProductViewController.m b/XFFruit/ViewControllers/ChooseViewController/ChooseProductViewController.m
similarity index 100%
rename from XFFruit/ViewControllers/Survey/controllers/ChooseProductViewController.m
rename to XFFruit/ViewControllers/ChooseViewController/ChooseProductViewController.m
diff --git a/XFFruit/ViewControllers/Purchase/Controllers/ChooseTypeViewController.h b/XFFruit/ViewControllers/ChooseViewController/ChooseTypeViewController.h
similarity index 100%
rename from XFFruit/ViewControllers/Purchase/Controllers/ChooseTypeViewController.h
rename to XFFruit/ViewControllers/ChooseViewController/ChooseTypeViewController.h
diff --git a/XFFruit/ViewControllers/Purchase/Controllers/ChooseTypeViewController.m b/XFFruit/ViewControllers/ChooseViewController/ChooseTypeViewController.m
similarity index 100%
rename from XFFruit/ViewControllers/Purchase/Controllers/ChooseTypeViewController.m
rename to XFFruit/ViewControllers/ChooseViewController/ChooseTypeViewController.m
diff --git a/XFFruit/ViewControllers/Purchase/Controllers/ChooseVendorViewController.h b/XFFruit/ViewControllers/ChooseViewController/ChooseVendorViewController.h
similarity index 100%
rename from XFFruit/ViewControllers/Purchase/Controllers/ChooseVendorViewController.h
rename to XFFruit/ViewControllers/ChooseViewController/ChooseVendorViewController.h
diff --git a/XFFruit/ViewControllers/Purchase/Controllers/ChooseVendorViewController.m b/XFFruit/ViewControllers/ChooseViewController/ChooseVendorViewController.m
similarity index 100%
rename from XFFruit/ViewControllers/Purchase/Controllers/ChooseVendorViewController.m
rename to XFFruit/ViewControllers/ChooseViewController/ChooseVendorViewController.m
diff --git a/XFFruit/ViewControllers/Purchase/Controllers/ChooseWarehouseViewController.h b/XFFruit/ViewControllers/ChooseViewController/ChooseWarehouseViewController.h
similarity index 100%
rename from XFFruit/ViewControllers/Purchase/Controllers/ChooseWarehouseViewController.h
rename to XFFruit/ViewControllers/ChooseViewController/ChooseWarehouseViewController.h
diff --git a/XFFruit/ViewControllers/Purchase/Controllers/ChooseWarehouseViewController.m b/XFFruit/ViewControllers/ChooseViewController/ChooseWarehouseViewController.m
similarity index 100%
rename from XFFruit/ViewControllers/Purchase/Controllers/ChooseWarehouseViewController.m
rename to XFFruit/ViewControllers/ChooseViewController/ChooseWarehouseViewController.m
diff --git a/XFFruit/ViewControllers/Survey/controllers/ChosePersonViewController.h b/XFFruit/ViewControllers/ChooseViewController/ChosePersonViewController.h
similarity index 100%
rename from XFFruit/ViewControllers/Survey/controllers/ChosePersonViewController.h
rename to XFFruit/ViewControllers/ChooseViewController/ChosePersonViewController.h
diff --git a/XFFruit/ViewControllers/Survey/controllers/ChosePersonViewController.m b/XFFruit/ViewControllers/ChooseViewController/ChosePersonViewController.m
similarity index 100%
rename from XFFruit/ViewControllers/Survey/controllers/ChosePersonViewController.m
rename to XFFruit/ViewControllers/ChooseViewController/ChosePersonViewController.m
diff --git a/XFFruit/ViewControllers/Purchase/Controllers/NewPurchaseViewController.m b/XFFruit/ViewControllers/Purchase/Controllers/NewPurchaseViewController.m
index fc8bbaa02c3f1b78f1b43f445393b27804834262..2af05581dd48935705a2cc0b8002b7cbc94a6b60 100644
--- a/XFFruit/ViewControllers/Purchase/Controllers/NewPurchaseViewController.m
+++ b/XFFruit/ViewControllers/Purchase/Controllers/NewPurchaseViewController.m
@@ -11,6 +11,8 @@
#import "ProductBillViewController.h"
#import "PurchaseBillProduct.h"
#import "PurchaseViewController.h"
+#import "ShopDetaileViewController.h"
+#import "PurchaseBillProduct.h"
#define TopHeight 328
#define BottomHeight 300
#define SpaceHeight 20
@@ -41,6 +43,7 @@ typedef enum : NSUInteger {
if (self) {
//监å¬å€¼çš„改å˜
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(setProductTotalPrice:) name:SetProductTotalPrice object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(addPurchaseProduct:) name:KNOTIFICATION_AddPurchaseProduct object:nil];
}
return self;
}
@@ -145,7 +148,29 @@ typedef enum : NSUInteger {
_purchaseView.chargePurchase = [NSNumber numberWithFloat:otherPrice];
_purchaseView.total = [NSNumber numberWithFloat:totalPrice+otherPrice];
}
-
+- (void)addPurchaseProduct:(NSNotification *)fication{
+ ShopDetaileViewController *svc = [[ShopDetaileViewController alloc] init];
+ // 回调
+ svc.choseShopDetail = ^(ShopDetail *shopDetail){
+ PurchaseBillProduct *billProduct = [[PurchaseBillProduct alloc]init];
+ billProduct.product_uuid = shopDetail.product_uuid;
+ billProduct.product_code = shopDetail.product_code;
+ billProduct.product_name = shopDetail.merchandise;
+ billProduct.qpc = [NSNumber numberWithFloat:[shopDetail.packageSpecification floatValue]];
+ billProduct.unit = shopDetail.packageUnit;
+ billProduct.qty = [NSNumber numberWithFloat:[shopDetail.packageQuantity floatValue]];
+ billProduct.price = [NSNumber numberWithFloat:[shopDetail.packageUnitPrice floatValue]];
+ billProduct.baseQty = [NSNumber numberWithFloat:[shopDetail.foundationQuantity floatValue]];
+ billProduct.basePrice = [NSNumber numberWithFloat:[shopDetail.foundationUnitPrice floatValue]];
+ billProduct.total = [NSNumber numberWithFloat:[shopDetail.totalMoney floatValue]];
+ billProduct.remark = shopDetail.remark;
+ billProduct.qpcStr = @"fdsfdsfdsa";
+ [_pvc.productArr addObject:billProduct];
+ [_pvc.tableView reloadData];
+ };
+ svc.title = [IBTCommon localizableString:@"AddShopDetail"];
+ [self PushViewController:svc animated:YES];
+}
- (void)btnClick:(UIButton *)btn{
switch (btn.tag) {
case SaveTag:
diff --git a/XFFruit/ViewControllers/Purchase/Controllers/ProductBillViewController.m b/XFFruit/ViewControllers/Purchase/Controllers/ProductBillViewController.m
index 81e1dd53412a326a6b452a9183541af67ce98279..b91d0e87f1d04aa7f2dff86d7c5a2f650e49ab17 100644
--- a/XFFruit/ViewControllers/Purchase/Controllers/ProductBillViewController.m
+++ b/XFFruit/ViewControllers/Purchase/Controllers/ProductBillViewController.m
@@ -50,7 +50,6 @@
billProduct.remark = @"hshshshsh";
billProduct.qpcStr = @"fdsfdsfdsa";
[self.productArr addObject:billProduct];
- [self.productArr addObject:billProduct];
if (self.productArr.count > 0) {
[[NSNotificationCenter defaultCenter] postNotificationName:SetProductTotalPrice object:nil];
}
@@ -81,10 +80,10 @@
}
#pragma mark - footerDelegate
- (void)addClick{
-
+ [[NSNotificationCenter defaultCenter] postNotificationName:KNOTIFICATION_AddPurchaseProduct object:nil];
}
- (void)choosePurchase{
- [[NSNotificationCenter defaultCenter] postNotificationName:@"ChoseTransportPurchase" object:nil];
+ [[NSNotificationCenter defaultCenter] postNotificationName:KNOTIFICATION_ChoseTransportPurchase object:nil];
}
#pragma mark - å议方法
diff --git a/XFFruit/ViewControllers/Purchase/Controllers/PurchaseDetailViewController.m b/XFFruit/ViewControllers/Purchase/Controllers/PurchaseDetailViewController.m
index 9464cefce01d9fe28675679d50faf61b14c2f1be..c296cb32bfdc6545d2e89a2e77200cb4053ce79f 100644
--- a/XFFruit/ViewControllers/Purchase/Controllers/PurchaseDetailViewController.m
+++ b/XFFruit/ViewControllers/Purchase/Controllers/PurchaseDetailViewController.m
@@ -108,7 +108,7 @@ typedef enum : NSUInteger {
}
- (void)createBtn{
- _firstBtn = [IBTCustomButtom creatButtonWithFrame:CGRectMake(LeftMargin, ScreenSize.height - 64 - BottomHeight +5, (ScreenSize.width - LeftMargin*3)/2, 40) target:self sel:@selector(btnClick:) tag:RejectTag image:nil title:@"" titleColor: [UIColor whiteColor] isCorner:YES corner:5 bgColor:GXF_SAVE_COLOR];
+ _firstBtn = [IBTCustomButtom creatButtonWithFrame:CGRectMake(LeftMargin, ScreenSize.height - 64 - BottomHeight +5, (ScreenSize.width - LeftMargin*3)/2, 40) target:self sel:@selector(btnClick:) tag:0 image:nil title:@"" titleColor: [UIColor whiteColor] isCorner:YES corner:5 bgColor:GXF_SAVE_COLOR];
[self.view addSubview:_firstBtn];
_secondBtn = [IBTCustomButtom creatButtonWithFrame:CGRectMake(CGRectGetMaxX(_firstBtn.frame)+ LeftMargin, ScreenSize.height - 64 - BottomHeight +5, (ScreenSize.width - LeftMargin*3)/2, 40) target:self sel:@selector(btnClick:) tag:0 image:nil title:@"" titleColor:[UIColor whiteColor] isCorner:YES corner:5 bgColor:GXF_COMMIT_COLOR];
@@ -118,22 +118,18 @@ typedef enum : NSUInteger {
//æ ¹æ®æƒé™åˆ¤æ–按钮显示
- (void)showBtnByPermissions{
//逻辑判æ–按钮显示ä¸æ˜¾ç¤º
- if ([self.bill.state isEqualToString:PURCHASE_STATE_SUBMITTED]) {//状æ€å·²æ交
- if ([self checkIsPermission:PURCHASE_PERMISSIONS_VENDORAPPROVE]) {//供应商审批æƒ
- //显示确认按钮
- _firstBtn.hidden = YES;
- [self changeBtnFrame:_secondBtn title:@"确认" originX:LeftMargin width:OneWidth];
- _secondBtn.tag = SureTag;
- self.indexStyle = 2;
- }else if([self checkIsPermission:PURCHASE_PERMISSIONS_MANAGEAPPROVE]){
+ if ([self.bill.state isEqualToString:PURCHASE_STATE_SUBMITTED]) {//状æ€å·²æ交 未审批
+ if([self checkIsPermission:PURCHASE_PERMISSIONS_MANAGEAPPROVE]){
//显示拒ç»å’Œå®¡æ‰¹
[self changeBtnFrame:_firstBtn title:@"æ‹’ç»" originX:LeftMargin width:TwoWidth];
[self changeBtnFrame:_secondBtn title:@"å®¡æ ¸é€šè¿‡" originX:CGRectGetMaxX(_firstBtn.frame) + LeftMargin width:TwoWidth];
_firstBtn.tag = RejectTag;
_secondBtn.tag = PassTag;
self.indexStyle = 1;
+ }else{
+ [self hiddenTwoBtn];
}
- }else if([self.bill.state isEqualToString:PURCHASE_STATE_SHIPPING]){//状æ€æ˜¯å‘è¿ä¸
+ }else if([self.bill.state isEqualToString:PURCHASE_STATE_APPROVED]){//状æ€æ˜¯å‘è¿ä¸å³å·²å®¡æ‰¹
if([self checkIsPermission:PURCHASE_PERMISSIONS_VENDORAPPROVE]){//供应商审批æƒ
//显示确认按钮
_firstBtn.hidden = YES;
@@ -159,6 +155,8 @@ typedef enum : NSUInteger {
_firstBtn.hidden = YES;
[self changeBtnFrame:_secondBtn title:@"作废" originX:LeftMargin width:OneWidth];
_secondBtn.tag = CancleTag;
+ }else{
+ [self hiddenTwoBtn];
}
}
}
@@ -170,17 +168,22 @@ typedef enum : NSUInteger {
_secondBtn.tag = CancleTag;
self.indexStyle = 0;
+ }else{
+ [self hiddenTwoBtn];
}
}else if([self.bill.state isEqualToString:PURCHASE_STATE_ABORTED]){//已作废
- _firstBtn.hidden = YES;
- _secondBtn.hidden = YES;
- self.indexStyle = 1;
- CGRect scrollViewFrame = _scrollView.frame;
- scrollViewFrame.size.height = ScreenSize.height - 64;
- _scrollView.frame = scrollViewFrame;
-
+ [self hiddenTwoBtn];
}
}
+
+- (void)hiddenTwoBtn{
+ _firstBtn.hidden = YES;
+ _secondBtn.hidden = YES;
+ self.indexStyle = 1;
+ CGRect scrollViewFrame = _scrollView.frame;
+ scrollViewFrame.size.height = ScreenSize.height - 64;
+ _scrollView.frame = scrollViewFrame;
+}
//改å˜æŒ‰é’®çš„ä½ç½®
- (void)changeBtnFrame:(UIButton *)btn title:(NSString *)title originX:(CGFloat)originX width:(CGFloat)width{
CGRect btnFrame = btn.frame;
diff --git a/XFFruit/ViewControllers/Purchase/Views/PurchaseCell.m b/XFFruit/ViewControllers/Purchase/Views/PurchaseCell.m
index 5f2e93f6050516f5a0b39940cc80f1eeaa993d5e..fd6e5d1849ec18da9595ba8c1e7a310a721a83a1 100644
--- a/XFFruit/ViewControllers/Purchase/Views/PurchaseCell.m
+++ b/XFFruit/ViewControllers/Purchase/Views/PurchaseCell.m
@@ -78,21 +78,23 @@
stateStr = @"未æ交";
[self.stateBtn setBackgroundImage:[UIImage imageNamed:@"initial"] forState:UIControlStateDisabled];
}else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_SUBMITTED]) {
- stateStr = @"å·²æ交";
+ stateStr = @"未审批";
[self.stateBtn setBackgroundImage:[UIImage imageNamed:@"insurvey"] forState:UIControlStateDisabled];
}else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_REJECTED]) {
stateStr = @"已拒ç»";
- [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"insurvey"] forState:UIControlStateDisabled];
+ [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"initial"] forState:UIControlStateDisabled];
}else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_APPROVED]) {
- stateStr = @"已审批";
- [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"insurvey"] forState:UIControlStateDisabled];
-
- }else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_SHIPPING]) {
stateStr = @"å‘è¿ä¸";
[self.stateBtn setBackgroundImage:[UIImage imageNamed:@"insurvey"] forState:UIControlStateDisabled];
- }else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_FINISHED]) {
+ }
+// else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_SHIPPING]) {
+// stateStr = @"å‘è¿ä¸";
+// [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"insurvey"] forState:UIControlStateDisabled];
+//
+// }
+ else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_FINISHED]) {
stateStr = @"已完æˆ";
[self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
}else if ([purchaseBill.state isEqualToString:PURCHASE_STATE_ABORTED]) {
@@ -103,11 +105,6 @@
}
-
-
-
-
-
- (void)awakeFromNib {
// Initialization code
}
diff --git a/XFFruit/ViewControllers/PurchaseNotice/Controllers/NewPurchaseNoticeViewController.m b/XFFruit/ViewControllers/PurchaseNotice/Controllers/NewPurchaseNoticeViewController.m
index 3c010526a131be24a476b8cbab368103d280cf48..f62852fbbbdcc1f135fb0b3663e15ca46c997b2e 100644
--- a/XFFruit/ViewControllers/PurchaseNotice/Controllers/NewPurchaseNoticeViewController.m
+++ b/XFFruit/ViewControllers/PurchaseNotice/Controllers/NewPurchaseNoticeViewController.m
@@ -309,7 +309,7 @@ typedef enum : NSUInteger {
- (void)createViewInCell:(SurveyCell *)cell indexPath:(NSIndexPath *)indexPath{
if (indexPath.row == 0) {
- _titleField = [[UITextField alloc] initWithFrame:CGRectMake(100+LeftMargin, 0, ScreenSize.width - 100 - LeftMargin*2-10, TableHeight)];
+ _titleField = [[UITextField alloc] initWithFrame:CGRectMake(100+LeftMargin, 0, ScreenSize.width - 100 - LeftMargin*2-15, TableHeight)];
_titleField.textAlignment = NSTextAlignmentRight;
_titleField.textColor = HexColor(@"444444");
_titleField.placeholder = @"输入采è´é€šçŸ¥æ ‡é¢˜";
@@ -319,7 +319,7 @@ typedef enum : NSUInteger {
[cell.contentView addSubview:_titleField];
}else if (indexPath.row == _dataArr.count -1){
- _noteTextView = [[HPGrowingTextView alloc] initWithFrame:CGRectMake(100+LeftMargin, 0, ScreenSize.width - 100 - LeftMargin*2-10, TableHeight)];
+ _noteTextView = [[HPGrowingTextView alloc] initWithFrame:CGRectMake(100+LeftMargin, 0, ScreenSize.width - 100 - LeftMargin*2-15, TableHeight)];
_noteTextView.contentInset = UIEdgeInsetsMake(5, 5, 5, 0);
_noteTextView.minNumberOfLines = 1;
_noteTextView.maxNumberOfLines = 4;
@@ -333,7 +333,7 @@ typedef enum : NSUInteger {
lineFrame.origin.y = TableHeight*2-1;
cell.lineLabel.frame = lineFrame;
}else{
- UILabel *contentLabel = [[UILabel alloc]initWithFrame:(CGRectMake(100+LeftMargin, 0, ScreenSize.width - 100 - LeftMargin*2-10, TableHeight))];
+ UILabel *contentLabel = [[UILabel alloc]initWithFrame:(CGRectMake(100+LeftMargin, 0, ScreenSize.width - 100 - LeftMargin*2-15, TableHeight))];
contentLabel.textAlignment= NSTextAlignmentRight;
contentLabel.textColor = HexColor(@"bbbbbb");
contentLabel.font = FontSize(TitleSize);
diff --git a/XFFruit/ViewControllers/PurchaseNotice/Models/ShopDetail.h b/XFFruit/ViewControllers/PurchaseNotice/Models/ShopDetail.h
index 6245ff70c0be28fb51d2d00bd78de460b8e03828..79297e5474be0be8921a3fd50c691fc478ae279c 100644
--- a/XFFruit/ViewControllers/PurchaseNotice/Models/ShopDetail.h
+++ b/XFFruit/ViewControllers/PurchaseNotice/Models/ShopDetail.h
@@ -10,6 +10,9 @@
@interface ShopDetail : IBTModel
@property (nonatomic,strong)NSString *merchandise;//商å“
+@property (nonatomic,strong)NSString *product_uuid;//商å“
+@property (nonatomic,strong)NSString *product_code;//商å“
+
@property (nonatomic,strong)NSString *packageSpecification;//åŒ…è£…è§„æ ¼
@property (nonatomic,strong)NSString *packageQuantity;//包装数é‡
@property (nonatomic,strong)NSString *packageUnit;//包装å•ä½
diff --git a/XFFruit/ViewControllers/PurchaseNotice/Views/ShopDetaileViewController.m b/XFFruit/ViewControllers/PurchaseNotice/Views/ShopDetaileViewController.m
index 71fea39f6b6d19e1a1be101f8531c1c8938dba41..267e52809b77acb6c9a153792d92a5341ed53393 100644
--- a/XFFruit/ViewControllers/PurchaseNotice/Views/ShopDetaileViewController.m
+++ b/XFFruit/ViewControllers/PurchaseNotice/Views/ShopDetaileViewController.m
@@ -152,7 +152,8 @@ typedef enum : NSUInteger {
self.shopDetail.packageUnitPrice=packageUnitPrice.text;
self.shopDetail.totalMoney=totalMoney.text;
self.shopDetail.remark=remark.text;
-
+ self.shopDetail.product_code = self.productCodeStr;
+ self.shopDetail.product_uuid = self.productUuidStr;
if (merchandise.text.length == 0 ) {
ShowMessage(@"商å“ä¸èƒ½ä¸ºç©º");
return NO;
diff --git a/XFFruit/ViewControllers/Survey/Transport/Views/BottomTransportView.h b/XFFruit/ViewControllers/Survey/Transport/Views/BottomTransportView.h
deleted file mode 100644
index d368bf7261bc3ab9267d78509a1b190eb29bff83..0000000000000000000000000000000000000000
--- a/XFFruit/ViewControllers/Survey/Transport/Views/BottomTransportView.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// BottomTransportView.h
-// XFFruit
-//
-// Created by 陈俊俊 on 15/9/6.
-// Copyright (c) 2015å¹´ Xummer. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import "ProductBillViewController.h"
-#import "CostViewController.h"
-@interface BottomTransportView : UIView
-@property (nonatomic,strong)ProductBillViewController *productVC;
-@property (nonatomic,strong)CostViewController *costVC;
-
-//刷新tableView
-- (void)refreshProduct:(NSArray *)productArr;
-- (void)refreshCost:(NSArray *)costArr;
-@end
diff --git a/XFFruit/ViewControllers/Survey/Transport/Views/TransportPurductCell.h b/XFFruit/ViewControllers/Survey/Transport/Views/TransportPurductCell.h
deleted file mode 100644
index 4a441a06d49c9b59123b94aee690db18938a63c6..0000000000000000000000000000000000000000
--- a/XFFruit/ViewControllers/Survey/Transport/Views/TransportPurductCell.h
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// TransportPurductCell.h
-// XFFruit
-//
-// Created by 陈俊俊 on 15/9/6.
-// Copyright (c) 2015å¹´ Xummer. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface TransportPurductCell : UITableViewCell
-@property (nonatomic,strong)UIImageView *smallImageView;
-@property (nonatomic,strong)UIButton *editBtn;
-@property (nonatomic,strong)UILabel *seqLabel;
-@property (nonatomic,strong)UILabel *titleLabel;
-@property (nonatomic,strong)UILabel *standLabel;
-@property (nonatomic,strong)UILabel *countLabel;
-@property (nonatomic,strong)UILabel *baseCountLabel;
-@property (nonatomic,strong)UILabel *lineLabel;
-@end
diff --git a/XFFruit/ViewControllers/Survey/Transport/Views/TransportPurductCell.m b/XFFruit/ViewControllers/Survey/Transport/Views/TransportPurductCell.m
deleted file mode 100644
index a162d972456c92af46a2aa3f08323a3d2fdab424..0000000000000000000000000000000000000000
--- a/XFFruit/ViewControllers/Survey/Transport/Views/TransportPurductCell.m
+++ /dev/null
@@ -1,87 +0,0 @@
-//
-// TransportPurductCell.m
-// XFFruit
-//
-// Created by 陈俊俊 on 15/9/6.
-// Copyright (c) 2015å¹´ Xummer. All rights reserved.
-//
-
-#import "TransportPurductCell.h"
-#define LeftMargin 13
-#define TableHeight 44
-#define SmallSize 10
-#define SmallWidth 20
-#define SpaceMargin 1
-#define LeftWidth 40
-
-#define ShowWidth 150
-#define ShowHeight 20
-
-@implementation TransportPurductCell
-- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{
-
- self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
- if (self) {
- [self bulidLayout];
- }
- return self;
-}
-
-- (void)bulidLayout
-{
- CGFloat headWidth = (ScreenSize.width - LeftWidth*2 - SpaceMargin* (4 -1))/4;
-
-
- self.seqLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin, 0, SmallWidth, TableHeight))];
- self.seqLabel.textColor = GXF_CONTENT_COLOR;
- self.seqLabel.text = @"13";
- self.seqLabel.font = GXF_SIXTEENTEH_SIZE;
-
- self.titleLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftWidth, 0, headWidth, TableHeight))];
- self.titleLabel.textAlignment = NSTextAlignmentLeft;
- self.titleLabel.textColor = GXF_CONTENT_COLOR;
- self.titleLabel.text = @"苹果桃å";
- self.titleLabel.font = GXF_SIXTEENTEH_SIZE;
-
- self.standLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.titleLabel.frame) + SpaceMargin, 0, headWidth, TableHeight))];
- self.standLabel.textAlignment = NSTextAlignmentLeft;
- self.standLabel.textColor = GXF_CONTENT_COLOR;
- self.standLabel.text = @"80";
- self.standLabel.font = GXF_SIXTEENTEH_SIZE;
-
- self.countLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.standLabel.frame) + SpaceMargin, 0, headWidth, TableHeight))];
- self.countLabel.textAlignment = NSTextAlignmentLeft;
- self.countLabel.text = @"200";
- self.countLabel.textColor = GXF_CONTENT_COLOR;
- self.countLabel.font = GXF_SIXTEENTEH_SIZE;
-
- self.baseCountLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.countLabel.frame) + SpaceMargin, 0, headWidth, TableHeight))];
- self.baseCountLabel.textAlignment = NSTextAlignmentLeft;
- self.baseCountLabel.text = @"200";
- self.baseCountLabel.textColor = GXF_CONTENT_COLOR;
- self.baseCountLabel.font = GXF_SIXTEENTEH_SIZE;
-
- self.editBtn = [UIButton buttonWithType:UIButtonTypeCustom];
- [self.editBtn setImage:[UIImage imageNamed:@"selected"] forState:UIControlStateNormal];
- self.editBtn.frame = CGRectMake(ScreenSize.width - LeftWidth, 0, LeftWidth , TableHeight);
- self.editBtn.contentMode = UIViewContentModeScaleAspectFit;
-
- self.lineLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin,TableHeight-1, ScreenSize.width - LeftMargin * 2, 1))];;
- self.lineLabel.backgroundColor = GXF_LINE_COLOR;
-
- [self.contentView addSubview:self.smallImageView];
- [self.contentView addSubview:self.seqLabel];
- [self.contentView addSubview:self.titleLabel];
- [self.contentView addSubview:self.standLabel];
- [self.contentView addSubview:self.countLabel];
- [self.contentView addSubview:self.baseCountLabel];
-
- [self.contentView addSubview:self.editBtn];
-}
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
- [super setSelected:selected animated:animated];
-
- // Configure the view for the selected state
-}
-
-@end
diff --git a/XFFruit/ViewControllers/WorkSheet/Controllers/CostViewController.h b/XFFruit/ViewControllers/Transport/Controllers/CostViewController.h
similarity index 88%
rename from XFFruit/ViewControllers/WorkSheet/Controllers/CostViewController.h
rename to XFFruit/ViewControllers/Transport/Controllers/CostViewController.h
index 1d5878e68f947dc724bf85daaa4d5c4d39323f44..599ad06b28adb6ac313ebfc4443843baef75bea1 100644
--- a/XFFruit/ViewControllers/WorkSheet/Controllers/CostViewController.h
+++ b/XFFruit/ViewControllers/Transport/Controllers/CostViewController.h
@@ -12,4 +12,6 @@
@property (nonatomic,strong)NSMutableArray *costArr;
@property (nonatomic,strong)UITableView *tableView;
@property (nonatomic,assign)CGRect viewFrame;
+@property (nonatomic,assign)BOOL isHiddenEdit;
+
@end
diff --git a/XFFruit/ViewControllers/WorkSheet/Controllers/CostViewController.m b/XFFruit/ViewControllers/Transport/Controllers/CostViewController.m
similarity index 54%
rename from XFFruit/ViewControllers/WorkSheet/Controllers/CostViewController.m
rename to XFFruit/ViewControllers/Transport/Controllers/CostViewController.m
index 15cb5db7f58f8b2722ea79dacdf7047202ed5c02..68c31c48ffabe8d55e2e1935fbbe0ae7381322a8 100644
--- a/XFFruit/ViewControllers/WorkSheet/Controllers/CostViewController.m
+++ b/XFFruit/ViewControllers/Transport/Controllers/CostViewController.m
@@ -9,6 +9,7 @@
#import "CostViewController.h"
#import "HeaderCell.h"
#import "FooterCell.h"
+#import "CostCell.h"
@interface CostViewController ()<UITableViewDataSource,UITableViewDelegate,FooterCellDelegate>
{
CGRect _tableFrame;
@@ -32,24 +33,32 @@
self.tableView.backgroundColor = [UIColor whiteColor];
self.tableView.delegate = self;
self.tableView.dataSource = self;
+ self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
[self.view addSubview:self.tableView];
- NSArray *arr = @[@"费用",@"应付金é¢",@"已付金é¢"];
+ NSArray *arr = @[@"费用",@"应付金é¢",@"已付金é¢",@"尾款"];
HeaderCell *headCell = [[HeaderCell alloc]initWithFrame:CGRectMake(0, 0, ScreenSize.width, 38) withArr:arr];
[self.view addSubview:headCell];
self.tableView.tableHeaderView = headCell;
-
- FooterCell *footCell = [[FooterCell alloc]initWithFrame:CGRectMake(0, 0, _tableFrame.size.width, 50) withTitle:@"+ç‚¹å‡»æ·»åŠ åŽŸæ–™æ˜Žç»†" isTwo:@""];
- [self.view addSubview:footCell];
- footCell.delegate = self;
- self.tableView.tableFooterView = footCell;
+ if (!self.isHiddenEdit) {
+ FooterCell *footCell = [[FooterCell alloc]initWithFrame:CGRectMake(0, 0, _tableFrame.size.width, 50) withTitle:@"+ç‚¹å‡»æ·»åŠ è´¹ç”¨æ˜Žç»†" isTwo:@""];
+ [self.view addSubview:footCell];
+ footCell.delegate = self;
+ self.tableView.tableFooterView = footCell;
+ }
}
- (void)addClick{
- [self.costArr addObject:@"dddd"];
- [self.tableView reloadData];
+ [[NSNotificationCenter defaultCenter] postNotificationName:KNOTIFICATION_AddTransportCost object:nil];
}
+- (void)editClick:(UIButton *)btn{
+ FeeAcountDetail *fee = self.costArr[btn.tag];
+ [[NSNotificationCenter defaultCenter] postNotificationName:KNOTIFICATION_AddTransportCost object:nil userInfo:@{@"indexPath":[NSIndexPath indexPathForRow:btn.tag inSection:0],@"feeAccountDetail":fee}];
+
+}
+#pragma mark footDelegate
+- (void)choosePurchase{}
#pragma mark - å议方法
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
return 1;
@@ -58,12 +67,21 @@
return self.costArr.count;
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
- static NSString *cellID = @"cellID";
- UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
+ static NSString *cellID = @"CostCell";
+ CostCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
if (cell == nil) {
- cell = [[UITableViewCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID];
+ cell = [[CostCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID];
+ cell.selectionStyle = UITableViewCellSelectionStyleNone;
+ if (self.isHiddenEdit) {
+ cell.editBtn.hidden = YES;
+ }
+ }
+ cell.editBtn.tag = indexPath.row;
+ [cell.editBtn addTarget:self action:@selector(editClick:) forControlEvents:UIControlEventTouchUpInside];
+ if (self.costArr.count) {
+ FeeAcountDetail *fee = self.costArr[indexPath.row];
+ [cell setFeeCost:fee row:indexPath.row];
}
- cell.textLabel.text = @"3333333";
return cell;
}
/*
diff --git a/XFFruit/ViewControllers/Transport/Controllers/NewCostViewController.h b/XFFruit/ViewControllers/Transport/Controllers/NewCostViewController.h
new file mode 100644
index 0000000000000000000000000000000000000000..e57c81ab72282c44e737631cbf986be033d3f5c9
--- /dev/null
+++ b/XFFruit/ViewControllers/Transport/Controllers/NewCostViewController.h
@@ -0,0 +1,19 @@
+//
+// NewCostViewController.h
+// XFFruit
+//
+// Created by 陈俊俊 on 15/9/7.
+// Copyright (c) 2015å¹´ Xummer. All rights reserved.
+//
+
+#import "ICRBaseViewController.h"
+#import "FeeAcountDetail.h"
+typedef void(^GetTransportCost)(FeeAcountDetail *accountDetail,NSIndexPath *indexPath);
+typedef void(^DeleteTransportCost)(FeeAcountDetail *accountDetail,NSIndexPath *indexPath);
+@interface NewCostViewController : ICRBaseViewController
+@property (nonatomic,copy)GetTransportCost getTransportCost;
+@property (nonatomic,copy)DeleteTransportCost deleteTransportCost;
+@property (nonatomic,strong)NSString *navTitle;
+@property (nonatomic,strong)FeeAcountDetail *accountDetail;
+@property (nonatomic,strong)NSIndexPath *indexPath;
+@end
diff --git a/XFFruit/ViewControllers/Transport/Controllers/NewCostViewController.m b/XFFruit/ViewControllers/Transport/Controllers/NewCostViewController.m
new file mode 100644
index 0000000000000000000000000000000000000000..8ac7d8cd6d3066c8a92f950a1283ad8bc91ea1cc
--- /dev/null
+++ b/XFFruit/ViewControllers/Transport/Controllers/NewCostViewController.m
@@ -0,0 +1,303 @@
+//
+// NewCostViewController.m
+// XFFruit
+//
+// Created by 陈俊俊 on 15/9/7.
+// Copyright (c) 2015å¹´ Xummer. All rights reserved.
+//
+
+#import "NewCostViewController.h"
+#import "SurveyCell.h"
+#import "HPGrowingTextView.h"
+#import "ChooseCostViewController.h"
+#define LeftMargin 15
+#define BtnHeight 44
+#define TableRowHeight 46
+#define CornerRadius 5
+#define BtnSize 19
+#define TotalHeight 230
+#define KeyboardHeight 258
+typedef enum : NSUInteger {
+ deleteTag = 10000,
+ SaveTag,
+} BtnTag;
+
+@interface NewCostViewController ()<UITableViewDataSource,UITableViewDelegate,HPGrowingTextViewDelegate,UITextFieldDelegate>
+{
+ UITableView *_tableView;
+ NSMutableArray *_dataArr;
+
+ UILabel *_chooseCostLabel;
+ UITextField *_actualmoneyField;
+ UITextField *_paidmoneyField;
+ UITextField *_leftmoneyField;
+ HPGrowingTextView *_noteTextView;
+}
+
+@end
+
+@implementation NewCostViewController
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ self.title = self.navTitle;
+ [self initData];
+ [self createTableView];
+
+}
+- (void)initData{
+
+ _dataArr = [NSMutableArray array];
+ [_dataArr addObject:@"费用"];
+ [_dataArr addObject:@"应付金é¢"];
+ [_dataArr addObject:@"已付金é¢"];
+ [_dataArr addObject:@"尾款"];
+ [_dataArr addObject:@"备注"];
+}
+
+- (void)createTableView
+{
+ self.view.backgroundColor = XXFBgColor;
+
+ _tableView = [[UITableView alloc]initWithFrame:(CGRectMake(0, LeftMargin,ScreenSize.width, ScreenSize.height - 64 - LeftMargin)) style:(UITableViewStylePlain)];
+ _tableView.backgroundColor = [UIColor whiteColor];
+ _tableView.bounces = NO;
+ _tableView.delegate = self;
+ _tableView.dataSource = self;
+
+ UIView *footView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenSize.width, 50)];
+
+ UIButton *saveBtn = [IBTCustomButtom creatButtonWithFrame:CGRectMake(LeftMargin, 10, (ScreenSize.width - LeftMargin*3)/2, BtnHeight) target:self sel:@selector(btnClick:) tag:deleteTag image:nil title:@"åˆ é™¤" titleColor: [UIColor whiteColor] isCorner:YES corner:CornerRadius bgColor:GXF_SAVE_COLOR];
+ [footView addSubview:saveBtn];
+
+ UIButton *commitBtn = [IBTCustomButtom creatButtonWithFrame:CGRectMake(saveBtn.frame.origin.x + saveBtn.frame.size.width + LeftMargin, 10, (ScreenSize.width - LeftMargin*3)/2, BtnHeight) target:self sel:@selector(btnClick:) tag:SaveTag image:nil title:@"ä¿å˜" titleColor: [UIColor whiteColor] isCorner:YES corner:CornerRadius bgColor:GXF_COMMIT_COLOR];
+ [footView addSubview:commitBtn];
+
+ _tableView.tableFooterView = footView;
+ [self.view addSubview:_tableView];
+}
+
+#pragma mark - 按钮点击事件
+- (void)btnClick:(UIButton *)btn{
+ switch (btn.tag) {
+ case deleteTag://åˆ é™¤
+ {
+ if ([self checkCost]) {
+ if (self.indexPath) {
+ self.deleteTransportCost(self.accountDetail,self.indexPath);
+ [self PopViewControllerAnimated:YES];
+ }else{
+ [self clearInfomation];
+ }
+ }
+ }
+ break;
+ case SaveTag:
+ {
+ if ([self checkCost]) {
+ self.getTransportCost(self.accountDetail,self.indexPath);
+ [self PopViewControllerAnimated:YES];
+ }
+ }
+ break;
+ default:
+ break;
+ }
+}
+- (void)clearInfomation{
+ _chooseCostLabel.text = @"选择费用类型";
+ _chooseCostLabel.textColor = GXF_PLACEHOLDER_COLOR;
+ _actualmoneyField.text = @"";
+ _paidmoneyField.text = @"";
+ _leftmoneyField.text = @"";
+}
+- (BOOL)checkCost{
+
+ if (_chooseCostLabel.text.length == 0 ) {
+ ShowMessage(@"费用类型ä¸èƒ½ä¸ºç©º");
+ return NO;
+ }
+ if (_actualmoneyField.text.length == 0 ) {
+ ShowMessage(@"应付金é¢ä¸èƒ½ä¸ºç©º");
+ return NO;
+ }
+ if (_paidmoneyField.text.length == 0) {
+ ShowMessage(@"已付金é¢ä¸èƒ½ä¸ºç©º");
+ return NO;
+ }
+ if (_leftmoneyField.text.length == 0) {
+ ShowMessage(@"尾款ä¸èƒ½ä¸ºç©º");
+ return NO;
+ }
+ if (![RegexUtil isValidateNmuberAndFloat:_actualmoneyField.text]) {
+ ShowMessage(@"应付金é¢ä¸åˆæ³•");
+ return NO;
+ }
+ if (![RegexUtil isValidateNmuberAndFloat:_paidmoneyField.text]) {
+ ShowMessage(@"已付金é¢é¢ä¸åˆæ³•");
+ return NO;
+ }
+ if (![RegexUtil isValidateNmuberAndFloat:_leftmoneyField.text]) {
+ ShowMessage(@"尾款ä¸åˆæ³•");
+ return NO;
+ }
+ if (!self.accountDetail) {
+ self.accountDetail = [[FeeAcountDetail alloc]init];
+ }
+ self.accountDetail.accounttitle = _chooseCostLabel.text;
+ self.accountDetail.accounttitlename = _chooseCostLabel.text;
+ self.accountDetail.actualmoney = [NSNumber numberWithFloat:[_actualmoneyField.text floatValue]];
+ self.accountDetail.paidmoney = [NSNumber numberWithFloat:[_paidmoneyField.text floatValue]];
+ self.accountDetail.leftmoney = [NSNumber numberWithFloat:[_leftmoneyField.text floatValue]];
+ self.accountDetail.note = _noteTextView.text;
+ return YES;
+}
+
+#pragma mark - å议方法
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return 1;
+}
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ return _dataArr.count;
+}
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ static NSString *cellID = @"cellID";
+ SurveyCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
+ if (cell == nil) {
+ cell = [[SurveyCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID];
+ tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+ cell.selectionStyle = UITableViewCellSelectionStyleNone;
+ if (indexPath.row == 0) {
+ cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+ }
+ [self createViewInCell:cell indexPath:indexPath];
+ }
+ [cell setTitleStr:_dataArr[indexPath.row]];
+ return cell;
+}
+
+- (void)createViewInCell:(SurveyCell *)cell indexPath:(NSIndexPath *)indexPath{
+ if (indexPath.row == 0) {
+ UILabel *contentLabel = [[UILabel alloc]initWithFrame:(CGRectMake(100+LeftMargin, 0, ScreenSize.width - 100 - LeftMargin*2-15, TableRowHeight))];
+ contentLabel.textAlignment= NSTextAlignmentRight;
+ contentLabel.textColor = GXF_PLACEHOLDER_COLOR;
+ contentLabel.font = GXF_FIFTEENTEN_SIZE;
+ [cell.contentView addSubview:contentLabel];
+ contentLabel.text = @"选择费用类型";
+ _chooseCostLabel = contentLabel;
+
+ }else if (indexPath.row == _dataArr.count -1){
+ _noteTextView = [[HPGrowingTextView alloc] initWithFrame:CGRectMake(100+LeftMargin, 0, ScreenSize.width - 100 - LeftMargin*2-15, TableRowHeight)];
+ _noteTextView.contentInset = UIEdgeInsetsMake(5, 5, 5, 0);
+ _noteTextView.minNumberOfLines = 1;
+ _noteTextView.maxNumberOfLines = 1;
+ _noteTextView.isScrollable = YES;
+ _noteTextView.font = GXF_FIFTEENTEN_SIZE;
+ _noteTextView.textAlignment = NSTextAlignmentRight;
+ _noteTextView.delegate = self;
+ _noteTextView.returnKeyType = UIReturnKeyDone;
+ _noteTextView.placeholder = @"输入备注内容";
+ [cell.contentView addSubview:_noteTextView];
+ }else{
+ UITextField *textField = [[UITextField alloc] initWithFrame:CGRectMake(100+LeftMargin, 0, ScreenSize.width - 100 - LeftMargin*2-15, TableRowHeight)];
+ textField.textAlignment = NSTextAlignmentRight;
+ textField.textColor = GXF_CONTENT_COLOR;
+ textField.font = GXF_FIFTEENTEN_SIZE;
+ textField.returnKeyType = UIReturnKeyDone;
+ textField.keyboardType = UIKeyboardTypeNumbersAndPunctuation;
+ textField.delegate = self;
+ [cell.contentView addSubview:textField];
+ if (indexPath.row == 1) {
+ textField.placeholder = @"输入应付金é¢";
+
+ _actualmoneyField = textField;
+ }else if(indexPath.row == 2){
+ textField.placeholder = @"输入已付金é¢";
+ _paidmoneyField = textField;
+ }else{
+ textField.placeholder = @"输入尾款";
+ _leftmoneyField = textField;
+ }
+ }
+ if (self.accountDetail) {
+ [self prepareDataIncell];
+ }
+}
+- (void)prepareDataIncell{
+ _chooseCostLabel.text = self.accountDetail.accounttitle;
+ _chooseCostLabel.textColor = GXF_CONTENT_COLOR;
+
+ _actualmoneyField.text = [self.accountDetail.actualmoney stringValue];
+ _paidmoneyField.text = [self.accountDetail.paidmoney stringValue];
+ _leftmoneyField.text = [self.accountDetail.leftmoney stringValue];
+ _noteTextView.text = self.accountDetail.note;
+
+}
+
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
+ return TableRowHeight;
+}
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
+ if(indexPath.row == 0){
+ ChooseCostViewController *cvc = [ChooseCostViewController new];
+ cvc.choseBaseInfo = ^(NSArray *costs){
+ if (costs.count > 0) {
+ NSString *type = costs[0];
+ _chooseCostLabel.text = type;
+ _chooseCostLabel.textColor = GXF_CONTENT_COLOR;
+ }
+ };
+ [self PushViewController:cvc animated:YES];
+ }
+}
+
+
+#pragma mark delegate
+- (BOOL)growingTextViewShouldReturn:(HPGrowingTextView *)growingTextView{
+ [_noteTextView resignFirstResponder];
+ [self setTableFrame:LeftMargin];
+ return YES;
+}
+- (void)growingTextViewDidBeginEditing:(HPGrowingTextView *)growingTextView{
+ CGFloat offset = ScreenSize.height - TotalHeight - KeyboardHeight;
+ if (offset < 0) {//上移
+ [self setTableFrame:LeftMargin+offset];
+ }
+}
+- (void)setTableFrame:(CGFloat)tabelH{
+ [UIView animateWithDuration:0.25 animations:^{
+ CGRect tableFrame = _tableView.frame;
+ tableFrame.origin.y = tabelH;
+ _tableView.frame = tableFrame;
+ }];
+}
+
+- (void)keyboardHidden{
+ [_actualmoneyField resignFirstResponder];
+ [_paidmoneyField resignFirstResponder];
+ [_leftmoneyField resignFirstResponder];
+ [_noteTextView resignFirstResponder];
+ [self setTableFrame:LeftMargin];
+}
+
+- (void)viewWillDisappear:(BOOL)animated{
+ [super viewWillDisappear:animated];
+
+}
+- (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
diff --git a/XFFruit/ViewControllers/Survey/Transport/Controllers/NewTransportViewController.h b/XFFruit/ViewControllers/Transport/Controllers/NewTransportViewController.h
similarity index 100%
rename from XFFruit/ViewControllers/Survey/Transport/Controllers/NewTransportViewController.h
rename to XFFruit/ViewControllers/Transport/Controllers/NewTransportViewController.h
diff --git a/XFFruit/ViewControllers/Survey/Transport/Controllers/NewTransportViewController.m b/XFFruit/ViewControllers/Transport/Controllers/NewTransportViewController.m
similarity index 61%
rename from XFFruit/ViewControllers/Survey/Transport/Controllers/NewTransportViewController.m
rename to XFFruit/ViewControllers/Transport/Controllers/NewTransportViewController.m
index e9289485d0946cde8a90d9e387dd5690fbc13f1c..076aac034b71127814d1e7668763e36bab71c9b9 100644
--- a/XFFruit/ViewControllers/Survey/Transport/Controllers/NewTransportViewController.m
+++ b/XFFruit/ViewControllers/Transport/Controllers/NewTransportViewController.m
@@ -10,8 +10,11 @@
#import "TopTransportView.h"
#import "BottomTransportView.h"
#import "TransportPurchaseViewController.h"
-#import "PurchaseBillProduct.h"
+#import "NewCostViewController.h"
+#import "TransportPdtDetail.h"
#import "FeeAcountDetail.h"
+#import "TransportViewController.h"
+#import "ShopDetaileViewController.h"
typedef enum : NSUInteger {
SaveTag = 7000,
CommitTag,
@@ -34,27 +37,67 @@ typedef enum : NSUInteger {
@end
@implementation NewTransportViewController
-
+- (void)dealloc{
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
- (instancetype)init{
self = [super init];
if (self) {
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(choseTransportPurchase) name:@"ChoseTransportPurchase" object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(choseTransportPurchase) name:KNOTIFICATION_ChoseTransportPurchase object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(addTransportCost:) name:KNOTIFICATION_AddTransportCost object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(addPurchaseProduct:) name:KNOTIFICATION_AddPurchaseProduct object:nil];
}
return self;
}
- (void)viewDidLoad {
[super viewDidLoad];
- self.title = @"新建å‘è¿å•";
//布局
[self bulidLayout];
uuidObject = [NSNull null];
billNumberObject = [NSNull null];
versionObject = [NSNumber numberWithInteger:0];
-// if (self.purchaseBill) {
-// [self getDataFromServer];
-// }
+ if (self.transport) {
+ [self getDataFromServer];
+ }
+}
+
+- (void)getDataFromServer{
+ __weak typeof(self)weakSelf = self;
+ void(^succ)(id) = ^(id data) {
+ [IBTLoadingView hideHUDWithText:nil];
+ __strong __typeof(weakSelf)strongSelf = weakSelf;
+ if (data) {
+ NSInteger success = [data[@"success"] integerValue];
+ NSString *message = data[@"message"] ;
+ if (success == 1) {
+ NSDictionary *dictData = data[@"data"];
+ Transport *transport = [[Transport alloc]init];
+ [transport setValuesForKeysWithDictionary:dictData];
+ self.transport = transport;
+ [strongSelf fetchtTransportDetail];
+ }else{
+ [IBTLoadingView showTips:message];
+ }
+ }else{
+ [IBTLoadingView showTips:@" æ— è®°å½• "];
+ }
+ };
+ void(^fail)(id) = ^(id data) {
+ [IBTLoadingView hideHUDWithText:nil];
+ [IBTLoadingView showTips:data];
+ };
+ [IBTLoadingView showProgressLabel:@"æ£åœ¨åŠ è½½..."];
+ [[ICRHTTPController sharedController] getTransportResultWithTransportUuid:self.transport.uuid success:succ failure:fail];
}
+
+- (void)fetchtTransportDetail
+{
+ _sheetView.transport = self.transport;
+ [_bottomView refreshCost:self.transport.accountDetails];
+ [_bottomView refreshTranProduct:self.transport.pdtDetails];
+}
+
- (void)bulidLayout{
self.view.backgroundColor = XXFBgColor;
_scrollView = [[UIScrollView alloc]initWithFrame:CGRectMake(0,0, ScreenSize.width, ScreenSize.height- 64 - BottomViewHeight )];
@@ -77,7 +120,7 @@ typedef enum : NSUInteger {
_sheetView.delegate = self;
[_scrollView addSubview:_sheetView];
- _bottomView = [[BottomTransportView alloc]initWithFrame:CGRectMake(0, CGRectGetMaxY(_sheetView.frame) + 20, ScreenSize.width,BottomHeight)];
+ _bottomView = [[BottomTransportView alloc]initWithFrame:CGRectMake(0, CGRectGetMaxY(_sheetView.frame) + 20, ScreenSize.width,BottomHeight) withHidden:NO];
_bottomView.backgroundColor = [UIColor whiteColor];
[_scrollView addSubview:_bottomView];
}
@@ -86,13 +129,13 @@ typedef enum : NSUInteger {
case SaveTag:
{
if ([self checkTransport]) {
- [self getDataFromServer:PURCHASE_STATE_INITIAL msg:@"æ£åœ¨ä¿å˜..."];
+ [self getDataFromServer:TRANSPORT_STATE_INITIAL msg:@"æ£åœ¨ä¿å˜..."];
}
}
break;
case CommitTag:{
if ([self checkTransport]) {
- [self getDataFromServer:PURCHASE_STATE_SUBMITTED msg:@"æ£åœ¨æ交..."];
+ [self getDataFromServer:TRANSPORT_STATE_UNRECEIVED msg:@"æ£åœ¨æ交..."];
}
}
@@ -119,8 +162,8 @@ typedef enum : NSUInteger {
versionObject = versionN;
[IBTLoadingView showTips:[NSString stringWithFormat:@"当å‰å•æ®%@å·²ä¿å˜æˆåŠŸ",billNumberS]];
}else{//æ交æˆåŠŸ
-// PurchaseViewController *svc = [PurchaseViewController new];
-// [self PushViewController:svc animated:YES];
+ TransportViewController *svc = [TransportViewController new];
+ [self PushViewController:svc animated:YES];
}
}else{
[IBTLoadingView showTips:message];
@@ -138,21 +181,23 @@ typedef enum : NSUInteger {
if (self.transport.billnumber > 0 && billNumberObject == [NSNull null]) {
billNumberObject = self.transport.billnumber;
}
-// if (self.purchaseBill && [versionObject integerValue] == 0) {
-// versionObject = self.transport.version;
-// }
+ if (self.transport && [versionObject integerValue] == 0) {
+ versionObject = self.transport.version;
+ }
NSMutableArray *billProducts = [NSMutableArray array];
- for (PurchaseBillProduct *billProduct in _bottomView.productVC.productArr) {
- [billProducts addObject:[billProduct dictForCommit]];
+ for (TransportPdtDetail *pdtDetail in _bottomView.productVC.transportProductArr) {
+ [billProducts addObject:[pdtDetail dictForCommit]];
}
NSMutableArray *costs = [NSMutableArray array];
for (FeeAcountDetail *fee in _bottomView.costVC.costArr) {
[costs addObject:[fee dictForCommit]];
}
// self.state = state;
+
NSDictionary *dict = @{@"uuid":uuidObject,
-// @"version":versionObject,
+ @"version":versionObject,
@"billnumber":billNumberObject,
+ @"enterprise":[ICRUserUtil sharedInstance].orgId,
@"state":state,
@"warehouseUuid":[IBTCommon checkString:_sheetView.warehouseUuid],
@"warehouseCode":[IBTCommon checkString:_sheetView.warehouseCode],
@@ -167,7 +212,7 @@ typedef enum : NSUInteger {
@"pdtDetails":billProducts,
@"accountDetails":costs};
[IBTLoadingView showProgressLabel:msg];
- [[ICRHTTPController sharedController] savePurchaseWithData:dict success:succ failure:fail];
+ [[ICRHTTPController sharedController] saveTransportWithData:dict success:succ failure:fail];
}
@@ -198,7 +243,7 @@ typedef enum : NSUInteger {
ShowMessage(@"å¸æœºç”µè¯ä¸èƒ½ä¸ºç©º");
return NO;
}
- if (_bottomView.productVC.productArr.count == 0) {
+ if (_bottomView.productVC.transportProductArr.count == 0) {
ShowMessage(@"商å“ä¸èƒ½ä¸ºç©º");
return NO;
}
@@ -214,10 +259,59 @@ typedef enum : NSUInteger {
- (void)choseTransportPurchase{
TransportPurchaseViewController *tpv = [TransportPurchaseViewController new];
tpv.getProchaseProduct = ^(NSArray *products){
- [_bottomView refreshProduct:products];
+ if (products.count > 0) {
+ [_bottomView reProduct:products];
+ }
};
[self PushViewController:tpv animated:YES];
}
+- (void)addTransportCost:(NSNotification *)fination{
+
+ NewCostViewController *nvc = [NewCostViewController new];
+ NSIndexPath *indexPath = [[fination userInfo] objectForKey:@"indexPath"];
+ FeeAcountDetail *fee = [[fination userInfo] objectForKey:@"feeAccountDetail"];
+
+ if (indexPath) {
+ nvc.navTitle = @"编辑费用";
+ nvc.indexPath = indexPath;
+ nvc.accountDetail = fee;
+ }else{
+ nvc.navTitle = @"æ·»åŠ è´¹ç”¨";
+ }
+ nvc.getTransportCost = ^(FeeAcountDetail *fee,NSIndexPath *indexPath){
+ if (fee) {
+ [_bottomView refreshCost:fee indexPath:indexPath];
+ }
+ };
+ nvc.deleteTransportCost = ^(FeeAcountDetail *fee,NSIndexPath *indexPath){
+ if (fee) {
+ [_bottomView refreshDelCost:fee indexPath:indexPath];
+ }
+ };
+ [self PushViewController:nvc animated:YES];
+
+}
+- (void)addPurchaseProduct:(NSNotification *)fication{
+ ShopDetaileViewController *svc = [[ShopDetaileViewController alloc] init];
+ // 回调
+ svc.choseShopDetail = ^(ShopDetail *shopDetail){
+ TransportPdtDetail *billProduct = [[TransportPdtDetail alloc]init];
+ billProduct.productUuid = shopDetail.product_uuid;
+ billProduct.productCode = shopDetail.product_code;
+ billProduct.productName = shopDetail.merchandise;
+ billProduct.qpc = [NSNumber numberWithFloat:[shopDetail.packageSpecification floatValue]];
+ billProduct.unit = shopDetail.packageUnit;
+ billProduct.qty = [NSNumber numberWithFloat:[shopDetail.packageQuantity floatValue]];
+ billProduct.price = [NSNumber numberWithFloat:[shopDetail.packageUnitPrice floatValue]];
+ billProduct.baseQty = [NSNumber numberWithFloat:[shopDetail.foundationQuantity floatValue]];
+ billProduct.total = [NSNumber numberWithFloat:[shopDetail.totalMoney floatValue]];
+ billProduct.note = shopDetail.remark;
+ billProduct.qpcStr = @"fdsfdsfdsa";
+ [_bottomView refreshProduct:billProduct];
+ };
+ svc.title = [IBTCommon localizableString:@"AddShopDetail"];
+ [self PushViewController:svc animated:YES];
+}
#pragma mark - TopPurchaseViewDelegate
@@ -237,6 +331,7 @@ typedef enum : NSUInteger {
[super didReceiveMemoryWarning];
}
+
/*
#pragma mark - Navigation
diff --git a/XFFruit/ViewControllers/Transport/Controllers/TransportDetailViewController.h b/XFFruit/ViewControllers/Transport/Controllers/TransportDetailViewController.h
new file mode 100644
index 0000000000000000000000000000000000000000..cdbbff5c4dfd3bd928f7ddf7d5588d195b6e05cc
--- /dev/null
+++ b/XFFruit/ViewControllers/Transport/Controllers/TransportDetailViewController.h
@@ -0,0 +1,13 @@
+//
+// TransportDetailViewController.h
+// XFFruit
+//
+// Created by 陈俊俊 on 15/9/7.
+// Copyright (c) 2015å¹´ Xummer. All rights reserved.
+//
+
+#import "ICRBaseViewController.h"
+#import "Transport.h"
+@interface TransportDetailViewController : ICRBaseViewController
+@property (nonatomic,strong)Transport *transport;
+@end
diff --git a/XFFruit/ViewControllers/Transport/Controllers/TransportDetailViewController.m b/XFFruit/ViewControllers/Transport/Controllers/TransportDetailViewController.m
new file mode 100644
index 0000000000000000000000000000000000000000..dd4db8a98f1fab6027840ea2c07030c4d5765059
--- /dev/null
+++ b/XFFruit/ViewControllers/Transport/Controllers/TransportDetailViewController.m
@@ -0,0 +1,284 @@
+//
+// TransportDetailViewController.m
+// XFFruit
+//
+// Created by 陈俊俊 on 15/9/7.
+// Copyright (c) 2015å¹´ Xummer. All rights reserved.
+//
+
+#import "TransportDetailViewController.h"
+#import "TransportProductViewController.h"
+#import "Transport.h"
+#import "TransportPdtDetail.h"
+#import "FeeAcountDetail.h"
+#import "BottomTransportView.h"
+#define BottomHeight 50
+#define LeftMargin 15
+#define LeftWidth 100
+#define LeftHeight 30
+#define TopMargin 15
+typedef enum : NSUInteger {
+ AbortTag = 20000,
+ EndTag
+
+} BtnTag;
+
+@interface TransportDetailViewController ()
+{
+ UIScrollView *_scrollView;
+ UIView *_transportView;
+ UIView *_bottomView;
+ UIButton *_firstBtn;
+ UIButton *_secondBtn;
+ BottomTransportView *_transView;
+}
+@property (nonatomic,strong)UILabel *billNumberLabel;
+@property (nonatomic,strong)UILabel *purchaseLabel;
+@property (nonatomic,strong)UILabel *stateLabel;
+@property (nonatomic,strong)UILabel *warehouseLabel;
+@property (nonatomic,strong)UILabel *rwarehouseLabel;
+@property (nonatomic,strong)UILabel *carnumberLabel;
+@property (nonatomic,strong)UILabel *carhoneLabel;
+@property (nonatomic,strong)UILabel *createOperLabel;
+@property (nonatomic,strong)UILabel *noteLabel;
+@end
+
+@implementation TransportDetailViewController
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ self.title = @"å‘è¿å•è¯¦æƒ…";
+ [self bulifLayout];
+ [self getDataFromServer];
+}
+
+- (void)getDataFromServer{
+ __weak typeof(self)weakSelf = self;
+ void(^succ)(id) = ^(id data) {
+ [IBTLoadingView hideHUDWithText:nil];
+ __strong __typeof(weakSelf)strongSelf = weakSelf;
+ if (data) {
+ NSInteger success = [data[@"success"] integerValue];
+ NSString *message = data[@"message"] ;
+ if (success == 1) {
+ NSDictionary *dictData = data[@"data"];
+ Transport *transport = [[Transport alloc]init];
+ [transport setValuesForKeysWithDictionary:dictData];
+ self.transport = transport;
+ [strongSelf fetchtTransportDetail];
+ }else{
+ [IBTLoadingView showTips:message];
+ }
+ }else{
+ [IBTLoadingView showTips:@" æ— è®°å½• "];
+ }
+ };
+ void(^fail)(id) = ^(id data) {
+ [IBTLoadingView hideHUDWithText:nil];
+ [IBTLoadingView showTips:data];
+ };
+ [IBTLoadingView showProgressLabel:@"æ£åœ¨åŠ è½½..."];
+ [[ICRHTTPController sharedController] getTransportResultWithTransportUuid:self.transport.uuid success:succ failure:fail];
+}
+
+
+
+
+- (void)fetchtTransportDetail{
+ self.billNumberLabel.text = [IBTCommon checkString:self.transport.billnumber];
+// self.purchaseLabel.text =
+ if ([self.transport.state isEqualToString:TRANSPORT_STATE_UNRECEIVED]) {
+ self.stateLabel.textColor = [UIColor redColor];
+ self.stateLabel.text = @"未å‘è´§";
+ }else if ([self.transport.state isEqualToString:TRANSPORT_STATE_RECEIVED]) {
+ self.stateLabel.textColor = [UIColor greenColor];
+ self.stateLabel.text = @"å·²å‘è´§";
+ }else if ([self.transport.state isEqualToString:TRANSPORT_STATE_ABORTED]) {
+ self.stateLabel.textColor = [UIColor grayColor];
+ self.stateLabel.text = @"已作废";
+ }
+// self.noticeNumberLabel.text = (self.bill.noticeNumber.length == 0) ? @"æ— ":(self.bill.noticeNumber);
+ self.warehouseLabel.text = [IBTCommon checkString:self.transport.warehouseName];
+ self.rwarehouseLabel.text = [IBTCommon checkString:self.transport.rwarehouseName];
+ self.carnumberLabel.text = [IBTCommon checkString:self.transport.carnumber];
+ self.carhoneLabel.text = [IBTCommon checkString:self.transport.carphone];
+ self.noteLabel.text = [IBTCommon checkString:self.transport.note];
+ self.createOperLabel.text = [NSString stringWithFormat:@"%@%@",[IBTCommon checkString:self.transport.create_operName],self.transport.create_time];
+
+
+ [_transView refreshTranProduct:self.transport.pdtDetails];
+ [_transView refreshCost:self.transport.accountDetails];
+ [self setNoteHeight];
+}
+
+- (void)setNoteHeight
+{
+ CGFloat height = [self.noteLabel calculateHeight];
+
+ CGRect noteFrame = self.noteLabel.frame;
+ noteFrame.size.height = height;
+ self.noteLabel.frame = noteFrame;
+
+ CGFloat totalHeight = height + LeftHeight*9;
+// CGRect purchaseFrame = _purchaseView.frame;
+// purchaseFrame.size.height = totalHeight;
+// _purchaseView.frame = purchaseFrame;
+//
+//
+// CGRect bottomFrame = _bottomView.frame;
+// bottomFrame.origin.y = CGRectGetMaxY(_purchaseView.frame) + TopMargin;
+// _bottomView.frame = bottomFrame;
+
+ _scrollView.contentSize = CGSizeMake(ScreenSize.width, totalHeight + CGRectGetHeight(_bottomView.frame) + TopMargin*2);
+}
+
+- (void)btnClick:(UIButton *)btn{
+ CLog(@"%ld",(long)btn.tag);
+ switch (btn.tag) {
+ case AbortTag:
+ {
+ CLog(@"作废");
+ [self dealByAction:TRANSPORT_STATE_ABORTED];
+ }
+ break;
+ case EndTag:
+ {
+ CLog(@"结æŸ");
+ [self dealByAction:TRANSPORT_STATE_RECEIVED];
+ }
+ break;
+
+ default:
+ break;
+ }
+}
+- (void)dealByAction:(NSString *)action{
+ //ä¿å˜
+ void(^succ)(id) = ^(id data) {
+ [IBTLoadingView hideHUDWithText:nil];
+ if (data) {
+ NSInteger success = [data[@"success"] integerValue];
+ NSString *message = data[@"message"];
+ if (success == 1) {
+ [ICRUserUtil sharedInstance].needFresh = YES;
+ [self PopViewControllerAnimated:YES];
+ }else{
+ [IBTLoadingView showTips:message];
+ }
+ }else{
+ [IBTLoadingView showTips:@"æ“作异常"];
+ }
+ };
+ void(^fail)(id) = ^(id data) {
+ [IBTLoadingView hideHUDWithText:nil];
+ [IBTLoadingView showTips:data];
+ };
+ [IBTLoadingView showProgressLabel:@"æ£åœ¨åŠ è½½..."];
+ if ([action isEqualToString:TRANSPORT_STATE_ABORTED]) {
+ [[ICRHTTPController sharedController] abortTransportWithTransportUuid:self.transport.uuid version:self.transport.version success:succ failure:fail];
+ }else{
+ [[ICRHTTPController sharedController] endTransportWithTransportUuid:self.transport.uuid version:self.transport.version success:succ failure:fail];
+ }
+}
+
+
+#pragma mark - 视图åˆå§‹åŒ–
+- (void)bulifLayout{
+ _scrollView = [[UIScrollView alloc]initWithFrame:CGRectMake(0, 0, ScreenSize.width, ScreenSize.height - 64 - BottomHeight)];
+ _scrollView.showsHorizontalScrollIndicator = NO;
+ _scrollView.showsVerticalScrollIndicator = NO;
+ _scrollView.backgroundColor = XXFBgColor;
+ [self.view addSubview:_scrollView];
+
+ _firstBtn = [IBTCustomButtom creatButtonWithFrame:CGRectMake(LeftMargin, ScreenSize.height - 64 - BottomHeight +5, (ScreenSize.width - LeftMargin*3)/2, 40) target:self sel:@selector(btnClick:) tag:AbortTag image:nil title:@"作废" titleColor: [UIColor whiteColor] isCorner:YES corner:5 bgColor:GXF_SAVE_COLOR];
+ [self.view addSubview:_firstBtn];
+
+ _secondBtn = [IBTCustomButtom creatButtonWithFrame:CGRectMake(CGRectGetMaxX(_firstBtn.frame)+ LeftMargin, ScreenSize.height - 64 - BottomHeight +5, (ScreenSize.width - LeftMargin*3)/2, 40) target:self sel:@selector(btnClick:) tag:EndTag image:nil title:@"结æŸ" titleColor:[UIColor whiteColor] isCorner:YES corner:5 bgColor:GXF_COMMIT_COLOR];
+ [self.view addSubview:_secondBtn];
+
+ if ([self.transport.state isEqualToString:TRANSPORT_STATE_RECEIVED] || [self.transport.state isEqualToString:TRANSPORT_STATE_ABORTED]) {
+ _firstBtn.hidden = YES;
+ _secondBtn.hidden = YES;
+ CGRect scrollViewFrame = _scrollView.frame;
+ scrollViewFrame.size.height = ScreenSize.height - 64;
+ _scrollView.frame = scrollViewFrame;
+ }
+
+
+ NSArray *leftArr = @[@"å•å·:",@"采è´å•:",@"状æ€:",@"å‘货仓库:",@"收货仓库:",@"车辆:",@"å¸æœºç”µè¯:",@"创建:",@"备注"];
+
+ _transportView= [[UIView alloc]initWithFrame:CGRectMake(0, TopMargin, ScreenSize.width, LeftHeight*leftArr.count +LeftMargin)];
+ _transportView.backgroundColor = [UIColor whiteColor];
+ [_scrollView addSubview:_transportView];
+
+
+ for (NSInteger i = 0 ; i < leftArr.count; i++) {
+ UILabel *leftLabel = [[UILabel alloc]initWithFrame:CGRectMake(LeftMargin, 10 + LeftHeight *i, LeftWidth, LeftHeight)];
+ leftLabel.font = GXF_SEVENTEENTH_SIZE;
+ leftLabel.text = leftArr[i];
+ leftLabel.textColor = GXF_DETAIL_COLOR;
+ [_transportView addSubview:leftLabel];
+
+ 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;
+
+ if (i == 0) {
+ self.billNumberLabel = rightLabel;
+ }else if (i == 1) {
+ self.purchaseLabel = rightLabel;
+ }else if(i == 2){
+ self.stateLabel = rightLabel;
+ }else if(i == 3){
+ self.warehouseLabel = rightLabel;
+ }else if(i == 4){
+ self.rwarehouseLabel = rightLabel;
+ }else if(i == 5){
+ self.carnumberLabel = rightLabel;
+ }else if(i == 6){
+ self.carhoneLabel = rightLabel;
+ }else if(i == 7){
+ self.createOperLabel = rightLabel;
+ }else if(i == leftArr.count - 1){
+ rightLabel.numberOfLines = 0;
+ self.noteLabel = rightLabel;
+ }
+ [_transportView addSubview:rightLabel];
+ }
+ [self createBottomView];
+}
+- (void)createBottomView{
+ _bottomView= [[UIView alloc]initWithFrame:CGRectMake(0, CGRectGetMaxY(_transportView.frame) + TopMargin, ScreenSize.width, 300)];
+ _bottomView.backgroundColor = [UIColor whiteColor];
+ [_scrollView addSubview:_bottomView];
+
+ _transView = [[BottomTransportView alloc]initWithFrame:_bottomView.bounds withHidden:YES];
+// _transView.backgroundColor = [UIColor redColor];
+ [_bottomView addSubview:_transView];
+
+// _tpv = [[TransportProductViewController alloc]init];
+// [self addChildViewController:_tpv];
+//
+// _tpv.viewFrame = _bottomView.bounds;
+// _tpv.isHiddenEdit = YES;
+// [_bottomView addSubview:_tpv.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
diff --git a/XFFruit/ViewControllers/Transport/Controllers/TransportProductViewController.h b/XFFruit/ViewControllers/Transport/Controllers/TransportProductViewController.h
new file mode 100644
index 0000000000000000000000000000000000000000..3eda9817c7eee9e93ce5da5697c0a7bc2f7c0bca
--- /dev/null
+++ b/XFFruit/ViewControllers/Transport/Controllers/TransportProductViewController.h
@@ -0,0 +1,17 @@
+//
+// TransportProductViewController.h
+// XFFruit
+//
+// Created by 陈俊俊 on 15/9/7.
+// Copyright (c) 2015å¹´ Xummer. All rights reserved.
+//
+
+#import "ICRBaseViewController.h"
+
+@interface TransportProductViewController : ICRBaseViewController
+@property (nonatomic,strong)NSMutableArray *transportProductArr;
+@property (nonatomic,strong)UITableView *tableView;
+@property (nonatomic,assign)CGRect viewFrame;
+@property (nonatomic,assign)BOOL isHiddenEdit;
+@property (nonatomic,strong)NSString *twoTitle;
+@end
diff --git a/XFFruit/ViewControllers/Transport/Controllers/TransportProductViewController.m b/XFFruit/ViewControllers/Transport/Controllers/TransportProductViewController.m
new file mode 100644
index 0000000000000000000000000000000000000000..bd462eb904e7328d0337737826ce4c215df37c3c
--- /dev/null
+++ b/XFFruit/ViewControllers/Transport/Controllers/TransportProductViewController.m
@@ -0,0 +1,189 @@
+//
+// TransportProductViewController.m
+// XFFruit
+//
+// Created by 陈俊俊 on 15/9/7.
+// Copyright (c) 2015å¹´ Xummer. All rights reserved.
+//
+
+#import "TransportProductViewController.h"
+#import "FooterCell.h"
+#import "HeaderCell.h"
+#import "TransportPurductCell.h"
+#import "TransportPdtDetail.h"
+#define TableHeight 44
+#define ShowHeight 110
+@interface TransportProductViewController ()
+<UITableViewDataSource,UITableViewDelegate,FooterCellDelegate>
+{
+ CGRect _tableFrame;
+ NSMutableArray *_selectRowArr;//记录当å‰é€‰ä¸çš„cell
+}
+@end
+
+@implementation TransportProductViewController
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ self.view.backgroundColor = XXFBgColor;
+ [self initData];
+ [self createView];
+}
+- (void)initData{
+ _selectRowArr = [[NSMutableArray alloc]init];
+ if (!self.transportProductArr) {
+ self.transportProductArr = [NSMutableArray array];
+ }
+// TransportPdtDetail *pdtDetail = [TransportPdtDetail new];
+//
+// pdtDetail.productName = @"dd";
+// pdtDetail.productUuid = @"402880e64e287fe2014e28895b8a0032";
+// pdtDetail.productCode = @"农夫山泉";
+// pdtDetail.qpc = [NSNumber numberWithFloat:22];
+// pdtDetail.unit = @"ç";
+// pdtDetail.qty = [NSNumber numberWithFloat:23];
+// pdtDetail.price = [NSNumber numberWithFloat:333];
+// pdtDetail.baseQty = [NSNumber numberWithFloat:333];
+// pdtDetail.total = [NSNumber numberWithFloat:80];
+// pdtDetail.note = @"hshshshsh";
+// pdtDetail.qpcStr = @"fdsfdsfdsa";
+//
+//
+// [self.transportProductArr addObject:pdtDetail];
+}
+
+- (void)setViewFrame:(CGRect)viewFrame{
+ _tableFrame = viewFrame;
+}
+- (void)createView{
+ self.tableView = [[UITableView alloc]initWithFrame:_tableFrame style:(UITableViewStylePlain)];
+ self.tableView.delegate = self;
+ self.tableView.dataSource = self;
+ self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+ [self.view addSubview:self.tableView];
+
+ NSArray *arr = @[@"商å“",@"å•ä»·",@"包装数é‡"];
+
+ HeaderCell *headCell = [[HeaderCell alloc]initWithFrame:CGRectMake(0, 0, ScreenSize.width, 38) withArr:arr];
+ [self.view addSubview:headCell];
+ self.tableView.tableHeaderView = headCell;
+
+ if (!self.isHiddenEdit) {
+ FooterCell *footCell = [[FooterCell alloc]initWithFrame:CGRectMake(0, 0, _tableFrame.size.width, 50) withTitle:@"+ç‚¹å‡»æ·»åŠ å•†å“明细" isTwo:self.twoTitle];
+ [self.view addSubview:footCell];
+ footCell.delegate = self;
+ self.tableView.tableFooterView = footCell;
+ }
+}
+#pragma mark - footerDelegate
+- (void)addClick{
+ [[NSNotificationCenter defaultCenter] postNotificationName:KNOTIFICATION_AddPurchaseProduct object:nil];
+}
+- (void)choosePurchase{
+ [[NSNotificationCenter defaultCenter] postNotificationName:KNOTIFICATION_ChoseTransportPurchase object:nil];
+}
+
+#pragma mark - å议方法
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return 1;
+}
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ return self.transportProductArr.count;
+}
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ static NSString *cellID = @"TransportPurductCell";
+ TransportPurductCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
+ if (cell == nil) {
+ cell = [[TransportPurductCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID withImageName:@"edit"];
+ cell.selectionStyle = UITableViewCellSelectionStyleNone;
+ if (self.isHiddenEdit) {
+ cell.editBtn.hidden = YES;
+ }
+ }
+ if ([self isHaveIndexPath:indexPath]) {
+ cell.smallImageView.image = [UIImage imageNamed:@"arrowdown"];
+ CGRect Linefrmame = cell.lineLabel.frame;
+ Linefrmame.origin.y = ShowHeight + TableHeight -1;
+ cell.lineLabel.frame = Linefrmame;
+ CGRect showfrmame = cell.showView.frame;
+ showfrmame.size.height = ShowHeight;
+ cell.showView.frame = showfrmame;
+ cell.backgroundColor = XXFBgColor;
+ }else{
+ cell.smallImageView.image = [UIImage imageNamed:@"arrowright"];
+ CGRect Linefrmame = cell.lineLabel.frame;
+ Linefrmame.origin.y = TableHeight-1;
+ cell.lineLabel.frame = Linefrmame;
+ CGRect showfrmame = cell.showView.frame;
+ showfrmame.size.height = 0;
+ cell.showView.frame = showfrmame;
+ cell.backgroundColor = [UIColor whiteColor];
+ }
+ cell.editBtn.tag = indexPath.row;
+ [cell.editBtn addTarget:self action:@selector(editClick:) forControlEvents:UIControlEventTouchUpInside];
+
+ if (self.transportProductArr.count > 0) {
+ TransportPdtDetail *billP = self.transportProductArr[indexPath.row];
+ [cell setPdtDetail:billP row:indexPath.row];
+ }
+ return cell;
+}
+- (BOOL)isHaveIndexPath:(NSIndexPath *)indexPath{
+ for (NSIndexPath *path in _selectRowArr) {
+ if (path.row == indexPath.row) {
+ return YES;
+ }
+ }
+ return NO;
+}
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+ TransportPurductCell *cell = (TransportPurductCell *)[tableView cellForRowAtIndexPath:indexPath];
+ CGRect Linefrmame = cell.lineLabel.frame;
+ CGRect showfrmame = cell.showView.frame;
+ if (Linefrmame.origin.y == TableHeight - 1) {
+ cell.smallImageView.image = [UIImage imageNamed:@"arrowdown"];
+
+ Linefrmame.origin.y = ShowHeight + TableHeight - 1;
+ showfrmame.size.height = ShowHeight;
+ cell.backgroundColor = [UIColor whiteColor];
+ [_selectRowArr addObject:indexPath];
+ }else{
+ cell.smallImageView.image = [UIImage imageNamed:@"arrowright"];
+ Linefrmame.origin.y = TableHeight -1;
+ showfrmame.size.height = 0;
+ cell.backgroundColor = [UIColor whiteColor];
+ [_selectRowArr removeObject:indexPath];
+ }
+ cell.lineLabel.frame = Linefrmame;
+ cell.showView.frame = showfrmame;
+ [self.tableView reloadData];
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
+ if ([self isHaveIndexPath:indexPath]) {
+ return ShowHeight + TableHeight;
+ }
+ return TableHeight;
+}
+
+- (void)editClick:(UIButton *)btn{
+ UIAlertView *alert = [[UIAlertView alloc]initWithTitle:@"" message:@"哈哈" delegate:self cancelButtonTitle:@"确定" otherButtonTitles:nil, nil];
+ [alert show];
+}
+
+- (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
diff --git a/XFFruit/ViewControllers/Survey/Transport/Controllers/TransportPurchaseViewController.h b/XFFruit/ViewControllers/Transport/Controllers/TransportPurchaseViewController.h
similarity index 100%
rename from XFFruit/ViewControllers/Survey/Transport/Controllers/TransportPurchaseViewController.h
rename to XFFruit/ViewControllers/Transport/Controllers/TransportPurchaseViewController.h
diff --git a/XFFruit/ViewControllers/Survey/Transport/Controllers/TransportPurchaseViewController.m b/XFFruit/ViewControllers/Transport/Controllers/TransportPurchaseViewController.m
similarity index 94%
rename from XFFruit/ViewControllers/Survey/Transport/Controllers/TransportPurchaseViewController.m
rename to XFFruit/ViewControllers/Transport/Controllers/TransportPurchaseViewController.m
index 35ad3d55394958d0523918ab6c54f6ec43f179eb..fc9dc5d46247ef76ad65a77090c909ce202aac89 100644
--- a/XFFruit/ViewControllers/Survey/Transport/Controllers/TransportPurchaseViewController.m
+++ b/XFFruit/ViewControllers/Transport/Controllers/TransportPurchaseViewController.m
@@ -9,6 +9,7 @@
#import "TransportPurchaseViewController.h"
#import "TransportPurchaseCell.h"
#import "QueryOrder.h"
+#import "TransportPdtDetail.h"
#define TopMargin 50
#define TableHeight 50
@interface TransportPurchaseViewController ()<UITextFieldDelegate,UITableViewDataSource,UITableViewDelegate>
@@ -149,20 +150,20 @@
if(self.dataArr.count > 0){
PurchaseBill *bill = _dataArr[indexPath.row];
NSMutableArray *arr = [NSMutableArray array];
- PurchaseBillProduct *billProduct = [PurchaseBillProduct new];
+ TransportPdtDetail *billProduct = [TransportPdtDetail new];
- billProduct.product_name = @"dd";
- billProduct.product_uuid = @"402880e64e287fe2014e28895b8a0032";
- billProduct.product_code = @"农夫山泉";
+ billProduct.productName = @"dd";
+ billProduct.productUuid = @"402880e64e287fe2014e28895b8a0032";
+ billProduct.productCode = @"农夫山泉";
billProduct.qpc = [NSNumber numberWithFloat:22];
billProduct.unit = @"ç";
billProduct.qty = [NSNumber numberWithFloat:23];
billProduct.price = [NSNumber numberWithFloat:333];
billProduct.baseQty = [NSNumber numberWithFloat:333];
- billProduct.basePrice = [NSNumber numberWithFloat:33];
billProduct.total = [NSNumber numberWithFloat:80];
- billProduct.remark = @"hshshshsh";
+ billProduct.note = @"hshshshsh";
billProduct.qpcStr = @"fdsfdsfdsa";
+ billProduct.purchasebillnumber = bill.billNumber;
[arr addObject:billProduct];
[arr addObject:billProduct];
bill.products = arr;
@@ -171,7 +172,7 @@
return cell;
}
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
- return 200;
+ return 210;
}
#pragma mark - 按钮确定
- (void)sureClick{
@@ -183,7 +184,7 @@
#pragma mark - 得到通知的方法
- (void)getSelectPurchaseProduct:(NSNotification *)fination{
NSDictionary *dict = fination.userInfo;
- PurchaseBillProduct *billProduct = dict[@"selectArr"];
+ TransportPdtDetail *billProduct = dict[@"selectArr"];
NSString *state = dict[@"state"];
if ([state isEqualToString:@"add"]) {
[self.indexArr addObject:billProduct];
diff --git a/XFFruit/ViewControllers/Transport/Controllers/TransportViewController.h b/XFFruit/ViewControllers/Transport/Controllers/TransportViewController.h
new file mode 100644
index 0000000000000000000000000000000000000000..e5bcbe57521e25891eee64943f46253a1937c91a
--- /dev/null
+++ b/XFFruit/ViewControllers/Transport/Controllers/TransportViewController.h
@@ -0,0 +1,13 @@
+//
+// TransportViewController.h
+// XFFruit
+//
+// Created by 陈俊俊 on 15/9/7.
+// Copyright (c) 2015å¹´ Xummer. All rights reserved.
+//
+
+#import "ICRBaseViewController.h"
+
+@interface TransportViewController : ICRBaseViewController
+
+@end
diff --git a/XFFruit/ViewControllers/Transport/Controllers/TransportViewController.m b/XFFruit/ViewControllers/Transport/Controllers/TransportViewController.m
new file mode 100644
index 0000000000000000000000000000000000000000..00c076be924cc1fcf76b00c91bcb1b16ced3d567
--- /dev/null
+++ b/XFFruit/ViewControllers/Transport/Controllers/TransportViewController.m
@@ -0,0 +1,468 @@
+//
+// TransportViewController.m
+// XFFruit
+//
+// Created by 陈俊俊 on 15/9/7.
+// Copyright (c) 2015å¹´ Xummer. All rights reserved.
+//
+
+#import "TransportViewController.h"
+#import "NewTransportViewController.h"
+#import "TransportDetailViewController.h"
+#import "TransportCell.h"
+#import "Transport.h"
+#import "PurchaseDetailViewController.h"
+#import "QueryOrder.h"
+#import "SortMaskView.h"
+#import "TransportBoltView.h"
+#import "MJRefresh.h"
+
+#define TopMargin 44
+#define TableHeight 120
+#define LeftMargin 20
+#define BtnWidth 60
+#define BtnHeight 24
+#define BtnSize 16
+
+typedef enum : NSUInteger {
+ SortTag = 3000,
+ BoltTag
+
+} BtnTag;
+
+@interface TransportViewController ()<UITableViewDataSource,UITableViewDelegate,TransportBoltViewDelegate,SortMaskViewDelegate>
+{
+ UIView *_maskView;
+ UIButton *currentBtn;
+ SortMaskView *_sortView;
+ TransportBoltView *_boltView;
+ UIBarButtonItem *_sureBtn;
+ UIButton *_sortBtn;
+ UIButton *_boltBtn;
+ BOOL _isRefresh;
+ BOOL _isLoadMore;
+ NSInteger _currentPage;
+}
+@property (nonatomic,strong)NSMutableArray *dataArr;
+@property (nonatomic,strong)UITableView *tableView;
+@property (nonatomic,strong)NSString *billLike;
+@property (nonatomic,strong)NSString *state;
+@property (nonatomic,strong)NSString *userLike;
+@property (nonatomic,strong)NSString *orderDirection;//asc(å‡åº)，desc(é™åº)
+@end
+
+@implementation TransportViewController
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ self.view.backgroundColor = XXFBgColor;
+ [self initData];
+ [self createBackBtn];
+ [self createTableView];
+ [self createRefresh];
+ [self getData];
+}
+- (void)initData{
+ self.dataArr = [NSMutableArray array];
+}
+- (void)getData{
+ [ICRUserUtil sharedInstance].needFresh = NO;
+ __weak typeof(self)weakSelf = self;
+ void(^succ)(id) = ^(id data) {
+ [IBTLoadingView hideHUDWithText:nil];
+ __strong __typeof(weakSelf)strongSelf = weakSelf;
+ [strongSelf fetchtPuchaseList:data];
+ };
+ void(^fail)(id) = ^(id data) {
+ [IBTLoadingView hideHUDWithText:nil];
+ [IBTLoadingView showTips:data];
+ };
+ [IBTLoadingView showProgressLabel:@"æ£åœ¨åŠ è½½..."];
+
+ NSMutableArray *orderArr =[NSMutableArray array];
+ if (self.orderDirection.length > 0 && ![self.orderDirection isEqualToString:@"none"]) {
+ QueryOrder *order = [QueryOrder new];
+ order.field = @"lastModified";
+ order.direction = self.orderDirection;
+ [orderArr addObject:[order dictForCommit]];
+ }
+ id userObject = [NSNull null];
+ if (self.userLike.length > 0) {
+ userObject = self.userLike;
+ if (self.orderDirection.length > 0 && ![self.orderDirection isEqualToString:@"none"]) {
+ QueryOrder *order = [QueryOrder new];
+ order.field = @"uuid";
+ order.direction = self.orderDirection;
+ [orderArr addObject:[order dictForCommit]];
+ }
+ }
+ id stateObject = [NSNull null];
+ if (self.state.length > 0 && ![self.state isEqualToString:@"none"]) {
+ stateObject = self.state;
+ if (self.orderDirection.length > 0 && ![self.orderDirection isEqualToString:@"none"]) {
+ QueryOrder *order = [QueryOrder new];
+ order.field = @"state";
+ order.direction = self.orderDirection;
+ [orderArr addObject:[order dictForCommit]];
+ }
+ }
+ id billObject = [NSNull null];
+ if (self.billLike.length > 0) {
+ billObject = self.billLike;
+ if (self.orderDirection.length > 0 && ![self.orderDirection isEqualToString:@"none"]) {
+ QueryOrder *order = [QueryOrder new];
+ order.field = @"billNumber";
+ order.direction = self.orderDirection;
+ [orderArr addObject:[order dictForCommit]];
+ }
+ }
+ if (orderArr.count == 0) {
+ QueryOrder *order = [QueryOrder new];
+ order.field = @"billNumber";
+ order.direction = @"desc";
+ [orderArr addObject:[order dictForCommit]];
+
+ }
+ ICRUserUtil *userUtil = [ICRUserUtil sharedInstance];
+ NSDictionary *dict = @{
+// @"userEquals":userObject,
+ @"state":stateObject,
+ @"billNumberLike":billObject,
+ @"creator":[NSNull null],
+ @"queryOrders":orderArr,
+ @"userCode":userUtil.userCode,
+ @"pageNumber":@(_currentPage),
+ @"pageSize":@(20)};
+ [[ICRHTTPController sharedController] queryTransPortWithData:dict success:succ failure:fail];
+}
+- (void)fetchtPuchaseList:(id)data{
+ if (data) {
+ NSInteger success = [data[@"success"] integerValue];
+ NSString *message = data[@"message"] ;
+ if (success == 1) {
+ if (_currentPage == 0) {
+ if (self.dataArr.count > 0) {
+ [self.dataArr removeAllObjects];
+ }
+ }
+ NSArray *recodesArr = data[ @"data" ][ @"records" ];
+ for (NSDictionary *transportDict in recodesArr) {
+ Transport *transport = [[Transport alloc]init];
+ [transport setValuesForKeysWithDictionary:transportDict];
+ [self.dataArr addObject:transport];
+ }
+ NSDictionary *pageDict = data[ @"data" ][ @"paging" ];
+ NSInteger pageCount = [pageDict[@"pageCount"] integerValue];
+ [self.tableView reloadData];
+ [self endRefreshing];
+ if (pageCount <= _currentPage) {
+ [self.tableView.footer noticeNoMoreData];
+ }
+ if (_currentPage == 0 && self.dataArr.count > 0) {
+ [self.tableView scrollToRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0] atScrollPosition:UITableViewScrollPositionTop animated:YES];
+ }
+ }else{
+ [IBTLoadingView showTips:message];
+ }
+ }else{
+ [IBTLoadingView showTips:@" æ— è®°å½• "];
+ }
+
+
+}
+- (void)createRefresh{
+ self.tableView.header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
+ if (_isRefresh) {
+ return ;
+ }
+ _isRefresh = YES;
+ _currentPage = 0;
+ [self getData];
+ }];
+ self.tableView.header.lastUpdatedTimeKey = TransportUpdateDate;
+
+ self.tableView.footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+ if (_isLoadMore) {
+ return ;
+ }
+ _isLoadMore = YES;
+ _currentPage ++;
+ [self getData];
+ } ];
+}
+#pragma mark - 结æŸåˆ·æ–°
+- (void)endRefreshing{
+ _isLoadMore = NO;
+ _isRefresh = NO;
+ [self.tableView.header endRefreshing];
+ [self.tableView.footer endRefreshing];
+}
+- (void)createTableView
+{
+ _sureBtn = [[UIBarButtonItem alloc]initWithTitle:@"确定" style:UIBarButtonItemStylePlain target:self action:@selector(sureClick)];
+ self.navigationItem.rightBarButtonItem = _sureBtn;
+
+ _sortBtn = [IBTCustomButtom creatButtonWithFrame:CGRectMake(LeftMargin, 10, BtnWidth, BtnHeight) target:self sel:@selector(sortClick:) tag:SortTag image:@"black_arrow_down_with_text" title:nil titleColor:GXF_DETAIL_COLOR isCorner:NO corner:0 bgColor:nil];
+ _sortBtn.titleLabel.font = FontSize(BtnSize);
+ [self.view addSubview:_sortBtn];
+
+ _boltBtn = [IBTCustomButtom creatButtonWithFrame:CGRectMake(ScreenSize.width-BtnWidth - LeftMargin,10,BtnWidth, BtnHeight) target:self sel:@selector(sortClick:) tag:BoltTag image:@"black_filter_with_text" title:nil titleColor:GXF_DETAIL_COLOR isCorner:NO corner:0 bgColor:nil];
+ _boltBtn.titleLabel.font = FontSize(BtnSize);
+ [self.view addSubview:_boltBtn];
+
+
+ self.tableView = [[UITableView alloc]initWithFrame:(CGRectMake(0, TopMargin,ScreenSize.width, ScreenSize.height - 64 - TopMargin)) style:(UITableViewStylePlain)];
+ self.tableView.delegate = self;
+ self.tableView.dataSource = self;
+ [self.view addSubview:self.tableView];
+
+ _maskView = [[UIView alloc]initWithFrame:CGRectMake(0, TopMargin, ScreenSize.width, ScreenSize.height - 64- TopMargin)];
+ _maskView.backgroundColor = RGBA(0, 0, 0, 0.5);
+ _maskView.hidden = YES;
+ [self.view addSubview:_maskView];
+}
+
+#pragma mark -按钮事件
+- (void)sortClick:(UIButton *)btn{
+ _maskView.backgroundColor = RGBA(0, 0, 0, 0.5);
+ _maskView.hidden = NO;
+ if (btn.tag == SortTag) {
+ if(_boltView){
+ [self hiddenBoltMaskView:NO];
+ }
+ if (currentBtn == btn) {
+ [btn setImage:[UIImage imageNamed:@"black_arrow_down_with_text"] forState:UIControlStateNormal];
+ [self hiddenSortMaskView:YES];
+ currentBtn = nil;
+ }else{
+ [btn setImage:[UIImage imageNamed:@"select_arrow_up_text"] forState:UIControlStateNormal];
+ if (_sortView == nil) {
+ _sortView = [[SortMaskView alloc]initWithFrame:CGRectMake(0, -105, ScreenSize.width, 150) withOrderDirection:self.orderDirection];
+ _sortView.dataArr = [[NSMutableArray alloc]initWithObjects:@"按时间顺åº",@"按时间逆åº",@"默认排åº",nil];
+ _sortView.delegate = self;
+ [_maskView addSubview:_sortView];
+ [UIView animateWithDuration:0.25 animations:^{
+ CGRect sortFrame = _sortView.frame;
+ sortFrame.origin.y = 0;
+ _sortView.frame = sortFrame;
+ }];
+ }
+ currentBtn = btn;
+ }
+ }else if(btn.tag == BoltTag){
+ if (_sortView) {
+ [self hiddenSortMaskView:NO];
+ }
+ if (currentBtn == btn) {
+ [btn setImage:[UIImage imageNamed:@"black_filter_with_text"] forState:UIControlStateNormal];
+ [self hiddenBoltMaskView:YES];
+ currentBtn = nil;
+
+ }else{
+ [btn setImage:[UIImage imageNamed:@"selected-filter_with_text"] forState:UIControlStateNormal];
+ if (_boltView == nil) {
+ _boltView = [[TransportBoltView alloc]initWithFrame:CGRectMake(0, -105, ScreenSize.width, 274) state:self.state userNumber:self.userLike billNumber:self.billLike];
+
+ _boltView.backgroundColor = XXFBgColor;
+ _boltView.delegate = self;
+
+ _boltView.dataArr = [[NSMutableArray alloc]initWithObjects:@"未æ交",@"未收货",@"已收货",@"已作废",nil];
+ [_maskView addSubview:_boltView];
+ [UIView animateWithDuration:0.25 animations:^{
+ CGRect sortFrame = _boltView.frame;
+ sortFrame.origin.y = 0;
+ _boltView.frame = sortFrame;
+ }];
+ currentBtn = btn;
+ }
+ }
+ }
+}
+
+- (void)hiddenSortMaskView:(BOOL)isHide{
+ currentBtn = nil;
+ [self checkSortBtnColor];
+ if (isHide == NO) {
+ [_sortView removeFromSuperview];
+ _sortView = nil;
+ }else{
+ [UIView animateWithDuration:0.25 animations:^{
+ CGRect sortFrame = _sortView.frame;
+ sortFrame.origin.y = -105;
+ _sortView.frame = sortFrame;
+ _maskView.backgroundColor = RGBA(0, 0, 0, 0);
+ }completion:^(BOOL finished) {
+ [_sortView removeFromSuperview];
+ _sortView = nil;
+ _maskView.hidden = YES;
+ }];
+ }
+}
+- (void)hiddenBoltMaskView:(BOOL)isHide{
+ currentBtn = nil;
+ [self checkBoltBtnColor];
+ if (isHide == NO) {
+ [_boltView removeFromSuperview];
+ _boltView = nil;
+ }else{
+ [UIView animateWithDuration:0.25 animations:^{
+ CGRect sortFrame = _boltView.frame;
+ sortFrame.origin.y = -105;
+ _boltView.frame = sortFrame;
+ _maskView.backgroundColor = RGBA(0, 0, 0, 0);
+ }completion:^(BOOL finished) {
+ [_boltView removeFromSuperview];
+ _boltView = nil;
+ _maskView.hidden = YES;
+ }];
+ }
+}
+
+//检测排åºçš„颜色
+- (void)checkSortBtnColor{
+ if (self.orderDirection.length > 0) {
+ [_sortBtn setImage:[UIImage imageNamed:@"select_arrow_up_text"] forState:UIControlStateNormal];
+ }else{
+ [_sortBtn setImage:[UIImage imageNamed:@"black_arrow_down_with_text"] forState:UIControlStateNormal];
+
+ }
+}
+- (void)checkBoltBtnColor{
+ if (self.state.length > 0 || self.billLike.length > 0 || self.userLike.length > 0) {
+ [_boltBtn setImage:[UIImage imageNamed:@"selected-filter_with_text"] forState:UIControlStateNormal];
+ }else{
+ [_boltBtn setImage:[UIImage imageNamed:@"black_filter_with_text"] forState:UIControlStateNormal];
+
+ }
+}
+#pragma mark - 确定
+- (void)sureClick{
+
+ if (self.state.length > 0 || self.userLike.length > 0 || self.billLike.length > 0 ||self.orderDirection.length > 0) {
+ [_boltView.userFiled resignFirstResponder];
+ [_boltView.billFiled resignFirstResponder];
+ _currentPage = 0;
+
+ //请求
+ [self getData];
+ //还原数æ®
+ if (_sortView) {
+ [self hiddenSortMaskView:YES];
+ }
+ if (_boltView) {
+ [self hiddenBoltMaskView:YES];
+ }
+ }
+
+}
+
+#pragma mark - sortDelegate
+- (void)getSortValueSelectRow:(NSString *)state{
+ if (state.length > 0) {
+ self.orderDirection = state;
+ CLog(@"%@",state);
+ }
+}
+#pragma mark - boltDelegate
+- (void)getBoltValueSelectRow:(NSString *)state{
+ self.state = state;
+ CLog(@"%@",state);
+}
+- (void)getuserLike:(NSString *)userLike{
+ self.userLike = userLike;
+ CLog(@"%@",userLike);
+}
+- (void)getbillLike:(NSString *)billLike{
+ self.billLike = billLike;
+ CLog(@"%@",billLike);
+}
+- (void)clearBoltInformation{
+ //清空所有æ¡ä»¶
+ if (self.userLike.length > 0) {
+ self.userLike = @"";
+ }
+ if (self.billLike.length > 0) {
+ self.billLike = @"";
+ }
+ if (self.state.length > 0) {
+ self.state = @"";
+ }
+}
+
+#pragma mark - å议方法
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return 1;
+}
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ return self.dataArr.count;
+}
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ static NSString *cellID = @"TransportCell";
+ TransportCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
+ if (cell == nil) {
+ cell = [[TransportCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID];
+ tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+ cell.selectionStyle = UITableViewCellSelectionStyleNone;
+ }
+ if (self.dataArr.count > 0) {
+ Transport *transport = self.dataArr[indexPath.row];
+ [cell setTransport:transport];
+ }
+ return cell;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
+
+ if (_dataArr.count > 0) {
+ Transport *transport = _dataArr[indexPath.row];
+ if ([transport.state isEqualToString:TRANSPORT_STATE_INITIAL] ) {
+ NewTransportViewController *nvc = [NewTransportViewController new];
+ nvc.transport = transport;
+ nvc.title = @"修改å‘è¿å•";
+ [self PushViewController:nvc animated:YES];
+ }else{
+ TransportDetailViewController *pvc = [TransportDetailViewController new];
+ pvc.title = @"查看å‘è¿å•";
+ pvc.transport = transport;
+ [self PushViewController:pvc animated:YES];
+ }
+ }
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
+ return TableHeight;
+}
+
+- (void)createBackBtn{
+ UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
+ [btn setImage:[UIImage imageNamed:@"back"] forState:UIControlStateNormal];
+ btn.frame = CGRectMake(0, 0, 12, 20);
+ [btn addTarget:self action:@selector(backRV) forControlEvents:UIControlEventTouchUpInside];
+ UIBarButtonItem *back = [[UIBarButtonItem alloc]initWithCustomView:btn];
+ self.navigationItem.leftBarButtonItem = back;
+}
+- (void)backRV{
+ [self PopToRootViewControllerAnimated:YES];
+}
+- (void)viewWillAppear:(BOOL)animated{
+ [super viewWillAppear:animated];
+ if ([ICRUserUtil sharedInstance].needFresh && self.tableView != nil) {
+ [self.tableView.header beginRefreshing];
+ }
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+}
+
+/*
+#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
diff --git a/XFFruit/ViewControllers/Survey/Transport/Models/FeeAcountDetail.h b/XFFruit/ViewControllers/Transport/Models/FeeAcountDetail.h
similarity index 100%
rename from XFFruit/ViewControllers/Survey/Transport/Models/FeeAcountDetail.h
rename to XFFruit/ViewControllers/Transport/Models/FeeAcountDetail.h
diff --git a/XFFruit/ViewControllers/Survey/Transport/Models/FeeAcountDetail.m b/XFFruit/ViewControllers/Transport/Models/FeeAcountDetail.m
similarity index 100%
rename from XFFruit/ViewControllers/Survey/Transport/Models/FeeAcountDetail.m
rename to XFFruit/ViewControllers/Transport/Models/FeeAcountDetail.m
diff --git a/XFFruit/ViewControllers/Survey/Transport/Models/Transport.h b/XFFruit/ViewControllers/Transport/Models/Transport.h
similarity index 89%
rename from XFFruit/ViewControllers/Survey/Transport/Models/Transport.h
rename to XFFruit/ViewControllers/Transport/Models/Transport.h
index 59826033668e877349deb25de4cceaf85d772b39..0603f6e4f752a7c0dff4be9723ed9f4bd7386bbb 100644
--- a/XFFruit/ViewControllers/Survey/Transport/Models/Transport.h
+++ b/XFFruit/ViewControllers/Transport/Models/Transport.h
@@ -23,6 +23,7 @@
@property (nonatomic,strong)NSString *type;//类型
@property (nonatomic,strong)NSString *carphone;//å¸æœºç”µè¯
@property (nonatomic,strong)NSString *note;//备注
+@property (nonatomic,strong)NSNumber *version;//版本
@property (nonatomic,strong)NSString *create_time;//创建时间
@property (nonatomic,strong)NSString *create_id;//创建人代ç
@@ -31,6 +32,8 @@
@property (nonatomic,strong)NSString *lastModified_id;//最åŽä¿®æ”¹äººä»£ç
@property (nonatomic,strong)NSString *lastModified_operName;//最åŽä¿®æ”¹äººå称
+@property (nonatomic,strong)NSArray *pdtDetails;//商å“
+@property (nonatomic,strong)NSArray *accountDetails;//费用
@end
diff --git a/XFFruit/ViewControllers/Survey/Transport/Models/Transport.m b/XFFruit/ViewControllers/Transport/Models/Transport.m
similarity index 100%
rename from XFFruit/ViewControllers/Survey/Transport/Models/Transport.m
rename to XFFruit/ViewControllers/Transport/Models/Transport.m
diff --git a/XFFruit/ViewControllers/Transport/Models/TransportPdtDetail.h b/XFFruit/ViewControllers/Transport/Models/TransportPdtDetail.h
new file mode 100644
index 0000000000000000000000000000000000000000..6dd93be0348a6dbc595e39799a28f31fd70a0bf1
--- /dev/null
+++ b/XFFruit/ViewControllers/Transport/Models/TransportPdtDetail.h
@@ -0,0 +1,27 @@
+//
+// TransportPdtDetail.h
+// XFFruit
+//
+// Created by 陈俊俊 on 15/9/7.
+// Copyright (c) 2015å¹´ Xummer. All rights reserved.
+//
+
+#import "IBTModel.h"
+
+@interface TransportPdtDetail : IBTModel
+@property (nonatomic,strong)NSString *uuid;//å”¯ä¸€æ ‡è¯†
+@property (nonatomic,strong)NSString *productUuid;//商å“uuid
+@property (nonatomic,strong)NSString *productCode;//商å“代ç
+@property (nonatomic,strong)NSString *productName;//商å“å称
+@property (nonatomic,strong)NSString *purchasebillnumber;//采è´å•å·
+@property (nonatomic,strong)NSString *purchasePdtDetail;//采è´å•æ˜Žç»†id
+@property (nonatomic,strong)NSNumber *qpc;//åŒ…è£…è§„æ ¼
+@property (nonatomic,strong)NSString *qpcStr;//åŒ…è£…è§„æ ¼æè¿°
+@property (nonatomic,strong)NSString *unit;//包装å•ä½
+@property (nonatomic,strong)NSNumber *qty;//å‘è¿çš„包装数é‡
+@property (nonatomic,strong)NSNumber *price;//基础å•ä»·
+@property (nonatomic,strong)NSNumber *baseQty;//å‘è¿çš„基础数é‡
+@property (nonatomic,strong)NSNumber *total;//å‘è¿åˆè®¡é‡‘é¢
+@property (nonatomic,strong)NSString *note;//备注
+
+@end
diff --git a/XFFruit/ViewControllers/Transport/Models/TransportPdtDetail.m b/XFFruit/ViewControllers/Transport/Models/TransportPdtDetail.m
new file mode 100644
index 0000000000000000000000000000000000000000..83c410c8cde6ad3aca50931eb28ae79369d63f82
--- /dev/null
+++ b/XFFruit/ViewControllers/Transport/Models/TransportPdtDetail.m
@@ -0,0 +1,13 @@
+//
+// TransportPdtDetail.m
+// XFFruit
+//
+// Created by 陈俊俊 on 15/9/7.
+// Copyright (c) 2015å¹´ Xummer. All rights reserved.
+//
+
+#import "TransportPdtDetail.h"
+
+@implementation TransportPdtDetail
+
+@end
diff --git a/XFFruit/ViewControllers/Transport/Views/BottomTransportView.h b/XFFruit/ViewControllers/Transport/Views/BottomTransportView.h
new file mode 100644
index 0000000000000000000000000000000000000000..6036b1b1da03a9af4f65ef671dae0ebb121d5e16
--- /dev/null
+++ b/XFFruit/ViewControllers/Transport/Views/BottomTransportView.h
@@ -0,0 +1,35 @@
+//
+// BottomTransportView.h
+// XFFruit
+//
+// Created by 陈俊俊 on 15/9/6.
+// Copyright (c) 2015å¹´ Xummer. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "TransportProductViewController.h"
+#import "CostViewController.h"
+#import "FeeAcountDetail.h"
+#import "TransportPdtDetail.h"
+@interface BottomTransportView : UIView
+- (instancetype)initWithFrame:(CGRect)frame withHidden:(BOOL)isHidden;
+@property (nonatomic,strong)TransportProductViewController *productVC;
+@property (nonatomic,strong)CostViewController *costVC;
+@property (nonatomic,assign)BOOL isHiddenEdit;
+
+
+//æ·»åŠ æˆ–è€…ç¼–è¾‘è´¹ç”¨
+- (void)refreshCost:(FeeAcountDetail *)fee indexPath:(NSIndexPath *)indexPath;
+//åˆ é™¤è´¹ç”¨
+- (void)refreshDelCost:(FeeAcountDetail *)fee indexPath:(NSIndexPath *)indexPath;
+//刷新费用
+- (void)refreshCost:(NSArray *)costArr;
+
+//刷新商å“
+- (void)refreshTranProduct:(NSArray *)tranProductArr;
+#warning - 临时
+- (void)reProduct:(NSArray *)tranProductArr;
+
+//æ·»åŠ æˆ–è€…ç¼–è¾‘
+- (void)refreshProduct:(TransportPdtDetail *)transportPdtDetail;
+@end
diff --git a/XFFruit/ViewControllers/Survey/Transport/Views/BottomTransportView.m b/XFFruit/ViewControllers/Transport/Views/BottomTransportView.m
similarity index 64%
rename from XFFruit/ViewControllers/Survey/Transport/Views/BottomTransportView.m
rename to XFFruit/ViewControllers/Transport/Views/BottomTransportView.m
index fdc300ebd6cc28ca613a6fcda36c7907a8514948..e8a6d7f69bbac89b9f32421713f4d6e6903597d4 100644
--- a/XFFruit/ViewControllers/Survey/Transport/Views/BottomTransportView.m
+++ b/XFFruit/ViewControllers/Transport/Views/BottomTransportView.m
@@ -7,7 +7,8 @@
//
#import "BottomTransportView.h"
-
+#import "TransportPdtDetail.h"
+#import "FeeAcountDetail.h"
#define ContentHeight 44
#define BtnWidth 100
#define BeginTag 8000
@@ -24,9 +25,10 @@
@implementation BottomTransportView
-- (instancetype)initWithFrame:(CGRect)frame{
+- (instancetype)initWithFrame:(CGRect)frame withHidden:(BOOL)isHidden{
self = [super initWithFrame:frame];
if (self) {
+ self.isHiddenEdit = isHidden;
//ç•Œé¢
[self bulidLayout];
}
@@ -67,9 +69,11 @@
if (i == 0) {
view.backgroundColor = [UIColor redColor];
self.productVC.viewFrame = view.bounds;
+ self.productVC.isHiddenEdit = self.isHiddenEdit;
[view addSubview:self.productVC.view];
}else if(i == 1){
self.costVC.viewFrame = view.bounds;
+ self.costVC.isHiddenEdit = self.isHiddenEdit;
[view addSubview:self.costVC.view];
view.backgroundColor = [UIColor blueColor];
}
@@ -86,7 +90,7 @@
}
- (void)addChildView{
- self.productVC = [[ProductBillViewController alloc]init];
+ self.productVC = [[TransportProductViewController alloc]init];
self.productVC.twoTitle = @"+选择采è´å•";
self.costVC = [[CostViewController alloc]init];
}
@@ -115,15 +119,59 @@
btn.enabled = NO;
_currentBtn = btn;
}
-
-- (void)refreshProduct:(NSArray *)productArr{
- if (self.productVC.productArr) {
- [self.productVC.productArr addObjectsFromArray:productArr];
+//æ·»åŠ å•†å“
+- (void)refreshProduct:(TransportPdtDetail *)transportPdtDetail
+{
+ if (self.productVC.transportProductArr) {
+ [self.productVC.transportProductArr addObject:transportPdtDetail];
[self.productVC.tableView reloadData];
}
}
+//æ·»åŠ ç¼–è¾‘
+- (void)refreshCost:(FeeAcountDetail *)fee indexPath:(NSIndexPath *)indexPath{
+ if (indexPath) {
+ [self.costVC.costArr replaceObjectAtIndex:indexPath.row withObject:fee];
+// NSArray *indexArray=[NSArray arrayWithObject:indexPath];
+// [self.costVC.tableView reloadRowsAtIndexPaths:indexArray withRowAnimation:UITableViewRowAnimationAutomatic];
+ [self.costVC.tableView reloadData];
+ }else{
+ if (self.costVC.costArr) {
+ [self.costVC.costArr addObject:fee];
+ [self.costVC.tableView reloadData];
+ }
+ }
+}
+//åˆ é™¤
+- (void)refreshDelCost:(FeeAcountDetail *)fee indexPath:(NSIndexPath *)indexPath{
+ if (indexPath) {
+ [self.costVC.costArr removeObjectAtIndex:indexPath.row];
+ [self.costVC.tableView reloadData];
+ }
+}
+//刷新
- (void)refreshCost:(NSArray *)costArr{
-
+ NSMutableArray *feeArr = [NSMutableArray array];
+ for (NSDictionary *billDict in costArr) {
+ FeeAcountDetail *billProbuct = [FeeAcountDetail new];
+ [billProbuct setValuesForKeysWithDictionary:billDict];
+ [feeArr addObject:billProbuct];
+ }
+ self.costVC.costArr = feeArr;
+ [self.costVC.tableView reloadData];
+}
+- (void)refreshTranProduct:(NSArray *)tranProductArr{
+ NSMutableArray *productArr = [NSMutableArray array];
+ for (NSDictionary *billDict in tranProductArr) {
+ TransportPdtDetail *billProbuct = [TransportPdtDetail new];
+ [billProbuct setValuesForKeysWithDictionary:billDict];
+ [productArr addObject:billProbuct];
+ }
+ self.productVC.transportProductArr = productArr;
+ [self.productVC.tableView reloadData];
+}
+- (void)reProduct:(NSArray *)tranProductArr{
+ [self.productVC.transportProductArr addObjectsFromArray:tranProductArr];
+ [self.productVC.tableView reloadData];
}
@end
diff --git a/XFFruit/ViewControllers/Transport/Views/CostCell.h b/XFFruit/ViewControllers/Transport/Views/CostCell.h
new file mode 100644
index 0000000000000000000000000000000000000000..f08c4668b803419431951e6fe51303efdb9d5042
--- /dev/null
+++ b/XFFruit/ViewControllers/Transport/Views/CostCell.h
@@ -0,0 +1,22 @@
+//
+// CostCell.h
+// XFFruit
+//
+// Created by 陈俊俊 on 15/9/7.
+// Copyright (c) 2015å¹´ Xummer. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "FeeAcountDetail.h"
+@interface CostCell : UITableViewCell
+@property (nonatomic,strong)UIImageView *smallImageView;
+@property (nonatomic,strong)UIButton *editBtn;
+@property (nonatomic,strong)UILabel *seqLabel;
+@property (nonatomic,strong)UILabel *typeLabel;
+@property (nonatomic,strong)UILabel *actualLabel;
+@property (nonatomic,strong)UILabel *paidLabel;
+@property (nonatomic,strong)UILabel *leftLabel;
+@property (nonatomic,strong)UILabel *lineLabel;
+
+- (void)setFeeCost:(FeeAcountDetail *)fee row:(NSInteger)row;
+@end
diff --git a/XFFruit/ViewControllers/Transport/Views/CostCell.m b/XFFruit/ViewControllers/Transport/Views/CostCell.m
new file mode 100644
index 0000000000000000000000000000000000000000..601356f7d1be225ce21ce4a372228f9a2338988d
--- /dev/null
+++ b/XFFruit/ViewControllers/Transport/Views/CostCell.m
@@ -0,0 +1,97 @@
+//
+// CostCell.m
+// XFFruit
+//
+// Created by 陈俊俊 on 15/9/7.
+// Copyright (c) 2015å¹´ Xummer. All rights reserved.
+//
+
+#import "CostCell.h"
+#define LeftMargin 13
+#define TableHeight 44
+#define SmallSize 10
+#define SmallWidth 20
+#define SpaceMargin 1
+#define LeftWidth 45
+#define RightWidth 30
+@implementation CostCell
+
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{
+
+ self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
+ if (self) {
+ [self bulidLayout];
+ }
+ return self;
+}
+
+- (void)bulidLayout
+{
+ CGFloat headWidth = (ScreenSize.width - LeftWidth - RightWidth - SpaceMargin* (4 -1))/4;
+
+ self.smallImageView = [[UIImageView alloc]initWithFrame:CGRectMake(LeftMargin, (TableHeight - SmallSize)/2 , SmallSize, SmallSize)];
+ self.smallImageView.image = [UIImage imageNamed:@"arrowright"];
+
+ self.seqLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.smallImageView.frame), 0, SmallWidth, TableHeight))];
+ self.seqLabel.textColor = GXF_CONTENT_COLOR;
+ self.seqLabel.text = @"13";
+ self.seqLabel.font = GXF_SIXTEENTEH_SIZE;
+
+ self.typeLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftWidth, 0, headWidth, TableHeight))];
+ self.typeLabel.textAlignment = NSTextAlignmentLeft;
+ self.typeLabel.textColor = GXF_CONTENT_COLOR;
+ self.typeLabel.text = @"苹果桃å";
+ self.typeLabel.font = GXF_SIXTEENTEH_SIZE;
+
+ self.actualLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.typeLabel.frame) + SpaceMargin, 0, headWidth, TableHeight))];
+ self.actualLabel.textAlignment = NSTextAlignmentLeft;
+ self.actualLabel.textColor = GXF_CONTENT_COLOR;
+ self.actualLabel.text = @"30000";
+ self.actualLabel.font = GXF_SIXTEENTEH_SIZE;
+
+ self.paidLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.actualLabel.frame) + SpaceMargin, 0, headWidth, TableHeight))];
+ self.paidLabel.textAlignment = NSTextAlignmentLeft;
+ self.paidLabel.text = @"2015-04-05";
+ self.paidLabel.textColor = GXF_CONTENT_COLOR;
+ self.paidLabel.font = GXF_SIXTEENTEH_SIZE;
+
+ self.leftLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.paidLabel.frame) + SpaceMargin, 0, headWidth, TableHeight))];
+ self.leftLabel.textAlignment = NSTextAlignmentLeft;
+ self.leftLabel.text = @"2015-04-05";
+ self.leftLabel.textColor = GXF_CONTENT_COLOR;
+ self.leftLabel.font = GXF_SIXTEENTEH_SIZE;
+
+ self.editBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+ [self.editBtn setImage:[UIImage imageNamed:@"edit"] forState:UIControlStateNormal];
+ self.editBtn.frame = CGRectMake(ScreenSize.width - LeftWidth, 0, LeftWidth, TableHeight);
+
+ self.lineLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin,TableHeight-1, ScreenSize.width - LeftMargin * 2, 1))];;
+ self.lineLabel.backgroundColor = GXF_LINE_COLOR;
+ [self.contentView addSubview:self.smallImageView];
+ [self.contentView addSubview:self.seqLabel];
+ [self.contentView addSubview:self.smallImageView];
+ [self.contentView addSubview:self.typeLabel];
+ [self.contentView addSubview:self.editBtn];
+ [self.contentView addSubview:self.actualLabel];
+ [self.contentView addSubview:self.paidLabel];
+ [self.contentView addSubview:self.leftLabel];
+ [self.contentView addSubview:self.lineLabel];
+
+
+}
+- (void)setFeeCost:(FeeAcountDetail *)fee row:(NSInteger)row
+{
+ self.seqLabel.text = [NSString stringWithFormat:@"%@",@(row+1)];
+ self.typeLabel.text = fee.accounttitle;
+ self.actualLabel.text = [fee.actualmoney stringValue];
+ self.paidLabel.text = [fee.paidmoney stringValue];
+ self.leftLabel.text = [fee.leftmoney stringValue];
+}
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+ [super setSelected:selected animated:animated];
+
+ // Configure the view for the selected state
+}
+
+@end
diff --git a/XFFruit/ViewControllers/Survey/Transport/Views/TopTransportView.h b/XFFruit/ViewControllers/Transport/Views/TopTransportView.h
similarity index 94%
rename from XFFruit/ViewControllers/Survey/Transport/Views/TopTransportView.h
rename to XFFruit/ViewControllers/Transport/Views/TopTransportView.h
index 11cafcd38dd8d0ff807ce9569cea375a8acf5d59..13b3241f315f19c8a825dd8e3f0217e4ec6b4445 100644
--- a/XFFruit/ViewControllers/Survey/Transport/Views/TopTransportView.h
+++ b/XFFruit/ViewControllers/Transport/Views/TopTransportView.h
@@ -8,7 +8,7 @@
#import <UIKit/UIKit.h>
#import "HPGrowingTextView.h"
-
+#import "Transport.h"
@protocol TopTransportViewDelegate <NSObject>
- (void)hiddenKeyBoard;
@@ -36,5 +36,6 @@
@property (nonatomic,strong)NSString *type;
@property (nonatomic,strong)NSString *carphone;
@property (nonatomic,strong)NSString *note;
+@property (nonatomic,strong)Transport *transport;
@end
diff --git a/XFFruit/ViewControllers/Survey/Transport/Views/TopTransportView.m b/XFFruit/ViewControllers/Transport/Views/TopTransportView.m
similarity index 80%
rename from XFFruit/ViewControllers/Survey/Transport/Views/TopTransportView.m
rename to XFFruit/ViewControllers/Transport/Views/TopTransportView.m
index 48908690fb5e01fc83b2bf67b175eba326b1de2d..9d8ae5ffc9551707f12aa8b90c80929a2dedd405 100644
--- a/XFFruit/ViewControllers/Survey/Transport/Views/TopTransportView.m
+++ b/XFFruit/ViewControllers/Transport/Views/TopTransportView.m
@@ -125,6 +125,43 @@
}
}
}
+- (void)setTransport:(Transport *)transport{
+ if (transport) {
+ if (transport.warehouseName.length > 0) {
+ self.warehouseLabel.text = transport.warehouseName;
+ self.warehouseLabel.textColor = GXF_CONTENT_COLOR;
+ self.warehouseCode = transport.warehouseCode;
+ self.warehouseName = transport.warehouseName;
+ self.warehouseUuid = transport.warehouseUuid;
+ }
+ if (transport.type.length > 0) {
+ NSString *type = [transport.type isEqualToString:GXF_Critical] ? @"紧急" : @"普通";
+ self.typeLabel.text = type;
+ self.typeLabel.textColor = GXF_CONTENT_COLOR;
+ self.type = transport.type;
+ }
+ if (transport.rwarehouseName.length > 0) {
+ self.rwarehouseLabel.text = transport.rwarehouseName;
+ self.rwarehouseLabel.textColor = GXF_CONTENT_COLOR;
+ self.rwarehouseCode = transport.rwarehouseCode;
+ self.rwarehouseName = transport.rwarehouseName;
+ self.rwarehouseUuid = transport.rwarehouseUuid;
+ }
+ if (transport.carnumber.length > 0) {
+ self.carTextFiled.text = transport.carnumber;
+ self.carnumber = transport.carnumber;
+ }
+ if (transport.carphone) {
+ self.phoneTextFiled.text = transport.carphone;
+ self.carphone = transport.carphone;
+ }
+ if (transport.note) {
+ self.remarkTextView.text = transport.note;
+ self.note = transport.note;
+ }
+ }
+}
+
-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
if(indexPath.row == 0){
ChooseWarehouseViewController *cvc = [ChooseWarehouseViewController new];
@@ -160,9 +197,13 @@
tvc.choseBaseInfo = ^(NSArray *types){
if (types.count > 0) {
NSString *type = types[0];
- self.typeLabel.text = [type isEqualToString:GXF_Critical] ? @"紧急":@"普通";
+ self.typeLabel.text = type;
self.typeLabel.textColor = GXF_CONTENT_COLOR;
- self.type = type;
+ if ([type isEqualToString:@"紧急"]) {
+ self.type = GXF_Critical;
+ }else{
+ self.type = GXF_Normal;
+ }
}
};
diff --git a/XFFruit/ViewControllers/Transport/Views/TransportBoltView.h b/XFFruit/ViewControllers/Transport/Views/TransportBoltView.h
new file mode 100644
index 0000000000000000000000000000000000000000..7092a5311b7b07d2218257c0089325d17bfef117
--- /dev/null
+++ b/XFFruit/ViewControllers/Transport/Views/TransportBoltView.h
@@ -0,0 +1,27 @@
+//
+// TransportBoltView.h
+// XFFruit
+//
+// Created by 陈俊俊 on 15/9/7.
+// Copyright (c) 2015å¹´ Xummer. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+@protocol TransportBoltViewDelegate <NSObject>
+- (void)getBoltValueSelectRow:(NSString *)state;
+- (void)getuserLike:(NSString *)userLike;
+- (void)getbillLike:(NSString *)billLike;
+- (void)clearBoltInformation;
+@end
+
+@interface TransportBoltView : UIView<UITableViewDataSource,UITableViewDelegate>
+@property (nonatomic,strong)UITableView *tableView;
+@property (nonatomic,strong)NSMutableArray *dataArr;
+@property (nonatomic,weak)id <TransportBoltViewDelegate>delegate;
+
+@property (nonatomic,strong)UITextField *userFiled;//采è´å•å·ç±»ä¼¼äºŽ
+@property (nonatomic,strong)UITextField *billFiled;//通知å•å·ç±»ä¼¼äºŽ
+@property (nonatomic,strong)UITextField *creatorField;//供应商uuid类似于
+
+- (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state userNumber:(NSString *)userNumber billNumber:(NSString *)billNumber;
+@end
diff --git a/XFFruit/ViewControllers/Transport/Views/TransportBoltView.m b/XFFruit/ViewControllers/Transport/Views/TransportBoltView.m
new file mode 100644
index 0000000000000000000000000000000000000000..aa89cdae4f6ca4b775ae7855e684f62f9160d66f
--- /dev/null
+++ b/XFFruit/ViewControllers/Transport/Views/TransportBoltView.m
@@ -0,0 +1,275 @@
+//
+// TransportBoltView.m
+// XFFruit
+//
+// Created by 陈俊俊 on 15/9/7.
+// Copyright (c) 2015å¹´ Xummer. All rights reserved.
+//
+
+#import "TransportBoltView.h"
+
+#import "MaskCell.h"
+#define TableHeight 45
+#define LeftMargin 80
+#define TotalHeight 224
+#define LeftHeight 44
+#define BottomHeight 50
+@interface TransportBoltView ()<UITextFieldDelegate>
+{
+ UIView *_leftView;
+ UIButton *_currentBtn;
+ NSIndexPath *_currentIndexPath;
+ UIView *_userView;
+ UIView *_billView;
+ NSString *_state;
+ NSString *_billNumber;
+ NSString *_title;
+ UIButton *_clearBtn;
+}
+@property (nonatomic,strong)NSString *state;
+@property (nonatomic,strong)NSString *billNumber;
+@property (nonatomic,strong)NSString *userNumber;
+
+@end
+
+@implementation TransportBoltView
+
+- (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state userNumber:(NSString *)userNumber billNumber:(NSString *)billNumber{
+ self = [super initWithFrame:frame];
+ if (self) {
+ self.userNumber = userNumber;
+ self.billNumber = billNumber;
+ self.state = state;
+ [self createView];
+ [self createRightView];
+ [self preferData];
+ }
+ return self;
+}
+- (void)preferData{
+ if ([self.state isEqualToString:TRANSPORT_STATE_INITIAL]) {
+ _currentIndexPath = [NSIndexPath indexPathForRow:0 inSection:0];
+ }else if ([self.state isEqualToString:TRANSPORT_STATE_UNRECEIVED]) {
+ _currentIndexPath = [NSIndexPath indexPathForRow:1 inSection:0];
+ }else if ([self.state isEqualToString:TRANSPORT_STATE_RECEIVED]) {
+ _currentIndexPath = [NSIndexPath indexPathForRow:2 inSection:0];
+ }else if ([self.state isEqualToString:TRANSPORT_STATE_ABORTED]) {
+ _currentIndexPath = [NSIndexPath indexPathForRow:3 inSection:0];
+ }
+ _userView.hidden = YES;
+ if(self.userNumber.length > 0){
+ self.userFiled.text = self.userNumber;
+ }
+ _billView.hidden = YES;
+ if (self.billNumber.length > 0) {
+ self.billFiled.text = self.billNumber;
+ }
+}
+
+#pragma mark - 创建视图
+- (void)createView
+{
+ _leftView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, LeftMargin,self.frame.size.height- BottomHeight)];
+ [self addSubview:_leftView];
+ NSArray *arr = @[@"按状æ€",@"用户代ç ",@"è°ƒç ”å•å·"];
+ for (NSInteger i = 0; i<arr.count; i++) {
+ UIButton *button = [UIButton buttonWithType:UIButtonTypeSystem];
+ button.frame = CGRectMake(0, LeftHeight * i , LeftMargin ,LeftHeight);
+ [button setTitle:arr[i] forState:UIControlStateNormal];
+ [button setTitleColor:GXF_DETAIL_COLOR forState:UIControlStateNormal];
+ if (i == 0) {
+ button.enabled = NO;
+ _currentBtn = button;
+ }
+ [button setBackgroundImage:[UIImage imageNamed:@"maskEnable"] forState:UIControlStateDisabled];
+ [button setBackgroundImage:[UIImage imageNamed:@"mask"] forState:UIControlStateNormal];
+ button.tag = 1001+i;
+ [button addTarget:self action:@selector(leftBtnClick:) forControlEvents:UIControlEventTouchUpInside];
+ [_leftView addSubview:button];
+ }
+ _clearBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+ _clearBtn.frame = CGRectMake(0, CGRectGetMaxY(_leftView.frame), self.frame.size.width, BottomHeight);
+ [_clearBtn setTitle:@"清空选项" forState:UIControlStateNormal];
+ [_clearBtn setTitleColor:GXF_CONTENT_COLOR forState:UIControlStateNormal];
+ _clearBtn.titleLabel.font = GXF_FIFTEENTEN_SIZE;
+ [_clearBtn addTarget:self action:@selector(clearBolt) forControlEvents:UIControlEventTouchUpInside];
+ [self addSubview:_clearBtn];
+}
+- (void)createRightView{
+
+ _userView = [[UIView alloc]initWithFrame:CGRectMake(LeftMargin, 0, ScreenSize.width - LeftMargin, self.frame.size.height - BottomHeight)];
+ _userView.backgroundColor = [UIColor whiteColor];
+ [self addSubview:_userView];
+ UILabel *titleLabel = [[UILabel alloc]initWithFrame:CGRectMake(10, 20, (ScreenSize.width - LeftMargin - 10*2), 20)];
+ titleLabel.font = GXF_FIFTEENTEN_SIZE;
+ titleLabel.text = @"类似于：";
+ [_userView addSubview:titleLabel];
+ self.userFiled = [[UITextField alloc]initWithFrame:CGRectMake(10, CGRectGetMaxY(titleLabel.frame) + 10, (ScreenSize.width - LeftMargin - 10*2), 30)];
+ self.userFiled.textAlignment = NSTextAlignmentLeft;
+ self.userFiled.textColor = GXF_CONTENT_COLOR;
+ self.userFiled.placeholder = @"输入类似登陆用户代ç ";
+ self.userFiled.borderStyle = UITextBorderStyleRoundedRect;
+ self.userFiled.font = GXF_FIFTEENTEN_SIZE;
+ self.userFiled.returnKeyType = UIReturnKeyDone;
+ self.userFiled.delegate = self;
+ [_userView addSubview:self.userFiled];
+
+
+ _billView = [[UIView alloc]initWithFrame:CGRectMake(LeftMargin, 0, ScreenSize.width - LeftMargin, self.frame.size.height - BottomHeight)];
+ _billView.backgroundColor = [UIColor whiteColor];
+ [self addSubview:_billView];
+ UILabel *billLabel = [[UILabel alloc]initWithFrame:CGRectMake(10, 20, (ScreenSize.width - LeftMargin - 10*2), 20)];
+ billLabel.font = GXF_FIFTEENTEN_SIZE;
+ billLabel.text = @"类似于：";
+ [_billView addSubview:billLabel];
+
+ self.billFiled = [[UITextField alloc]initWithFrame:CGRectMake(10, CGRectGetMaxY(billLabel.frame) + 10, (ScreenSize.width - LeftMargin - 10*2), 30)];
+ self.billFiled.textAlignment = NSTextAlignmentLeft;
+ self.billFiled.textColor = GXF_CONTENT_COLOR;
+ self.billFiled.placeholder = @"è¾“å…¥ç±»ä¼¼è°ƒç ”å•å·";
+ self.billFiled.borderStyle = UITextBorderStyleRoundedRect;
+ self.billFiled.font = GXF_FIFTEENTEN_SIZE;
+ self.billFiled.returnKeyType = UIReturnKeyDone;
+ self.billFiled.delegate = self;
+ [_billView addSubview:self.billFiled];
+
+ self.tableView = [[UITableView alloc]initWithFrame:CGRectMake(LeftMargin, 0, ScreenSize.width - LeftMargin, self.frame.size.height - BottomHeight) style:(UITableViewStylePlain)];
+ self.tableView.backgroundColor = [UIColor whiteColor];
+ self.tableView.delegate = self;
+ self.tableView.dataSource = self;
+ [self addSubview:self.tableView];
+
+}
+
+
+- (void)leftBtnClick:(UIButton *)btn{
+ _currentBtn.enabled = YES;
+ btn.enabled = NO;
+ _currentBtn = btn;
+ [self keyBoardHidden];
+ switch (btn.tag) {
+ case 1001://状æ€
+ {
+ self.tableView.hidden = NO;
+ _userView.hidden = YES;
+ _billView.hidden = YES;
+ }
+ break;
+ case 1002://æ¡ä»¶äºŒ
+ {
+ self.tableView.hidden = YES;
+ _userView.hidden = NO;
+ _billView.hidden = YES;
+ }
+ break;
+ case 1003://æ¡ä»¶ä¸‰
+ {
+ self.tableView.hidden = YES;
+ _userView.hidden = YES;
+ _billView.hidden = NO;
+ }
+ break;
+ default:
+ break;
+ }
+}
+
+- (void)clearBolt{
+ if (_billFiled.text.length > 0) {
+ _billFiled.text = @"";
+ }
+ if (_userFiled.text.length > 0) {
+ _userFiled.text = @"";
+ }
+ if (_currentIndexPath) {
+ _currentIndexPath = nil;
+ [self.tableView reloadData];
+ }
+ if ([self.delegate respondsToSelector:@selector(clearBoltInformation)]) {
+ [self.delegate clearBoltInformation];
+ }
+}
+
+#pragma mark - åè®®
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return 1;
+}
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ return self.dataArr.count;
+}
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ static NSString *cellID = @"MaskID";
+ MaskCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
+ if (cell == nil) {
+ cell = [[MaskCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID totalWidth: ScreenSize.width - 80 totalHeight:TableHeight];
+ tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+ cell.selectionStyle = UITableViewCellSelectionStyleNone;
+ }
+ if (_dataArr.count > 0) {
+ cell.Commitbtn.hidden = YES;
+ [cell setTitleStr:self.dataArr[indexPath.row]];
+
+ }
+ if (_currentIndexPath) {
+ if (indexPath.row == _currentIndexPath.row) {
+ cell.Commitbtn.hidden = NO;
+ }else{
+ cell.Commitbtn.hidden = YES;
+ }
+ }
+ return cell;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
+ //获å–选ä¸çš„cell
+ MaskCell *currentCell = (MaskCell *)[tableView cellForRowAtIndexPath:_currentIndexPath];
+ currentCell.Commitbtn.hidden = YES;
+ MaskCell *cell = (MaskCell *)[tableView cellForRowAtIndexPath:indexPath];
+ cell.Commitbtn.hidden = NO;
+ _currentIndexPath = indexPath;
+
+ //initial(未æ交)submitted(å·²æ交)rejected(已拒ç»)approved(已审批)shipping(å‘è¿ä¸)finished(已完æˆ)
+
+ NSString *stateStr = @"";
+ if (indexPath.row == 0) {
+ stateStr = TRANSPORT_STATE_INITIAL;
+ }else if(indexPath.row == 1){
+ stateStr = TRANSPORT_STATE_UNRECEIVED;
+ }else if(indexPath.row == 2){
+ stateStr = TRANSPORT_STATE_RECEIVED;
+ }else if(indexPath.row == 3){
+ stateStr = TRANSPORT_STATE_ABORTED;
+ }
+ [self.delegate getBoltValueSelectRow:stateStr];
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
+ return TableHeight;
+}
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField{
+ [self keyBoardHidden];
+ return YES;
+}
+- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event{
+ [self keyBoardHidden];
+}
+- (void)keyBoardHidden{
+ [self.userFiled resignFirstResponder];
+ [self.billFiled resignFirstResponder];
+}
+
+- (void)textFieldDidEndEditing:(UITextField *)textField{
+ if (textField == self.userFiled) {
+ if (self.userFiled.text.length > 0) {
+ [self.delegate getuserLike:self.userFiled.text];
+ }
+ }else if(textField == self.billFiled){
+ if (self.billFiled.text.length > 0) {
+ [self.delegate getbillLike:self.billFiled.text];
+ }
+ }
+}
+
+
+@end
diff --git a/XFFruit/ViewControllers/Transport/Views/TransportCell.h b/XFFruit/ViewControllers/Transport/Views/TransportCell.h
new file mode 100644
index 0000000000000000000000000000000000000000..b2564d5d3f60d6d1e3863f0729d42837134a5f47
--- /dev/null
+++ b/XFFruit/ViewControllers/Transport/Views/TransportCell.h
@@ -0,0 +1,22 @@
+//
+// TransportCell.h
+// XFFruit
+//
+// Created by 陈俊俊 on 15/9/7.
+// Copyright (c) 2015å¹´ Xummer. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "Transport.h"
+@interface TransportCell : UITableViewCell
+@property (nonatomic,strong)UILabel *billNumberLabel;//å•å·
+@property (nonatomic,strong)UILabel *warehouseLabel;//仓库
+@property (nonatomic,strong)UILabel *carnumberLabel;//车辆
+
+@property (nonatomic,strong)UILabel *createOperNameLabel;//创建人
+@property (nonatomic,strong)UILabel *createTimeLabel;//创建时间
+@property (nonatomic,strong)UILabel *lineLabel;
+@property (nonatomic,strong)UIButton *stateBtn;
+
+@property (nonatomic,strong)Transport *transport;
+@end
diff --git a/XFFruit/ViewControllers/Transport/Views/TransportCell.m b/XFFruit/ViewControllers/Transport/Views/TransportCell.m
new file mode 100644
index 0000000000000000000000000000000000000000..61be79c6cde34cad1e99c535555d912c1422f45f
--- /dev/null
+++ b/XFFruit/ViewControllers/Transport/Views/TransportCell.m
@@ -0,0 +1,100 @@
+//
+// TransportCell.m
+// XFFruit
+//
+// Created by 陈俊俊 on 15/9/7.
+// Copyright (c) 2015å¹´ Xummer. All rights reserved.
+//
+
+#import "TransportCell.h"
+#define TitleSize 16
+#define LeftMargin 90
+#define TopMargin 10
+#define TitleHeight 20
+#define TableHeight 120
+
+@implementation TransportCell
+
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{
+
+ self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
+ if (self) {
+ [self bulidLayout];
+ }
+ return self;
+}
+
+- (void)bulidLayout
+{
+ self.stateBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+ self.stateBtn.frame = CGRectMake(TopMargin *2 , TopMargin, LeftMargin - TopMargin*3, 20);
+ self.stateBtn.titleLabel.font = GXF_FOURTEENTH_SIZE;
+ [self.stateBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+ self.stateBtn.enabled = NO;
+
+ self.billNumberLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin, TopMargin, ScreenSize.width - LeftMargin, TitleHeight))];
+ self.billNumberLabel.textColor = GXF_CONTENT_COLOR;
+ self.billNumberLabel.font = GXF_SIXTEENTEH_SIZE;
+
+ self.warehouseLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin, CGRectGetMaxY(self.billNumberLabel.frame), ScreenSize.width - LeftMargin, TitleHeight))];
+ self.warehouseLabel.numberOfLines = 0;
+ self.warehouseLabel.textColor = GXF_CELL_COLOR;
+ self.warehouseLabel.font = GXF_FOURTEENTH_SIZE;
+
+ self.carnumberLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin, CGRectGetMaxY(self.warehouseLabel.frame), ScreenSize.width - LeftMargin, TitleHeight))];
+ self.carnumberLabel.textColor = GXF_CELL_COLOR;
+ self.carnumberLabel.font = GXF_FOURTEENTH_SIZE;
+
+ self.createOperNameLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin, CGRectGetMaxY(self.carnumberLabel.frame), ScreenSize.width - LeftMargin, TitleHeight))];
+ self.createOperNameLabel.textColor = GXF_CELL_COLOR;
+ self.createOperNameLabel.font = GXF_FOURTEENTH_SIZE;
+
+
+ self.createTimeLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin, CGRectGetMaxY(self.createOperNameLabel.frame), ScreenSize.width - LeftMargin, TitleHeight))];
+ self.createTimeLabel.textColor = GXF_CELL_COLOR;
+ self.createTimeLabel.font = GXF_FOURTEENTH_SIZE;
+
+ self.lineLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin,TableHeight-1, ScreenSize.width - LeftMargin - TopMargin * 2, 1))];;
+ self.lineLabel.backgroundColor = GXF_LINE_COLOR;
+
+ [self.contentView addSubview:self.stateBtn];
+ [self.contentView addSubview:self.billNumberLabel];
+ [self.contentView addSubview:self.warehouseLabel];
+ [self.contentView addSubview:self.carnumberLabel];
+ [self.contentView addSubview:self.createOperNameLabel];
+ [self.contentView addSubview:self.createTimeLabel];
+ [self.contentView addSubview:self.lineLabel];
+
+}
+- (void)setTransport:(Transport *)transport{
+ self.billNumberLabel.text = [NSString stringWithFormat:@"å•å·ï¼š%@",transport.billnumber];
+ self.warehouseLabel.text = [NSString stringWithFormat:@"仓库：%@-%@",transport.warehouseName,transport.rwarehouseName];
+ self.carnumberLabel.text = [NSString stringWithFormat:@"车辆：%@",transport.carnumber] ;
+ self.createOperNameLabel.text = [NSString stringWithFormat:@"创建人：%@",transport.create_operName] ;
+ self.createTimeLabel.text =[NSString stringWithFormat:@"创建时间：%@",transport.create_time];
+ NSString *stateStr = @"";
+ if ([transport.state isEqualToString:TRANSPORT_STATE_INITIAL]) {
+ stateStr = @"未æ交";
+ [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"initial"] forState:UIControlStateDisabled];
+ }else if ([transport.state isEqualToString:TRANSPORT_STATE_UNRECEIVED]) {
+ stateStr = @"未收货";
+ [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"insurvey"] forState:UIControlStateDisabled];
+ }else if ([transport.state isEqualToString:TRANSPORT_STATE_RECEIVED]) {
+ stateStr = @"已收货";
+ [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
+
+ }else if ([transport.state isEqualToString:TRANSPORT_STATE_ABORTED]) {
+ stateStr = @"已作废";
+ [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
+
+ }
+ [self.stateBtn setTitle:stateStr forState:UIControlStateNormal];
+}
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+ [super setSelected:selected animated:animated];
+
+ // Configure the view for the selected state
+}
+
+@end
diff --git a/XFFruit/ViewControllers/Survey/Transport/Views/TransportPurchaseCell.h b/XFFruit/ViewControllers/Transport/Views/TransportPurchaseCell.h
similarity index 93%
rename from XFFruit/ViewControllers/Survey/Transport/Views/TransportPurchaseCell.h
rename to XFFruit/ViewControllers/Transport/Views/TransportPurchaseCell.h
index 21f9e192f62151c7a4f152cc7b390f657c0c1328..00cb54ac2d62527fd30a5fe51b8acc32ab166036 100644
--- a/XFFruit/ViewControllers/Survey/Transport/Views/TransportPurchaseCell.h
+++ b/XFFruit/ViewControllers/Transport/Views/TransportPurchaseCell.h
@@ -7,12 +7,12 @@
//
#import <UIKit/UIKit.h>
-#import "ProductBillCell.h"
#import "PurchaseBill.h"
@interface TransportPurchaseCell : UITableViewCell<UITableViewDataSource,UITableViewDelegate>
@property (nonatomic,strong)UILabel *titleLabel;
@property (nonatomic,strong)UILabel *lineLabel;
@property (nonatomic,strong)UILabel *secondLabel;
+@property (nonatomic,strong)UILabel *threeLabel;
@property (nonatomic,strong)UITableView *secondTable;
@property (nonatomic,strong)NSMutableArray *secondArr;
@@ -21,4 +21,5 @@
@property (nonatomic,strong)NSMutableArray *indexArr;
@property (nonatomic,strong)NSMutableArray *selectArr;
+
@end
diff --git a/XFFruit/ViewControllers/Survey/Transport/Views/TransportPurchaseCell.m b/XFFruit/ViewControllers/Transport/Views/TransportPurchaseCell.m
similarity index 73%
rename from XFFruit/ViewControllers/Survey/Transport/Views/TransportPurchaseCell.m
rename to XFFruit/ViewControllers/Transport/Views/TransportPurchaseCell.m
index fae643b5b282707ff41471e5f01a4531f47cf9d9..34d06de5d02de240e1b5e28d7e2daedf02cd7e85 100644
--- a/XFFruit/ViewControllers/Survey/Transport/Views/TransportPurchaseCell.m
+++ b/XFFruit/ViewControllers/Transport/Views/TransportPurchaseCell.m
@@ -7,7 +7,7 @@
//
#import "TransportPurchaseCell.h"
-#import "PurchaseBillProduct.h"
+#import "TransportPurductCell.h"
#import "HeaderCell.h"
@implementation TransportPurchaseCell
@@ -23,22 +23,31 @@
- (void)bulidLayout
{
-
+ self.contentView.backgroundColor = XXFBgColor;
+
+ UIView *bgView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenSize.width, 200)];
+ bgView.backgroundColor = [UIColor whiteColor];
+ [self.contentView addSubview:bgView];
+
self.lineLabel = [[UILabel alloc]initWithFrame:(CGRectMake(0,0, ScreenSize.width, 1))];;
self.lineLabel.backgroundColor = GXF_LINE_COLOR;
self.titleLabel = [[UILabel alloc]initWithFrame:(CGRectMake(0, 0, ScreenSize.width, 44))];
self.titleLabel.textAlignment = NSTextAlignmentCenter;
- self.titleLabel.textColor = GXF_NAVIGAYION_COLOR;
self.titleLabel.text = @"苹果桃å";
- self.titleLabel.font = GXF_SIXTEENTEH_SIZE;
+ self.titleLabel.font = GXF_SEVENTEENTH_SIZE;
self.secondLabel = [[UILabel alloc]initWithFrame:(CGRectMake(0,44-1, ScreenSize.width, 1))];;
self.secondLabel.backgroundColor = GXF_LINE_COLOR;
- [self.contentView addSubview:self.titleLabel];
- [self.contentView addSubview:self.lineLabel];
- [self.contentView addSubview:self.secondLabel];
+ self.threeLabel = [[UILabel alloc]initWithFrame:(CGRectMake(0,200-1, ScreenSize.width, 1))];;
+ self.threeLabel.backgroundColor = GXF_LINE_COLOR;
+
+ [bgView addSubview:self.titleLabel];
+ [bgView addSubview:self.lineLabel];
+ [bgView addSubview:self.secondLabel];
+ [bgView addSubview:self.threeLabel];
+
}
- (void)setBill:(PurchaseBill *)bill{
@@ -52,7 +61,7 @@
// [self.secondArr addObject:billProcuct];
// }
- self.secondTable = [[UITableView alloc]initWithFrame:(CGRectMake(0, 44,ScreenSize.width, 200-44)) style:(UITableViewStylePlain)];
+ self.secondTable = [[UITableView alloc]initWithFrame:(CGRectMake(0, 44,ScreenSize.width, 200-45)) style:(UITableViewStylePlain)];
self.secondTable.delegate = self;
self.secondTable.dataSource = self;
@@ -79,21 +88,22 @@
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
- static NSString *cellID = @"ProductBillCell";
- ProductBillCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
+ static NSString *cellID = @"TransportPurductCell";
+ TransportPurductCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
if (cell == nil) {
- cell = [[ProductBillCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID];
+ cell = [[TransportPurductCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID withImageName:@"selected"];
cell.editBtn.hidden = YES;
+ cell.rightImageName = @"edit";
}
- PurchaseBillProduct * billProduct = self.secondArr[indexPath.row];
- [cell setBillProduct:billProduct row:indexPath.row];
+ TransportPdtDetail * billProduct = self.secondArr[indexPath.row];
+ [cell setPdtDetail:billProduct row:indexPath.row];
cell.selectionStyle = UITableViewCellSelectionStyleNone;
return cell;
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
- ProductBillCell *cell = (ProductBillCell *)[tableView cellForRowAtIndexPath:indexPath];
- PurchaseBillProduct * billProduct = self.secondArr[indexPath.row];
+ TransportPurductCell *cell = (TransportPurductCell *)[tableView cellForRowAtIndexPath:indexPath];
+ TransportPdtDetail * billProduct = self.secondArr[indexPath.row];
if (![self isHaveIndexPath:indexPath]) {
cell.editBtn.hidden = NO;
[self.selectArr addObject:indexPath];
diff --git a/XFFruit/ViewControllers/Transport/Views/TransportPurductCell.h b/XFFruit/ViewControllers/Transport/Views/TransportPurductCell.h
new file mode 100644
index 0000000000000000000000000000000000000000..98bd4c1dab182595f09c1a1c1924d7b87a7895fc
--- /dev/null
+++ b/XFFruit/ViewControllers/Transport/Views/TransportPurductCell.h
@@ -0,0 +1,32 @@
+//
+// TransportPurductCell.h
+// XFFruit
+//
+// Created by 陈俊俊 on 15/9/6.
+// Copyright (c) 2015å¹´ Xummer. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "TransportPdtDetail.h"
+@interface TransportPurductCell : UITableViewCell
+@property (nonatomic,strong)UIImageView *smallImageView;
+@property (nonatomic,strong)UIButton *editBtn;
+@property (nonatomic,strong)UILabel *seqLabel;
+@property (nonatomic,strong)UILabel *titleLabel;
+@property (nonatomic,strong)UILabel *priceLabel;
+@property (nonatomic,strong)UILabel *countLabel;
+@property (nonatomic,strong)UILabel *lineLabel;
+
+@property (nonatomic,strong)UIView *showView;
+@property (nonatomic,strong)UILabel *showStandLabel;
+@property (nonatomic,strong)UILabel *showCountLabel;
+@property (nonatomic,strong)UILabel *showBaseCountLabel;
+@property (nonatomic,strong)UILabel *showPriceLabel;
+@property (nonatomic,strong)UILabel *showTotalLabel;
+@property (nonatomic,strong)UILabel *showNoteLabel;
+@property (nonatomic,strong)UILabel *showPurchaseLabel;
+@property (nonatomic,strong)NSString *rightImageName;
+
+- (void)setPdtDetail:(TransportPdtDetail *)pdtDetail row:(NSInteger)row;
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier withImageName:(NSString *)imageName;
+@end
diff --git a/XFFruit/ViewControllers/Transport/Views/TransportPurductCell.m b/XFFruit/ViewControllers/Transport/Views/TransportPurductCell.m
new file mode 100644
index 0000000000000000000000000000000000000000..b22f6668a0a7035bc6e562ad3da951355fa11206
--- /dev/null
+++ b/XFFruit/ViewControllers/Transport/Views/TransportPurductCell.m
@@ -0,0 +1,164 @@
+//
+// TransportPurductCell.m
+// XFFruit
+//
+// Created by 陈俊俊 on 15/9/6.
+// Copyright (c) 2015å¹´ Xummer. All rights reserved.
+//
+
+#import "TransportPurductCell.h"
+#define LeftMargin 13
+#define TableHeight 44
+#define SmallSize 10
+#define SmallWidth 20
+#define SpaceMargin 1
+#define LeftWidth 45
+#define RightWidth 30
+
+#define ShowWidth 150
+#define ShowHeight 20
+
+@implementation TransportPurductCell
+
+
+
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier withImageName:(NSString *)imageName{
+
+ self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
+ if (self) {
+ self.rightImageName = imageName;
+ [self bulidLayout];
+ }
+ return self;
+}
+
+- (void)bulidLayout
+{
+ CGFloat headWidth = (ScreenSize.width - LeftWidth*2 - SpaceMargin* (3 -1))/3;
+
+ self.smallImageView = [[UIImageView alloc]initWithFrame:CGRectMake(LeftMargin, (TableHeight - SmallSize)/2 , SmallSize, SmallSize)];
+ self.smallImageView.image = [UIImage imageNamed:@"arrowright"];
+ self.smallImageView.contentMode = UIViewContentModeScaleAspectFit;
+
+ self.seqLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.smallImageView.frame), 0, SmallWidth, TableHeight))];
+ self.seqLabel.textColor = GXF_CONTENT_COLOR;
+ self.seqLabel.text = @"13";
+ self.seqLabel.font = GXF_SIXTEENTEH_SIZE;
+
+ self.titleLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftWidth, 0, headWidth, TableHeight))];
+ self.titleLabel.textAlignment = NSTextAlignmentLeft;
+ self.titleLabel.textColor = GXF_CONTENT_COLOR;
+ self.titleLabel.text = @"苹果桃å";
+ self.titleLabel.font = GXF_SIXTEENTEH_SIZE;
+
+ self.priceLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.titleLabel.frame) + SpaceMargin, 0, headWidth, TableHeight))];
+ self.priceLabel.textAlignment = NSTextAlignmentLeft;
+ self.priceLabel.textColor = GXF_CONTENT_COLOR;
+ self.priceLabel.text = @"80";
+ self.priceLabel.font = GXF_SIXTEENTEH_SIZE;
+
+ self.countLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.priceLabel.frame) + SpaceMargin, 0, headWidth, TableHeight))];
+ self.countLabel.textAlignment = NSTextAlignmentLeft;
+ self.countLabel.text = @"200";
+ self.countLabel.textColor = GXF_CONTENT_COLOR;
+ self.countLabel.font = GXF_SIXTEENTEH_SIZE;
+
+
+ self.showView = [[UIView alloc]initWithFrame:CGRectMake(0, TableHeight, ScreenSize.width, 0)];
+ self.showView.clipsToBounds = YES;
+
+ self.showStandLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.seqLabel.frame), 0, ShowWidth, ShowHeight))];
+ self.showStandLabel.textAlignment = NSTextAlignmentLeft;
+ self.showStandLabel.textColor = GXF_PLACEHOLDER_COLOR;
+ self.showStandLabel.text = @"åŒ…è£…è§„æ ¼ï¼š1*12æ–¤";
+ self.showStandLabel.font = GXF_THREETEENTH_SIZE;
+
+ self.showCountLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMaxX(self.showStandLabel.frame), 0, ShowWidth, ShowHeight))];
+ self.showCountLabel.textAlignment = NSTextAlignmentLeft;
+ self.showCountLabel.textColor = GXF_PLACEHOLDER_COLOR;
+ self.showCountLabel.text = @"包装数é‡ï¼š10000";
+ self.showCountLabel.font = GXF_THREETEENTH_SIZE;
+
+ self.showBaseCountLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showStandLabel.frame), CGRectGetMaxY(self.showStandLabel.frame), ShowWidth, ShowHeight))];
+ self.showBaseCountLabel.textAlignment = NSTextAlignmentLeft;
+ self.showBaseCountLabel.textColor = GXF_PLACEHOLDER_COLOR;
+ self.showBaseCountLabel.text = @"基础数é‡ï¼š300";
+ self.showBaseCountLabel.font = GXF_THREETEENTH_SIZE;
+
+ self.showPriceLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showCountLabel.frame), CGRectGetMaxY(self.showStandLabel.frame), ShowWidth, ShowHeight))];
+ self.showPriceLabel.textAlignment = NSTextAlignmentLeft;
+ self.showPriceLabel.textColor = GXF_PLACEHOLDER_COLOR;
+ self.showPriceLabel.text = @"包装å•ä»·ï¼š11å…ƒ";
+ self.showPriceLabel.font = GXF_THREETEENTH_SIZE;
+
+
+
+ self.showTotalLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showStandLabel.frame), CGRectGetMaxY(self.showBaseCountLabel.frame), ShowWidth, ShowHeight))];
+ self.showTotalLabel.textAlignment = NSTextAlignmentLeft;
+ self.showTotalLabel.textColor = GXF_PLACEHOLDER_COLOR;
+ self.showTotalLabel.text = @"总金é¢ï¼š100";
+ self.showTotalLabel.font = GXF_THREETEENTH_SIZE;
+
+ self.showNoteLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showCountLabel.frame), CGRectGetMaxY(self.showBaseCountLabel.frame), ShowWidth, ShowHeight))];
+ self.showNoteLabel.textAlignment = NSTextAlignmentLeft;
+ self.showNoteLabel.textColor = GXF_PLACEHOLDER_COLOR;
+ self.showNoteLabel.text = @"备注：1000";
+ self.showNoteLabel.font = GXF_THREETEENTH_SIZE;
+
+ self.showPurchaseLabel = [[UILabel alloc]initWithFrame:(CGRectMake(CGRectGetMinX(self.showStandLabel.frame), CGRectGetMaxY(self.showTotalLabel.frame), ShowWidth+ 100, ShowHeight))];
+ self.showPurchaseLabel.textAlignment = NSTextAlignmentLeft;
+ self.showPurchaseLabel.textColor = GXF_PLACEHOLDER_COLOR;
+ self.showPurchaseLabel.text = @"采è´å•å·ï¼š1000";
+ self.showPurchaseLabel.font = GXF_THREETEENTH_SIZE;
+
+
+ self.editBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+ [self.editBtn setImage:[UIImage imageNamed:self.rightImageName] forState:UIControlStateNormal];
+ self.editBtn.frame = CGRectMake(ScreenSize.width - LeftWidth, 0, LeftWidth , TableHeight);
+ self.editBtn.contentMode = UIViewContentModeScaleAspectFit;
+
+ self.lineLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin,TableHeight-1, ScreenSize.width - LeftMargin * 2, 1))];;
+ self.lineLabel.backgroundColor = GXF_LINE_COLOR;
+
+ [self.contentView addSubview:self.smallImageView];
+ [self.contentView addSubview:self.seqLabel];
+ [self.contentView addSubview:self.titleLabel];
+ [self.contentView addSubview:self.priceLabel];
+ [self.contentView addSubview:self.countLabel];
+ [self.contentView addSubview:self.editBtn];
+ [self.contentView addSubview:self.showView];
+
+ [self.showView addSubview:self.showStandLabel];
+ [self.showView addSubview:self.showCountLabel];
+ [self.showView addSubview:self.showBaseCountLabel];
+ [self.showView addSubview:self.showPriceLabel];
+ [self.showView addSubview:self.showPurchaseLabel];
+ [self.showView addSubview:self.showTotalLabel];
+
+ [self.showView addSubview:self.showNoteLabel];
+ [self.contentView addSubview:self.lineLabel];
+
+}
+
+- (void)setPdtDetail:(TransportPdtDetail *)pdtDetail row:(NSInteger)row{
+ self.seqLabel.text = [NSString stringWithFormat:@"%@",@(row+1)];
+ self.titleLabel.text = pdtDetail.productName;
+ self.priceLabel.text = [pdtDetail.price stringValue];
+ self.countLabel.text = [pdtDetail.qty stringValue];
+ self.showStandLabel.text = [NSString stringWithFormat:@"åŒ…è£…è§„æ ¼ï¼š%@",pdtDetail.qpc];
+ self.showCountLabel.text = [NSString stringWithFormat:@"包装数é‡ï¼š%@",pdtDetail.baseQty];
+ self.showBaseCountLabel.text =[NSString stringWithFormat:@"基础数é‡ï¼š%@",pdtDetail.qty];
+ self.showPriceLabel.text = [NSString stringWithFormat:@"包装å•ä»·ï¼š%@",pdtDetail.price];
+ self.showPurchaseLabel.text = [NSString stringWithFormat:@"采è´å•å·ï¼š%@",pdtDetail.purchasebillnumber.length > 0 ? pdtDetail.purchasebillnumber: @"æ— "];
+ self.showTotalLabel.text = [NSString stringWithFormat:@"总金é¢ï¼š%@",pdtDetail.total];
+
+ self.showNoteLabel.text =[NSString stringWithFormat:@"备注：%@",pdtDetail.note];
+}
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+ [super setSelected:selected animated:animated];
+
+ // Configure the view for the selected state
+}
+
+@end
diff --git a/XFFruit/XFFruit-Prefix.pch b/XFFruit/XFFruit-Prefix.pch
index 880facc5ea91d2becbdeffffcb7819feb3e9accc..47f5ff3a38ff9860596e444e5e74db5748127899 100644
--- a/XFFruit/XFFruit-Prefix.pch
+++ b/XFFruit/XFFruit-Prefix.pch
@@ -15,5 +15,5 @@
#import "IBTConstants.h"
#import "ICRAppMacro.h"
#import "ICRNotificationMacro.h"
-
+#import "RegexUtil.h"
#endif