1.修改Homer Model增加Master Model视图。

RedAnt ERP Mobile/common/Functions/cart/MasterModel.storyboard

@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="ipad9_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Master Model View Controller-->
+        <scene sceneID="hDH-fh-1OF">
+            <objects>
+                <viewController storyboardIdentifier="MasterModelViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="P5b-oR-5g8" customClass="MasterModelViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="Nah-PV-Df1"/>
+                        <viewControllerLayoutGuide type="bottom" id="jQr-iG-Tqe"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="CYz-m6-ll5">
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="b2A-V7-3ZK">
+                                <rect key="frame" x="0.0" y="20" width="768" height="1004"/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <prototypes>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="MasterModelCell" rowHeight="70" id="a7O-b5-O2e" customClass="MasterModelCell">
+                                        <rect key="frame" x="0.0" y="28" width="768" height="70"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="a7O-b5-O2e" id="cbK-c8-RlI">
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="69.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1393W-48" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7R2-3m-gXo">
+                                                    <rect key="frame" x="5" y="5" width="120" height="59.5"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="120" id="adR-9D-gGr"/>
+                                                    </constraints>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="(1/2) DNNG TABLE TOP, 48RD, WHT" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="N2y-DU-BbQ">
+                                                    <rect key="frame" x="130" y="5" width="200" height="59.5"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="200" id="04S-fZ-0RT"/>
+                                                    </constraints>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="51.50&quot;w   51.25&quot;d   4.50&quot;h" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nb6-ia-f5L">
+                                                    <rect key="frame" x="450" y="5" width="191.5" height="59.5"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="180" id="fKz-dU-05h"/>
+                                                    </constraints>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="5" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pfn-13-dm8">
+                                                    <rect key="frame" x="646.5" y="5" width="35" height="59.5"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="35" id="jlV-r7-p8c"/>
+                                                    </constraints>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="$9999.00" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v8s-Po-aQb">
+                                                    <rect key="frame" x="686.5" y="5" width="76.5" height="59.5"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="77" id="NpO-VQ-hkP"/>
+                                                    </constraints>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="48 Dia X 30H" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iJG-zh-eZ8">
+                                                    <rect key="frame" x="335" y="5" width="110" height="59.5"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="110" id="Dm8-F1-K8b"/>
+                                                    </constraints>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="pfn-13-dm8" firstAttribute="top" secondItem="cbK-c8-RlI" secondAttribute="top" constant="5" id="34C-Ma-fHX"/>
+                                                <constraint firstAttribute="bottom" secondItem="7R2-3m-gXo" secondAttribute="bottom" constant="5" id="60p-6G-gzb"/>
+                                                <constraint firstAttribute="bottom" secondItem="pfn-13-dm8" secondAttribute="bottom" constant="5" id="92O-XN-Fve"/>
+                                                <constraint firstItem="7R2-3m-gXo" firstAttribute="top" secondItem="cbK-c8-RlI" secondAttribute="top" constant="5" id="9h7-rL-Sha"/>
+                                                <constraint firstItem="v8s-Po-aQb" firstAttribute="top" secondItem="cbK-c8-RlI" secondAttribute="top" constant="5" id="AZk-ss-kvW"/>
+                                                <constraint firstItem="iJG-zh-eZ8" firstAttribute="leading" secondItem="N2y-DU-BbQ" secondAttribute="trailing" constant="5" id="BGB-mD-0mj"/>
+                                                <constraint firstItem="v8s-Po-aQb" firstAttribute="centerY" secondItem="cbK-c8-RlI" secondAttribute="centerY" id="Cdp-yp-9D3"/>
+                                                <constraint firstAttribute="bottom" secondItem="iJG-zh-eZ8" secondAttribute="bottom" constant="5" id="Dil-pX-8IE"/>
+                                                <constraint firstItem="7R2-3m-gXo" firstAttribute="centerY" secondItem="cbK-c8-RlI" secondAttribute="centerY" id="ESI-bv-faU"/>
+                                                <constraint firstAttribute="trailing" secondItem="v8s-Po-aQb" secondAttribute="trailing" constant="5" id="H5w-GK-1Gs"/>
+                                                <constraint firstItem="nb6-ia-f5L" firstAttribute="top" secondItem="cbK-c8-RlI" secondAttribute="top" constant="5" id="K1R-dR-4Jh"/>
+                                                <constraint firstItem="N2y-DU-BbQ" firstAttribute="centerY" secondItem="cbK-c8-RlI" secondAttribute="centerY" id="Kcb-FX-wUt"/>
+                                                <constraint firstItem="pfn-13-dm8" firstAttribute="centerY" secondItem="cbK-c8-RlI" secondAttribute="centerY" id="L1x-Vd-2LN"/>
+                                                <constraint firstItem="iJG-zh-eZ8" firstAttribute="centerY" secondItem="cbK-c8-RlI" secondAttribute="centerY" id="N5D-YM-Fjv"/>
+                                                <constraint firstItem="v8s-Po-aQb" firstAttribute="leading" secondItem="pfn-13-dm8" secondAttribute="trailing" constant="5" id="UwU-ct-Ry2"/>
+                                                <constraint firstItem="7R2-3m-gXo" firstAttribute="leading" secondItem="cbK-c8-RlI" secondAttribute="leading" constant="5" id="aS7-Ev-C1G"/>
+                                                <constraint firstItem="nb6-ia-f5L" firstAttribute="centerY" secondItem="cbK-c8-RlI" secondAttribute="centerY" id="cgG-Dy-Uif"/>
+                                                <constraint firstItem="N2y-DU-BbQ" firstAttribute="top" secondItem="cbK-c8-RlI" secondAttribute="top" constant="5" id="dFU-iy-V5F"/>
+                                                <constraint firstAttribute="bottom" secondItem="v8s-Po-aQb" secondAttribute="bottom" constant="5" id="gfw-oa-cq8"/>
+                                                <constraint firstItem="nb6-ia-f5L" firstAttribute="leading" secondItem="iJG-zh-eZ8" secondAttribute="trailing" constant="5" id="i6c-F4-dcv"/>
+                                                <constraint firstAttribute="bottom" secondItem="nb6-ia-f5L" secondAttribute="bottom" constant="5" id="jTx-Rl-hTh"/>
+                                                <constraint firstItem="iJG-zh-eZ8" firstAttribute="top" secondItem="cbK-c8-RlI" secondAttribute="top" constant="5" id="kNJ-lI-eqi"/>
+                                                <constraint firstItem="pfn-13-dm8" firstAttribute="leading" secondItem="nb6-ia-f5L" secondAttribute="trailing" constant="5" id="nhJ-A6-wel"/>
+                                                <constraint firstAttribute="bottom" secondItem="N2y-DU-BbQ" secondAttribute="bottom" constant="5" id="rp6-Mc-KF8"/>
+                                                <constraint firstItem="N2y-DU-BbQ" firstAttribute="leading" secondItem="7R2-3m-gXo" secondAttribute="trailing" constant="5" id="tAU-vx-XcG"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                        <connections>
+                                            <outlet property="modelBoxDimensionLabel" destination="nb6-ia-f5L" id="FhY-vl-bbl"/>
+                                            <outlet property="modelDescLabel" destination="N2y-DU-BbQ" id="t5Y-q0-umV"/>
+                                            <outlet property="modelDimensionLabel" destination="iJG-zh-eZ8" id="kbS-Qs-tKb"/>
+                                            <outlet property="modelNameLabel" destination="7R2-3m-gXo" id="UyN-By-Rjd"/>
+                                            <outlet property="modelPriceLabel" destination="v8s-Po-aQb" id="EBB-uu-FE0"/>
+                                            <outlet property="modelQtyLabel" destination="pfn-13-dm8" id="3Vm-AI-EXO"/>
+                                        </connections>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="MasterModelHeader" rowHeight="40" id="oGV-L3-h1A">
+                                        <rect key="frame" x="0.0" y="98" width="768" height="40"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="oGV-L3-h1A" id="40X-ty-Rh6">
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="39.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Model" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RHb-8Y-S4D">
+                                                    <rect key="frame" x="5" y="5" width="120" height="29.5"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="120" id="bSy-UQ-hUM"/>
+                                                    </constraints>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Description" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bol-PQ-PER">
+                                                    <rect key="frame" x="130" y="5" width="200" height="29.5"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="200" id="N5m-YM-FBo"/>
+                                                    </constraints>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Box Dimensions" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vbv-yp-MMX">
+                                                    <rect key="frame" x="450" y="5" width="191.5" height="29.5"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="180" id="cRS-IM-7rh"/>
+                                                    </constraints>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="QTY" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OKl-iQ-fVP">
+                                                    <rect key="frame" x="646.5" y="5" width="35" height="29.5"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="35" id="Prf-NZ-r5k"/>
+                                                    </constraints>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Price" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="F1G-qL-uVS">
+                                                    <rect key="frame" x="686.5" y="5" width="76.5" height="29.5"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="77" id="eYp-06-dFP"/>
+                                                    </constraints>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Dimension" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iba-V7-bJK">
+                                                    <rect key="frame" x="335" y="5" width="110" height="29.5"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="110" id="b7f-rg-lgb"/>
+                                                    </constraints>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="vbv-yp-MMX" firstAttribute="top" secondItem="40X-ty-Rh6" secondAttribute="top" constant="5" id="5HE-im-DkH"/>
+                                                <constraint firstItem="F1G-qL-uVS" firstAttribute="leading" secondItem="OKl-iQ-fVP" secondAttribute="trailing" constant="5" id="9RJ-qa-Wsf"/>
+                                                <constraint firstItem="iba-V7-bJK" firstAttribute="top" secondItem="40X-ty-Rh6" secondAttribute="top" constant="5" id="9o8-CY-4wc"/>
+                                                <constraint firstItem="RHb-8Y-S4D" firstAttribute="centerY" secondItem="40X-ty-Rh6" secondAttribute="centerY" id="AJL-2U-h3J"/>
+                                                <constraint firstItem="Bol-PQ-PER" firstAttribute="leading" secondItem="RHb-8Y-S4D" secondAttribute="trailing" constant="5" id="EXL-Zy-2x8"/>
+                                                <constraint firstItem="RHb-8Y-S4D" firstAttribute="top" secondItem="40X-ty-Rh6" secondAttribute="top" constant="5" id="KF7-Jb-zFZ"/>
+                                                <constraint firstAttribute="bottom" secondItem="F1G-qL-uVS" secondAttribute="bottom" constant="5" id="Lnd-5s-GT5"/>
+                                                <constraint firstItem="F1G-qL-uVS" firstAttribute="top" secondItem="40X-ty-Rh6" secondAttribute="top" constant="5" id="OOe-Ae-DQX"/>
+                                                <constraint firstItem="iba-V7-bJK" firstAttribute="centerY" secondItem="40X-ty-Rh6" secondAttribute="centerY" id="OPO-5G-ILG"/>
+                                                <constraint firstItem="OKl-iQ-fVP" firstAttribute="centerY" secondItem="40X-ty-Rh6" secondAttribute="centerY" id="RoN-K2-Kug"/>
+                                                <constraint firstItem="OKl-iQ-fVP" firstAttribute="leading" secondItem="vbv-yp-MMX" secondAttribute="trailing" constant="5" id="W4L-Rq-zrg"/>
+                                                <constraint firstItem="OKl-iQ-fVP" firstAttribute="top" secondItem="40X-ty-Rh6" secondAttribute="top" constant="5" id="Wn6-Kk-okA"/>
+                                                <constraint firstAttribute="bottom" secondItem="Bol-PQ-PER" secondAttribute="bottom" constant="5" id="Wsm-JW-8jQ"/>
+                                                <constraint firstItem="RHb-8Y-S4D" firstAttribute="leading" secondItem="40X-ty-Rh6" secondAttribute="leading" constant="5" id="XWg-RP-Zhe"/>
+                                                <constraint firstAttribute="trailing" secondItem="F1G-qL-uVS" secondAttribute="trailing" constant="5" id="Y64-zS-5Hg"/>
+                                                <constraint firstAttribute="bottom" secondItem="iba-V7-bJK" secondAttribute="bottom" constant="5" id="bQr-IF-Bv2"/>
+                                                <constraint firstItem="vbv-yp-MMX" firstAttribute="centerY" secondItem="40X-ty-Rh6" secondAttribute="centerY" id="chr-a2-dov"/>
+                                                <constraint firstItem="vbv-yp-MMX" firstAttribute="leading" secondItem="iba-V7-bJK" secondAttribute="trailing" constant="5" id="fBH-e8-fEq"/>
+                                                <constraint firstItem="Bol-PQ-PER" firstAttribute="top" secondItem="40X-ty-Rh6" secondAttribute="top" constant="5" id="fQW-Yo-Jw0"/>
+                                                <constraint firstAttribute="bottom" secondItem="vbv-yp-MMX" secondAttribute="bottom" constant="5" id="l9R-Mp-5gr"/>
+                                                <constraint firstAttribute="bottom" secondItem="RHb-8Y-S4D" secondAttribute="bottom" constant="5" id="lgK-nq-GXL"/>
+                                                <constraint firstItem="F1G-qL-uVS" firstAttribute="centerY" secondItem="40X-ty-Rh6" secondAttribute="centerY" id="ooe-EX-NsD"/>
+                                                <constraint firstItem="iba-V7-bJK" firstAttribute="leading" secondItem="Bol-PQ-PER" secondAttribute="trailing" constant="5" id="wgc-Lg-M0w"/>
+                                                <constraint firstItem="Bol-PQ-PER" firstAttribute="centerY" secondItem="40X-ty-Rh6" secondAttribute="centerY" id="xRR-oF-IJc"/>
+                                                <constraint firstAttribute="bottom" secondItem="OKl-iQ-fVP" secondAttribute="bottom" constant="5" id="zDe-5e-dI2"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                        <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                                    </tableViewCell>
+                                </prototypes>
+                                <connections>
+                                    <outlet property="dataSource" destination="P5b-oR-5g8" id="33b-ef-SPi"/>
+                                    <outlet property="delegate" destination="P5b-oR-5g8" id="hpN-4D-5Ft"/>
+                                </connections>
+                            </tableView>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstItem="b2A-V7-3ZK" firstAttribute="top" secondItem="Nah-PV-Df1" secondAttribute="bottom" id="4jg-BY-L0c"/>
+                            <constraint firstAttribute="trailing" secondItem="b2A-V7-3ZK" secondAttribute="trailing" id="QnR-Is-9fZ"/>
+                            <constraint firstItem="jQr-iG-Tqe" firstAttribute="top" secondItem="b2A-V7-3ZK" secondAttribute="bottom" id="eo0-d4-LgP"/>
+                            <constraint firstItem="b2A-V7-3ZK" firstAttribute="leading" secondItem="CYz-m6-ll5" secondAttribute="leading" id="q1p-dg-bqz"/>
+                        </constraints>
+                    </view>
+                    <connections>
+                        <outlet property="masterModelTableView" destination="b2A-V7-3ZK" id="xy5-pB-Gaq"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="VVM-6e-ZLj" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="121" y="236"/>
+        </scene>
+    </scenes>
+</document>

