1007

shangjian/CentralControl/bin/Debug/config/log4net.config

@@ -8,8 +8,8 @@
 		<root>
 			<level value="ALL" />
 			<appender-ref ref="LogFileAppender"/>
-			<appender-ref ref="MachineWainingLog"/>
-			<appender-ref ref="ErrorInfoLog"/>
+			<!--<appender-ref ref="MachineWainingLog"/>
+			<appender-ref ref="ErrorInfoLog"/>-->
 		</root>
 
 		<!--写入到文件-->

shangjian/CommonFunc/Config/log4net.config

@@ -8,8 +8,8 @@
 		<root>
 			<level value="ALL" />
 			<appender-ref ref="LogFileAppender"/>
-			<appender-ref ref="MachineWainingLog"/>
-			<appender-ref ref="ErrorInfoLog"/>
+			<!--<appender-ref ref="MachineWainingLog"/>
+			<appender-ref ref="ErrorInfoLog"/>-->
 		</root>
 
 		<!--写入到文件-->

shangjian/CommonFunc/bin/x86/Debug/Config/log4net.config

@@ -8,8 +8,8 @@
 		<root>
 			<level value="ALL" />
 			<appender-ref ref="LogFileAppender"/>
-			<appender-ref ref="MachineWainingLog"/>
-			<appender-ref ref="ErrorInfoLog"/>
+			<!--<appender-ref ref="MachineWainingLog"/>
+			<appender-ref ref="ErrorInfoLog"/>-->
 		</root>
 
 		<!--写入到文件-->

shangjian/LanJuLib/bin/Debug/Config/log4net.config

@@ -8,8 +8,8 @@
 		<root>
 			<level value="ALL" />
 			<appender-ref ref="LogFileAppender"/>
-			<appender-ref ref="MachineWainingLog"/>
-			<appender-ref ref="ErrorInfoLog"/>
+			<!--<appender-ref ref="MachineWainingLog"/>
+			<appender-ref ref="ErrorInfoLog"/>-->
 		</root>
 
 		<!--写入到文件-->

shangjian/XGL.Data/DBService/DringRoomService.cs

@@ -25,7 +25,7 @@ namespace XGL.Data.DBService
                 where += $"'{str2}',";
             }
             where = "("+where.Trim(',')+")";
-            string sql = $@"select equipment_code as quipCode,equipment_name as quipName,equipment_type_code from base_equipment where equipment_type_code = 'equ_type_hf' and equipment_code in {where}";
+            string sql = $@"select equipment_code as quipCode,equipment_name as quipName,equipment_type_code from base_equipment where equipment_type_code = 'equ_type_hf' and equipment_code in {where}  order by create_time";
 
             DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
             if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
@@ -46,7 +46,7 @@ namespace XGL.Data.DBService
         public DataTable GetDringRoomData(string devicecode,int inout)
         {
 
-            string sql = $@"SELECT rfid_no,device_code,type,create_time,update_time,factory_no,workorder_code,material_code FROM [dbo].[mes_dryinghouse_info] where device_code = '{devicecode}' and type = '{inout}' and del_flag='0' ;";
+            string sql = $@"SELECT ROW_NUMBER() OVER (ORDER BY create_time) AS RowNumber,rfid_no,device_code,type,create_time,update_time,factory_no,workorder_code,material_code FROM [dbo].[mes_dryinghouse_info] where device_code = '{devicecode}' and type = '{inout}' and del_flag='0'  order by create_time ;";
             //获取绑定中，且RFID没有出烘房（在烘房内）的数据
             //            string sql = $@"SELECT rfid,workorder_code,product_name,product_code,isnull(car_num,0) as car_num,isnull([begin],'1900-01-01 08:00:00') as [begin],ord.status FROM [dbo].[mes_material_transfer_result] res
             //LEFT JOIN pro_order_workorder ord on res.OrderCode = ord.workorder_id where equipmentCode = '{devicecode}' and rfid_status = '1' and rfid not in(select rfid from mes_material_transfer_result where taskcode = '1' and rfid_status = '1')";

shangjian/XGL.Data/DBService/FormingMachineService.cs

@@ -61,7 +61,7 @@ where equipmentCode = '{devicecode}' and rfid_status = '1'; ";
         /// <returns></returns>
         public DataTable GetInOutHistoryList(string devicecode)
         {
-            string sql = $@"SELECT workorder_code,product_name,product_code,isnull(car_num,0) as car_num,isnull([begin],'1900-00-00') as [begin],beout,ord.status,product_date,ord.create_time FROM [dbo].[mes_material_transfer_result] res
+            string sql = $@"SELECT workorder_code,product_name,product_code,isnull(car_num,0) as car_num,isnull([begin],'1900-00-00') as [begin],isnull([beout],'1900-00-00') as [beout],ord.status,product_date,ord.create_time,create_by FROM [dbo].[mes_material_transfer_result] res
 LEFT JOIN pro_order_workorder ord on res.OrderCode = ord.workorder_id
 where equipmentCode = '{devicecode}'; ";
 

shangjian/XGL.Data/bin/x86/Debug/Config/log4net.config

@@ -8,8 +8,8 @@
 		<root>
 			<level value="ALL" />
 			<appender-ref ref="LogFileAppender"/>
-			<appender-ref ref="MachineWainingLog"/>
-			<appender-ref ref="ErrorInfoLog"/>
+			<!--<appender-ref ref="MachineWainingLog"/>
+			<appender-ref ref="ErrorInfoLog"/>-->
 		</root>
 
 		<!--写入到文件-->

shangjian/XGL/App.config

@@ -10,9 +10,9 @@
 		<!--车间编码-->
 		<add key="SiteCode" value="1000" />
 		<!--设备编码-->
-		<add key="DeviceCode" value="C1" />
+		<add key="DeviceCode" value="C6" />
 		<!--上位机类型 0:工单准备，1：成型机\shoupei，2：烘房-->
-		<add key="ClientMode" value="2" />
+		<add key="ClientMode" value="1" />
 		<add key="DryingHouseList" value="H1,H2,H3" />
 		<!--上位机类型 1 上件 ，2 排空区  0下件区-->
 		<add key="PostType" value="1" />

shangjian/XGL/FormItem/Main.xaml.cs

@@ -146,7 +146,7 @@ namespace XGL.FormItem
             timerDeciveState.Interval = Utils.GetAppSetting("GetDeviceStateInterval") == "" ? 15000 : Convert.ToInt32(Utils.GetAppSetting("GetDeviceStateInterval"));
             timerDeciveState.Elapsed += TimerDeciveState_Elapsed;
             timerDeciveState.Start();
-            this.lbVersion.Content = "20231003001";
+            this.lbVersion.Content = "20231005001";
         }
 
 

shangjian/XGL/Views/DryingRoomUC.xaml

@@ -17,19 +17,19 @@
             <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
             <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
             <Setter Property="VerticalContentAlignment" Value="Center"/>
-          
+
             <!--<Setter Property="ItemContainerStyle" Value="{DynamicResource ApplicantList_ListBoxItem_Style}" />-->
             <Setter Property="ItemsPanel">
                 <Setter.Value>
                     <ItemsPanelTemplate>
                         <!--<WrapPanel Orientation="Horizontal" IsItemsHost="True" />-->
                         <UniformGrid Columns="6"/>
-                        <!--设置横向：Horizontal 纵向：Vertical显示-->  
+                        <!--设置横向：Horizontal 纵向：Vertical显示-->
                     </ItemsPanelTemplate>
                 </Setter.Value>
-            </Setter> 
+            </Setter>
         </Style>
-        
+
 
         <Style x:Key="ApplicantList_ListBoxItem_Style" TargetType="{x:Type ListBoxItem}">
             <Setter Property="Margin" Value="10,10,10,0" />
@@ -37,46 +37,50 @@
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type ListBoxItem}">
                         <Border x:Name="Bd" BorderThickness="3"
