Skip to content

T
total
Commit 925ae1e5 authored by 曹云霄's avatar 曹云霄
Browse files
Options

收油单增加出库编码

parent 0d826879
Hide whitespace changes
Inline Side-by-side
Showing with 322 additions and 149 deletions
total.xcodeproj/project.pbxproj
View file @ 925ae1e5
......@@ -7,7 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
291ED6291D1AA1FF0021E632 /* sourceOrderSectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 291ED6281D1AA1FF0021E632 /* sourceOrderSectionView.m */; };
291ED6291D1AA1FF0021E632 /* SourceOrderSectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 291ED6281D1AA1FF0021E632 /* SourceOrderSectionView.m */; };
2933CC4D1D20FF80000F8EE6 /* SeeObtainHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2933CC4C1D20FF80000F8EE6 /* SeeObtainHeaderView.m */; };
2933CC4F1D20FF87000F8EE6 /* SeeObtainHeaderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2933CC4E1D20FF87000F8EE6 /* SeeObtainHeaderView.xib */; };
2933CC521D212C5B000F8EE6 /* OilOrderDetailTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2933CC511D212C5B000F8EE6 /* OilOrderDetailTableViewCell.m */; };
......@@ -43,8 +43,8 @@
29603D8F1D1CDEA000951670 /* KMDatePickerDateModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 29603D8A1D1CDEA000951670 /* KMDatePickerDateModel.m */; };
29603D901D1CDEA000951670 /* NSDate+CalculateDay.m in Sources */ = {isa = PBXBuildFile; fileRef = 29603D8C1D1CDEA000951670 /* NSDate+CalculateDay.m */; };
29603D931D1CDFE500951670 /* DetailTimeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29603D921D1CDFE500951670 /* DetailTimeViewController.m */; };
2978ED421D1B7CEE00159B4A /* deleteSectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2978ED411D1B7CEE00159B4A /* deleteSectionView.m */; };
2978ED441D1B7CF600159B4A /* deleteSectionView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2978ED431D1B7CF600159B4A /* deleteSectionView.xib */; };
2978ED421D1B7CEE00159B4A /* DeleteSectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2978ED411D1B7CEE00159B4A /* DeleteSectionView.m */; };
2978ED441D1B7CF600159B4A /* DeleteSectionView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2978ED431D1B7CF600159B4A /* DeleteSectionView.xib */; };
2978ED481D1BB0BA00159B4A /* PromptTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2978ED471D1BB0BA00159B4A /* PromptTableViewController.m */; };
2978ED521D1BC74D00159B4A /* TimeSelectViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2978ED501D1BC74D00159B4A /* TimeSelectViewController.m */; };
2978ED531D1BC74D00159B4A /* TimeSelectViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2978ED511D1BC74D00159B4A /* TimeSelectViewController.xib */; };
......@@ -68,13 +68,14 @@
29B501DB1D1A897C003D4E74 /* SecondTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B501DA1D1A897C003D4E74 /* SecondTableViewCell.m */; };
29B501DE1D1A898B003D4E74 /* ThirdTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B501DD1D1A898B003D4E74 /* ThirdTableViewCell.m */; };
29B501E11D1A899A003D4E74 /* FourthTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B501E01D1A899A003D4E74 /* FourthTableViewCell.m */; };
29B501E61D1A95CC003D4E74 /* sourceOrderSectionView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29B501E51D1A95CC003D4E74 /* sourceOrderSectionView.xib */; };
29B501E61D1A95CC003D4E74 /* SourceOrderSectionView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29B501E51D1A95CC003D4E74 /* SourceOrderSectionView.xib */; };
29B501E91D1A986B003D4E74 /* OilHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B501E81D1A986B003D4E74 /* OilHeaderView.m */; };
29B501EB1D1A9875003D4E74 /* OilHeaderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29B501EA1D1A9875003D4E74 /* OilHeaderView.xib */; };
29BE722E1D40773F001D60EE /* OilNumberTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BE722D1D40773F001D60EE /* OilNumberTableViewCell.m */; };
29BE72311D407755001D60EE /* LossNumberTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BE72301D407755001D60EE /* LossNumberTableViewCell.m */; };
29BE72341D4077BE001D60EE /* NoteTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BE72331D4077BE001D60EE /* NoteTableViewCell.m */; };
29E75A7B1D406A4F00DA7661 /* selectTimeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E75A7A1D406A4F00DA7661 /* selectTimeCell.m */; };
29E75A7B1D406A4F00DA7661 /* SelectTimeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E75A7A1D406A4F00DA7661 /* SelectTimeCell.m */; };
29EB166C1E8B9688004B4D0D /* SerialNumberTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29EB166B1E8B9687004B4D0D /* SerialNumberTableViewCell.m */; };
29F143B51D18E1C800083975 /* SeePriceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29F143B41D18E1C800083975 /* SeePriceViewController.m */; };
29F143BF1D18E2CF00083975 /* NewRequestViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29F143BE1D18E2CF00083975 /* NewRequestViewController.m */; };
29F143C21D18E2E600083975 /* SeeRequestViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29F143C11D18E2E600083975 /* SeeRequestViewController.m */; };
......@@ -337,8 +338,8 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
291ED6271D1AA1FF0021E632 /* sourceOrderSectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sourceOrderSectionView.h; sourceTree = "<group>"; };
291ED6281D1AA1FF0021E632 /* sourceOrderSectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = sourceOrderSectionView.m; sourceTree = "<group>"; };
291ED6271D1AA1FF0021E632 /* SourceOrderSectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SourceOrderSectionView.h; sourceTree = "<group>"; };
291ED6281D1AA1FF0021E632 /* SourceOrderSectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SourceOrderSectionView.m; sourceTree = "<group>"; };
2933CC4B1D20FF80000F8EE6 /* SeeObtainHeaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SeeObtainHeaderView.h; sourceTree = "<group>"; };
2933CC4C1D20FF80000F8EE6 /* SeeObtainHeaderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SeeObtainHeaderView.m; sourceTree = "<group>"; };
2933CC4E1D20FF87000F8EE6 /* SeeObtainHeaderView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SeeObtainHeaderView.xib; sourceTree = "<group>"; };
......@@ -404,9 +405,9 @@
29603D8C1D1CDEA000951670 /* NSDate+CalculateDay.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+CalculateDay.m"; sourceTree = "<group>"; };
29603D911D1CDFE500951670 /* DetailTimeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DetailTimeViewController.h; sourceTree = "<group>"; };
29603D921D1CDFE500951670 /* DetailTimeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DetailTimeViewController.m; sourceTree = "<group>"; };
2978ED401D1B7CEE00159B4A /* deleteSectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = deleteSectionView.h; sourceTree = "<group>"; };
2978ED411D1B7CEE00159B4A /* deleteSectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = deleteSectionView.m; sourceTree = "<group>"; };
2978ED431D1B7CF600159B4A /* deleteSectionView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = deleteSectionView.xib; sourceTree = "<group>"; };
2978ED401D1B7CEE00159B4A /* DeleteSectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeleteSectionView.h; sourceTree = "<group>"; };
2978ED411D1B7CEE00159B4A /* DeleteSectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DeleteSectionView.m; sourceTree = "<group>"; };
2978ED431D1B7CF600159B4A /* DeleteSectionView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DeleteSectionView.xib; sourceTree = "<group>"; };
2978ED461D1BB0BA00159B4A /* PromptTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PromptTableViewController.h; sourceTree = "<group>"; };
2978ED471D1BB0BA00159B4A /* PromptTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PromptTableViewController.m; sourceTree = "<group>"; };
2978ED4F1D1BC74D00159B4A /* TimeSelectViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimeSelectViewController.h; sourceTree = "<group>"; };
......@@ -450,7 +451,7 @@
29B501DD1D1A898B003D4E74 /* ThirdTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThirdTableViewCell.m; sourceTree = "<group>"; };
29B501DF1D1A899A003D4E74 /* FourthTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FourthTableViewCell.h; sourceTree = "<group>"; };
29B501E01D1A899A003D4E74 /* FourthTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FourthTableViewCell.m; sourceTree = "<group>"; };
29B501E51D1A95CC003D4E74 /* sourceOrderSectionView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = sourceOrderSectionView.xib; sourceTree = "<group>"; };
29B501E51D1A95CC003D4E74 /* SourceOrderSectionView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SourceOrderSectionView.xib; sourceTree = "<group>"; };
29B501E71D1A986B003D4E74 /* OilHeaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OilHeaderView.h; sourceTree = "<group>"; };
29B501E81D1A986B003D4E74 /* OilHeaderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OilHeaderView.m; sourceTree = "<group>"; };
29B501EA1D1A9875003D4E74 /* OilHeaderView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OilHeaderView.xib; sourceTree = "<group>"; };
......@@ -460,8 +461,10 @@
29BE72301D407755001D60EE /* LossNumberTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LossNumberTableViewCell.m; sourceTree = "<group>"; };
29BE72321D4077BE001D60EE /* NoteTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NoteTableViewCell.h; sourceTree = "<group>"; };
29BE72331D4077BE001D60EE /* NoteTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NoteTableViewCell.m; sourceTree = "<group>"; };
29E75A791D406A4F00DA7661 /* selectTimeCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = selectTimeCell.h; sourceTree = "<group>"; };
29E75A7A1D406A4F00DA7661 /* selectTimeCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = selectTimeCell.m; sourceTree = "<group>"; };
29E75A791D406A4F00DA7661 /* SelectTimeCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectTimeCell.h; sourceTree = "<group>"; };
29E75A7A1D406A4F00DA7661 /* SelectTimeCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SelectTimeCell.m; sourceTree = "<group>"; };
29EB166A1E8B9687004B4D0D /* SerialNumberTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SerialNumberTableViewCell.h; sourceTree = "<group>"; };
29EB166B1E8B9687004B4D0D /* SerialNumberTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SerialNumberTableViewCell.m; sourceTree = "<group>"; };
29F143B31D18E1C800083975 /* SeePriceViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SeePriceViewController.h; sourceTree = "<group>"; };
29F143B41D18E1C800083975 /* SeePriceViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SeePriceViewController.m; sourceTree = "<group>"; };
29F143BD1D18E2CF00083975 /* NewRequestViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewRequestViewController.h; sourceTree = "<group>"; };
......@@ -1253,23 +1256,25 @@
29B501DD1D1A898B003D4E74 /* ThirdTableViewCell.m */,
29B501DF1D1A899A003D4E74 /* FourthTableViewCell.h */,
29B501E01D1A899A003D4E74 /* FourthTableViewCell.m */,
291ED6271D1AA1FF0021E632 /* sourceOrderSectionView.h */,
291ED6281D1AA1FF0021E632 /* sourceOrderSectionView.m */,
29B501E51D1A95CC003D4E74 /* sourceOrderSectionView.xib */,
2978ED401D1B7CEE00159B4A /* deleteSectionView.h */,
2978ED411D1B7CEE00159B4A /* deleteSectionView.m */,
2978ED431D1B7CF600159B4A /* deleteSectionView.xib */,
291ED6271D1AA1FF0021E632 /* SourceOrderSectionView.h */,
291ED6281D1AA1FF0021E632 /* SourceOrderSectionView.m */,
29B501E51D1A95CC003D4E74 /* SourceOrderSectionView.xib */,
2978ED401D1B7CEE00159B4A /* DeleteSectionView.h */,
2978ED411D1B7CEE00159B4A /* DeleteSectionView.m */,
2978ED431D1B7CF600159B4A /* DeleteSectionView.xib */,
29B501E71D1A986B003D4E74 /* OilHeaderView.h */,
29B501E81D1A986B003D4E74 /* OilHeaderView.m */,
29B501EA1D1A9875003D4E74 /* OilHeaderView.xib */,
29E75A791D406A4F00DA7661 /* selectTimeCell.h */,
29E75A7A1D406A4F00DA7661 /* selectTimeCell.m */,
29E75A791D406A4F00DA7661 /* SelectTimeCell.h */,
29E75A7A1D406A4F00DA7661 /* SelectTimeCell.m */,
29BE722C1D40773F001D60EE /* OilNumberTableViewCell.h */,
29BE722D1D40773F001D60EE /* OilNumberTableViewCell.m */,
29BE722F1D407755001D60EE /* LossNumberTableViewCell.h */,
29BE72301D407755001D60EE /* LossNumberTableViewCell.m */,
29BE72321D4077BE001D60EE /* NoteTableViewCell.h */,
29BE72331D4077BE001D60EE /* NoteTableViewCell.m */,
29EB166A1E8B9687004B4D0D /* SerialNumberTableViewCell.h */,
29EB166B1E8B9687004B4D0D /* SerialNumberTableViewCell.m */,
);
name = view;
sourceTree = "<group>";
......@@ -2653,7 +2658,7 @@
297BFE901D221E9C000F41D1 /* CustomSelectCityViewController.xib in Resources */,
3506ECD21BA00E3400897EBE /* LaunchScreen.xib in Resources */,
2978ED5C1D1BDEF700159B4A /* DistributionHeaderView.xib in Resources */,
29B501E61D1A95CC003D4E74 /* sourceOrderSectionView.xib in Resources */,
29B501E61D1A95CC003D4E74 /* SourceOrderSectionView.xib in Resources */,
3506ED9B1BA0166700897EBE /* not_selected_star@2x.png in Resources */,
35CD5EFF1BE09984008A2B8D /* PushConfig.plist in Resources */,
35422FC11BD5EB0600455F7A /* Localizable.strings in Resources */,
......@@ -2669,7 +2674,7 @@
2933CC4F1D20FF87000F8EE6 /* SeeObtainHeaderView.xib in Resources */,
3506ED9D1BA0166700897EBE /* selected_star@2x.png in Resources */,
295FE1E01D17E9B600DF5B77 /* BusinessStoryBoard.storyboard in Resources */,
2978ED441D1B7CF600159B4A /* deleteSectionView.xib in Resources */,
2978ED441D1B7CF600159B4A /* DeleteSectionView.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -2878,6 +2883,7 @@
35B2E58E1BAC140500AB8582 /* ICRAttachTitleView.m in Sources */,
3523ADC11BE24B85006D821C /* GTOPaging.m in Sources */,
29603D8D1D1CDEA000951670 /* DateHelper.m in Sources */,
29EB166C1E8B9688004B4D0D /* SerialNumberTableViewCell.m in Sources */,
35A53D181BF88155007184C4 /* GTOPioneeringAddressInfoView.m in Sources */,
3547450F1BCFFA4F00361FFD /* GTOCommonTools.m in Sources */,
35B2E5691BAC064600AB8582 /* ICRQResultViewController.m in Sources */,
......@@ -2896,7 +2902,7 @@
3506ED521BA0164E00897EBE /* IBTSegmentedControl.m in Sources */,
3506ED491BA0164E00897EBE /* IBTTableViewInfo.m in Sources */,
3506EDE11BA0194300897EBE /* UIView+ViewFrameGeometry.m in Sources */,
29E75A7B1D406A4F00DA7661 /* selectTimeCell.m in Sources */,
29E75A7B1D406A4F00DA7661 /* SelectTimeCell.m in Sources */,
3506EDED1BA0366C00897EBE /* ICRUIAppearance.m in Sources */,
3506EDFC1BA0390500897EBE /* ICRHTTPController.m in Sources */,
35D922D01BAF9AC700D02338 /* ICRPatrolResultViewController.m in Sources */,
......@@ -2964,7 +2970,7 @@
35FC36411BCE52FB00C62137 /* ChooseParentViewController.m in Sources */,
294154361D1CFD3000B3B761 /* HttpRequestManager.m in Sources */,
2933CC4D1D20FF80000F8EE6 /* SeeObtainHeaderView.m in Sources */,
291ED6291D1AA1FF0021E632 /* sourceOrderSectionView.m in Sources */,
291ED6291D1AA1FF0021E632 /* SourceOrderSectionView.m in Sources */,
35EB8E651BE32C1600411E45 /* GTOLicenceListCellContentView.m in Sources */,
35422FBD1BD54B8700455F7A /* GTOAlertInfoPioneeringViewController.m in Sources */,
35B2E5981BAC14ED00AB8582 /* ICRPostTask.m in Sources */,
......@@ -2984,7 +2990,7 @@
35B2E5601BAC064600AB8582 /* GTOFunctionEntity.m in Sources */,
2933CC521D212C5B000F8EE6 /* OilOrderDetailTableViewCell.m in Sources */,
35B2E5621BAC064600AB8582 /* GTOPatrolPlan.m in Sources */,
2978ED421D1B7CEE00159B4A /* deleteSectionView.m in Sources */,
2978ED421D1B7CEE00159B4A /* DeleteSectionView.m in Sources */,
3506EDE91BA0217D00897EBE /* ICRAppViewControllerManager.m in Sources */,
35C287C61BFAC40900A1B89D /* ICRAnnouncementViewController.m in Sources */,
29F143D51D18F10E00083975 /* SeePriceTableViewCell.m in Sources */,
......
total/GTOApp/Business/BusinessStoryBoard.storyboard
View file @ 925ae1e5
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
......@@ -737,9 +737,53 @@
<outlet property="userInputTextField" destination="guG-Vm-Gjm" id="hww-Pq-WoF"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="OilNumberTableViewCell" id="LxT-tF-8B7" customClass="OilNumberTableViewCell">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="SerialNumberTableViewCell" id="Gzl-97-93S" customClass="SerialNumberTableViewCell">
<rect key="frame" x="0.0" y="72" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Gzl-97-93S" id="QbH-CU-GLI">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="出库编码:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hCe-mq-cqZ">
<rect key="frame" x="12" y="14" width="62" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.33333333329999998" green="0.33333333329999998" blue="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="FGF-O3-hps">
<rect key="frame" x="84" y="7" width="281" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="HIu-jT-nj2"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9bG-mO-KM0">
<rect key="frame" x="0.0" y="43" width="375" height="1"/>
<color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="8yC-9i-GkT"/>
</constraints>
</view>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="9bG-mO-KM0" secondAttribute="trailing" id="16W-K9-1M6"/>
<constraint firstItem="hCe-mq-cqZ" firstAttribute="leading" secondItem="QbH-CU-GLI" secondAttribute="leading" constant="12" id="Tun-c8-o8W"/>
<constraint firstAttribute="bottom" secondItem="9bG-mO-KM0" secondAttribute="bottom" id="Zy1-m9-owx"/>
<constraint firstItem="hCe-mq-cqZ" firstAttribute="centerY" secondItem="QbH-CU-GLI" secondAttribute="centerY" id="cZY-FR-ylg"/>
<constraint firstItem="FGF-O3-hps" firstAttribute="leading" secondItem="hCe-mq-cqZ" secondAttribute="trailing" constant="10" id="e0a-N3-KcY"/>
<constraint firstItem="FGF-O3-hps" firstAttribute="centerY" secondItem="hCe-mq-cqZ" secondAttribute="centerY" id="e9C-vd-b1m"/>
<constraint firstAttribute="trailing" secondItem="FGF-O3-hps" secondAttribute="trailing" constant="10" id="i38-ft-Gfa"/>
<constraint firstItem="9bG-mO-KM0" firstAttribute="leading" secondItem="QbH-CU-GLI" secondAttribute="leading" id="zsS-pm-K7c"/>
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="codingTextField" destination="FGF-O3-hps" id="eYZ-4Y-3eV"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="OilNumberTableViewCell" id="LxT-tF-8B7" customClass="OilNumberTableViewCell">
<rect key="frame" x="0.0" y="116" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LxT-tF-8B7" id="wou-Vq-Ibz">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
......@@ -797,7 +841,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="LossNumberTableViewCell" id="pfu-cu-kAH" customClass="LossNumberTableViewCell">
<rect key="frame" x="0.0" y="116" width="375" height="44"/>
<rect key="frame" x="0.0" y="160" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="pfu-cu-kAH" id="Wnd-bA-XhN">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
......@@ -861,7 +905,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="NoteTableViewCell" id="f7a-OE-L4V" customClass="NoteTableViewCell">
<rect key="frame" x="0.0" y="160" width="375" height="44"/>
<rect key="frame" x="0.0" y="204" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="f7a-OE-L4V" id="yFJ-FT-VNF">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
......@@ -904,8 +948,8 @@
<outlet property="userInputTextField" destination="kgI-og-pZ4" id="W42-pD-e6r"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="selectTimeCell" id="x5X-x6-a3d" customClass="selectTimeCell">
<rect key="frame" x="0.0" y="204" width="375" height="44"/>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="SelectTimeCell" id="x5X-x6-a3d" customClass="SelectTimeCell">
<rect key="frame" x="0.0" y="248" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="x5X-x6-a3d" id="sFA-Qm-7LA">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
......@@ -971,7 +1015,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="SecondTableViewCell" id="CNo-T4-hWB" customClass="SecondTableViewCell">
<rect key="frame" x="0.0" y="248" width="375" height="44"/>
<rect key="frame" x="0.0" y="292" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="CNo-T4-hWB" id="iwV-oX-HsH">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
......@@ -1035,7 +1079,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="ThirdTableViewCell" id="3mB-o0-xc8" customClass="ThirdTableViewCell">
<rect key="frame" x="0.0" y="292" width="375" height="44"/>
<rect key="frame" x="0.0" y="336" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3mB-o0-xc8" id="heI-eZ-kPx">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
......@@ -1099,7 +1143,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="FourthTableViewCell" id="nH4-tz-ubJ" customClass="FourthTableViewCell">
<rect key="frame" x="0.0" y="336" width="375" height="44"/>
<rect key="frame" x="0.0" y="380" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="nH4-tz-ubJ" id="QXj-Hc-TaB">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
......@@ -1158,7 +1202,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="OilOrderDetailTableViewCell" rowHeight="170" id="jJ3-aW-HCy" customClass="OilOrderDetailTableViewCell">
<rect key="frame" x="0.0" y="380" width="375" height="170"/>
<rect key="frame" x="0.0" y="424" width="375" height="170"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jJ3-aW-HCy" id="Hyl-8I-gQm">
<rect key="frame" x="0.0" y="0.0" width="375" height="170"/>
......@@ -2443,9 +2487,53 @@
<outlet property="userInputTextField" destination="I7U-B0-H3d" id="IwZ-VI-we2"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="LossNumberTableViewCell" id="fqV-ue-fy8" customClass="LossNumberTableViewCell">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="SerialNumberTableViewCell" id="1jJ-7D-8Hl" customClass="SerialNumberTableViewCell">
<rect key="frame" x="0.0" y="72" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1jJ-7D-8Hl" id="c0p-6P-3KE">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="出库编码:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wRo-JH-PCb">
<rect key="frame" x="12" y="14" width="62" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.33333333329999998" green="0.33333333329999998" blue="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="E2j-4y-wk3">
<rect key="frame" x="84" y="7" width="281" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="HKA-Hl-Xoq"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IX7-3W-dwq">
<rect key="frame" x="0.0" y="43" width="375" height="1"/>
<color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="xnj-HA-pM1"/>
</constraints>
</view>
</subviews>
<constraints>
<constraint firstItem="wRo-JH-PCb" firstAttribute="leading" secondItem="c0p-6P-3KE" secondAttribute="leading" constant="12" id="Cer-aU-g3G"/>
<constraint firstAttribute="bottom" secondItem="IX7-3W-dwq" secondAttribute="bottom" id="FiU-Oi-wsY"/>
<constraint firstAttribute="trailing" secondItem="E2j-4y-wk3" secondAttribute="trailing" constant="10" id="Icr-t6-vmt"/>
<constraint firstAttribute="trailing" secondItem="IX7-3W-dwq" secondAttribute="trailing" id="JqJ-5E-MST"/>
<constraint firstItem="E2j-4y-wk3" firstAttribute="leading" secondItem="wRo-JH-PCb" secondAttribute="trailing" constant="10" id="Pll-8z-FOE"/>
<constraint firstItem="wRo-JH-PCb" firstAttribute="centerY" secondItem="c0p-6P-3KE" secondAttribute="centerY" id="aBu-n9-gcj"/>
<constraint firstItem="IX7-3W-dwq" firstAttribute="leading" secondItem="c0p-6P-3KE" secondAttribute="leading" id="nx7-d8-JvY"/>
<constraint firstItem="E2j-4y-wk3" firstAttribute="centerY" secondItem="wRo-JH-PCb" secondAttribute="centerY" id="s3o-xi-rHE"/>
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="codingTextField" destination="E2j-4y-wk3" id="ZVg-AH-69q"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="LossNumberTableViewCell" id="fqV-ue-fy8" customClass="LossNumberTableViewCell">
<rect key="frame" x="0.0" y="116" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fqV-ue-fy8" id="K4J-b6-4i2">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
......@@ -2508,7 +2596,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="OilNumberTableViewCell" id="Hx5-MX-a1Y" customClass="OilNumberTableViewCell">
<rect key="frame" x="0.0" y="116" width="375" height="44"/>
<rect key="frame" x="0.0" y="160" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Hx5-MX-a1Y" id="sRf-7J-kAd">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
......@@ -2571,8 +2659,8 @@
<outlet property="oilNumberLabel" destination="fWO-TY-QCY" id="N9a-iC-8Cu"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="selectTimeCell" id="jpB-eI-25V" customClass="selectTimeCell">
<rect key="frame" x="0.0" y="160" width="375" height="44"/>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="SelectTimeCell" id="jpB-eI-25V" customClass="SelectTimeCell">
<rect key="frame" x="0.0" y="204" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jpB-eI-25V" id="hRm-9U-MXb">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
......@@ -2639,7 +2727,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="FirstTableViewCell" id="fT0-I7-b2B" customClass="FirstTableViewCell">
<rect key="frame" x="0.0" y="204" width="375" height="44"/>
<rect key="frame" x="0.0" y="248" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fT0-I7-b2B" id="5TE-j9-5hF">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
......@@ -2697,7 +2785,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="SecondTableViewCell" id="4ih-g4-Yi9" customClass="SecondTableViewCell">
<rect key="frame" x="0.0" y="248" width="375" height="44"/>
<rect key="frame" x="0.0" y="292" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="4ih-g4-Yi9" id="6jP-It-hg1">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
......@@ -2712,24 +2800,18 @@
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="收油前油量" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LDD-hL-Gob">
<rect key="frame" x="35" y="14" width="67" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="66.5" id="wZ5-st-oe8"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="升" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zLP-W9-ddG">
<rect key="frame" x="352" y="14" width="13" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="13.5" id="ikP-zW-XeQ"/>
</constraints>
<rect key="frame" x="351.5" y="14" width="13.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ReV-Ig-atj">
<rect key="frame" x="112" y="7" width="230" height="30"/>
<rect key="frame" x="122" y="7" width="219.5" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="Ee4-fk-xS8"/>
</constraints>
......@@ -2748,7 +2830,7 @@
<constraint firstAttribute="trailing" secondItem="zLP-W9-ddG" secondAttribute="trailing" constant="10" id="1Wa-44-Ry2"/>
<constraint firstItem="zLP-W9-ddG" firstAttribute="centerY" secondItem="LDD-hL-Gob" secondAttribute="centerY" id="4fP-KN-dLw"/>
<constraint firstItem="2HJ-2P-nho" firstAttribute="centerY" secondItem="6jP-It-hg1" secondAttribute="centerY" id="8nK-8K-Ql7"/>
<constraint firstItem="ReV-Ig-atj" firstAttribute="leading" secondItem="LDD-hL-Gob" secondAttribute="trailing" constant="10" id="Fpb-l3-D5G"/>
<constraint firstItem="ReV-Ig-atj" firstAttribute="leading" secondItem="LDD-hL-Gob" secondAttribute="trailing" constant="20" id="Fpb-l3-D5G"/>
<constraint firstItem="ReV-Ig-atj" firstAttribute="centerY" secondItem="zLP-W9-ddG" secondAttribute="centerY" id="M0E-l4-uyD"/>
<constraint firstAttribute="trailing" secondItem="sta-if-8g4" secondAttribute="trailing" id="VZg-g0-xRg"/>
<constraint firstItem="zLP-W9-ddG" firstAttribute="leading" secondItem="ReV-Ig-atj" secondAttribute="trailing" constant="10" id="X2z-Vr-QSm"/>
......@@ -2767,7 +2849,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="ThirdTableViewCell" id="QBf-Ig-YDs" customClass="ThirdTableViewCell">
<rect key="frame" x="0.0" y="292" width="375" height="44"/>
<rect key="frame" x="0.0" y="336" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="QBf-Ig-YDs" id="MVM-0E-1Zm">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
......@@ -2832,7 +2914,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="FourthTableViewCell" id="CHy-AQ-UA0" customClass="FourthTableViewCell">
<rect key="frame" x="0.0" y="336" width="375" height="44"/>
<rect key="frame" x="0.0" y="380" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="CHy-AQ-UA0" id="FTa-PW-dkD">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
......@@ -2896,7 +2978,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="OilOrderDetailTableViewCell" rowHeight="170" id="sXi-JD-S9n" customClass="OilOrderDetailTableViewCell">
<rect key="frame" x="0.0" y="380" width="375" height="170"/>
<rect key="frame" x="0.0" y="424" width="375" height="170"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="sXi-JD-S9n" id="GPg-SA-ZD3">
<rect key="frame" x="0.0" y="0.0" width="375" height="170"/>
......
total/GTOApp/Business/deleteSectionView.h → total/GTOApp/Business/DeleteSectionView.h
View file @ 925ae1e5
//
// deleteSectionView.h
// DeleteSectionView.h
// total
//
// Created by 曹云霄 on 16/6/23.
......@@ -8,7 +8,7 @@
#import <UIKit/UIKit.h>
@interface deleteSectionView : UIView
@interface DeleteSectionView : UIView
+ (instancetype)initialize;
......
total/GTOApp/Business/deleteSectionView.m → total/GTOApp/Business/DeleteSectionView.m
View file @ 925ae1e5
//
// deleteSectionView.m
// DeleteSectionView.m
// total
//
// Created by 曹云霄 on 16/6/23.
// Copyright © 2016年 free. All rights reserved.
//
#import "deleteSectionView.h"
#import "DeleteSectionView.h"
@implementation deleteSectionView
@implementation DeleteSectionView
+ (instancetype)initialize
{
return [[[NSBundle mainBundle] loadNibNamed:@"deleteSectionView" owner:nil options:nil] firstObject];
return [[[NSBundle mainBundle] loadNibNamed:@"DeleteSectionView" owner:nil options:nil] firstObject];
}
......
total/GTOApp/Business/deleteSectionView.xib → total/GTOApp/Business/DeleteSectionView.xib
View file @ 925ae1e5
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB" customClass="deleteSectionView">
<view contentMode="scaleToFill" id="iN0-l3-epB" customClass="DeleteSectionView">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
......@@ -21,7 +25,7 @@
<inset key="titleEdgeInsets" minX="0.0" minY="0.0" maxX="12" maxY="0.0"/>
<inset key="imageEdgeInsets" minX="23" minY="5" maxX="60" maxY="6"/>
<state key="normal" title="删除" image="Trash">
<color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6Zf-nE-def">
......@@ -33,12 +37,12 @@
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<inset key="imageEdgeInsets" minX="58" minY="4" maxX="20" maxY="4"/>
<state key="normal" image="narrow">
<color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<state key="selected" image="2-副本-5"/>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="j37-i7-FR9" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="dka-2c-2DL"/>
<constraint firstAttribute="bottom" secondItem="j37-i7-FR9" secondAttribute="bottom" constant="7" id="pyh-fT-Coh"/>
......@@ -57,7 +61,7 @@
</objects>
<resources>
<image name="2-副本-5" width="42" height="42"/>
<image name="Trash" width="29" height="31"/>
<image name="Trash" width="28" height="30"/>
<image name="narrow" width="42" height="42"/>
</resources>
</document>
total/GTOApp/Business/NewObtainViewController.m
View file @ 925ae1e5
......@@ -13,9 +13,9 @@
#import "ThirdTableViewCell.h"
#import "FourthTableViewCell.h"
#import "screeningButton.h"
#import "sourceOrderSectionView.h"
#import "SourceOrderSectionView.h"
#import "SaveCommitView.h"
#import "deleteSectionView.h"
#import "DeleteSectionView.h"
#import "PromptTableViewController.h"
#import "SeeObtainHeaderView.h"
#import "OilOrderDetailTableViewCell.h"
......@@ -26,9 +26,9 @@
#import "NoteTableViewCell.h"
#import "OilNumberTableViewCell.h"
#import "LossNumberTableViewCell.h"
#import "SerialNumberTableViewCell.h"
#define COUNT 11
#define COUNT 12
@interface NewObtainViewController ()<UITableViewDelegate,UITableViewDataSource>
......@@ -118,8 +118,8 @@
[_imageAndTitleArray addObject:array];
}
//送货人信息
NSArray *imageArray = [NSArray arrayWithObjects:@"car1",@"Friends",@"图层-2New",@"图层-2New",@"班",@"wNew",@"ρNew",@"car1",@"Friends",@"car1",nil];
NSArray *titleArray = [NSArray arrayWithObjects:@"车牌号:",@"司机:",@"实际到油时间:",@"到油营业日期:",@"班次号:",@"发油公斤数:",@"发油密度:",@"发油升数:",@"损耗升数:",@"备注:", nil];
NSArray *imageArray = [NSArray arrayWithObjects:@"car1",@"Friends",@"图层-2New",@"图层-2New",@"班",@"wNew",@"ρNew",@"car1",@"Friends",@"car1",@"car1",nil];
NSArray *titleArray = [NSArray arrayWithObjects:@"车牌号:",@"司机:",@"实际到油时间:",@"到油营业日期:",@"班次号:",@"发油公斤数:",@"发油密度:",@"发油升数:",@"损耗升数:",@"出库编码:",@"备注:", nil];
for (int i=0; i<imageArray.count; i++) {
NSDictionary *dict = @{@"image":[imageArray objectAtIndex:i],@"title":[titleArray objectAtIndex:i]};
[_imageAndTitleArray[0] addObject:dict];
......@@ -172,7 +172,7 @@
[_userInputArray addObject:[NSMutableArray array]];
}
//司机、车牌
for (int i=0; i<10; i++) {
for (int i=0; i<11; i++) {
[_userInputArray[0] addObject:@""];
}
//油罐信息
......@@ -347,7 +347,7 @@
return cell;
}
if (indexPath.row == 2 + self.numberValue || indexPath.row == 3 + self.numberValue) {//实际到油时间、到油营业时间
selectTimeCell *cell = [tableView dequeueReusableCellWithIdentifier:@"selectTimeCell" forIndexPath:indexPath];
SelectTimeCell *cell = [tableView dequeueReusableCellWithIdentifier:@"SelectTimeCell" forIndexPath:indexPath];
[cell.selecteArriveTimeButton addTarget:self action:@selector(detailsTimeButtonClick:) forControlEvents:UIControlEventTouchUpInside];
cell.headerView.image = TCImage([[[self.imageAndTitleArray objectAtIndex:indexPath.section] objectAtIndex:indexPath.row] objectForKey:@"image"]);
cell.titleLabel.text = [[[self.imageAndTitleArray objectAtIndex:indexPath.section] objectAtIndex:indexPath.row] objectForKey:@"title"];
......@@ -383,7 +383,14 @@
cell.lossNumberLabel.text = self.userInputArray[indexPath.section][indexPath.row];
return cell;
}
if (indexPath.row == 9 + self.numberValue) {//备注
if (indexPath.row == 9 + self.numberValue) {//出库编码
SerialNumberTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"SerialNumberTableViewCell" forIndexPath:indexPath];
[cell.codingTextField addTarget:self action:@selector(firstTableViewCellInputString:) forControlEvents:UIControlEventEditingChanged];
cell.codingTextField.tag = indexPath.row;
cell.codingTextField.text = self.userInputArray[indexPath.section][indexPath.row];;
return cell;
}
if (indexPath.row == 10 + self.numberValue) {//备注
NoteTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"NoteTableViewCell" forIndexPath:indexPath];
[cell.userInputTextField addTarget:self action:@selector(firstTableViewCellInputString:) forControlEvents:UIControlEventEditingChanged];
cell.userInputTextField.tag = indexPath.row;
......@@ -454,7 +461,7 @@
return view;
}
if (section%2 == 0) {
deleteSectionView *deleteView = [deleteSectionView initialize];
DeleteSectionView *deleteView = [DeleteSectionView initialize];
deleteView.frame = CGRectMake(0, 0, ScreenSize.width, 44);
deleteView.deleteButton.tag = section;
deleteView.zoomButton.tag = section;
......@@ -462,7 +469,7 @@
[deleteView.zoomButton addTarget:self action:@selector(zoomSectionAction:) forControlEvents:UIControlEventTouchUpInside];
return deleteView;
}
sourceOrderSectionView *sectionView = [sourceOrderSectionView initializeOne];
SourceOrderSectionView *sectionView = [SourceOrderSectionView initializeOne];
//监听
[sectionView.selectetankButton addTarget:self action:@selector(selectetankButtonClickAction:) forControlEvents:UIControlEventTouchUpInside];
if ([self.tankInputArray[section] isKindOfClass:[NSDictionary class]]) {//油罐信息
......@@ -605,9 +612,9 @@
#pragma mark -油站选择
- (void)selectedGasStation:(UIButton *)btn
{
// if (!self.recordSelectOrder) {
// [IBTLoadingView showTextOnly:@"请先选择配油单"];return;
// }
if (!self.recordSelectOrder) {
[IBTLoadingView showTextOnly:@"请先选择配油单"];return;
}
PromptTableViewController *promptVoew = [[PromptTableViewController alloc]init];
promptVoew.isBoolValue = YES;
__weak typeof(self) weakSelf = self;
......@@ -724,8 +731,8 @@
#pragma mark -监听车牌号、司机姓名录入
- (void)firstTableViewCellInputString:(UITextField *)textField
{
//过滤车牌号输入、司机姓名输入、备注输入、班次号
if (!(textField.tag == (0 + self.numberValue) || textField.tag == (1 + self.numberValue) || textField.tag == (4 + self.numberValue) || textField.tag == (9 + self.numberValue))) {
//过滤车牌号输入、司机姓名输入、备注输入、班次号、出库编码
if (!(textField.tag == (0 + self.numberValue) || textField.tag == (1 + self.numberValue) || textField.tag == (4 + self.numberValue) || textField.tag == (9 + self.numberValue) || textField.tag == (10 + self.numberValue))) {
if (![self isPureInt:textField.text]) {
textField.text = nil;
return;
......@@ -838,6 +845,9 @@
if ([self.userInputArray[0][4 + self.numberValue] isEqualToString:@""]) {
[IBTLoadingView showTextOnly:@"请输入班次号"];return;
}
if ([self.userInputArray[0][9 + self.numberValue] isEqualToString:@""]) {
[IBTLoadingView showTextOnly:@"请输入出库编码"];return;
}
for (int i=1; i<self.tankInputArray.count; i+=2) {
if (![self.tankInputArray[i] isKindOfClass:[NSDictionary class]]) {
[IBTLoadingView showTextOnly:@"请选择油罐"];return;
......@@ -852,12 +862,12 @@
NSString *remark = @"该单损耗超过千分之三!";
if (lossNumber > delivery * 3/1000) {
//添加到备注信息
if ([self.userInputArray[0][9 + self.numberValue] isEqualToString:@""]) {
self.userInputArray[0][9 + self.numberValue] = remark;
if ([self.userInputArray[0][10 + self.numberValue] isEqualToString:@""]) {
self.userInputArray[0][10 + self.numberValue] = remark;
}else {
NSString *string = self.userInputArray[0][9 + self.numberValue];
NSString *string = self.userInputArray[0][10 + self.numberValue];
if (![string containsString:remark]) {//包含就不追加
self.userInputArray[0][9 + self.numberValue] = [NSString stringWithFormat:@"%@,%@",string,remark];
self.userInputArray[0][10 + self.numberValue] = [NSString stringWithFormat:@"%@,%@",string,remark];
}
}
UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"提示" message:@"该单损耗超过千分之三，确认继续吗？" preferredStyle:UIAlertControllerStyleAlert];
......@@ -873,9 +883,9 @@
}else
{
//修改后不满足该单损耗超过千分之三
NSString *string = self.userInputArray[0][9 + self.numberValue];
NSString *string = self.userInputArray[0][10 + self.numberValue];
if (![string containsString:remark]) {
self.userInputArray[0][9] = [NSString stringWithFormat:@"%@",string];
self.userInputArray[0][10] = [NSString stringWithFormat:@"%@",string];
}
}
}else {
......@@ -943,6 +953,8 @@
orderBill.truckNo = self.userInputArray[0][0 + self.numberValue]?self.userInputArray[0][0 + self.numberValue]:nil;
//司机
orderBill.carter = self.userInputArray[0][1 + self.numberValue]?self.userInputArray[0][1 + self.numberValue]:nil;
//出库编码
orderBill.envOutCode = self.userInputArray[0][9 + self.numberValue]?self.userInputArray[0][9 + self.numberValue]:nil;
//油罐信息
__weak typeof(self) weakSelf = self;
NSMutableArray *tanksArray = [NSMutableArray array];
......@@ -1039,7 +1051,7 @@
//损耗升数
orderBill.wasterCapacity = [NSNumber numberWithDouble:[self.userInputArray[0][8 + self.numberValue] doubleValue]];
//备注
orderBill.remark = self.userInputArray[0][9 + self.numberValue];
orderBill.remark = self.userInputArray[0][10 + self.numberValue];
NSString *urlString = [NSString stringWithFormat:@"%@/receiveBill/save?operId=%@&operName=%@&time=%@",HTTP_REST_API_BASE_URL,user.f_user_uuid,user.f_user_name,[GTOCommonTools GetCurrenttime]];
NSString *string = [urlString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
NSLog(@"%@",[orderBill toDictionary]);
......
total/GTOApp/Business/SeeObtainViewController.m
View file @ 925ae1e5
......@@ -12,17 +12,19 @@
#import "FirstTableViewCell.h"
#import "SecondTableViewCell.h"
#import "ThirdTableViewCell.h"
#import "sourceOrderSectionView.h"
#import "SourceOrderSectionView.h"
#import "FourthTableViewCell.h"
#import "deleteSectionView.h"
#import "DeleteSectionView.h"
#import "OilOrderDetailTableViewCell.h"
#import "SelectOrderViewController.h"
#import "PromptTableViewController.h"
#import "selectTimeCell.h"
#import "SelectTimeCell.h"
#import "OilNumberTableViewCell.h"
#import "LossNumberTableViewCell.h"
#import "NoteTableViewCell.h"
#import "DetailTimeViewController.h"
#import "SerialNumberTableViewCell.h"
#define COUNT 11
......@@ -96,8 +98,8 @@
}
[_imageAndTitleArray[0] addObject:@""];//配油单
//送货人信息
NSArray *imageArray = [NSArray arrayWithObjects:@"car1",@"Friends",@"图层-2New",@"图层-2New",@"班",@"wNew",@"ρNew",@"car1",@"Friends",@"car1",nil];
NSArray *titleArray = [NSArray arrayWithObjects:@"车牌号:",@"司机:",@"实际到油时间:",@"到油营业日期:",@"班次号:",@"发油公斤数:",@"发油密度:",@"发油升数:",@"损耗升数:",@"备注:", nil];
NSArray *imageArray = [NSArray arrayWithObjects:@"car1",@"Friends",@"图层-2New",@"图层-2New",@"班",@"wNew",@"ρNew",@"car1",@"Friends",@"car1",@"car1",nil];
NSArray *titleArray = [NSArray arrayWithObjects:@"车牌号:",@"司机:",@"实际到油时间:",@"到油营业日期:",@"班次号:",@"发油公斤数:",@"发油密度:",@"发油升数:",@"损耗升数:",@"出库编码:",@"备注:", nil];
for (int i=0; i<imageArray.count; i++) {
NSDictionary *dict = @{@"image":[imageArray objectAtIndex:i],@"title":[titleArray objectAtIndex:i]};
[_imageAndTitleArray[1] addObject:dict];
......@@ -150,7 +152,7 @@
//配油单
[_userInputArray[0] addObject:@""];
//司机、车牌
for (int i=0; i<10; i++) {
for (int i=0; i<11; i++) {
[_userInputArray[1] addObject:@""];
}
}
......@@ -257,7 +259,8 @@
weakSelf.userInputArray[ONE][6] = [NSString stringWithFormat:@"%.6lf",[weakSelf.orderDetails.pickFuelDensity doubleValue]];//发油密度
weakSelf.userInputArray[ONE][7] = [NSString stringWithFormat:@"%.6lf",[weakSelf.orderDetails.pickFuelDensityCapacity doubleValue]];//发油升数
weakSelf.userInputArray[ONE][8] = [NSString stringWithFormat:@"%.6lf",[weakSelf.orderDetails.wasterCapacity doubleValue]];//损耗升数
weakSelf.userInputArray[ONE][9] = weakSelf.orderDetails.remark?weakSelf.orderDetails.remark:@"";//备注;
weakSelf.userInputArray[ONE][9] = weakSelf.orderDetails.envOutCode?weakSelf.orderDetails.envOutCode:@"";//出库编码;
weakSelf.userInputArray[ONE][10] = weakSelf.orderDetails.remark?weakSelf.orderDetails.remark:@"";//备注;
//默认数据源个数
for (int i=0; i<weakSelf.orderDetails.tankDtls.count; i++) {
NSInteger index = weakSelf.orderStateBoolValue?1:2;//区分收油单状态
......@@ -386,7 +389,7 @@
if (indexPath.section == 1) {
if (indexPath.row == 2 || indexPath.row == 3) {//实际到油时间/到油营业时间
selectTimeCell *cell = [tableView dequeueReusableCellWithIdentifier:@"selectTimeCell" forIndexPath:indexPath];
SelectTimeCell *cell = [tableView dequeueReusableCellWithIdentifier:@"SelectTimeCell" forIndexPath:indexPath];
[cell.selecteArriveTimeButton addTarget:self action:@selector(detailsTimeButtonClick:) forControlEvents:UIControlEventTouchUpInside];
cell.selecteArriveTimeButton.tag = indexPath.row;
[cell.selecteArriveTimeButton setTitle:self.userInputArray[indexPath.section][indexPath.row] forState:UIControlStateNormal];
......@@ -427,7 +430,14 @@
cell.lossNumberLabel.text = [NSString stringWithFormat:@"%.6lf",[self.userInputArray[indexPath.section][indexPath.row] doubleValue]];
return cell;
}
if (indexPath.row == 9) {//备注
if (indexPath.row == 9) {//出库编码
SerialNumberTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"SerialNumberTableViewCell" forIndexPath:indexPath];
[cell.codingTextField addTarget:self action:@selector(firstTableViewCellInputString:) forControlEvents:UIControlEventEditingChanged];
cell.codingTextField.tag = indexPath.row;
cell.codingTextField.text = self.userInputArray[indexPath.section][indexPath.row];;
return cell;
}
if (indexPath.row == 10) {//备注
NoteTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"NoteTableViewCell" forIndexPath:indexPath];
[cell.userInputTextField addTarget:self action:@selector(firstTableViewCellInputString:) forControlEvents:UIControlEventEditingChanged];
cell.userInputTextField.tag = indexPath.row;
......@@ -504,7 +514,7 @@
{
//配油单
if (section == 0) {
sourceOrderSectionView *sectionView = [sourceOrderSectionView initializenThird];
SourceOrderSectionView *sectionView = [SourceOrderSectionView initializenThird];
sectionView.zoomButton.tag = section;
sectionView.oilOrderNumber.enabled = !self.orderStateBoolValue;
// sectionView.arrowImageView.hidden = self.orderStateBoolValue;//区分收油单状态
......@@ -523,7 +533,7 @@
if (!self.orderStateBoolValue) {
//删除
if (section%2 != 0 && section > 2) {
deleteSectionView *deleteView = [deleteSectionView initialize];
DeleteSectionView *deleteView = [DeleteSectionView initialize];
deleteView.frame = CGRectMake(0, 0, ScreenSize.width, 44);
deleteView.deleteButton.tag = section;
deleteView.zoomButton.tag = section;
......@@ -533,7 +543,7 @@
}
}
//油罐
sourceOrderSectionView *sectionView = self.orderStateBoolValue?[sourceOrderSectionView initializenTwo]:[sourceOrderSectionView initializeOne];
SourceOrderSectionView *sectionView = self.orderStateBoolValue?[SourceOrderSectionView initializenTwo]:[SourceOrderSectionView initializeOne];
sectionView.zoomButton.tag = section+1;
sectionView.selectetankButton.tag = section;
sectionView.selectetankButtonTwo.enabled = !self.orderStateBoolValue;//区分收油单状态
......@@ -756,7 +766,7 @@
- (void)firstTableViewCellInputString:(UITextField *)textField
{
//过滤车牌号输入、司机姓名输入、备注输入
if (!(textField.tag == 0 || textField.tag == 1 || textField.tag == 9 || textField.tag == 4)) {
if (!(textField.tag == 0 || textField.tag == 1 || textField.tag == 9 || textField.tag == 4 || textField.tag == 10)) {
if (![self isPureInt:textField.text]) {
textField.text = nil;
return;
......@@ -832,6 +842,9 @@
if ([self.userInputArray[ONE][4] isEqualToString:@""]) {
[IBTLoadingView showTextOnly:@"请输入班次号"];return;
}
if ([self.userInputArray[ONE][9] isEqualToString:@""]) {
[IBTLoadingView showTextOnly:@"请输入出库编码"];return;
}
for (int i=2; i<self.tankInputArray.count-1; i+=2) {
if (![self.tankInputArray[i] isKindOfClass:[NSDictionary class]]) {
[IBTLoadingView showTextOnly:@"请选择油罐"];return;
......@@ -854,12 +867,12 @@
NSString *remark = @"该单损耗超过千分之三!";
if (lossNumber > delivery * 3/1000) {
//添加到备注信息
if ([self.userInputArray[ONE][9] isEqualToString:@""]) {
self.userInputArray[ONE][9] = remark;
if ([self.userInputArray[ONE][10] isEqualToString:@""]) {
self.userInputArray[ONE][10] = remark;
}else {
NSString *string = self.userInputArray[ONE][9];
NSString *string = self.userInputArray[ONE][10];
if (![string containsString:remark]) {//包含就不追加
self.userInputArray[ONE][9] = [NSString stringWithFormat:@"%@,%@",string,remark];
self.userInputArray[ONE][10] = [NSString stringWithFormat:@"%@,%@",string,remark];
}
}
UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"提示" message:@"该单损耗超过千分之三，确认继续吗？" preferredStyle:UIAlertControllerStyleAlert];
......@@ -875,9 +888,9 @@
}
else{
//修改后不满足该单损耗超过千分之三
NSString *string = self.userInputArray[ONE][9];
NSString *string = self.userInputArray[ONE][10];
if (![string containsString:remark]) {
self.userInputArray[ONE][9] = [NSString stringWithFormat:@"%@",string];
self.userInputArray[ONE][10] = [NSString stringWithFormat:@"%@",string];
}
}
}else {
......@@ -999,8 +1012,10 @@
self.orderDetails.pickFuelDensityCapacity = [NSNumber numberWithDouble:[self.userInputArray[ONE][7] doubleValue]];
//损耗升数
self.orderDetails.wasterCapacity = [NSNumber numberWithDouble:[self.userInputArray[ONE][8] doubleValue]];
//出库编码
self.orderDetails.envOutCode = self.userInputArray[ONE][9];
//备注
self.orderDetails.remark = self.userInputArray[ONE][9];
self.orderDetails.remark = self.userInputArray[ONE][10];
NSString *urlString = [NSString stringWithFormat:@"%@/receiveBill/save?operId=%@&operName=%@&time=%@",HTTP_REST_API_BASE_URL,user.f_user_uuid,user.f_user_name,[GTOCommonTools GetCurrenttime]];
NSString *string = [urlString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
[IBTLoadingView showProgressLabel:@"保存中..."];
......
total/GTOApp/Business/selectTimeCell.h → total/GTOApp/Business/SelectTimeCell.h
View file @ 925ae1e5
//
// selectTimeCell.h
// SelectTimeCell.h
// total
//
// Created by 曹云霄 on 16/7/21.
......@@ -8,7 +8,7 @@
#import <UIKit/UIKit.h>
@interface selectTimeCell : UITableViewCell
@interface SelectTimeCell : UITableViewCell
/**
* 选择到油时间
......
total/GTOApp/Business/selectTimeCell.m → total/GTOApp/Business/SelectTimeCell.m
View file @ 925ae1e5
//
// selectTimeCell.m
// SelectTimeCell.m
// total
//
// Created by 曹云霄 on 16/7/21.
// Copyright © 2016年 Delevin. All rights reserved.
//
#import "selectTimeCell.h"
#import "SelectTimeCell.h"
@implementation selectTimeCell
@implementation SelectTimeCell
- (void)awakeFromNib {
[super awakeFromNib];
......
total/GTOApp/Business/SerialNumberTableViewCell.h 0 → 100644
View file @ 925ae1e5
//
// SerialNumberTableViewCell.h
// total
//
// Created by 曹云霄 on 2017/3/29.
// Copyright © 2017年 Delevin. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface SerialNumberTableViewCell : UITableViewCell
/**
出库编码
*/
@property (weak, nonatomic) IBOutlet UITextField *codingTextField;
@end
total/GTOApp/Business/SerialNumberTableViewCell.m 0 → 100644
View file @ 925ae1e5
//
// SerialNumberTableViewCell.m
// total
//
// Created by 曹云霄 on 2017/3/29.
// Copyright © 2017年 Delevin. All rights reserved.
//
#import "SerialNumberTableViewCell.h"
@implementation SerialNumberTableViewCell
- (void)awakeFromNib {
[super awakeFromNib];
// Initialization code
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
// Configure the view for the selected state
}
@end
total/GTOApp/Business/sourceOrderSectionView.h → total/GTOApp/Business/SourceOrderSectionView.h
View file @ 925ae1e5
//
// sourceOrderSectionView.h
// SourceOrderSectionView.h
// total
//
// Created by 曹云霄 on 16/6/22.
......@@ -8,7 +8,7 @@
#import <UIKit/UIKit.h>
@interface sourceOrderSectionView : UIView
@interface SourceOrderSectionView : UIView
+ (instancetype)initializeOne;
+ (instancetype)initializenTwo;
......
total/GTOApp/Business/sourceOrderSectionView.m → total/GTOApp/Business/SourceOrderSectionView.m
View file @ 925ae1e5
//
// sourceOrderSectionView.m
// SourceOrderSectionView.m
// total
//
// Created by 曹云霄 on 16/6/22.
// Copyright © 2016年 free. All rights reserved.
//
#import "sourceOrderSectionView.h"
#import "SourceOrderSectionView.h"
@implementation sourceOrderSectionView
@implementation SourceOrderSectionView
+ (instancetype)initializeOne
{
return [[[NSBundle mainBundle] loadNibNamed:@"sourceOrderSectionView" owner:nil options:nil] firstObject];
return [[[NSBundle mainBundle] loadNibNamed:@"SourceOrderSectionView" owner:nil options:nil] firstObject];
}
+ (instancetype)initializenTwo
{
return [[[NSBundle mainBundle] loadNibNamed:@"sourceOrderSectionView" owner:nil options:nil] objectAtIndex:1];
return [[[NSBundle mainBundle] loadNibNamed:@"SourceOrderSectionView" owner:nil options:nil] objectAtIndex:1];
}
+ (instancetype)initializenThird
{
return [[[NSBundle mainBundle] loadNibNamed:@"sourceOrderSectionView" owner:nil options:nil] lastObject];
return [[[NSBundle mainBundle] loadNibNamed:@"SourceOrderSectionView" owner:nil options:nil] lastObject];
}
@end
total/GTOApp/Business/sourceOrderSectionView.xib → total/GTOApp/Business/SourceOrderSectionView.xib
View file @ 925ae1e5
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB" userLabel="Source Order Section View One" customClass="sourceOrderSectionView">
<view contentMode="scaleToFill" id="iN0-l3-epB" userLabel="Source Order Section View One" customClass="SourceOrderSectionView">
<rect key="frame" x="0.0" y="0.0" width="375" height="54"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
......@@ -22,7 +26,7 @@
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<state key="normal">
<color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
</button>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="3" translatesAutoresizingMaskIntoConstraints="NO" id="drV-vf-Ksx">
......@@ -33,7 +37,7 @@
</constraints>
</imageView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="drV-vf-Ksx" firstAttribute="leading" secondItem="6nT-g0-Lrl" secondAttribute="trailing" constant="8" id="4fL-qR-f9U"/>
<constraint firstAttribute="trailing" secondItem="drV-vf-Ksx" secondAttribute="trailing" constant="14" id="SrM-kf-alv"/>
......@@ -57,18 +61,18 @@
<constraint firstAttribute="width" constant="95" id="ZHG-G3-q4P"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<color key="textColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tiB-A9-pE6">
<rect key="frame" x="0.0" y="53" width="375" height="1"/>
<color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="yaV-uh-8ES"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="tiB-A9-pE6" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="1XP-iC-JER"/>
<constraint firstItem="E6m-Q8-m3R" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="9" id="5oX-c4-wga"/>
......@@ -91,13 +95,13 @@
</connections>
<point key="canvasLocation" x="481.5" y="282"/>
</view>
<view contentMode="scaleToFill" id="NRZ-7Y-EOX" userLabel="Source Order Section View Two" customClass="sourceOrderSectionView">
<view contentMode="scaleToFill" id="NRZ-7Y-EOX" userLabel="Source Order Section View Two" customClass="SourceOrderSectionView">
<rect key="frame" x="0.0" y="0.0" width="375" height="54"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qbp-Sa-JMt">
<rect key="frame" x="0.0" y="10" width="375" height="44"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="xsM-am-D0T"/>
</constraints>
......@@ -106,7 +110,7 @@
<rect key="frame" x="116" y="17" width="195" height="30"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<state key="normal">
<color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
</button>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="22" translatesAutoresizingMaskIntoConstraints="NO" id="TAT-bJ-oVS">
......@@ -123,12 +127,12 @@
<constraint firstAttribute="height" constant="21" id="f1I-4D-hvV"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<color key="textColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="P8K-d2-etn">
<rect key="frame" x="0.0" y="53" width="375" height="1"/>
<color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8wn-wq-Azp">
<rect key="frame" x="319" y="8" width="56" height="46"/>
......@@ -139,12 +143,12 @@
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<inset key="imageEdgeInsets" minX="17" minY="12" maxX="17" maxY="12"/>
<state key="normal" image="narrow">
<color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<state key="selected" image="2-副本-5"/>
</button>
</subviews>
<color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="P8K-d2-etn" firstAttribute="top" secondItem="ggz-RY-I1l" secondAttribute="bottom" constant="6" id="2N6-lG-P4I"/>
<constraint firstItem="8wn-wq-Azp" firstAttribute="leading" secondItem="ggz-RY-I1l" secondAttribute="trailing" constant="8" id="31p-qu-fgU"/>
......@@ -174,7 +178,7 @@
</connections>
<point key="canvasLocation" x="481.5" y="385"/>
</view>
<view contentMode="scaleToFill" id="4ei-uR-olS" userLabel="Source Order Section View Third" customClass="sourceOrderSectionView">
<view contentMode="scaleToFill" id="4ei-uR-olS" userLabel="Source Order Section View Third" customClass="SourceOrderSectionView">
<rect key="frame" x="0.0" y="0.0" width="375" height="54"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
......@@ -185,7 +189,7 @@
<constraint firstAttribute="width" constant="89" id="sTh-qu-194"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" red="0.99607843139999996" green="0.12941176469999999" blue="0.16078431369999999" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" red="0.99607843139999996" green="0.12941176469999999" blue="0.16078431369999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="m1z-nT-X96">
......@@ -194,7 +198,7 @@
<constraint firstAttribute="height" constant="30" id="vll-jF-UeR"/>
</constraints>
<state key="normal" title="1234567">
<color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
</button>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="3" translatesAutoresizingMaskIntoConstraints="NO" id="fkT-MX-R3e">
......@@ -213,12 +217,12 @@
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<inset key="imageEdgeInsets" minX="17" minY="12" maxX="17" maxY="12"/>
<state key="normal" image="narrow">
<color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<state key="selected" image="2-副本-5"/>
</button>
</subviews>
<color key="backgroundColor" red="0.93725490196078431" green="0.91764705882352937" blue="0.85882352941176465" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" red="0.93725490196078431" green="0.91764705882352937" blue="0.85882352941176465" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="VJu-Fw-JxZ" firstAttribute="top" secondItem="4ei-uR-olS" secondAttribute="top" constant="4" id="B8f-aT-Xay"/>
<constraint firstItem="fkT-MX-R3e" firstAttribute="leading" secondItem="m1z-nT-X96" secondAttribute="trailing" constant="8" id="Dax-9j-BBk"/>
......@@ -246,8 +250,8 @@
</objects>
<resources>
<image name="2-副本-5" width="42" height="42"/>
<image name="22" width="41" height="42"/>
<image name="3" width="14" height="25"/>
<image name="22" width="41" height="41"/>
<image name="3" width="14" height="24"/>
<image name="narrow" width="42" height="42"/>
</resources>
</document>
total/GTOApp/UserUtil/total_objc_json_client.h
View file @ 925ae1e5
......@@ -2539,6 +2539,11 @@ extern NSString * const POSITIONTYPE_NONE;
*
*/
@property (nonatomic, copy) NSString *remark;
/**
出库编码
*/
@property (nonatomic,copy) NSString *envOutCode;
/**
* 收油单油罐明细
* @see ReceiveTankDtl
......
total/Macro/GTOAppMacro.h
View file @ 925ae1e5
......@@ -88,8 +88,8 @@
//#define HTTP_LOCAL_BASE_URL @"http://139.196.39.77:8180"
//开发环境
#define HTTP_LOCAL_BASE_URL @"http://139.196.195.30:8093"
#define HTTP_REST_API_BASE_URL @"http://139.196.195.30:8093/total-server/rest"
#define HTTP_LOCAL_BASE_URL @"http://gomoredev:8083"
#define HTTP_REST_API_BASE_URL @"http://gomoredev:8083/total-server/rest"
#define HTTP_WEATHER_URL @"http://apis.baidu.com/heweather/weather/free"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment