change-页面修改

Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml

@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:Aucma.Scada.UI.Page.AssemblyPlan"
         xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.AssemblyPlan"
         mc:Ignorable="d"
-        Title="MES生产计划" Height="800" Width="1500" Name="window" WindowStartupLocation="CenterScreen"  FontFamily="Microsoft YaHei"  Background="#1152AC"
+        Title="MES生产计划" Height="800" Width="1600" Name="window" WindowStartupLocation="CenterScreen"  FontFamily="Microsoft YaHei"  Background="#1152AC"
         ResizeMode="NoResize" >
     <Window.Resources>
         <Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
@@ -144,13 +144,13 @@
                       Foreground="#FFFFFF"  SelectedItem="{Binding SelectedDataItem}" MouseLeftButtonDown="dataGrid_MouseLeftButtonDown">
                     <!--resourceStyle 399行修改选中字体颜色-->
                     <DataGrid.Columns>
-                        <DataGridTextColumn Binding="{Binding planCode}" Header="计划编号" Width="1*"  IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                        <DataGridTextColumn Binding="{Binding planCode}" Header="计划编号" Width="0.9*"  IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                        <DataGridTextColumn Binding="{Binding orderCode}" Header="工单编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                        <DataGridTextColumn Binding="{Binding orderCode}" Header="工单编号" Width="0.9*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                         <DataGridTextColumn Binding="{Binding materialCode}" Header="产品编码" Width="1.3*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                        <DataGridTextColumn Binding="{Binding materialName}" Header="产品型号" Width="4*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                        <DataGridTextColumn Binding="{Binding materialName}" Header="产品型号" Width="3.5*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                        <DataGridTextColumn Binding="{Binding planAmount}" Header="计划数量" Width="0.8*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                        <DataGridTextColumn Binding="{Binding planAmount}" Header="计划数量" Width="0.6*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                        <DataGridTextColumn Binding="{Binding completeAmount}" Header="完成数量" Width="0.8*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                        <DataGridTextColumn Binding="{Binding completeAmount}" Header="完成数量" Width="0.6*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                        <DataGridTextColumn Binding="{Binding beginTime,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="开始时间" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                        <DataGridTextColumn Binding="{Binding beginTime,StringFormat=\{0:MM月dd日 HH:mm:ss\}}" Header="开始时间" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                     </DataGrid.Columns>
                 </DataGrid>
             </Border>

Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml

@@ -239,9 +239,9 @@
                     <DataGrid.Columns>
                         <DataGridTextColumn Binding="{Binding taskCode}" Header="任务编号" Width="100" IsReadOnly="True"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                         <!--<DataGridTextColumn Binding="{Binding materialCode}" Header="物料编码" Width="*" IsReadOnly="True"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>-->
-                        <DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="*" IsReadOnly="True"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                        <DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="2.7*" IsReadOnly="True"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                        <DataGridTextColumn Binding="{Binding spaceName}" Header="出库货道" Width="*" IsReadOnly="True"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                        <DataGridTextColumn Binding="{Binding spaceName}" Header="出库货道" Width="0.5*" IsReadOnly="True"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                        <DataGridTextColumn Binding="{Binding taskStatus,Converter={StaticResource TaskStatusConverter}}" Header="出库状态" Width="*" IsReadOnly="True"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                        <DataGridTextColumn Binding="{Binding taskStatus,Converter={StaticResource TaskStatusConverter}}" Header="出库状态" Width="0.5*" IsReadOnly="True"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                         <DataGridTextColumn Binding="{Binding createTime,StringFormat=\{0:yyyy-MM-dd HH:mm:ss\}}" Header="创建时间" Width="*" IsReadOnly="True"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                         <!--<DataGridTextColumn Binding="{Binding beginTime,StringFormat=\{0:MM-dd HH:mm:ss\}}" Header="开始时间" Width="*" IsReadOnly="True"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>-->
                         <DataGridTemplateColumn Header="操作" Width="*">

Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6DA0971FEEFF86ABE715CAE90CF158E4845B3F2075983251ADE14C38565EE308"
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F47677F91A1A9CE3550529D0C6329DB2DBFA7E2AA4E80AA36C8E2ECFE7628EF3"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.g.i.cs

@@ -1,4 +1,5 @@
-#pragma checksum "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6DA0971FEEFF86ABE715CAE90CF158E4845B3F2075983251ADE14C38565EE308"
+// Updated by XamlIntelliSenseFileGenerator 2024-03-20 19:17:46
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F47677F91A1A9CE3550529D0C6329DB2DBFA7E2AA4E80AA36C8E2ECFE7628EF3"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -33,29 +34,26 @@ using System.Windows.Shapes;
 using System.Windows.Shell;
 
 
-namespace Aucma.Scada.UI.Page.AssemblyPlan {
+namespace Aucma.Scada.UI.Page.AssemblyPlan
+{
 
 
     /// <summary>
     /// PlanInfoEditWindow
     /// </summary>
-    public partial class PlanInfoEditWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+    public partial class PlanInfoEditWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector
+    {
 
-        
+#line default
-        #line 9 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml"
+#line hidden
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Aucma.Scada.UI.Page.AssemblyPlan.PlanInfoEditWindow window;
-        
-        #line default
-        #line hidden
 
 
-        #line 139 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml"
+#line 139 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid dataGrid;
 
-        #line default
+#line default
-        #line hidden
+#line hidden
 
         private bool _contentLoaded;
 
@@ -64,18 +62,20 @@ namespace Aucma.Scada.UI.Page.AssemblyPlan {
         /// </summary>
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
+        public void InitializeComponent()
-            if (_contentLoaded) {
+        {
+            if (_contentLoaded)
+            {
                 return;
             }
             _contentLoaded = true;
             System.Uri resourceLocater = new System.Uri("/Aucma.Scada.UI;component/page/assemblyplan/planinfoeditwindow.xaml", System.UriKind.Relative);
 
-            #line 1 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml"
+#line 1 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml"
             System.Windows.Application.LoadComponent(this, resourceLocater);
 
-            #line default
+#line default
-            #line hidden
+#line hidden
         }
 
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -84,24 +84,27 @@ namespace Aucma.Scada.UI.Page.AssemblyPlan {
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
+        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target)
+        {
             switch (connectionId)
             {
-            case 1:
+                case 1:
-            this.window = ((Aucma.Scada.UI.Page.AssemblyPlan.PlanInfoEditWindow)(target));
+                    this.window = ((Aucma.Scada.UI.Page.AssemblyPlan.PlanInfoEditWindow)(target));
-            return;
+                    return;
-            case 2:
+                case 2:
-            this.dataGrid = ((System.Windows.Controls.DataGrid)(target));
+                    this.dataGrid = ((System.Windows.Controls.DataGrid)(target));
-            
+
-            #line 144 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml"
+#line 144 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml"
-            this.dataGrid.MouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.dataGrid_MouseLeftButtonDown);
+                    this.dataGrid.MouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.dataGrid_MouseLeftButtonDown);
-            
+
-            #line default
+#line default
-            #line hidden
+#line hidden
-            return;
+                    return;
             }
             this._contentLoaded = true;
         }
+
+        internal System.Windows.Window window;
     }
 }
 

Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E7BEA44FBAD7E55038BA853DE5C111A538C831C963C96BA8F11DBDC6C484EB4F"
+#pragma checksum "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B78E3E90A2B9F957AA66D6BC928EE79BC09DB328F88CB88C39E5BD7E52D7EFE2"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E7BEA44FBAD7E55038BA853DE5C111A538C831C963C96BA8F11DBDC6C484EB4F"
+#pragma checksum "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B78E3E90A2B9F957AA66D6BC928EE79BC09DB328F88CB88C39E5BD7E52D7EFE2"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。