优化

shangjian/XGL.Data/DBService/DBService.cs

@@ -646,14 +646,21 @@ select  a.TrayCode,a.ProductBarNo,a.carcode,a.createtime,a.lineno,b.HadNumber
 
         public DataTable GetWetPlanInfo()
         {
-            string sql = $@"select wet.id,wet.factory_code,wet.prod_code, wet.sync_flag,wet.plan_time, 
+            //删除湿料计划主表
+            //            string sql = $@"select wet.id,wet.factory_code,wet.prod_code, wetDetail.sync_flag,wet.plan_time, 
+            //wetDetail.workorder_id,bucket_id,bucket_code,material_code,material_name,
+            //wetDetail.product_name,wet.shift_desc,prod_line_code,workorder.status,workorder.workorder_code
+            //from pro_wet_material_plan wet 
+            //LEFT JOIN pro_wet_material_plan_detail wetDetail 
+            //on wet.id = wetDetail.wet_material_plan_id
+            //left join pro_order_workorder workorder on workorder.workorder_id = wetDetail.workorder_id where 1=1 and workorder.status = 'w1' and workorder.end_flag = '1' and CONVERT(VARCHAR(10), wet.plan_time , 120)= CONVERT(VARCHAR(10), GetDate() , 120)"; 
+            //workorder.status = 'w1' and
+            string sql = $@"select wetDetail.id,wetDetail.factory_code,wetDetail.material_code as prod_code, wetDetail.sync_flag,wetDetail.plan_time, 
 wetDetail.workorder_id,bucket_id,bucket_code,material_code,material_name,
-wetDetail.product_name,wet.shift_desc,prod_line_code,workorder.status,sync_flag
-from pro_wet_material_plan wet 
-LEFT JOIN pro_wet_material_plan_detail wetDetail 
-on wet.id = wetDetail.wet_material_plan_id
-left join pro_order_workorder workorder on workorder.workorder_id = wetDetail.workorder_id where 1=1 and workorder.status = 'w1' and workorder.end_flag = '1' and CONVERT(VARCHAR(10), wet.plan_time , 120)= CONVERT(VARCHAR(10), GetDate() , 120)
-"; //where  CONVERT(VARCHAR(10), wet.plan_time , 120)= CONVERT(VARCHAR(10), GetDate() , 120)
+wetDetail.material_name as product_name,wetDetail.shift_desc,prod_line_code,workorder.status,workorder.workorder_code
+from pro_wet_material_plan_detail wetDetail 
+left join pro_order_workorder workorder on workorder.workorder_id = wetDetail.workorder_id where 1=1 and 
+ workorder.end_flag = '1' and CONVERT(VARCHAR(10), wetDetail.plan_time , 120)= CONVERT(VARCHAR(10), GetDate() , 120)";
             DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
             if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
             {
@@ -703,12 +710,13 @@ order by order_num"; //where  CONVERT(VARCHAR(10), wet.plan_time , 120)= CONVERT
         /// 更新湿料计划同步状态、工单状态
         /// </summary>
         /// <returns></returns>
-        public bool UpdateSycnFlag(string wetPlanID,string workOrderID)
+        public bool UpdateSycnFlag(string workOrderID)
         {
             List<string> sqlList = new List<string>();
-            string sql = $@"update pro_wet_material_plan set sync_flag = 'Y' where id  = '{wetPlanID}'";
-            string sql1 = $@"update pro_order_workorder set status = 'w2' where workorder_id = '{workOrderID}'";
-
+            string sql = $@"update pro_wet_material_plan_detail set sync_flag = 'Y', update_by = '{LoginUser.UserName}',update_time = GETDATE() where workorder_id  = '{workOrderID}' ";
+            string sql1 = $@"update pro_order_workorder set status = 'w2', update_by = '{LoginUser.UserName}',update_time = GETDATE() where workorder_id = '{workOrderID}' ";
+            sqlList.Add(sql);
+            sqlList.Add(sql1);
             return Utils.netClientDBHelper.executeBatchSql(sqlList);
             
         }
@@ -720,12 +728,19 @@ order by order_num"; //where  CONVERT(VARCHAR(10), wet.plan_time , 120)= CONVERT
         /// <returns></returns>
         public DataTable GetCXJList(string workOrderNo)
         {
+            //根据湿料计划获取所有工单用到的成型机
+            //string sql = $@"select prod_line_code,bucket_code
+            //from pro_wet_material_plan wet 
+            //LEFT JOIN pro_wet_material_plan_detail wetDetail 
+            //on wet.id = wetDetail.wet_material_plan_id
+            //left join pro_order_workorder workorder on workorder.workorder_id = wetDetail.workorder_id 
+            //where wet.id = '{workOrderNo}'";
+
+            //根据工单获取成型机
             string sql = $@"select prod_line_code,bucket_code
-                            from pro_wet_material_plan wet 
-                            LEFT JOIN pro_wet_material_plan_detail wetDetail 
-                            on wet.id = wetDetail.wet_material_plan_id
-                            left join pro_order_workorder workorder on workorder.workorder_id = wetDetail.workorder_id 
-                            where wet.id = '{workOrderNo}'";
+from pro_order_workorder workorder 
+LEFT JOIN pro_wet_material_plan_detail wetDetail  on workorder.workorder_id = wetDetail.workorder_id             
+where workorder.workorder_id = '{workOrderNo}'";
 
             DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
             if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)

shangjian/XGL.Data/DBService/DringRoomService.cs

@@ -41,7 +41,7 @@ namespace XGL.Data.DBService
         {
             //获取绑定中，且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";
+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')";
             //where rfid !=null and 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

@@ -19,7 +19,7 @@ namespace XGL.Data.DBService
         public DataTable GetFormingMachineInfo(string devicecode)
         {
 
-            string sql = $@"SELECT 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
+            string sql = $@"SELECT ord.workorder_code,res.OrderCode,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}'; ";
 
@@ -78,10 +78,10 @@ where equipmentCode = '{devicecode}'; ";
         /// <returns></returns>
         public DataTable GetCompleteHistoryList(string devicecode)
         {
-
+            //taskcode=1,当前机台完成，ord.status = 'w3'当前工单完成
             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
 LEFT JOIN pro_order_workorder ord on res.OrderCode = ord.workorder_id
-where  ord.status = 'w3' and  equipmentCode = '{devicecode}'; ";
+where  res.taskcode = '1' and  equipmentCode = '{devicecode}'; ";
 
             DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
             if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)

shangjian/XGL.Model/Model/OrderPrepare/WetMaterialModel.cs

@@ -16,7 +16,7 @@ namespace XGL.Models.Model.OrderPrepare
 
         public DateTime plan_time { get; set; }
         public string workorder_id { get; set; }
-
+        public string workorder_code { get; set; }
         public string bucket_id { get; set; }
         public string bucket_code { get; set; }
         public string material_code { get; set; }

shangjian/XGL/App.config

@@ -12,7 +12,7 @@
 	  <!--设备编码-->
 	  <add key="DeviceCode" value="C1"/>
 	  <!--上位机类型 0:工单准备，1：成型机\shoupei，2：烘房-->
-	  <add key="ClientMode" value="0"/>
+	  <add key="ClientMode" value="2"/>
     <!--上位机类型 1 上件 ，2 排空区  0下件区-->
     <add key="PostType" value="1"/>
     <!--线体编码-->

shangjian/XGL/Tools/BtnBackGroundColorConverter.cs

@@ -13,21 +13,20 @@ namespace XGL.Tools
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            int second = 0;
             if (value != null)
             {
                 if (value.Equals("正常"))
-                    return Brushes.Green;
+                    return "Green";
                 else
-                    return Brushes.Red;
+                    return "Red";
             }
             else
-                return Brushes.Red;
+                return "Red";
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            return "";
+            return Brushes.Red;
         }
     }
 }

shangjian/XGL/Tools/ModuleUC.xaml

@@ -5,16 +5,16 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:XGL.Tools"
              mc:Ignorable="d" 
-             d:DesignHeight="150" d:DesignWidth="150">
+             d:DesignHeight="250" d:DesignWidth="250">
     <UserControl.Resources>
         <Style TargetType="TextBlock">
-            <Setter Property="FontSize" Value="14"></Setter>
+            <Setter Property="FontSize" Value="16"></Setter>
             <Setter Property="FontWeight" Value="Bold"></Setter>
             <Setter Property="FontFamily" Value="宋体"></Setter>
             <Setter Property="Foreground" Value="Black"></Setter>
         </Style>
     </UserControl.Resources>
-    <Grid  Width="120" Height="120">
+    <Grid  Width="250" Height="250">
         <!--<Grid.Background>
             <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
                 <GradientStop Color="#07437F" Offset="0"/>

shangjian/XGL/Tools/MyValueConverter.cs

@@ -13,26 +13,27 @@ namespace XGL.Tools
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             // 根据输入值返回对应的输出值 已派发w1未派w0活动w2报工w3
-            if (value == "w1")
+            if (value.Equals("w1"))
             {
                 return "已派发";
             }
-            else if (value == "w2")
+            if (value.Equals("w2"))
             {
                 return "活动";
             }
-            else if (value == "w3")
+            if (value.Equals("w3"))
             {
                 return "报工";
             }
-            else if (value == "w4")
+             if (value.Equals("w4"))
             {
                 return "暂停";
             }
-            else
+            if(value.Equals("w0"))
             {
                 return "未派";
             }
+            return "未派";
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

shangjian/XGL/Tools/NetStatusToColorConvert.cs

@@ -32,8 +32,6 @@ namespace XGL.Tools
                     {
                         return Brushes.Red;
                     } 
-
-
                 }
             }
 