-                                Width="250" 
-                                Height="150"
-                                Margin="2,0,0,0"
+                                Width="280" 
+                                Height="120"
+                                Margin="2,0,0,0" 
                                 Style="{DynamicResource ListBoxItemNormalBackground_Border_Style}">
                             <Grid >
-                                <TextBlock Text="{Binding workorder_code}" 
-                                   Margin="110,12,0,0"
-                                   HorizontalAlignment="left"
+                               
+                                <TextBlock Text="{Binding material_code}" 
                                    VerticalAlignment="top"
+                                   Margin="80,22,0,0"  
+                                   Style="{DynamicResource ListBoxItemContent_TextBlock_Style}"/>
+                                <TextBlock Text="{Binding workorder_code}" 
+                                   Margin="80,42,0,0"
+                                   HorizontalAlignment="left" 
                                    TextAlignment="left"
                                    Style="{DynamicResource ListBoxItemName_TextBlock_Style}"/>
-                                <TextBlock Text="{Binding material_code}" 
-                                   Margin="111,32,0,0" FontSize="16"
-                                   Style="{DynamicResource ListBoxItemContent_TextBlock_Style}"/>
+                              
                                 <WrapPanel Orientation="Horizontal">
-                                    <TextBlock Margin="111,50,0,0" Text="批次单号：" FontSize="14"/>
+                                    <TextBlock Margin="80,60,0,0" Text="RFID：" FontSize="14"/>
                                     <TextBlock Text="{Binding rfid_no}" 
                                        Style="{DynamicResource ListBoxItemContent_TextBlock_Style}"
-                                       Margin="0,50,0,0"/>
+                                       Margin="0,59,0,0"/>
                                 </WrapPanel>
                                 <WrapPanel>
-                                    <TextBlock Margin="111,68,0,0" Text="批次日期：" FontSize="14"></TextBlock>
-                                    <TextBlock Text="{Binding update_time}" 
-                                       Margin="0,68,0,0"
+                                    <TextBlock Text="{Binding update_time,StringFormat=yyyy-MM-dd HH:mm:ss}" 
+                                       Margin="80,78,0,0"
                                        Style="{DynamicResource ListBoxItemContent_TextBlock_Style}"/>
                                 </WrapPanel>
                                 <WrapPanel>
-                                    <TextBlock  Margin="111,86,0,0" Text="病区名称：" FontSize="14"></TextBlock>
-                                    <TextBlock Text="{Binding rfid_no}" 
-                                       Margin="0,86,0,0"
-                                       Style="{DynamicResource ListBoxItemContent_TextBlock_Style}"/>
+                                    <TextBlock Text="{Binding RowNumber}" 
+                                   VerticalAlignment="top"
+                                   Margin="130,96,0,0"  
+                                   Style="{DynamicResource ListBoxItemContent_TextBlock_Style}"/>
+                                  
                                 </WrapPanel>