RedAnt ERP Mobile/common/Functions/cart/MasterModelCell.h

@@ -0,0 +1,20 @@
+//
+//  MasterModelCell.h
+//  iSales-HOMER
+//
+//  Created by Jack on 2018/1/27.
+//  Copyright © 2018年 United Software Applications, Inc. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface MasterModelCell : UITableViewCell
+
+- (instancetype)setName:(NSString *)name;
+- (instancetype)setDescription:(NSString *)desc;
+- (instancetype)setDimension:(NSString *)dimension;
+- (instancetype)setBoxDimension:(NSString *)boxDimension;
+- (instancetype)setQty:(NSString *)qty;
+- (instancetype)setPrice:(NSString *)price;
+
+@end

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

@@ -0,0 +1,67 @@
+//
+//  MasterModelCell.m
+//  iSales-HOMER
+//
+//  Created by Jack on 2018/1/27.
+//  Copyright © 2018年 United Software Applications, Inc. All rights reserved.
+//
+
+#import "MasterModelCell.h"
+
+@interface MasterModelCell()
+
+@property (strong, nonatomic) IBOutlet UILabel *modelNameLabel;
+@property (strong, nonatomic) IBOutlet UILabel *modelDescLabel;
+@property (strong, nonatomic) IBOutlet UILabel *modelDimensionLabel;
+@property (strong, nonatomic) IBOutlet UILabel *modelBoxDimensionLabel;
+@property (strong, nonatomic) IBOutlet UILabel *modelQtyLabel;
+@property (strong, nonatomic) IBOutlet UILabel *modelPriceLabel;
+
+
+@end
+
+
+@implementation MasterModelCell
+
+- (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
+}
+
+- (instancetype)setName:(NSString *)name {
+    self.modelNameLabel.text = name;
+    return self;
+}
+
+- (instancetype)setDescription:(NSString *)desc {
+    self.modelDescLabel.text = desc;
+    return self;
+}
+
+- (instancetype)setDimension:(NSString *)dimension {
+    self.modelDimensionLabel.text = dimension;
+    return self;
+}
+
+- (instancetype)setBoxDimension:(NSString *)boxDimension {
+    self.modelBoxDimensionLabel.text = boxDimension;
+    return self;
+}
+
+- (instancetype)setQty:(NSString *)qty {
+    self.modelQtyLabel.text = qty;
+    return self;
+}
+
+- (instancetype)setPrice:(NSString *)price {
+    self.modelPriceLabel.text = price;
+    return self;
+}
+
+@end

