11

Layout/gridHomePosRes.xml

@@ -1,6 +1,6 @@
 <XtraSerializer version="1.0" application="View">
   <property name="#LayoutVersion" />
-  <property name="#LayoutScaleFactor">@10,Width=1.14285719@10,Height=1.26666665</property>
+  <property name="#LayoutScaleFactor">@10,Width=1.14285719@10,Height=1.35714281</property>
   <property name="Appearance" isnull="true" iskey="true">
     <property name="Row" iskey="true" value="Row">
       <property name="Options" isnull="true" iskey="true">
@@ -43,16 +43,16 @@
     <property name="EnableGroupPanelMenu">false</property>
   </property>
   <property name="OptionsEditForm" isnull="true" iskey="true">
-    <property name="PopupEditFormWidth">1829</property>
+    <property name="PopupEditFormWidth">731</property>
   </property>
-  <property name="FixedLineWidth">1</property>
+  <property name="FixedLineWidth">2</property>
   <property name="IndicatorWidth">30</property>
   <property name="ColumnPanelRowHeight">-1</property>
   <property name="RowSeparatorHeight">0</property>
   <property name="FooterPanelHeight">-1</property>
   <property name="HorzScrollVisibility">Auto</property>
   <property name="VertScrollVisibility">Auto</property>