-                                <Border Style="{DynamicResource ListBoxItemHeadBackground_Border_Style}"
-                                    Margin="15,15,0,0"
-                                    Width="82" 
+                                <TextBlock Text="#"  
+                                   Margin="148,96,0,0"  
+                                   Style="{DynamicResource ListBoxItemContent_TextBlock_Style}"/>
+                                <Border 
+                                    Margin="0,12,0,0"
+                                    Width="90" 
                                     Height="102" 
                                     VerticalAlignment="Top" 
                                     HorizontalAlignment="Left" >
-                                    <!--<Image Source="{Binding 1.png,Converter={StaticResource IndsxToImageSourceConverter}}"
-                                       Margin="2"/>-->
+                                    <Image Source="../Resources/lanjuLogo.ico" VerticalAlignment="Stretch"/>
                                     <!--<StackPanel Orientation="Vertical">
                                         <TextBlock Text="{Binding rfid_no}" FontSize="18" 
                                                Foreground="{Binding rfid_no,Converter={StaticResource ForeGroundBatchType}}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
@@ -85,6 +89,7 @@
                                 </Border>
                             </Grid>
                         </Border>
+
                         <!--控件触发器-->
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsSelected" Value="true">
@@ -149,7 +154,37 @@
                 </Setter.Value>
             </Setter>
         </Style>
-      
+        <Style TargetType="{x:Type Border}" x:Key="ListBoxItemHeadBackground_Border_Style">
+            <Setter Property="BitmapEffect">
+                <Setter.Value>
+                    <DropShadowBitmapEffect Color="Black" Direction="340" ShadowDepth="7" Softness="0.1" Opacity="0.3"/>
+                </Setter.Value>
+            </Setter>
+            <Setter Property="Background" >
+                <Setter.Value>
+                    <LinearGradientBrush
+                                        StartPoint="0.4,0"
+                                        EndPoint="0.4,1">
+                        <LinearGradientBrush.GradientStops> 
+                            <GradientStopCollection>
+                                <GradientStop
+                                                    Color="#FFffeeac"
+                                                    Offset="0" />
+                                <GradientStop
+                                                    Color="#FFfbe178"
+                                                    Offset="0.4" />
+                                <GradientStop
+                                                    Color="#FFfbe178"
+                                                    Offset="0.6" />
+                                <GradientStop
+                                                    Color="#FFfffbd9"
+                                                    Offset="1" />
+                            </GradientStopCollection>
+                        </LinearGradientBrush.GradientStops>
+                    </LinearGradientBrush>
+                </Setter.Value>
+            </Setter>
+        </Style>
         <!--字体样式-->
         <Style x:Key="Title_TextBlock_Style" TargetType="{x:Type TextBlock}">
             <Setter Property="FontSize" Value="34"/>
@@ -167,7 +202,7 @@
             <Setter Property="Foreground" Value="#FFFFFFFF"/>
         </Style>
         <Style x:Key="ListBoxItemName_TextBlock_Style" TargetType="{x:Type TextBlock}">
-            <Setter Property="FontSize" Value="18"/>
+            <Setter Property="FontSize" Value="14"/>
             <Setter Property="FontFamily" Value="微软雅黑"/>
             <Setter Property="Foreground" Value="#000000"/>
             <Setter Property="TextWrapping" Value="Wrap"/>
@@ -274,7 +309,7 @@
                     <!--ComBoxItem #59CA4F #81D779-->
                     <Style TargetType="ComboBoxItem">
                         <Setter Property="MinHeight" Value="22"></Setter>
-                        <Setter Property="MinWidth" Value="60"></Setter> 
+                        <Setter Property="MinWidth" Value="60"></Setter>
                         <Setter Property="Template">
                             <Setter.Value>
                                 <ControlTemplate TargetType="ComboBoxItem">
@@ -327,12 +362,12 @@
                 </Setter.Value>
             </Setter>
         </Style>
-       
+
     </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="0.2*"/>
-            <RowDefinition />
+            <RowDefinition Height="0.1*"/>
+            <RowDefinition Height="0.32*"/>
             <RowDefinition/>
         </Grid.RowDefinitions>
         <StackPanel Orientation="Horizontal" Grid.Row="0" VerticalAlignment="Center">
@@ -365,8 +400,19 @@
             </StackPanel>
         </StackPanel>
         <!--ItemContainerStyle="{DynamicResource ApplicantList_ListBoxItem_Style}"-->
-        <ListBox Grid.Row="1" x:Name="DringRoomOuterListBox"  Style="{DynamicResource ApplicantList_ListBox_Style}"   Margin="20,0,0,0"></ListBox>
-        <ListBox Grid.Row="2" x:Name="DringRoomListBox" Style="{DynamicResource ApplicantList_ListBox_Style}"   Margin="20,0,0,0">
-        </ListBox>
+        <GroupBox  Grid.Row="1"  HorizontalContentAlignment="Center">
+            <GroupBox.Header>
+                <Label Content="烘房外" FontSize="18"/>
+            </GroupBox.Header>
+            <ListBox  x:Name="DringRoomOuterListBox"  Style="{DynamicResource ApplicantList_ListBox_Style}" ItemContainerStyle="{DynamicResource ApplicantList_ListBoxItem_Style}"   Margin="20,0,0,0"></ListBox>
+        </GroupBox>
+        <GroupBox Grid.Row="2">
+            <GroupBox.Header>
+                <Label Content="烘房内" FontSize="18"/>
+            </GroupBox.Header>
+            <ListBox Grid.Row="2" x:Name="DringRoomListBox" Style="{DynamicResource ApplicantList_ListBox_Style}" ItemContainerStyle="{DynamicResource ApplicantList_ListBoxItem_Style}"  Margin="20,0,0,0">
+            </ListBox>
+        </GroupBox>
+      
     </Grid>
 </UserControl>