shangjian/XGL/Tools/SyncFlagColorConverter.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace XGL.Tools
+{
+    public class SyncFlagColorConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value.Equals("Y"))
+            {
+                return "Blue";
+                //System.Windows.Media.ColorConverter.ConvertFromString("#FF4FEE4F");
+            }
+            else
+            {
+                return "Orange";
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

shangjian/XGL/Tools/SyncFlagConverter.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace XGL.Tools
+{
+    public class SyncFlagConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value.Equals("Y"))
+            {
+                return "已同步";
+            }
+            else 
+            {
+                return "未同步";
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

shangjian/XGL/Views/DryingRoomUC.xaml.cs

@@ -39,10 +39,15 @@ namespace XGL.Views
 
         private void GetDringRoomData()
         {
+            DringRoomListBox.ItemsSource = null;
+            DringRoomListBox.Items.Clear();
             DataTable dt = dringRoomService.GetDringRoomData(comboDryRoomInfo.SelectedValue.ToString());
             if (dt == null)
+            {
                 return;
-            DringRoomListBox.Items.Clear();
+            }
+                
+           
             int index = 0;
             int i = 0;
             foreach (DataRow item in dt.Rows)
@@ -53,6 +58,7 @@ namespace XGL.Views
                 string materialCode = item["product_code"].ToString();
                 //string workorder_code = item["workorder_code"].ToString();
                 ModuleUC uc = new ModuleUC(index.ToString(), rfid, workorder_code, materialCode, "10");
+                
                 DringRoomListBox.Items.Add(uc);
             }
             
@@ -81,7 +87,7 @@ namespace XGL.Views
 
         private void comboDryRoomInfo_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            string hfCode = comboDryRoomInfo.Text;
+            string hfCode = comboDryRoomInfo.SelectedValue.ToString();//.Text;
             GetDringRoomData();
         }
     }

shangjian/XGL/Views/LanJu_Complete.xaml.cs