RedAnt ERP Mobile/common/Functions/cart/MasterModelViewController.h

@@ -0,0 +1,17 @@
+//
+//  MasterModelViewController.h
+//  iSales-HOMER
+//
+//  Created by Jack on 2018/1/27.
+//  Copyright © 2018年 United Software Applications, Inc. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface MasterModelViewController : UIViewController
+
+@property (strong, nonatomic) NSDictionary* content_data;
+
++ (instancetype)buildMasterModelViewController;
+
+@end

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

@@ -0,0 +1,102 @@
+//
+//  MasterModelViewController.m
+//  iSales-HOMER
+//
+//  Created by Jack on 2018/1/27.
+//  Copyright © 2018年 United Software Applications, Inc. All rights reserved.
+//
+
+#import "MasterModelViewController.h"
+#import "MasterModelCell.h"
+
+#define CELL_IDENTIFIER @"MasterModelCell"
+#define HEADER_IDENTIFIER @"MasterModelHeader"
+
+@interface MasterModelViewController () <UITableViewDelegate,UITableViewDataSource>
+@property (strong, nonatomic) IBOutlet UITableView *masterModelTableView;
+
+@end
+
+@implementation MasterModelViewController
+
++ (instancetype)buildMasterModelViewController {
+    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"MasterModel" bundle:nil];
+    return (MasterModelViewController *)[storyboard instantiateViewControllerWithIdentifier:@"MasterModelViewController"];
+}
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+    
+    self.title = @"Master Model";
+    
+    UIBarButtonItem *closeButton = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"close"] imageWithRenderingMode:UIImageRenderingModeAutomatic]
+                                                                    style:UIBarButtonItemStylePlain
+                                                                   target:self
+                                                                   action:@selector( onCloseClick:)];
+    self.navigationItem.rightBarButtonItem = closeButton;
+    
+    self.masterModelTableView.tableFooterView = [UIView new];
+    self.masterModelTableView.tableHeaderView = [UIView new];
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+- (void)onCloseClick:(UIButton *)sender {
+    
+    [self dismissViewControllerAnimated:true completion:nil];
+}
+
+- (void)setContent_data:(NSDictionary *)content_data {
+    _content_data = content_data;
+    [self.masterModelTableView reloadData];
+}
+
+#pragma mark - TableView DataSource && Delegate
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    int count =[[self.content_data valueForKey:@"count"] intValue];
+    return count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    MasterModelCell *cell = [tableView dequeueReusableCellWithIdentifier:CELL_IDENTIFIER forIndexPath:indexPath];
+    
+    NSDictionary * item_json = [self.content_data objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]];
+    NSString *name = [item_json valueForKey:@"model"];
+    NSString *desc = [item_json valueForKey:@"description"];
+    NSString *dimension = [item_json valueForKey:@"dimension"];
+    NSString *box_dimension = [item_json valueForKey:@"box_dimension"];
+    NSString *qty = [NSString stringWithFormat:@"%d",[[item_json valueForKey:@"modulus"] intValue]];
+    NSString *price = nil;
+    
+    if ([[NSString stringWithFormat:@"%@", [item_json valueForKey:@"unit_price"]] isEqualToString:@"No Price"]) {
+        price = @"No Price";
+    } else {
+        price = [NSString stringWithFormat:@"$%.2f",[[item_json valueForKey:@"unit_price"] floatValue]];
+    }
+    
+    dimension = @"48 Dia X 30H";
+    box_dimension = @"51.50\"w   51.25\"d   4.50\"h";
+    
+    [[[[[[cell setName:name] setDescription:desc] setDimension:dimension] setBoxDimension:box_dimension] setQty:qty] setPrice:price];
+    
+    return cell;
+}
+
+- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
+    return [tableView dequeueReusableCellWithIdentifier:HEADER_IDENTIFIER];
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+    return 70.0f;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+    return 40.0f;
+}
+
+@end

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