shangjian/XGL/Views/DryingRoomUC.xaml.cs

@@ -77,7 +77,37 @@ namespace XGL.Views
                ),
                System.Windows.Threading.DispatcherPriority.Render);
             }
-          
+
+            DataTable dtDringRoomData = dringRoomService.GetDringRoomData(deviceCode, 1);
+            if (dtDringRoomData != null)
+            {
+                //使用Dispatcher来在UI线程上更新UI
+                this.Dispatcher.Invoke(
+               new Action(() =>
+               {
+                   DringRoomListBox.ItemsSource = null;
+                   DringRoomListBox.Items.Clear();
+                   DringRoomListBox.ItemsSource = dtDringRoomData.DefaultView;
+               }
+               ),
+               System.Windows.Threading.DispatcherPriority.Render);
+            }
+
+            DataTable dtDringRoomOuter = dringRoomService.GetDringRoomData(deviceCode, 0);
+            if (dtDringRoomOuter != null)
+            {
+                //使用Dispatcher来在UI线程上更新UI
+                this.Dispatcher.Invoke(
+               new Action(() =>
+               {
+                   DringRoomOuterListBox.ItemsSource = null;
+                   DringRoomOuterListBox.Items.Clear();
+                   DringRoomOuterListBox.ItemsSource = dtDringRoomOuter.DefaultView;
+               }
+               ),
+               System.Windows.Threading.DispatcherPriority.Render); 
+            }
+
             //if (dt.Rows[0][0].ToString() == "1")
             //{
             //    this.Dispatcher.Invoke(
@@ -97,8 +127,8 @@ namespace XGL.Views
 
         private void GetDringRoomData()
         {
-            DringRoomListBox.ItemsSource = null;
-            DringRoomListBox.Items.Clear();
+            //DringRoomListBox.ItemsSource = null;
+            //DringRoomListBox.Items.Clear();
             DataTable dt = dringRoomService.GetDringRoomData(deviceCode, 1);
             if (dt == null)
             {
@@ -106,37 +136,37 @@ namespace XGL.Views
             }
 
 
-            int index = 0;
-            int i = 0;
-            foreach (DataRow item in dt.Rows)
-            {
-                index = i++;
-                string rfid = item["rfid_no"].ToString();
-                string workorder_code = item["workorder_code"].ToString();
-                string materialCode = item["material_code"].ToString();
-                string inTime = item["update_time"].ToString();
+            //int index = 0;
+            //int i = 0;
+            //foreach (DataRow item in dt.Rows)
+            //{
+            //    index = i++;
+            //    string rfid = item["rfid_no"].ToString();
+            //    string workorder_code = item["workorder_code"].ToString();
+            //    string materialCode = item["material_code"].ToString();
+            //    string inTime = item["update_time"].ToString();
 
-                TimeSpan ts;
+            //    TimeSpan ts;
 
-                ts = DateTime.Now - Convert.ToDateTime(inTime);
+            //    ts = DateTime.Now - Convert.ToDateTime(inTime);
 
-                int minuteDiff = Convert.ToInt32(ts.TotalMinutes);
-                //string workorder_code = item["workorder_code"].ToString();
-                ModuleUC uc = new ModuleUC(index.ToString(), rfid, workorder_code, materialCode, minuteDiff);
+            //    int minuteDiff = Convert.ToInt32(ts.TotalMinutes);
+            //    //string workorder_code = item["workorder_code"].ToString();
+            //    ModuleUC uc = new ModuleUC(index.ToString(), rfid, workorder_code, materialCode, minuteDiff);
 
-                DringRoomListBox.Items.Add(uc);
-            }
-            //DringRoomListBox.ItemsSource = null;
-            //DringRoomListBox.Items.Clear();
-            //DringRoomListBox.ItemsSource = dt.DefaultView;
+            //    DringRoomListBox.Items.Add(uc);
+            //}
+            DringRoomListBox.ItemsSource = null;
+            DringRoomListBox.Items.Clear();
+            DringRoomListBox.ItemsSource = dt.DefaultView;
 
 
         }
 
         private void GetOutDringRoomData()
         {
-            DringRoomOuterListBox.ItemsSource = null;
-            DringRoomOuterListBox.Items.Clear();
+            //DringRoomOuterListBox.ItemsSource = null;
+            //DringRoomOuterListBox.Items.Clear();
             DataTable dt = dringRoomService.GetDringRoomData(deviceCode, 0);
             if (dt == null)
             {
@@ -144,26 +174,28 @@ namespace XGL.Views
             }
 
 
-            int index = 0;
-            int i = 0;
-            foreach (DataRow item in dt.Rows)
-            {
-                index = i++;
-                string rfid = item["rfid_no"].ToString();
-                string workorder_code = item["workorder_code"].ToString();
-                string materialCode = item["material_code"].ToString();
-                string inTime = item["update_time"].ToString();
-                TimeSpan ts;
+            //int index = 0;
+            //int i = 0;
+            //foreach (DataRow item in dt.Rows)
+            //{
+            //    index = i++;
+            //    string rfid = item["rfid_no"].ToString();
+            //    string workorder_code = item["workorder_code"].ToString();
+            //    string materialCode = item["material_code"].ToString();
+            //    string inTime = item["update_time"].ToString();
+            //    TimeSpan ts;
 
-                ts = DateTime.Now - Convert.ToDateTime(inTime);
+            //    ts = DateTime.Now - Convert.ToDateTime(inTime);
 
-                int minuteDiff = Convert.ToInt32(ts.TotalMinutes);
-                //string workorder_code = item["workorder_code"].ToString();
-                ModuleUC uc = new ModuleUC(index.ToString(), rfid, workorder_code, materialCode, minuteDiff);
-
-                DringRoomOuterListBox.Items.Add(uc);
-            }
+            //    int minuteDiff = Convert.ToInt32(ts.TotalMinutes);
+            //    //string workorder_code = item["workorder_code"].ToString();
+            //    ModuleUC uc = new ModuleUC(index.ToString(), rfid, workorder_code, materialCode, minuteDiff);
 
+            //    DringRoomOuterListBox.Items.Add(uc);
+            //}
+            DringRoomOuterListBox.ItemsSource = null;
+            DringRoomOuterListBox.Items.Clear();
+            DringRoomOuterListBox.ItemsSource = dt.DefaultView;
 
         }
 

