From 3cf05e4d2553c31ffc879cb6a65abd97ad24daf6 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Thu, 7 Dec 2023 13:50:48 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Aucma.Scada.Business/AssemblyPlanBusiness.cs  |  2 +-
 .../AssemblyPlan/AssemblyPlanControl.xaml     | 22 +++++++++----------
 Aucma.Scada.UI/bin/Debug/config/App.Ini       |  6 ++---
 .../AssemblyPlan/AssemblyPlanViewModel.cs     | 10 +++++++++
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/Aucma.Scada.Business/AssemblyPlanBusiness.cs b/Aucma.Scada.Business/AssemblyPlanBusiness.cs
index 80010973..b0bd1678 100644
--- a/Aucma.Scada.Business/AssemblyPlanBusiness.cs
+++ b/Aucma.Scada.Business/AssemblyPlanBusiness.cs
@@ -155,7 +155,7 @@ namespace Aucma.Scada.Business
 
                     List<BaseSpaceDetail> spaceDetails = _spaceDetailService.GetSpaceDetailsByMaterialType(storeCode, materialType);
 
-                    if (spaceDetails.Count > transmitAmount)
+                    if (spaceDetails.Count >= transmitAmount)
                     {
                         result = true;
                     }
diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml
index 732c676a..7b6b5a59 100644
--- a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml
+++ b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml
@@ -286,24 +286,22 @@
                             <RowDefinition Height="1.3*"/>
                         </Grid.RowDefinitions>
 
-                        <DataGrid Grid.Row="0" ItemsSource="{Binding PlanInfoDataGrid}" Background="Transparent" 
-                      FontSize="20" ColumnHeaderHeight="35" 
-                      RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
+                        <DataGrid x:Name="grid" Grid.Row="0" ItemsSource="{Binding PlanInfoDataGrid}" Background="#00000000" 
+                       ColumnHeaderHeight="35"  
+                      RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0" 
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
-                      ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
-                      Foreground="#FFFFFF" >
+                      ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True"
+                      Foreground="White" >
                             <!--resourceStyle 399行修改选中字体颜色-->
                             <DataGrid.Columns>
-                                <DataGridTextColumn Binding="{Binding executePlanCode}" Header="计划编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                                <!--<DataGridTextColumn Binding="{Binding productPlanCode}" Header="生产计划" Width="1*" IsReadOnly="True"/>-->
-                                <DataGridTextColumn Binding="{Binding materialName}" Header="产品型号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn Binding="{Binding executePlanCode}" Header="计划编号" Width="*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" Visibility="Hidden"/>
+                                <DataGridTextColumn Binding="{Binding materialName}" Header="产品型号" Width="3*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                                 <DataGridTextColumn Binding="{Binding planAmount}" Header="计划数量" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                                 <DataGridTextColumn Binding="{Binding completeAmount}" Header="完成数量" Width="1*" 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\}}" Header="开始时间" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                                 <DataGridTextColumn Binding="{Binding executeStatus,Converter={StaticResource PlanStatusConverter}}" Header="执行状态" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                                <!--<DataGridTextColumn Binding="{Binding endTime ,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="完成时间" Width="1*" IsReadOnly="True"/>-->
-                                <!--<DataGridTextColumn Binding="{Binding createdTime ,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="创建时间" Width="1*" IsReadOnly="True"/>-->
-                                <DataGridTemplateColumn Header="操作" Width="2*">
+                               
+                                <DataGridTemplateColumn Header="操作" Width="3*">
                                     <DataGridTemplateColumn.CellTemplate>
                                         <DataTemplate>
                                             <StackPanel Orientation="Horizontal">
diff --git a/Aucma.Scada.UI/bin/Debug/config/App.Ini b/Aucma.Scada.UI/bin/Debug/config/App.Ini
index 20b732f0..ae151a4f 100644
--- a/Aucma.Scada.UI/bin/Debug/config/App.Ini
+++ b/Aucma.Scada.UI/bin/Debug/config/App.Ini
@@ -4,7 +4,7 @@ mesConnStr=Data Source=175.27.215.92/helowin;User ID=aucma_mes;Password=aucma
 scadaConnStr=Data Source=175.27.215.92/helowin;User ID=aucma_scada;Password=aucma
 
 #����
-stationCode=ZZ-01
+stationCode=1002
 #�����
 stationName=����ڵ���װ
 
@@ -14,9 +14,9 @@ shellStoreCode=XKJCK-001
 linerStoreCode=NDJCK-001
 
 #����������ͱ��
-shellMaterialType =3
+shellMaterialType =400
 #�ڵ��������ͱ��
-linerMaterialType=4
+linerMaterialType=500
 
 #����������ͱ��
 instoreTaskType=1
diff --git a/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs
index 97bf8904..345e4091 100644
--- a/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs
+++ b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs
@@ -48,6 +48,15 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
 
         #region 参数定义
         /// <summary>
+        /// 序号
+        /// </summary>
+        private int no;
+        public int NO
+        {
+            get { return no; }
+            set { no = value; RaisePropertyChanged(nameof(NO)); }
+        }
+        /// <summary>
         /// 工位名称
         /// </summary>
         private string stationName = string.Empty;
@@ -294,6 +303,7 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
 
         public void RefreshDataGrid(List<ExecutePlanInfo> executePlanInfos)
         {
+            int count = 0;
             PlanInfoDataGrid = new ObservableCollection<ExecutePlanInfo>();
             if (executePlanInfos != null)
             {