@@ -13,6 +13,12 @@
 #import "BundleModelViewController.h"
 #import "CartViewController.h"
 
+#if defined(BUILD_HOMER) || defined(BUILD_GATIT)
+
+#import "MasterModelViewController.h"
+
+#endif
+
 #define NUMBERS @"0123456789\n"
 @implementation ModelItemCell
 
@@ -282,18 +288,25 @@
     UIViewController* vc=[RAUtils getViewController :self.bundleButton];
     
     
-    BundleModelViewController * bundleVC =[ vc.storyboard instantiateViewControllerWithIdentifier:@"BundleModelViewController"];
-    
-    bundleVC.content_data = self.master_items;
+//    BundleModelViewController * bundleVC =[ vc.storyboard instantiateViewControllerWithIdentifier:@"BundleModelViewController"];
+//
+//    bundleVC.content_data = self.master_items;
+//
+//    UINavigationController* navi = [[UINavigationController alloc] initWithRootViewController:bundleVC] ;
+//
+//    navi.modalPresentationStyle = UIModalTransitionStyleCrossDissolve;//有三种状态，自己看看是哪种
+//    [vc presentViewController:navi animated:YES completion:^{
+//
+//
+//    }];
+#if defined(BUILD_HOMER) || defined(BUILD_GATIT)
     