shangjian/XGL/Views/LanJu_InOut.xaml

@@ -8,6 +8,13 @@
     Width="1920"
     Height="330"
     mc:Ignorable="d" Loaded="UserControl_Loaded">
+    <UserControl.Resources>
+        <Style x:Key="CustomCellStyle" TargetType="DataGridCell">
+            <Setter Property="Foreground" Value="Black" />
+            <Setter Property="TextBlock.TextAlignment" Value="Center" />
+            <Setter Property="TextBlock.FontSize" Value="22" />
+        </Style>
+    </UserControl.Resources>
     <Viewbox Stretch="Fill">
         <Canvas
             Width="1920"
@@ -24,10 +31,15 @@
                     Width="1870"
                     Height="220"
                     Margin="0"
+                    CellStyle="{StaticResource CustomCellStyle}"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Top"
+                    IsReadOnly="True"
+                    CanUserAddRows="False"
+                    LoadingRow="dgInOutRecord_LoadingRow"
+                    HeadersVisibility="Column"
                     AutoGenerateColumns="False">
-                    <DataGrid.ColumnHeaderStyle>
+                    <DataGrid.ColumnHeaderStyle  >
                         <Style TargetType="DataGridColumnHeader">
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
                             <Setter Property="Height" Value="48" />
@@ -44,12 +56,12 @@
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
-                        <DataGridTextColumn Width="250" Header="操作" />
+                        <!--<DataGridTextColumn Width="250" Header="操作" />-->
                         <DataGridTextColumn Width="250" Header="开始时间"  Binding="{Binding begin, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/>
                         <DataGridTextColumn Width="250" Header="结束时间"  Binding="{Binding beout, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/>
-                        <DataGridTextColumn Width="250" Header="工单/SFC"  Binding="{Binding workorder_code}"/>
+                        <DataGridTextColumn Width="*" Header="工单/SFC"  Binding="{Binding workorder_code}"/>
                         <DataGridTextColumn Width="250" Header="工单数量"  Binding="{Binding car_num}"/>
-                        <DataGridTextColumn Width="*" Header="人员"  Binding="{Binding create_by}"/>
+                        <DataGridTextColumn Width="250" Header="人员"  Binding="{Binding create_by}"/>
                     </DataGrid.Columns>
                 </DataGrid>
             </Grid>

shangjian/XGL/Views/LanJu_InOut.xaml.cs

@@ -54,7 +54,7 @@ namespace XGL.Views
                     FoamingMacModel order = new FoamingMacModel();
                     order.workorder_code = i["workorder_code"].ToString();
                     order.begin = Convert.ToDateTime(i["begin"].ToString());
-                    order.beout = Convert.ToDateTime(i["beout"].ToString());
+                    //order.beout = Convert.ToDateTime(i["beout"].ToString());
                     order.product_code = i["product_code"].ToString();
                     order.car_num = Convert.ToInt32(i["car_num"].ToString());
                     order.product_date = i["product_date"].ToString();
@@ -71,5 +71,10 @@ namespace XGL.Views
                 LogHelper.instance.log.Error("获取出入记录信息时发生异常：" + ex.Message);
             }
         }
+
+        private void dgInOutRecord_LoadingRow(object sender, DataGridRowEventArgs e)
+        {
+            e.Row.Header = (e.Row.GetIndex() + 1).ToString();
+        }
     }
 }

shangjian/XGL/Views/LanJu_Operator.xaml

@@ -27,7 +27,7 @@
             <RowDefinition Height="auto" />
             <RowDefinition Height="auto" />
             <RowDefinition Height="auto" />
-            <RowDefinition Height="auto" />
+           
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="220" />
@@ -118,7 +118,7 @@
         </StackPanel>-->
         <!--#70B603Background="{Binding RelativeSource={RelativeSource Mode=Self},Path=Content, Converter={StaticResource ButtonContentToBackgroundColorConverter}}"-->
         <StackPanel