@@ -26,8 +26,7 @@ namespace XGL.Views
     public partial class LanJu_Complete : UserControl
     {
         FormingMachineService formingMachineService = new FormingMachineService();
-        List<FoamingMacModel> orderList = new List<FoamingMacModel>();
-        FoamingMacModel order = new FoamingMacModel();
+       
 
 
         public LanJu_Complete()
@@ -44,12 +43,15 @@ namespace XGL.Views
         {
             try
             {
+                List<FoamingMacModel> orderList = new List<FoamingMacModel>();
+                
                 //modelWareHouse = new List<WorkOrder>();
                 //userDbWareHouse = new DBService();
                 DataTable dt = formingMachineService.GetCompleteHistoryList(Utils.GetAppSetting("DeviceCode"));
                 if (dt == null) return;
                 foreach (DataRow i in dt.Rows)
                 {
+                    FoamingMacModel order = new FoamingMacModel();
                     order.workorder_code = i["workorder_code"].ToString();
                     order.product_name = i["product_name"].ToString();
 

shangjian/XGL/Views/LanJu_InOut.xaml.cs

@@ -27,8 +27,7 @@ namespace XGL.Views
     {
 
         FormingMachineService formingMachineService = new FormingMachineService();
-        List<FoamingMacModel> orderList = new List<FoamingMacModel>();
-        FoamingMacModel order = new FoamingMacModel();
+      
 
         public LanJu_InOut()
         {
@@ -44,12 +43,15 @@ namespace XGL.Views
         {
             try
             {
+                List<FoamingMacModel> orderList = new List<FoamingMacModel>();
+               
                 //modelWareHouse = new List<WorkOrder>();
                 //userDbWareHouse = new DBService();
                 DataTable dt = formingMachineService.GetInOutHistoryList(Utils.GetAppSetting("DeviceCode"));
                 if (dt == null) return;
                 foreach (DataRow i in dt.Rows)
                 {
+                    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());
@@ -61,11 +63,12 @@ namespace XGL.Views
                     orderList.Add(order);
 
                 }
+                this.dgInOutRecord.ItemsSource = null;
                 this.dgInOutRecord.ItemsSource = orderList;
             }
             catch (Exception ex)
             {
-                LogHelper.instance.log.Error("获取完成记录信息时发生异常：" + ex.Message);
+                LogHelper.instance.log.Error("获取出入记录信息时发生异常：" + ex.Message);
             }
         }
     }

shangjian/XGL/Views/LanJu_Operator.xaml

@@ -13,7 +13,11 @@
     <UserControl.Resources>
         <convert:MyValueConverter x:Key="MyConverter"/>
         <convert:BtnBackGroundColorConverter x:Key="ButtonContentToBackgroundColorConverter"/>
-        
+        <Style x:Key="CustomCellStyle" TargetType="DataGridCell">
+            <Setter Property="Foreground" Value="#707971" />
+            <Setter Property="TextBlock.TextAlignment" Value="Center" />
+            <Setter Property="TextBlock.FontSize" Value="22" />
+        </Style>
     </UserControl.Resources>
 
     <Grid  Background="#F2F3F5"
@@ -104,13 +108,15 @@
                         Text="设备状态：" />
             <Label
                         x:Name="LbDeviceState"
-                        Width="140"
+                        Background="{Binding RelativeSource={RelativeSource Mode=Self},Path=Content, Converter={StaticResource ButtonContentToBackgroundColorConverter}}"
+                        Width="40"
                         Height="25"
-                        HorizontalContentAlignment="Center"
-                        Background="{Binding RelativeSource={RelativeSource Mode=Self},Path=Content, Converter={StaticResource ButtonContentToBackgroundColorConverter}}"  Content="正常" Foreground="White" FontSize="14">
+                        HorizontalContentAlignment="Center" HorizontalAlignment="Center"
+                        VerticalContentAlignment="Center" VerticalAlignment="Center"
+                        Foreground="White" FontSize="14" FontWeight="Bold">
 
             </Label>
-            <!--#70B603-->
+            <!--#70B603Background="{Binding RelativeSource={RelativeSource Mode=Self},Path=Content, Converter={StaticResource ButtonContentToBackgroundColorConverter}}"-->
         </StackPanel>
 
         <StackPanel
@@ -307,7 +313,9 @@
                     Width="1870"
                     Height="220"
                     Margin="0,20"
-            FontSize="18" Foreground="Black"
+            LoadingRow="dgWorkOrderInfo_LoadingRow"
+            HeadersVisibility="Column"
+             CellStyle="{StaticResource CustomCellStyle}"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Top"
                     AutoGenerateColumns="False">

shangjian/XGL/Views/LanJu_Operator.xaml.cs

@@ -33,8 +33,7 @@ namespace XGL.Views
         public static LanJu_Operator lanJu_Operator;
         Frame frame = new Frame() { Content = new Views.LanJu_InOut()};
         string deviceCode = Utils.GetAppSetting("DeviceCode");
-        List<FoamingMacModel> orderList = new List<FoamingMacModel>();
-        FoamingMacModel order = new FoamingMacModel();
+      
         Timer timerDeciveState = new Timer();
         public enum WindowID
         {
@@ -58,7 +57,21 @@ namespace XGL.Views
            new Action(() => { LbDeviceState.Content = dt.Rows[0][0].ToString() == "1" ? "正常" : "异常"; }
            ),
            System.Windows.Threading.DispatcherPriority.Render);
+            //if (dt.Rows[0][0].ToString() == "1")
+            //{
+            //    this.Dispatcher.Invoke(
+            //  new Action(() => { LbDeviceState.Background = Brushes.Green; }
+            //  ),
+            //  System.Windows.Threading.DispatcherPriority.Render);
+            //}
+            //else
+            //{
+            //    this.Dispatcher.Invoke(
+            //  new Action(() => { LbDeviceState.Background = Brushes.Red; }
+            //  ),
+            //  System.Windows.Threading.DispatcherPriority.Render);
 
+            //}
         }
 
         public void WindowChange(WindowID windowID)
@@ -135,12 +148,15 @@ namespace XGL.Views
         {
             try
             {
+                List<FoamingMacModel> orderList = new List<FoamingMacModel>();
+               
                 //modelWareHouse = new List<WorkOrder>();
                 //userDbWareHouse = new DBService();
-               DataTable dt = formingMachineService.GetFormingMachineInfo(deviceCode);
+                DataTable dt = formingMachineService.GetFormingMachineInfo(deviceCode);
                 if (dt == null) return;
                 foreach (DataRow i in dt.Rows)
                 {
+                    FoamingMacModel order = new FoamingMacModel();
                     order.workorder_code = i["workorder_code"].ToString();
                     order.product_name = i["product_name"].ToString();
 
@@ -152,6 +168,7 @@ namespace XGL.Views
                     orderList.Add(order);
                    
                 }
+                this.dgWorkOrderInfo.ItemsSource = null;
                 this.dgWorkOrderInfo.ItemsSource = orderList;
             }
             catch (Exception ex)
@@ -163,9 +180,19 @@ namespace XGL.Views
         private void btnPause_Click(object sender, RoutedEventArgs e)
         {
             var selectedRow = dgWorkOrderInfo.SelectedItem as FoamingMacModel;
+            if (selectedRow == null)
+            {
+                MessageBox.Show("请选择你要暂停的工单！", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Warning);
+                return;
+            }
             var workordercode = selectedRow.workorder_code;
             formingMachineService.PauseWorkOrder(workordercode);
             GetWorkOrderInfo();
         }
+
+        private void dgWorkOrderInfo_LoadingRow(object sender, DataGridRowEventArgs e)
+        {
+            e.Row.Header = (e.Row.GetIndex() + 1).ToString();
+        }
     }
 }

shangjian/XGL/Views/LanJu_Prepare.xaml

@@ -40,14 +40,59 @@
                     </Setter.Value>
                 </Setter>
             </Style>
-
+            <Style x:Key="CustomButtonStyle" TargetType="{x:Type Button}">
+                <Setter Property="Height" Value="40"></Setter>
+                <Setter Property="Width" Value="100"></Setter>
+                <Setter Property="Foreground" Value="White"></Setter>
+                <Setter Property="FontSize" Value="18"></Setter>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type Button}">
+                            <Grid>
+                                <Border
+                                    x:Name="border"
+                                    Background="#2F82E7" 
+                                    BorderThickness="0,0,0,3" />
+                                <ContentPresenter
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    RecognizesAccessKey="True"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                <VisualStateManager.VisualStateGroups>
+                                    <VisualStateGroup x:Name="CommonStates">
+                                        <VisualState x:Name="Normal" />
+                                        <VisualState x:Name="MouseOver">
+                                            <Storyboard>
+                                                <ColorAnimationUsingKeyFrames Storyboard.TargetName="border" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
+                                                    <EasingColorKeyFrame KeyTime="0" Value="#213269" />
+                                                </ColorAnimationUsingKeyFrames>
+                                            </Storyboard>
+                                        </VisualState>
+                                        <VisualState x:Name="Pressed" />
+                                        <VisualState x:Name="Disabled" />
+                                    </VisualStateGroup>
+                                </VisualStateManager.VisualStateGroups>
+                            </Grid>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsFocused" Value="True" />
+                                <Trigger Property="IsDefaulted" Value="True" />
+                                <Trigger Property="IsMouseOver" Value="True" />
+                                <Trigger Property="IsPressed" Value="True" />
+                                <Trigger Property="IsEnabled" Value="False" />
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
             <Style x:Key="CustomCellStyle" TargetType="DataGridCell">
                 <Setter Property="Foreground" Value="#707971" />
                 <Setter Property="TextBlock.TextAlignment" Value="Center" />
                 <Setter Property="TextBlock.FontSize" Value="22" /> 
             </Style>
             <convert:MyValueConverter x:Key="MyConverter"/>
-            <!--<convert:SyncFlagConverter x:Key="SyncFlagConverter"/>-->
+            <convert:SyncFlagConverter x:Key="SyncFlagConverter"/>
+            <convert:SyncFlagColorConverter x:Key="SyncFlagColorConvert"/>
+            
         </ResourceDictionary> 
     </UserControl.Resources>
 
@@ -92,6 +137,7 @@
                     Margin="25,0,0,0"
                     AutoGenerateColumns="False"
                     FrozenColumnCount="1"
+                    EnableColumnVirtualization="False"
                     ScrollViewer.HorizontalScrollBarVisibility="Visible">
                     <DataGrid.ColumnHeaderStyle>
                         <Style TargetType="DataGridColumnHeader">
@@ -132,25 +178,32 @@
                     Style="{StaticResource RoundButton}" Click="btnStartOrders_Click">
                
                 </Button>-->
-
-                <Label
+                <StackPanel Orientation="Horizontal"   Grid.Row="2"
+                    Grid.Column="0">
+                    <Label
                     Grid.Row="2"
                     Grid.Column="0"
                     Width="175"
                     Height="37"
                     Margin="26,5,0,0"
                     HorizontalAlignment="Left">
-                    <TextBlock
+                        <TextBlock
                         FontSize="22"
                         FontWeight="Bold"
                         Text="工单" />
-                </Label>
+                    </Label>
+                    
+                </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"
                     HorizontalScrollBarVisibility="Auto"
                     VerticalScrollBarVisibility="Auto">
+
+                    <!-- Foreground="Black" FontWeight="Bold"-->
                     <DataGrid
                         x:Name="WorkOrder"
                         Width="2490"
@@ -158,17 +211,17 @@
                         Margin="25,0,0,0"
                         HorizontalAlignment="Left"
                         AutoGenerateColumns="False" 
-                        CanUserResizeColumns="False"
                         SelectionMode="Single"
                         CellStyle="{StaticResource CustomCellStyle}"
-                        FrozenColumnCount="1"
+                        LoadingRow="USERLIST_LoadingRow"
+                        HeadersVisibility="Column"
                         IsReadOnly="True"
-                        FontSize="24" Foreground="Black" FontWeight="Bold">
+                        FontSize="24">
                         <DataGrid.ColumnHeaderStyle>
                             <Style TargetType="DataGridColumnHeader">
                                 <Setter Property="HorizontalContentAlignment" Value="Center" />
                                 <Setter Property="Height" Value="48" />
-                                <Setter Property="FontSize" Value="24" />
+                                <Setter Property="FontSize" Value="16" />
                                 <Setter Property="Foreground" Value="White" />
                                 <Setter Property="Background" Value="#2B7EE6" />
                             </Style>
@@ -181,7 +234,81 @@
                                     </DataTemplate>
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn> 
+                            <!--<DataGridTextColumn
+                                Width="250"
+                                Binding="{Binding WorkOrderCode}"
+                                Header="工单编码" />
+                            <DataGridTextColumn
+                                Width="150"
+                                Binding="{Binding OrderCode}"
+                                Header="订单编码" />
+                            <DataGridTextColumn
+                                Width="450"
+                                Binding="{Binding ProductName}"
+                                Header="产品名称" />
+                            <DataGridTextColumn
+                                Width="200"
+                                Binding="{Binding ProductSpc}"
+                                Header="产品型号" />
+                            <DataGridTextColumn
+                                Width="200"
+                                Binding="{Binding QuantitySplit}"
+                                Header="工单数量" />
+                            <DataGridTextColumn
+                                Width="*"
+                                Binding="{Binding BatchCode}"
+                                Header="生产批次" />-->
+                            <DataGridTextColumn
+                                Width="250"
+                                Binding="{Binding id}"
+                                Header="计划编码" />
+                            <DataGridTextColumn Visibility="Hidden"
+                                Width="150"
+                                Binding="{Binding workorder_id}"
+                                Header="订单编码" />
+                            <DataGridTextColumn Visibility="Visible"
+                                Width="350"
+                                Binding="{Binding workorder_code}"
+                                Header="订单码" />
                             
+                            <DataGridTextColumn
+                                Width="450"
+                                Binding="{Binding product_name}"
+                                Header="产品名称" />
+                            <DataGridTextColumn
+                                Width="200"
+                                Binding="{Binding material_code}"
+                                Header="产品型号" />
+                            <DataGridTextColumn
+                                Width="200"
+                                Binding="{Binding plan_time}"
+                                Header="工单时间" />
+                            <DataGridTextColumn
+                                Width="80"
+                                Binding="{Binding bucket_code}"
+                                Header="料罐编码" />
+                            <DataGridTextColumn
+                                Width="*"
+                                Binding="{Binding shift_desc}"
+                                Header="班次" /> 
+                            <DataGridTextColumn
+                                Width="*"
+                                Binding="{Binding prod_line_code}"
+                                Header="成型机" />
+                            <DataGridTextColumn
+                                Width="*"
+                                Binding="{Binding status,Converter={StaticResource MyConverter}}"
+                                Header="工单状态" />
+                            <DataGridTextColumn
+                                Width="*"
+                                Binding="{Binding sync_flag,Converter={StaticResource SyncFlagConverter}}"
+                                Header="同步状态" >
+                                <DataGridTextColumn.ElementStyle>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="{Binding sync_flag, Converter={StaticResource SyncFlagColorConvert}}" />
+                                    </Style>
+                                </DataGridTextColumn.ElementStyle>
+                            </DataGridTextColumn>
                             <DataGridTemplateColumn Width="350" Header="操作">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
@@ -215,70 +342,6 @@
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn>
 
-                            <!--<DataGridTextColumn
-                                Width="250"
-                                Binding="{Binding WorkOrderCode}"
-                                Header="工单编码" />
-                            <DataGridTextColumn
-                                Width="150"
-                                Binding="{Binding OrderCode}"
-                                Header="订单编码" />
-                            <DataGridTextColumn
-                                Width="450"
-                                Binding="{Binding ProductName}"
-                                Header="产品名称" />
-                            <DataGridTextColumn
-                                Width="200"
-                                Binding="{Binding ProductSpc}"
-                                Header="产品型号" />
-                            <DataGridTextColumn
-                                Width="200"
-                                Binding="{Binding QuantitySplit}"
-                                Header="工单数量" />
-                            <DataGridTextColumn
-                                Width="*"
-                                Binding="{Binding BatchCode}"
-                                Header="生产批次" />-->
-                            <DataGridTextColumn
-                                Width="250"
-                                Binding="{Binding id}"
-                                Header="计划编码" />
-                            <DataGridTextColumn
-                                Width="150"
-                                Binding="{Binding workorder_id}"
-                                Header="订单编码" />
-                            <DataGridTextColumn
-                                Width="450"
-                                Binding="{Binding product_name}"
-                                Header="产品名称" />
-                            <DataGridTextColumn
-                                Width="200"
-                                Binding="{Binding material_code}"
-                                Header="产品型号" />
-                            <DataGridTextColumn
-                                Width="200"
-                                Binding="{Binding plan_time}"
-                                Header="工单时间" />
-                            <DataGridTextColumn
-                                Width="*"
-                                Binding="{Binding bucket_code}"
-                                Header="料罐编码" />
-                            <DataGridTextColumn
-                                Width="*"
-                                Binding="{Binding shift_desc}"
-                                Header="班次" /> 
-                            <DataGridTextColumn
-                                Width="*"
-                                Binding="{Binding prod_line_code}"
-                                Header="成型机" />
-                            <DataGridTextColumn
-                                Width="*"
-                                Binding="{Binding status,Converter={StaticResource MyConverter}}"
-                                Header="状态" />
-                            <DataGridTextColumn
-                                Width="*"
-                                Binding="{Binding sync_flag}"
-                                Header="状态" /> 
                         </DataGrid.Columns>
                     </DataGrid>
                 </ScrollViewer>

shangjian/XGL/Views/LanJu_Prepare.xaml.cs

@@ -38,8 +38,8 @@ namespace XGL.Views
         DBService userDbWareHouse = new DBService();
         WorkOrder list_modelWareHouse = new WorkOrder();
 
-        List<WetMaterialModel> wetList = new List<WetMaterialModel>();
-        WetMaterialModel wet = new WetMaterialModel();
+     
+   
         string messageOrderCode = "";
         DataTable dt;
         /// <summary>
@@ -52,14 +52,17 @@ namespace XGL.Views
         {
             try
             {
+                List<WetMaterialModel> wetList = new List<WetMaterialModel>();
                 //modelWareHouse = new List<WorkOrder>();
                 //userDbWareHouse = new DBService();
                 dt = userDbWareHouse.GetWetPlanInfo();
                 if (dt == null) return;
                 foreach (DataRow i in dt.Rows)
                 {
+                    WetMaterialModel wet = new WetMaterialModel();
                     wet.id = i["id"].ToString();
                     wet.workorder_id = i["workorder_id"].ToString();
+                    wet.workorder_code = i["workorder_code"].ToString(); 
                     wet.product_name = i["product_name"].ToString();
 
                     wet.material_code = i["material_code"].ToString();
@@ -79,6 +82,7 @@ namespace XGL.Views
                     //    list_modelWareHouse.BatchCode = i["BatchCode"].ToString();
                     //    modelWareHouse.Add(list_modelWareHouse);
                 }
+                this.WorkOrder.ItemsSource = null;
                 this.WorkOrder.ItemsSource = wetList;
             }
             catch (Exception ex)
@@ -129,7 +133,7 @@ namespace XGL.Views
         {
             GetWorkOrder();
         }
-        private void btnStartOrders_Click(object sender, RoutedEventArgs e)
+        private async void btnStartOrders_Click(object sender, RoutedEventArgs e)
         {
             CheckUserWin checkUserWin = new CheckUserWin();
             checkUserWin.ShowDialog();
@@ -172,7 +176,11 @@ namespace XGL.Views
             //}
 
             //获取湿料计划指定的成型机
-            var cxjDt = userDbWareHouse.GetCXJList(orderID);
+            //var cxjDt = userDbWareHouse.GetCXJList(orderID);
+
+            //根据工单获取成型机
+            var cxjDt = userDbWareHouse.GetCXJList(workorderID);
+
             if (cxjDt == null || cxjDt.Rows.Count == 0)
             {
                 CustomMessageBox.Show("该工单未指定料罐、成型机，请稍后再试！", CustomMessageBoxIcon.Warning);
@@ -219,17 +227,17 @@ namespace XGL.Views
             materialPlanModel.reqCode = CommonFunc.Common.GetUUID();
             materialPlanModel.reqTime = DateTime.Now.ToString();
             materialPlanModel.factory = Utils.GetAppSetting("SiteCode");
-            materialPlanModel.planNo = orderID;
+            materialPlanModel.planNo = workorderID;
 
 
-            foreach (var item in cxjList)
+            foreach (var item in bucketList)
             {
                 skuInfo sku = new skuInfo();
                 sku.sku = material;
                 sku.loadNo = item;
                 
                 List<unloadNoInfo> unloadNoInfoList = new List<unloadNoInfo>();
-                foreach (var buckt in bucketList)
+                foreach (var buckt in cxjList)
                 {
                     unloadNoInfo unloadNoInfo = new unloadNoInfo();
                     unloadNoInfo.unloadNo = buckt;
@@ -245,13 +253,17 @@ namespace XGL.Views
             var jsonContent = JsonConvert.SerializeObject(materialPlanModel);
 
             RestHelper restClient = new RestHelper();
-            var response = restClient.PostAsync(apiUrl, jsonContent);
+            var response = await restClient.PostAsync(apiUrl, jsonContent);
 
-            Console.WriteLine(response);
+            //Console.WriteLine(response);
             //更新湿料计划同步状态
-            var updatestatus = userDbWareHouse.UpdateSycnFlag(orderID, workorderID);
+            var updatestatus = userDbWareHouse.UpdateSycnFlag(workorderID);
             if (!updatestatus)
                 LogHelper.instance.log.Info("更新湿料计划同步状态失败！");
+            else
+            {
+                GetWorkOrder();
+            }
         }
 
         private void SOP_Click(object sender, RoutedEventArgs e)
@@ -263,5 +275,22 @@ namespace XGL.Views
         {
 
         }
+ 
+
+        private void btnRefresh_Click(object sender, RoutedEventArgs e)
+        {
+            GetWorkOrder();
+        }
+
+        /// <summary>
+        /// 增加序号
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void USERLIST_LoadingRow(object sender, DataGridRowEventArgs e)
+        {
+            e.Row.Header = (e.Row.GetIndex() + 1).ToString();
+        }
+       
     }
 }

shangjian/XGL/XGL.csproj

@@ -212,8 +212,10 @@
     <Compile Include="Tools\ModuleUC.xaml.cs">
       <DependentUpon>ModuleUC.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Tools\SyncFlagColorConverter.cs" />
     <Compile Include="Tools\NetStatusToColorConvert.cs" />
     <Compile Include="Tools\MyValueConverter.cs" />
+    <Compile Include="Tools\SyncFlagConverter.cs" />
     <Compile Include="UControl\ordertj.xaml.cs">
       <DependentUpon>ordertj.xaml</DependentUpon>
     </Compile>

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

@@ -8,11 +8,11 @@
   </configSections>
   <appSettings> 
 	  <!--车间编码-->
-	  <add key="SiteCode" value="BPZ01"/>
+	  <add key="SiteCode" value="1000"/>
 	  <!--设备编码-->
 	  <add key="DeviceCode" value="C1"/>
 	  <!--上位机类型 0:工单准备，1：成型机\shoupei，2：烘房-->
-	  <add key="ClientMode" value="1"/>
+	  <add key="ClientMode" value="2"/>
     <!--上位机类型 1 上件 ，2 排空区  0下件区-->
     <add key="PostType" value="1"/>
     <!--线体编码-->

shangjian/XGL/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs

@@ -1,62 +1,2 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace XamlGeneratedNamespace {
-    
-    
-    /// <summary>
-    /// GeneratedInternalTypeHelper
-    /// </summary>
-    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
-        
-        /// <summary>
-        /// CreateInstance
-        /// </summary>
-        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
-            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
-                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
-        }
-        
-        /// <summary>
-        /// GetPropertyValue
-        /// </summary>
-        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
-            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// SetPropertyValue
-        /// </summary>
-        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
-            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// CreateDelegate
-        /// </summary>
-        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
-            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
-                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
-                        delegateType,
-                        handler}, null)));
-        }
-        
-        /// <summary>
-        /// AddEventHandler
-        /// </summary>
-        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
-            eventInfo.AddEventHandler(target, handler);
-        }
-    }
-}
+
 

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}" "923A471F5F1852E93CCBA311D226CC1C728BF607B35C758D0B9F3BB2EBDCAEF4"
+#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E4F3F2A075151D49F3744644EF28E46A664290FCA9AB049824420D662E2B475C"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -49,7 +49,7 @@ namespace XGL.Views {
         #line hidden
         
         