-    UINavigationController* navi = [[UINavigationController alloc] initWithRootViewController:bundleVC] ;
+    MasterModelViewController *masterModelVC = [MasterModelViewController buildMasterModelViewController];
+    masterModelVC.content_data = self.master_items;
+    UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:masterModelVC];
+    [vc presentViewController:nav animated:YES completion:nil];
     
-    navi.modalPresentationStyle = UIModalTransitionStyleCrossDissolve;//有三种状态，自己看看是哪种
-    [vc presentViewController:navi animated:YES completion:^{
-        
-
-    }];
-
+#endif
     
 }
 

RedAnt ERP Mobile/iSales-HOMER.xcodeproj/project.pbxproj

@@ -7,6 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		42604119201C072F002374A8 /* MasterModelViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42604118201C072F002374A8 /* MasterModelViewController.m */; };
+		4260411C201C079C002374A8 /* MasterModelCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4260411B201C079C002374A8 /* MasterModelCell.m */; };
+		4260411E201C07E3002374A8 /* MasterModel.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4260411D201C07E3002374A8 /* MasterModel.storyboard */; };
 		428980041E2490C1005F1BD8 /* NotificationNameCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 428980031E2490C1005F1BD8 /* NotificationNameCenter.m */; };
 		4289800A1E24918F005F1BD8 /* CartUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 428980091E24918F005F1BD8 /* CartUtils.m */; };
 		428980151E24924D005F1BD8 /* SortButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 428980101E24924D005F1BD8 /* SortButton.m */; };