-                    Grid.Row="1"
+                    Grid.Row="0"
                     Grid.Column="0"
                     Width="220"
                     Height="90"  Visibility="Collapsed">
@@ -139,7 +139,7 @@
             </Button>
         </StackPanel>
         <StackPanel
-                    Grid.Row="1"
+                    Grid.Row="0"
                     Grid.Column="6"
                     Height="90"  Visibility="Visible">
             <Button
@@ -160,7 +160,7 @@
             </Button>
         </StackPanel>
         <StackPanel
-                    Grid.Row="1"
+                    Grid.Row="0"
                     Grid.Column="2"
                     Height="90" Visibility="Collapsed">
             <Button
@@ -180,7 +180,7 @@
             </Button>
         </StackPanel>
         <StackPanel
-                    Grid.Row="1"
+                    Grid.Row="0"
                     Grid.Column="3"
                     Height="90"  Visibility="Collapsed">
             <Button
@@ -200,7 +200,7 @@
             </Button>
         </StackPanel>
         <StackPanel
-                    Grid.Row="1"
+                    Grid.Row="0"
                     Grid.Column="0"
                     Height="90">
             <Button
@@ -222,7 +222,7 @@
             </Button>
         </StackPanel>
         <StackPanel
-                    Grid.Row="1"
+                    Grid.Row="0"
                     Grid.Column="1"
                     Height="90">
             <Button x:Name="btnRecover"
@@ -242,7 +242,7 @@
             </Button>
         </StackPanel>
         <StackPanel
-                    Grid.Row="1"
+                    Grid.Row="0"
                     Grid.Column="2"
                     Height="90">
             <Button
@@ -263,7 +263,7 @@
             </Button>
         </StackPanel>
         <StackPanel
-                    Grid.Row="1"
+                    Grid.Row="0"
                     Grid.Column="3"
                     Height="90">
             <Button
@@ -284,7 +284,7 @@
             </Button>
         </StackPanel>
         <StackPanel
-                    Grid.Row="1"
+                    Grid.Row="0"
                     Grid.Column="4"
                     Width="220"
                     Height="90">
@@ -307,7 +307,7 @@
 
         </StackPanel>
         <StackPanel
-                    Grid.Row="1"
+                    Grid.Row="0"
                     Grid.Column="5"
                     Width="220"
                     Height="90">
@@ -330,7 +330,7 @@
 
         <DataGrid
                     x:Name="dgWorkOrderInfo"
-                    Grid.Row="2"
+                    Grid.Row="1"
                     Grid.ColumnSpan="9"
                     MinWidth="1000" 
                     MinHeight="340"
@@ -359,7 +359,7 @@
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
                 <DataGridTextColumn Width="250" Header="工单/SFC" Binding="{Binding workorder_id}" Visibility="Collapsed"/>
-                <DataGridTextColumn Width="250" Header="工单/SFC" Binding="{Binding workorder_code}" />
+                <DataGridTextColumn Width="300" Header="工单/SFC" Binding="{Binding workorder_code}" />
                 <DataGridTextColumn Width="120" Header="RFID" Binding="{Binding rfid}"/>
                 <DataGridTextColumn Width="250" Header="产品名称" Binding="{Binding product_name}" />
                 <DataGridTextColumn Width="250" Header="产品型号" Binding="{Binding product_code}" />
@@ -373,14 +373,14 @@
                     </DataGridTextColumn.ElementStyle>-->
                 </DataGridTextColumn>
                 <DataGridTextColumn Width="70" Header="完成数" Binding="{Binding attr1}" />
-                <DataGridTextColumn Width="250" Header="流转码" Binding="{Binding work_batch_code}" />
+                <DataGridTextColumn Width="340" Header="流转码" Binding="{Binding work_batch_code}" />
                 <DataGridTextColumn Width="60" Header="出入" Binding="{Binding taskcode,Converter={StaticResource TaskCodeConverter}}"/>
                
             </DataGrid.Columns>
         </DataGrid>
 
         <StackPanel
-                    Grid.Row="3"
+                    Grid.Row="2"
                     Grid.ColumnSpan="5"
                     Width="1000"
                     Height="69"
@@ -455,7 +455,7 @@
         </StackPanel>
 
         <Grid
-                    Grid.Row="4"
+                    Grid.Row="3"
                     Grid.ColumnSpan="9"
          
                     MinHeight="330"

shangjian/XGL/Views/LanJu_Prepare.xaml

@@ -219,16 +219,17 @@
                 </StackPanel>
                 <Button x:Name="btnRefresh" Content="刷新" Grid.Row="0"
                     Grid.Column="1" Style="{StaticResource CustomButtonStyle}" Click="btnRefresh_Click"></Button>
-                <ScrollViewer
-                    Grid.Row="3"
-                    Grid.Column="0"
-                    Grid.ColumnSpan="2"
+                <!--<ScrollViewer
+                    
                     HorizontalScrollBarVisibility="Auto"
-                    VerticalScrollBarVisibility="Auto">
+                    VerticalScrollBarVisibility="Auto">-->
 
                     <!-- Foreground="Black" FontWeight="Bold"-->
                     <DataGrid
                         x:Name="WorkOrder"
+                        Grid.Row="3"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
                         Width="1920"
                         MinHeight="309"
                         Margin="25,0,0,0"