-  <property name="RowHeight">13</property>
+  <property name="RowHeight">26</property>
   <property name="GroupRowHeight">-1</property>
   <property name="GroupFormat">{0}: [#image]{1} {2}</property>
   <property name="ChildGridLevelName" />
@@ -60,8 +60,8 @@
   <property name="PreviewFieldName" />
   <property name="GroupPanelText" />
   <property name="NewItemRowText" />
-  <property name="LevelIndent">0</property>
-  <property name="PreviewIndent">0</property>
+  <property name="LevelIndent">-1</property>
+  <property name="PreviewIndent">-1</property>
   <property name="PreviewLineCount">-1</property>
   <property name="ScrollStyle">LiveVertScroll, LiveHorzScroll</property>
   <property name="FocusRectStyle">CellFocus</property>
@@ -77,8 +77,8 @@
       <property name="ColumnEditName" />
       <property name="VisibleIndex">0</property>
       <property name="Visible">true</property>
-      <property name="Width">85</property>
-      <property name="MinWidth">20</property>
+      <property name="Width">86</property>
+      <property name="MinWidth">25</property>
       <property name="MaxWidth">0</property>
       <property name="UnboundDataTypeName" />
     </property>
@@ -90,8 +90,8 @@
       <property name="ColumnEditName" />
       <property name="VisibleIndex">1</property>
       <property name="Visible">true</property>
-      <property name="Width">85</property>
-      <property name="MinWidth">20</property>
+      <property name="Width">86</property>
+      <property name="MinWidth">25</property>
       <property name="MaxWidth">0</property>
       <property name="UnboundDataTypeName" />
     </property>
@@ -103,8 +103,8 @@
       <property name="ColumnEditName" />
       <property name="VisibleIndex">2</property>
       <property name="Visible">true</property>
-      <property name="Width">85</property>
-      <property name="MinWidth">20</property>
+      <property name="Width">86</property>
+      <property name="MinWidth">25</property>
       <property name="MaxWidth">0</property>
       <property name="UnboundDataTypeName" />
     </property>
@@ -116,8 +116,8 @@
       <property name="ColumnEditName" />
       <property name="VisibleIndex">3</property>
       <property name="Visible">true</property>
-      <property name="Width">85</property>
-      <property name="MinWidth">20</property>
+      <property name="Width">86</property>
+      <property name="MinWidth">25</property>
       <property name="MaxWidth">0</property>
       <property name="UnboundDataTypeName" />
     </property>
@@ -129,8 +129,8 @@
       <property name="ColumnEditName" />
       <property name="VisibleIndex">4</property>
       <property name="Visible">true</property>
-      <property name="Width">85</property>
-      <property name="MinWidth">20</property>
+      <property name="Width">86</property>
+      <property name="MinWidth">25</property>
       <property name="MaxWidth">0</property>
       <property name="UnboundDataTypeName" />
     </property>
@@ -145,8 +145,8 @@
       <property name="ColumnEditName" />
       <property name="VisibleIndex">5</property>
       <property name="Visible">true</property>
-      <property name="Width">85</property>
-      <property name="MinWidth">20</property>
+      <property name="Width">86</property>
+      <property name="MinWidth">25</property>
       <property name="MaxWidth">0</property>
       <property name="UnboundDataTypeName" />
     </property>
@@ -161,8 +161,8 @@
       <property name="ColumnEditName" />
       <property name="VisibleIndex">6</property>
       <property name="Visible">true</property>
-      <property name="Width">85</property>
-      <property name="MinWidth">20</property>
+      <property name="Width">86</property>
+      <property name="MinWidth">25</property>
       <property name="MaxWidth">0</property>
       <property name="UnboundDataTypeName" />
     </property>
@@ -174,8 +174,8 @@
       <property name="ColumnEditName" />
       <property name="VisibleIndex">7</property>
       <property name="Visible">true</property>
-      <property name="Width">85</property>
-      <property name="MinWidth">20</property>
+      <property name="Width">86</property>
+      <property name="MinWidth">25</property>
       <property name="MaxWidth">0</property>
       <property name="UnboundDataTypeName" />
     </property>
@@ -187,8 +187,8 @@
       <property name="ColumnEditName" />
       <property name="VisibleIndex">8</property>
       <property name="Visible">true</property>
-      <property name="Width">85</property>
-      <property name="MinWidth">20</property>
+      <property name="Width">86</property>
+      <property name="MinWidth">25</property>
       <property name="MaxWidth">0</property>
       <property name="UnboundDataTypeName" />
     </property>
@@ -200,8 +200,8 @@
       <property name="ColumnEditName" />
       <property name="VisibleIndex">9</property>
       <property name="Visible">true</property>
-      <property name="Width">85</property>
-      <property name="MinWidth">20</property>
+      <property name="Width">86</property>
+      <property name="MinWidth">25</property>
       <property name="MaxWidth">0</property>
       <property name="UnboundDataTypeName" />
     </property>
@@ -213,8 +213,8 @@
       <property name="ColumnEditName" />
       <property name="VisibleIndex">10</property>
       <property name="Visible">true</property>
-      <property name="Width">85</property>
-      <property name="MinWidth">20</property>
+      <property name="Width">86</property>
+      <property name="MinWidth">25</property>
       <property name="MaxWidth">0</property>
       <property name="UnboundDataTypeName" />
     </property>
@@ -224,7 +224,7 @@
   <property name="SynchronizeClones">true</property>
   <property name="DetailTabHeaderLocation">Top</property>
   <property name="Name">gridView2</property>
-  <property name="DetailHeight">875</property>
+  <property name="DetailHeight">380</property>
   <property name="Tag" isnull="true" />
   <property name="GroupSummary" iskey="true" value="0" />
   <property name="ActiveFilterString" />

Layout/gridHomeTask.xml

@@ -1,6 +1,6 @@
 <XtraSerializer version="1.0" application="View">
   <property name="#LayoutVersion" />
-  <property name="#LayoutScaleFactor">@10,Width=1.14285719@10,Height=1.26666665</property>
+  <property name="#LayoutScaleFactor">@10,Width=1.14285719@10,Height=1.35714281</property>
   <property name="Appearance" isnull="true" iskey="true">
     <property name="Row" iskey="true" value="Row">
       <property name="Options" isnull="true" iskey="true">
@@ -43,16 +43,16 @@
     <property name="EnableGroupPanelMenu">false</property>
   </property>
   <property name="OptionsEditForm" isnull="true" iskey="true">
-    <property name="PopupEditFormWidth">1829</property>
+    <property name="PopupEditFormWidth">731</property>
   </property>
-  <property name="FixedLineWidth">1</property>
+  <property name="FixedLineWidth">2</property>
   <property name="IndicatorWidth">-1</property>
   <property name="ColumnPanelRowHeight">-1</property>
   <property name="RowSeparatorHeight">0</property>
   <property name="FooterPanelHeight">-1</property>
   <property name="HorzScrollVisibility">Auto</property>
   <property name="VertScrollVisibility">Auto</property>
-  <property name="RowHeight">13</property>
+  <property name="RowHeight">26</property>
   <property name="GroupRowHeight">-1</property>
   <property name="GroupFormat">{0}: [#image]{1} {2}</property>
   <property name="ChildGridLevelName" />
@@ -60,8 +60,8 @@
   <property name="PreviewFieldName" />
   <property name="GroupPanelText" />
   <property name="NewItemRowText" />
-  <property name="LevelIndent">0</property>
-  <property name="PreviewIndent">0</property>
+  <property name="LevelIndent">-1</property>
+  <property name="PreviewIndent">-1</property>
   <property name="PreviewLineCount">-1</property>
   <property name="ScrollStyle">LiveVertScroll, LiveHorzScroll</property>
   <property name="FocusRectStyle">CellFocus</property>
@@ -77,7 +77,7 @@
       <property name="ColumnEditName" />
       <property name="VisibleIndex">0</property>
       <property name="Visible">true</property>
-      <property name="Width">416</property>
+      <property name="Width">86</property>
       <property name="AppearanceCell" isnull="true" iskey="true">
         <property name="Options" isnull="true" iskey="true">
           <property name="UseTextOptions">true</property>
@@ -86,7 +86,7 @@
           <property name="HAlignment">Near</property>
         </property>
       </property>
-      <property name="MinWidth">20</property>
+      <property name="MinWidth">25</property>
       <property name="MaxWidth">0</property>
       <property name="UnboundDataTypeName" />
     </property>
@@ -98,8 +98,8 @@
       <property name="ColumnEditName" />
       <property name="VisibleIndex">1</property>
       <property name="Visible">true</property>
-      <property name="Width">235</property>
-      <property name="MinWidth">20</property>
+      <property name="Width">86</property>
+      <property name="MinWidth">25</property>
       <property name="MaxWidth">0</property>
       <property name="UnboundDataTypeName" />
     </property>
@@ -109,8 +109,10 @@
       <property name="ImageIndex">-1</property>
       <property name="FieldName">ID</property>
       <property name="ColumnEditName" />
-      <property name="Width">85</property>
-      <property name="MinWidth">20</property>
+      <property name="VisibleIndex">2</property>
+      <property name="Visible">true</property>
+      <property name="Width">86</property>
+      <property name="MinWidth">25</property>
       <property name="MaxWidth">0</property>
       <property name="UnboundDataTypeName" />
     </property>
@@ -120,8 +122,10 @@
       <property name="ImageIndex">-1</property>
       <property name="FieldName">CreateTime</property>
       <property name="ColumnEditName" />
-      <property name="Width">85</property>
-      <property name="MinWidth">20</property>
+      <property name="VisibleIndex">3</property>
+      <property name="Visible">true</property>
+      <property name="Width">86</property>
+      <property name="MinWidth">25</property>
       <property name="MaxWidth">0</property>
       <property name="UnboundDataTypeName" />
     </property>
@@ -131,8 +135,10 @@
       <property name="ImageIndex">-1</property>
       <property name="FieldName">UpdateTime</property>
       <property name="ColumnEditName" />
-      <property name="Width">85</property>
-      <property name="MinWidth">20</property>
+      <property name="VisibleIndex">4</property>
+      <property name="Visible">true</property>
+      <property name="Width">86</property>
+      <property name="MinWidth">25</property>
       <property name="MaxWidth">0</property>
       <property name="UnboundDataTypeName" />
     </property>
@@ -142,7 +148,7 @@
   <property name="SynchronizeClones">true</property>
   <property name="DetailTabHeaderLocation">Top</property>
   <property name="Name">gridView1</property>
-  <property name="DetailHeight">875</property>
+  <property name="DetailHeight">380</property>
   <property name="Tag" isnull="true" />
   <property name="GroupSummary" iskey="true" value="0" />
   <property name="ActiveFilterString" />

Layout/gridXl.xml

@@ -66,15 +66,17 @@
   <property name="HorzScrollStep">0</property>
   <property name="ActiveFilterEnabled">true</property>
   <property name="ViewCaptionHeight">-1</property>
-  <property name="Columns" iskey="true" value="9">
+  <property name="Columns" iskey="true" value="10">
     <property name="Item1" isnull="true" iskey="true">
       <property name="Name">colSatCode</property>
       <property name="ImageAlignment">Near</property>
       <property name="ImageIndex">-1</property>
       <property name="FieldName">SatCode</property>
       <property name="ColumnEditName" />
+      <property name="VisibleIndex">0</property>
+      <property name="Visible">true</property>
       <property name="Width">86</property>
-      <property name="MinWidth">20</property>
+      <property name="MinWidth">25</property>
       <property name="MaxWidth">0</property>
       <property name="UnboundDataTypeName" />
     </property>
@@ -84,8 +86,10 @@
       <property name="ImageIndex">-1</property>
       <property name="FieldName">SatName</property>
       <property name="ColumnEditName" />
+      <property name="VisibleIndex">1</property>
+      <property name="Visible">true</property>
       <property name="Width">86</property>
-      <property name="MinWidth">20</property>
+      <property name="MinWidth">25</property>
       <property name="MaxWidth">0</property>
       <property name="UnboundDataTypeName" />
     </property>
@@ -98,10 +102,10 @@
       <property name="ImageIndex">-1</property>
       <property name="FieldName">Sat</property>
       <property name="ColumnEditName" />
-      <property name="VisibleIndex">0</property>
+      <property name="VisibleIndex">2</property>
       <property name="Visible">true</property>
-      <property name="Width">291</property>
-      <property name="MinWidth">20</property>
+      <property name="Width">86</property>
+      <property name="MinWidth">25</property>
       <property name="MaxWidth">0</property>
       <property name="UnboundDataTypeName" />
     </property>
@@ -111,10 +115,10 @@
       <property name="ImageIndex">-1</property>
       <property name="FieldName">TimeBJ</property>
       <property name="ColumnEditName" />
-      <property name="VisibleIndex">1</property>
+      <property name="VisibleIndex">3</property>
       <property name="Visible">true</property>
-      <property name="Width">164</property>
-      <property name="MinWidth">20</property>
+      <property name="Width">86</property>
+      <property name="MinWidth">25</property>
       <property name="MaxWidth">0</property>
       <property name="UnboundDataTypeName" />
     </property>
@@ -124,10 +128,10 @@
       <property name="ImageIndex">-1</property>
       <property name="FieldName">Line1</property>
       <property name="ColumnEditName" />
-      <property name="VisibleIndex">2</property>
+      <property name="VisibleIndex">4</property>
       <property name="Visible">true</property>
-      <property name="Width">519</property>
-      <property name="MinWidth">20</property>
+      <property name="Width">86</property>
+      <property name="MinWidth">25</property>
       <property name="MaxWidth">0</property>
       <property name="UnboundDataTypeName" />
     </property>
@@ -137,43 +141,65 @@
       <property name="ImageIndex">-1</property>
       <property name="FieldName">Line2</property>
       <property name="ColumnEditName" />
-      <property name="VisibleIndex">3</property>
+      <property name="VisibleIndex">5</property>
       <property name="Visible">true</property>
-      <property name="Width">524</property>
-      <property name="MinWidth">20</property>
+      <property name="Width">86</property>
+      <property name="MinWidth">25</property>
       <property name="MaxWidth">0</property>
       <property name="UnboundDataTypeName" />
     </property>
     <property name="Item7" isnull="true" iskey="true">
+      <property name="Name">colTwoLine</property>
+      <property name="OptionsColumn" isnull="true" iskey="true">
+        <property name="ReadOnly">true</property>
+      </property>
+      <property name="ImageAlignment">Near</property>
+      <property name="ImageIndex">-1</property>
+      <property name="FieldName">TwoLine</property>
+      <property name="ColumnEditName" />
+      <property name="VisibleIndex">6</property>
+      <property name="Visible">true</property>
+      <property name="Width">86</property>
+      <property name="MinWidth">25</property>
+      <property name="MaxWidth">0</property>
+      <property name="UnboundDataTypeName" />
+    </property>
+    <property name="Item8" isnull="true" iskey="true">
       <property name="Name">colID</property>
       <property name="ImageAlignment">Near</property>
       <property name="ImageIndex">-1</property>
       <property name="FieldName">ID</property>
       <property name="ColumnEditName" />
+      <property name="VisibleIndex">7</property>
+      <property name="Visible">true</property>
       <property name="Width">86</property>
-      <property name="MinWidth">20</property>
+      <property name="MinWidth">25</property>
       <property name="MaxWidth">0</property>
       <property name="UnboundDataTypeName" />
     </property>
-    <property name="Item8" isnull="true" iskey="true">
+    <property name="Item9" isnull="true" iskey="true">
       <property name="Name">colCreateTime</property>
       <property name="ImageAlignment">Near</property>
       <property name="ImageIndex">-1</property>
       <property name="FieldName">CreateTime</property>
       <property name="ColumnEditName" />
+      <property name="VisibleIndex">8</property>
+      <property name="Visible">true</property>
       <property name="Width">86</property>
-      <property name="MinWidth">20</property>
+      <property name="MinWidth">25</property>
       <property name="MaxWidth">0</property>
       <property name="UnboundDataTypeName" />
     </property>
-    <property name="Item9" isnull="true" iskey="true">
+    <property name="Item10" isnull="true" iskey="true">
       <property name="Name">colUpdateTime</property>
       <property name="ImageAlignment">Near</property>
       <property name="ImageIndex">-1</property>
       <property name="FieldName">UpdateTime</property>
       <property name="ColumnEditName" />
+      <property name="VisibleIndex">9</property>
+      <property name="Visible">true</property>
       <property name="Width">86</property>
-      <property name="MinWidth">20</property>
+      <property name="MinWidth">25</property>
       <property name="MaxWidth">0</property>
       <property name="UnboundDataTypeName" />
     </property>
@@ -188,6 +214,15 @@
   <property name="GroupSummary" iskey="true" value="0" />
   <property name="ActiveFilterString" />
   <property name="FormatRules" iskey="true" value="0" />
+  <property name="SortInfoState" iskey="true" value="1">
+    <property name="Item1" isnull="true" iskey="true">
+      <property name="Orders">Descending</property>
+      <property name="Columns">colTimeBJ</property>
+    </property>
+    <property name="Content" isnull="true" iskey="true">
+      <property name="GroupCount">0</property>
+    </property>
+  </property>
   <property name="FormatConditions" iskey="true" value="0" />
   <property name="GroupSummarySortInfoState" />
   <property name="FindFilterText" />

XdCxRhDW.App/Properties/licenses.licx

@@ -1,6 +1,7 @@
 DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraMap.MapControl, DevExpress.XtraMap.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a