-        #line 106 "..\..\..\..\Views\LanJu_Operator.xaml"
+        #line 110 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Label LbDeviceState;
         
@@ -57,7 +57,7 @@ namespace XGL.Views {
         #line hidden
         
         
-        #line 202 "..\..\..\..\Views\LanJu_Operator.xaml"
+        #line 208 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button btnPause;
         
@@ -65,7 +65,7 @@ namespace XGL.Views {
         #line hidden
         
         
-        #line 304 "..\..\..\..\Views\LanJu_Operator.xaml"
+        #line 310 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid dgWorkOrderInfo;
         
@@ -73,7 +73,7 @@ namespace XGL.Views {
         #line hidden
         
         
-        #line 428 "..\..\..\..\Views\LanJu_Operator.xaml"
+        #line 436 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ContentControl Window1;
         
@@ -81,7 +81,7 @@ namespace XGL.Views {
         #line hidden
         
         
-        #line 436 "..\..\..\..\Views\LanJu_Operator.xaml"
+        #line 444 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ContentControl Window2;
         
@@ -133,7 +133,7 @@ namespace XGL.Views {
             case 3:
             this.btnPause = ((System.Windows.Controls.Button)(target));
             
-            #line 203 "..\..\..\..\Views\LanJu_Operator.xaml"
+            #line 209 "..\..\..\..\Views\LanJu_Operator.xaml"
             this.btnPause.Click += new System.Windows.RoutedEventHandler(this.btnPause_Click);
             
             #line default
@@ -141,7 +141,7 @@ namespace XGL.Views {
             return;
             case 4:
             
-            #line 250 "..\..\..\..\Views\LanJu_Operator.xaml"
+            #line 256 "..\..\..\..\Views\LanJu_Operator.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
             
             #line default
@@ -149,7 +149,7 @@ namespace XGL.Views {
             return;
             case 5:
             
-            #line 271 "..\..\..\..\Views\LanJu_Operator.xaml"
+            #line 277 "..\..\..\..\Views\LanJu_Operator.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click);
             
             #line default
@@ -157,10 +157,16 @@ namespace XGL.Views {
             return;
             case 6:
             this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
+            
+            #line 316 "..\..\..\..\Views\LanJu_Operator.xaml"
+            this.dgWorkOrderInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgWorkOrderInfo_LoadingRow);
+            
+            #line default
+            #line hidden
             return;
             case 7:
             
-            #line 355 "..\..\..\..\Views\LanJu_Operator.xaml"
+            #line 363 "..\..\..\..\Views\LanJu_Operator.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click);
             
             #line default
@@ -168,7 +174,7 @@ namespace XGL.Views {
             return;
             case 8:
             
-            #line 368 "..\..\..\..\Views\LanJu_Operator.xaml"
+            #line 376 "..\..\..\..\Views\LanJu_Operator.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Complete_Click);
             
             #line default

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}" "923A471F5F1852E93CCBA311D226CC1C728BF607B35C758D0B9F3BB2EBDCAEF4"
+#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E4F3F2A075151D49F3744644EF28E46A664290FCA9AB049824420D662E2B475C"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -49,7 +49,7 @@ namespace XGL.Views {
         #line hidden
         
         
-        #line 106 "..\..\..\..\Views\LanJu_Operator.xaml"
+        #line 110 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Label LbDeviceState;
         
@@ -57,7 +57,7 @@ namespace XGL.Views {
         #line hidden
         
         
-        #line 202 "..\..\..\..\Views\LanJu_Operator.xaml"
+        #line 208 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button btnPause;
         
@@ -65,7 +65,7 @@ namespace XGL.Views {
         #line hidden
         
         
-        #line 304 "..\..\..\..\Views\LanJu_Operator.xaml"
+        #line 310 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid dgWorkOrderInfo;
         
@@ -73,7 +73,7 @@ namespace XGL.Views {
         #line hidden
         
         
-        #line 428 "..\..\..\..\Views\LanJu_Operator.xaml"
+        #line 436 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ContentControl Window1;
         
@@ -81,7 +81,7 @@ namespace XGL.Views {
         #line hidden
         
         
-        #line 436 "..\..\..\..\Views\LanJu_Operator.xaml"
+        #line 444 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ContentControl Window2;
         
@@ -133,7 +133,7 @@ namespace XGL.Views {
             case 3:
             this.btnPause = ((System.Windows.Controls.Button)(target));
             
-            #line 203 "..\..\..\..\Views\LanJu_Operator.xaml"
+            #line 209 "..\..\..\..\Views\LanJu_Operator.xaml"
             this.btnPause.Click += new System.Windows.RoutedEventHandler(this.btnPause_Click);
             
             #line default
@@ -141,7 +141,7 @@ namespace XGL.Views {
             return;
             case 4:
             
-            #line 250 "..\..\..\..\Views\LanJu_Operator.xaml"
+            #line 256 "..\..\..\..\Views\LanJu_Operator.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
             
             #line default
@@ -149,7 +149,7 @@ namespace XGL.Views {
             return;
             case 5:
             
-            #line 271 "..\..\..\..\Views\LanJu_Operator.xaml"
+            #line 277 "..\..\..\..\Views\LanJu_Operator.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click);
             
             #line default
@@ -157,10 +157,16 @@ namespace XGL.Views {
             return;
             case 6:
             this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
+            
+            #line 316 "..\..\..\..\Views\LanJu_Operator.xaml"
+            this.dgWorkOrderInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgWorkOrderInfo_LoadingRow);
+            
+            #line default
+            #line hidden
             return;
             case 7:
             
-            #line 355 "..\..\..\..\Views\LanJu_Operator.xaml"
+            #line 363 "..\..\..\..\Views\LanJu_Operator.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click);
             
             #line default
@@ -168,7 +174,7 @@ namespace XGL.Views {
             return;
             case 8:
             
-            #line 368 "..\..\..\..\Views\LanJu_Operator.xaml"
+            #line 376 "..\..\..\..\Views\LanJu_Operator.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Complete_Click);
             
             #line default

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}" "A013331107A454E06F5A24DC34534744EC128738FB5427748396E5162631E760"
+#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F430F137153B10D1FB7EFC67A79F115AF750C771080C3D4ECBEAEFB55E18CF05"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -42,7 +42,15 @@ namespace XGL.Views {
     public partial class LanJu_Prepare : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector, System.Windows.Markup.IStyleConnector {
         
         
-        #line 155 "..\..\..\..\Views\LanJu_Prepare.xaml"
+        #line 197 "..\..\..\..\Views\LanJu_Prepare.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button btnRefresh;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 208 "..\..\..\..\Views\LanJu_Prepare.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid WorkOrder;
         
@@ -89,14 +97,29 @@ namespace XGL.Views {
             return;
             case 2:
             
-            #line 113 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            #line 159 "..\..\..\..\Views\LanJu_Prepare.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.btnStartOrders_Click);
             
             #line default
             #line hidden
             return;
             case 3:
+            this.btnRefresh = ((System.Windows.Controls.Button)(target));
+            
+            #line 198 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            this.btnRefresh.Click += new System.Windows.RoutedEventHandler(this.btnRefresh_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 4:
             this.WorkOrder = ((System.Windows.Controls.DataGrid)(target));
+            
+            #line 216 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            this.WorkOrder.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.USERLIST_LoadingRow);
+            
+            #line default
+            #line hidden
             return;
             }
             this._contentLoaded = true;
@@ -111,25 +134,25 @@ namespace XGL.Views {
         void System.Windows.Markup.IStyleConnector.Connect(int connectionId, object target) {
             switch (connectionId)
             {
-            case 4:
-            
-            #line 198 "..\..\..\..\Views\LanJu_Prepare.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
-            
-            #line default
-            #line hidden
-            break;
             case 5:
             
-            #line 205 "..\..\..\..\Views\LanJu_Prepare.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SOP_Click);
+            #line 325 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
             
             #line default
             #line hidden
             break;
             case 6:
             
-            #line 212 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            #line 332 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SOP_Click);
+            
+            #line default
+            #line hidden
+            break;
+            case 7:
+            
+            #line 339 "..\..\..\..\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}" "A013331107A454E06F5A24DC34534744EC128738FB5427748396E5162631E760"
+#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F430F137153B10D1FB7EFC67A79F115AF750C771080C3D4ECBEAEFB55E18CF05"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -42,7 +42,15 @@ namespace XGL.Views {
     public partial class LanJu_Prepare : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector, System.Windows.Markup.IStyleConnector {
         
         
-        #line 155 "..\..\..\..\Views\LanJu_Prepare.xaml"
+        #line 197 "..\..\..\..\Views\LanJu_Prepare.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button btnRefresh;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 208 "..\..\..\..\Views\LanJu_Prepare.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid WorkOrder;
         
@@ -89,14 +97,29 @@ namespace XGL.Views {
             return;
             case 2:
             
-            #line 113 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            #line 159 "..\..\..\..\Views\LanJu_Prepare.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.btnStartOrders_Click);
             
             #line default
             #line hidden
             return;
             case 3:
+            this.btnRefresh = ((System.Windows.Controls.Button)(target));
+            
+            #line 198 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            this.btnRefresh.Click += new System.Windows.RoutedEventHandler(this.btnRefresh_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 4:
             this.WorkOrder = ((System.Windows.Controls.DataGrid)(target));
+            
+            #line 216 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            this.WorkOrder.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.USERLIST_LoadingRow);
+            
+            #line default
+            #line hidden
             return;
             }
             this._contentLoaded = true;
@@ -111,25 +134,25 @@ namespace XGL.Views {
         void System.Windows.Markup.IStyleConnector.Connect(int connectionId, object target) {
             switch (connectionId)
             {
-            case 4:
-            
-            #line 198 "..\..\..\..\Views\LanJu_Prepare.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
-            
-            #line default
-            #line hidden
-            break;
             case 5:
             
-            #line 205 "..\..\..\..\Views\LanJu_Prepare.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SOP_Click);
+            #line 325 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
             
             #line default
             #line hidden
             break;
             case 6:
             
-            #line 212 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            #line 332 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SOP_Click);
+            
+            #line default
+            #line hidden
+            break;
+            case 7:
+            
+            #line 339 "..\..\..\..\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.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-3c4a6a332e7492750f23abf774be6b469961c61b
+78ad0d5001c3faeee3bf14d7a8e5e51faa35ac21

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

@@ -12,7 +12,7 @@ DEBUG;TRACE
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\App.xaml
 54-2004655723
 3-297253631
-68-368259376
+701842115673
 511587517384
 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\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;
 

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

@@ -12,9 +12,9 @@ DEBUG;TRACE
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\App.xaml
 54-2004655723
 3-297253631
-69-1780281133
+71430093916
 511587517384
 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\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;
 
-False
+True
 

shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref

@@ -1,4 +1,4 @@
-
+D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\GeneratedInternalTypeHelper.g.cs
 
 FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormBlankingBoard.xaml;;
 FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormBoard.xaml;;