@@ -240,6 +241,7 @@
                         HeadersVisibility="Column"
                         IsReadOnly="True"
                         SelectionChanged="WorkOrder_SelectionChanged"
+                            FrozenColumnCount="1"
                         FontSize="24"  CanUserAddRows="False">
                         <DataGrid.ColumnHeaderStyle>
                             <Style TargetType="DataGridColumnHeader">
@@ -371,7 +373,7 @@
 
                         </DataGrid.Columns>
                     </DataGrid>
-                </ScrollViewer>
+                <!--</ScrollViewer>-->
 
             </Grid>
         </Canvas>

shangjian/XGL/XGL.csproj

@@ -77,7 +77,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Resources\app.ico</ApplicationIcon>
+    <ApplicationIcon>Resources\lanjuLogoNew.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
     <Win32Resource>
@@ -934,6 +934,7 @@
     </WebReferenceUrl>
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="LanjuLogo.png" />
     <Content Include="newMessage.wav">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -1019,6 +1020,10 @@
     <Resource Include="Resources\topblank.png" />
     <Resource Include="Resources\zxh.png" />
     <Resource Include="Resources\startOrder.png" />
+    <Resource Include="Resources\lanjuLogo.png" />
+    <Resource Include="Resources\lanjuLogoNew.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
     <Content Include="snap7.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

shangjian/XGL/bin/x86/Debug/XGL.exe.config

@@ -10,9 +10,9 @@
 		<!--车间编码-->
 		<add key="SiteCode" value="1000" />
 		<!--设备编码-->
-		<add key="DeviceCode" value="C1" />
+		<add key="DeviceCode" value="C6" />
 		<!--上位机类型 0:工单准备，1：成型机\shoupei，2：烘房-->
-		<add key="ClientMode" value="2" />
+		<add key="ClientMode" value="1" />
 		<add key="DryingHouseList" value="H1,H2,H3" />
 		<!--上位机类型 1 上件 ，2 排空区  0下件区-->
 		<add key="PostType" value="1" />

shangjian/XGL/bin/x86/Debug/config/log4net.config

@@ -8,8 +8,8 @@
 		<root>
 			<level value="ALL" />
 			<appender-ref ref="LogFileAppender"/>
-			<appender-ref ref="MachineWainingLog"/>
-			<appender-ref ref="ErrorInfoLog"/>
+			<!--<appender-ref ref="MachineWainingLog"/>
+			<appender-ref ref="ErrorInfoLog"/>-->
 		</root>
 
 		<!--写入到文件-->

shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C2D3123A650E8DBB1BAE4005F004874C2CC7F068FC45999660988B2520596F74"
+#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4F274FD442BEA87AD6398AACCB6772C9DC89D5D581D153BBB463B6CE5E33C793"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -42,7 +42,7 @@ namespace XGL.Views {
     public partial class LanJu_InOut : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
         
         
-        #line 23 "..\..\..\..\Views\LanJu_InOut.xaml"
+        #line 30 "..\..\..\..\Views\LanJu_InOut.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid dgInOutRecord;
         
@@ -89,6 +89,12 @@ namespace XGL.Views {
             return;
             case 2:
             this.dgInOutRecord = ((System.Windows.Controls.DataGrid)(target));
+            
+            #line 39 "..\..\..\..\Views\LanJu_InOut.xaml"
+            this.dgInOutRecord.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgInOutRecord_LoadingRow);
+            
+            #line default
+            #line hidden
             return;
             }
             this._contentLoaded = true;

shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C2D3123A650E8DBB1BAE4005F004874C2CC7F068FC45999660988B2520596F74"
+#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4F274FD442BEA87AD6398AACCB6772C9DC89D5D581D153BBB463B6CE5E33C793"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -42,7 +42,7 @@ namespace XGL.Views {
     public partial class LanJu_InOut : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
         
         
-        #line 23 "..\..\..\..\Views\LanJu_InOut.xaml"
+        #line 30 "..\..\..\..\Views\LanJu_InOut.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid dgInOutRecord;
         
@@ -89,6 +89,12 @@ namespace XGL.Views {
             return;
             case 2:
             this.dgInOutRecord = ((System.Windows.Controls.DataGrid)(target));
+            
+            #line 39 "..\..\..\..\Views\LanJu_InOut.xaml"
+            this.dgInOutRecord.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgInOutRecord_LoadingRow);
+            
+            #line default
+            #line hidden
             return;
             }
             this._contentLoaded = true;

shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "66CB1BC447836676E7929B60CAF1921F4955A78BDAD9D0442EE7AA2556D4FFB2"
+#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2C64C56E58CC31DC49E67813003427D01103BFC94002361C33C47F7162FFE649"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "66CB1BC447836676E7929B60CAF1921F4955A78BDAD9D0442EE7AA2556D4FFB2"
+#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2C64C56E58CC31DC49E67813003427D01103BFC94002361C33C47F7162FFE649"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "DCC592BAB4424C33E32AD56372B2F872F5BE74F8861224F7381EB353482ECC3C"
+#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E70FB93CCC7404CAF7C04C26DF24D7CEFDF22C068485FAB9F66BEBD5B943E3BB"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -59,7 +59,7 @@ namespace XGL.Views {
         #line hidden
         
         