@@ -291,6 +294,11 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		42604117201C072F002374A8 /* MasterModelViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MasterModelViewController.h; path = common/Functions/cart/MasterModelViewController.h; sourceTree = SOURCE_ROOT; };
+		42604118201C072F002374A8 /* MasterModelViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = MasterModelViewController.m; path = common/Functions/cart/MasterModelViewController.m; sourceTree = SOURCE_ROOT; };
+		4260411A201C079C002374A8 /* MasterModelCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MasterModelCell.h; path = common/Functions/cart/MasterModelCell.h; sourceTree = SOURCE_ROOT; };
+		4260411B201C079C002374A8 /* MasterModelCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = MasterModelCell.m; path = common/Functions/cart/MasterModelCell.m; sourceTree = SOURCE_ROOT; };
+		4260411D201C07E3002374A8 /* MasterModel.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = MasterModel.storyboard; path = common/Functions/cart/MasterModel.storyboard; sourceTree = SOURCE_ROOT; };
 		428980021E2490C1005F1BD8 /* NotificationNameCenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NotificationNameCenter.h; path = common/NotificationNameCenter.h; sourceTree = SOURCE_ROOT; };
 		428980031E2490C1005F1BD8 /* NotificationNameCenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NotificationNameCenter.m; path = common/NotificationNameCenter.m; sourceTree = SOURCE_ROOT; };
 		428980081E24918F005F1BD8 /* CartUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CartUtils.h; path = common/CartUtils.h; sourceTree = SOURCE_ROOT; };
@@ -837,6 +845,18 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		4260411F201C07EE002374A8 /* MasterModel */ = {
+			isa = PBXGroup;
+			children = (
+				42604117201C072F002374A8 /* MasterModelViewController.h */,
+				42604118201C072F002374A8 /* MasterModelViewController.m */,
+				4260411A201C079C002374A8 /* MasterModelCell.h */,
+				4260411B201C079C002374A8 /* MasterModelCell.m */,
+				4260411D201C07E3002374A8 /* MasterModel.storyboard */,
+			);
+			name = MasterModel;
+			sourceTree = "<group>";
+		};
 		4289800E1E24924D005F1BD8 /* sort */ = {
 			isa = PBXGroup;
 			children = (
@@ -1369,6 +1389,7 @@
 				712C40B81C731126000E6831 /* ItemNotesViewController.m */,
 				712C40B41C7310F4000E6831 /* CartGeneralNotesViewController.h */,
 				712C40B51C7310F4000E6831 /* CartGeneralNotesViewController.m */,
+				4260411F201C07EE002374A8 /* MasterModel */,
 			);
 			name = cartView;
 			sourceTree = "<group>";
@@ -2032,6 +2053,7 @@
 				7111E5721C76C557004763B3 /* customer_info_template_edit.json in Resources */,
 				7161FEB61D61B24900157EE1 /* normalpayment.html in Resources */,
 				71DF74961C57614C00F2789C /* PhotoBorder@2x.png in Resources */,
+				4260411E201C07E3002374A8 /* MasterModel.storyboard in Resources */,
 				71EFCA0B1FF3735900F8D511 /* homerUI.storyboard in Resources */,
 				71C1D83F1F456BE800CEA1C9 /* category.json in Resources */,
 				7165662E1EF3ACD900CB897F /* photostack_image.html in Resources */,
@@ -2123,6 +2145,7 @@
 				7162A5611C58724700AB630E /* CustomerInfoViewController.m in Sources */,
 				7162A5AB1C58735900AB630E /* PDFListViewController.m in Sources */,
 				71DF74681C575E7900F2789C /* EnumSelectViewController.m in Sources */,
+				42604119201C072F002374A8 /* MasterModelViewController.m in Sources */,
 				42BEF3531E89FE1200632AB6 /* README.md in Sources */,
 				428980471E249339005F1BD8 /* JKLockController.m in Sources */,
 				71D99D301CEF02E700CA32DE /* CustomIOSAlertView.m in Sources */,
@@ -2140,6 +2163,7 @@
 				71DF745C1C575E7900F2789C /* CommonEditorCellEdit.m in Sources */,
 				7186C25D1C97A6EE00CB43F4 /* FunctionTestViewController.m in Sources */,
 				71DF74691C575E7900F2789C /* MonthPickerViewController.m in Sources */,
+				4260411C201C079C002374A8 /* MasterModelCell.m in Sources */,
 				71EFCA0E1FF617C100F8D511 /* MDHTMLLabel.m in Sources */,
 				71DF74371C575D6600F2789C /* CommonGridViewController.m in Sources */,
 				71C1D8511F456CB400CEA1C9 /* HWWeakTimer.m in Sources */,