-        #line 231 "..\..\..\..\Views\LanJu_Prepare.xaml"
+        #line 229 "..\..\..\..\Views\LanJu_Prepare.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid WorkOrder;
         
@@ -133,13 +133,13 @@ namespace XGL.Views {
             case 5:
             this.WorkOrder = ((System.Windows.Controls.DataGrid)(target));
             
-            #line 239 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            #line 240 "..\..\..\..\Views\LanJu_Prepare.xaml"
             this.WorkOrder.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.USERLIST_LoadingRow);
             
             #line default
             #line hidden
             
-            #line 242 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            #line 243 "..\..\..\..\Views\LanJu_Prepare.xaml"
             this.WorkOrder.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.WorkOrder_SelectionChanged);
             
             #line default
@@ -160,7 +160,7 @@ namespace XGL.Views {
             {
             case 6:
             
-            #line 352 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            #line 354 "..\..\..\..\Views\LanJu_Prepare.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
             
             #line default
@@ -168,7 +168,7 @@ namespace XGL.Views {
             break;
             case 7:
             
-            #line 359 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            #line 361 "..\..\..\..\Views\LanJu_Prepare.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SOP_Click);
             
             #line default
@@ -176,7 +176,7 @@ namespace XGL.Views {
             break;
             case 8:
             
-            #line 366 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            #line 368 "..\..\..\..\Views\LanJu_Prepare.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click);
             
             #line default

shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "DCC592BAB4424C33E32AD56372B2F872F5BE74F8861224F7381EB353482ECC3C"
+#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E70FB93CCC7404CAF7C04C26DF24D7CEFDF22C068485FAB9F66BEBD5B943E3BB"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -59,7 +59,7 @@ namespace XGL.Views {
         #line hidden
         
         
-        #line 231 "..\..\..\..\Views\LanJu_Prepare.xaml"
+        #line 229 "..\..\..\..\Views\LanJu_Prepare.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid WorkOrder;
         
@@ -133,13 +133,13 @@ namespace XGL.Views {
             case 5:
             this.WorkOrder = ((System.Windows.Controls.DataGrid)(target));
             
-            #line 239 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            #line 240 "..\..\..\..\Views\LanJu_Prepare.xaml"
             this.WorkOrder.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.USERLIST_LoadingRow);
             
             #line default
             #line hidden
             
-            #line 242 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            #line 243 "..\..\..\..\Views\LanJu_Prepare.xaml"
             this.WorkOrder.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.WorkOrder_SelectionChanged);
             
             #line default
@@ -160,7 +160,7 @@ namespace XGL.Views {
             {
             case 6:
             
-            #line 352 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            #line 354 "..\..\..\..\Views\LanJu_Prepare.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
             
             #line default
@@ -168,7 +168,7 @@ namespace XGL.Views {
             break;
             case 7:
             
-            #line 359 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            #line 361 "..\..\..\..\Views\LanJu_Prepare.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SOP_Click);
             
             #line default
@@ -176,7 +176,7 @@ namespace XGL.Views {
             break;
             case 8:
             
-            #line 366 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            #line 368 "..\..\..\..\Views\LanJu_Prepare.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click);
             
             #line default

shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.i.cache

@@ -16,5 +16,5 @@ D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\App.xaml
 168-1235023147
 CSS\DataGridClass.xaml;CSS\NormalSmlBtnClass.xaml;CSS\SearchBtnClass.xaml;CSS\Style.xaml;CSS\SearchTextClass.xaml;CSS\TabControl.xaml;FormItem\FormBlankingBoard.xaml;FormItem\FormBoard.xaml;FormItem\FormChargingBoard.xaml;FormItem\FormLocator.xaml;FormItem\FormOutBoxBoard.xaml;FormItem\FormShowSelect.xaml;FormItem\Main.xaml;LoginPage.xaml;MainWindow.xaml;Tools\ModuleUC.xaml;UControl\ordertj.xaml;UControl\orderzfzy.xaml;UControl\orderzy.xaml;UControl\product_order.xaml;UControl\product_ordertj.xaml;UControl\product_orderzfzy.xaml;UControl\product_orderzy.xaml;UControl\UCArea.xaml;UControl\UCBoard.xaml;UControl\UCCar.xaml;UControl\UCCarL.xaml;UControl\UCLMix.xaml;UControl\UCMix.xaml;UControl\UCMixR.xaml;UControl\UCPermissionList.xaml;UControl\UCPostionList.xaml;UControl\UCProgressBar.xaml;UControl\UCRoleList.xaml;UControl\UCRProgressBar.xaml;UControl\UCStorage.xaml;UControl\UCStorageNew.xaml;UControl\UCStorageNewx.xaml;UControl\UCTakeOff.xaml;UControl\UCUserList.xaml;Views\CheckUserWin.xaml;Views\DryingRoomUC.xaml;Views\ShouPeiWin.xaml;Views\SopInfoWin.xaml;Views\FlowInfoWin.xaml;Views\LanJu_Complete.xaml;Views\LanJu_DeviceItems.xaml;Views\LanJu_Flow.xaml;Views\LanJu_Index.xaml;Views\LanJu_InOut.xaml;Views\LanJu_Material.xaml;Views\LanJu_NowUser.xaml;Views\LanJu_Operator.xaml;Views\LanJu_Paused.xaml;Views\LanJu_Prepare.xaml;Views\LanJu_User.xaml;Views\LanJu_UserRecord.xaml;
 
-True
+False