同步物料

shangjian/CentralControl/obj/Debug/CentralControl.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-0abd85b80046b9258518751daf3009dfc20e23db
+65ea42614d5210ce1f76f304a0b99eadc686e4a3

shangjian/CommonFunc/DataConfig/SqlDataObject.cs

@@ -104,10 +104,11 @@ namespace CommonFunc
         {
             get
             {
-                ConnectionConfig conSetting = DatabaseConfig.GetSettingsDirectory();
+                ConnectionConfig conSetting = DatabaseConfig.GetSettingsDirectory(); 
                 return CommonFunc.DESProvider.DecryptString(conSetting.MESNetClientConnectionString);
             }
         }
+ 
 
         /// <summary>
         /// 获取本地业务库

shangjian/CommonFunc/Tools/Utils.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Configuration;
 using System.Data;
+using System.Data.SqlClient;
 using System.Drawing;
 using System.IO;
 using System.Linq;
@@ -27,6 +28,12 @@ namespace CommonFunc.Tools
         public static SqlServerDBHelper clientDBHelper = new SqlServerDBHelper(SqlDataObject.GetMESClientSqlConnectionString);
         public static SqlServerDBHelper netClientDBHelper = new SqlServerDBHelper(SqlDataObject.GetMESNetClientSqlConnectionString);
 
+        public static string GetServerIP()
+        {
+            SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder(SqlDataObject.GetMESNetClientSqlConnectionString);
+            string serverIp = builder.DataSource.Split(',')[0];
+            return serverIp;
+        }
         /// <summary>
         /// 根据日期查询周天
         /// </summary>

shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-e89598d9122e10f3091f61c8bf70d5db84bb9e79
+0d3a19775b762537c0ccc61ba08dfd5625bd5f96

shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.cache

@@ -4,7 +4,7 @@
 library
 C#
 .cs
-E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\
+D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\
 CommonFunc
 none
 false
@@ -13,7 +13,7 @@ DEBUG;TRACE
 12023204370
 2-1355062061
 241494203934
-44196576213
+44-550732465
 HMessageBox.xaml;
 
 False

shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.lref

@@ -1,4 +1,4 @@
 
 
-FE:\workspace\LanJu\client\shangjian\CommonFunc\HMessageBox.xaml;;
+FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\HMessageBox.xaml;;
 

shangjian/LanJu/obj/Debug/LanJu.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-bc174b8fc67ac08f66a67e37a513d69b6869cfa6
+51790d22c3b0468f4e446c933001b592c3e5c2c3

shangjian/LanJu/obj/Debug/LanJu_MarkupCompile.cache

@@ -4,12 +4,12 @@
 winexe
 C#
 .cs
-E:\workspace\LanJu\client\shangjian\LanJu\obj\Debug\
+D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\obj\Debug\
 LanJu
 none
 false
 DEBUG;TRACE
-E:\workspace\LanJu\client\shangjian\LanJu\App.xaml
+D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\App.xaml
 9-1725419280
 
 131720844138

shangjian/LanJu/obj/Debug/LanJu_MarkupCompile.lref

@@ -1,12 +1,12 @@
 
 
-FE:\workspace\LanJu\client\shangjian\LanJu\MainWindow.xaml;;
-FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Complete.xaml;;
-FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_DeviceItems.xaml;;
-FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Flow.xaml;;
-FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Index.xaml;;
-FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Material.xaml;;
-FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Operator.xaml;;
-FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Paused.xaml;;
-FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Prepare.xaml;;
+FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\MainWindow.xaml;;
+FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Complete.xaml;;
+FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_DeviceItems.xaml;;
+FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Flow.xaml;;
+FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Index.xaml;;
+FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Material.xaml;;
+FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Operator.xaml;;
+FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Paused.xaml;;
+FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Prepare.xaml;;
 

shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-93e6bdf40a6f5d4b88993bae3e272b7f08763f68
+75b64367c22655afbbe469bfdef148da7e480363

shangjian/XGL.Data/DBService/DBService.cs

@@ -652,7 +652,7 @@ 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 
+left join pro_order_workorder workorder on workorder.workorder_id = wetDetail.workorder_id where 1=1 and workorder.status = 'w1'
 "; //where  CONVERT(VARCHAR(10), wet.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)
@@ -697,7 +697,7 @@ left join pro_order_workorder workorder on workorder.workorder_id = wetDetail.wo
         /// <returns></returns>
         public DataTable GetCXJList(string workOrderNo)
         {
-            string sql = $@"select prod_line_code
+            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

shangjian/XGL.Data/DBService/DringRoomService.cs

@@ -41,9 +41,9 @@ 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
-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')
-";
+LEFT JOIN pro_order_workorder ord on res.OrderCode = ord.workorder_id";
+            //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')
+
 
             DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
             if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)

shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache

@@ -1,5 +1 @@
-<<<<<<< HEAD
-fbc0cc7e40c5cf1726e3b3ecaa740b610d52f69f
-=======
 79f02adf94b81a462e2d021ffaeb806c569f29e2
->>>>>>> babf7ea9e37642c626439584d080cf06049abc5f

shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache

@@ -1,5 +1 @@
-<<<<<<< HEAD
-447124d86454b5028e0096d5af8102cbe476aa0c
-=======
 15e0079c678473a5e3606350c39806472a1461a2
->>>>>>> babf7ea9e37642c626439584d080cf06049abc5f

shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-da04babf50ef3035790f6c85a018240439a4cf82
+4c1eda63a6eb933282d4915d9cfa5b18a18739b1

shangjian/XGL/App.config

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

shangjian/XGL/FormItem/Main.xaml

@@ -6,6 +6,7 @@
     xmlns:local="clr-namespace:XGL.FormItem"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="Main"
+      xmlns:convert="clr-namespace:XGL.Tools"
    Width="1920"
             Height="1080"
     Closed="Close"
@@ -194,6 +195,7 @@
                     </Setter.Value>
                 </Setter>
             </Style>
+            <convert:NetStatusToColorConvert x:Key="colorconvert"></convert:NetStatusToColorConvert>
         </ResourceDictionary>
     </Window.Resources>
     <Viewbox Stretch="Fill">
@@ -473,20 +475,22 @@
                         HorizontalAlignment="Left"
                         Content="网络状态"
                         FontSize="20px"
-                        Foreground="Black" />
+                        Foreground="Black" VerticalContentAlignment="Center"/>
+                    <TextBlock x:Name="myTb"  HorizontalAlignment="Right" VerticalAlignment="Center" FontSize="20"  Margin="0 0 10 0" 
+                                  Width="120" Foreground="{Binding PingSeconds,Converter={StaticResource colorconvert}}" >
+                            <Run Foreground="white" Text="{DynamicResource 延迟}"></Run>
+                            <Run Name="btnText"  Text="{Binding PingSeconds}"></Run>
+                            <Run Text="ms"></Run>
+                    </TextBlock>
 
-                    <Button  BorderThickness="1" BorderBrush="CornflowerBlue" Visibility="Visible" Background="Transparent"  FontSize="26" Height="50" Width="50" HorizontalAlignment="Left" x:Name="btnZXH"    Margin="1400,4,0,2" ToolTip="最小化" Click="btnZXH_Click"  >
-                        <!--<TextBlock  Name="BtnLogoff"  Text="{DynamicResource 退出}"  TextWrapping="WrapWithOverflow"></TextBlock>-->
-                        <StackPanel Orientation="Horizontal" Margin="2">
-                            <Image Source="..\Resources\zxh.png" Width="40" Height="40"/>
-                            <!--<Label VerticalAlignment="Center" FontSize="20" Foreground="White" HorizontalAlignment="Center">退出</Label>-->
-                        </StackPanel>
+                    <Button  BorderThickness="1" BorderBrush="CornflowerBlue" Visibility="Visible" Background="Transparent"  FontSize="26" Height="40" Width="50" HorizontalAlignment="Left" x:Name="btnZXH"    Margin="1400,4,0,2" ToolTip="最小化" Click="btnZXH_Click"  > 
+                            <Image Source="..\Resources\zxh.png" /> 
                     </Button>
                     <Button
                         x:Name="btnFault"
                         Width="100"
                         Height="40"
-                        Margin="100,0,0,0"
+                        Margin="60,0,0,0"
                         Background="#2F82E7"
                         Click="btnExit_Click"
                         Content="退出"

shangjian/XGL/FormItem/Main.xaml.cs

@@ -3,8 +3,10 @@ using CommonFunc;
 using CommonFunc.Tools;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Data;
 using System.Linq;
+using System.Net.NetworkInformation;
 using System.Text;
 using System.Threading.Tasks;
 using System.Timers;
@@ -32,6 +34,27 @@ namespace XGL.FormItem
         LanJu_Operator op = new LanJu_Operator();
         DryingRoomUC dryingRoomUC = new DryingRoomUC();
 
+
+        System.Threading.Timer Time { get; set; }
+        private string _PingSeconds;
+
+        public string PingSeconds
+        {
+            get { return _PingSeconds; }
+            set
+            {
+                OnPropertyChanged("PingSeconds");
+            }
+        }
+
+        public event PropertyChangedEventHandler PropertyChanged;
+        protected void OnPropertyChanged(string info)
+        {
+            var handler = PropertyChanged;
+            handler?.Invoke(this, new PropertyChangedEventArgs(info));
+        }
+
+
         public enum WindowID
         {
             frame1
@@ -46,7 +69,18 @@ namespace XGL.FormItem
             timer.Elapsed += Timer_Elapsed;
             timer.Start();
 
+            //实例化绑定对象
+            Binding textBinding = new Binding();
+            //设置要绑定源
+            textBinding.Source = this;//绑定MainWindow类
+            //设置要绑定属性
+            textBinding.Path = new PropertyPath("PingSeconds");//绑定MainWindow类下的TxtValue属性。
+            textBinding.Mode = BindingMode.TwoWay;//绑定模式双向绑定
+            //设置绑定到要绑定的控件
+             this.myTb.SetBinding(TextBlock.TextProperty, textBinding);
+
             InitPage();
+            GetServiceDelay(Utils.GetServerIP());
         }
 
         private void InitPage()
@@ -110,6 +144,70 @@ namespace XGL.FormItem
             string name = dt == null?"": dt.Rows[0][0].ToString();
             this.tbFactory.Text = name;
         }
+
+
+        public void GetServiceDelay(string serviceIp)
+        {
+            Ping p1 = new Ping();
+            Time = new System.Threading.Timer((s) =>
+            { 
+                try
+                {
+                    p1.SendAsyncCancel();
+                    p1.SendPingAsync(serviceIp, 2000).ContinueWith(result =>
+                    {
+                        try
+                        {
+                            string time = result?.Result?.RoundtripTime.ToString();
+                            Application.Current.Dispatcher.Invoke(() =>
+                            {
+                                if (!string.IsNullOrEmpty(time) && time != "0")
+                                {
+                                    _PingSeconds = time;
+                                    PingSeconds = time;
+                                    this.btnText.Text = time;
+                                }
+                                else
+                                {
+                                    _PingSeconds = time;
+                                    PingSeconds = "--";
+                                    this.btnText.Text = "--";
+                                }
+                                int second = 0;
+                                if (int.TryParse(time, out second))
+                                {
+                                    if (second > 0 && second <= 20)
+                                    {
+                                        this.btnText.Foreground = Brushes.Green;
+                                        //System.Windows.Media.ColorConverter.ConvertFromString("#FF4FEE4F");
+                                    }
+                                    else if (second > 20 && second <= 40)
+                                    {
+                                        this.btnText.Foreground = Brushes.Orange;
+                                    }
+                                    else
+                                    {
+                                        this.btnText.Foreground = Brushes.Red;
+                                    }  
+                                }
+                                else { this.btnText.Foreground = Brushes.Red; }
+                            });
+                        }
+                        catch (Exception ex)
+                        {
+                            result?.Dispose();
+                        }
+
+                    });
+                }
+                catch (Exception)
+                {
+                    p1.SendAsyncCancel();
+                }
+            }, 1, 0, 2000);
+
+
+        }
     }
   
 }

shangjian/XGL/Tools/NetStatusToColorConvert.cs

@@ -0,0 +1,48 @@
+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 NetStatusToColorConvert : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+
+            int second = 0;
+            if (value != null)
+            {
+                if (int.TryParse(value.ToString(), out second))
+                {
+                    if (second > 0 && second <= 20)
+                    {
+                        return Brushes.Green;
+                        //System.Windows.Media.ColorConverter.ConvertFromString("#FF4FEE4F");
+                    }
+                    else if (second > 20 && second <= 40)
+                    {
+                        return Brushes.Orange;
+                    }
+                    else
+                    {
+                        return Brushes.Red;
+                    }
+
+
+                }
+            }
+
+            return Brushes.Red;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return "";
+        }
+    }
+}

shangjian/XGL/Views/CheckUserWin.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:XGL.Views"
         mc:Ignorable="d"
-        Title="CheckUserWin" Height="350" Width="600" WindowStartupLocation="CenterScreen" WindowStyle="None">
+        Title="CheckUserWin" Height="350" Width="600" WindowStartupLocation="CenterScreen" WindowStyle="None" Loaded="Window_Loaded">
     <Grid>
         <Grid.Background>
             <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">

shangjian/XGL/Views/CheckUserWin.xaml.cs

@@ -51,12 +51,18 @@ namespace XGL.Views
 
         private void txtUserID_TextChanged(object sender, TextChangedEventArgs e)
         {
-            tbMsg.Content = "";
+           this.tbMsg.Content = "";
         }
 
         private void pw_PasswordChanged(object sender, RoutedEventArgs e)
         {
             tbMsg.Content = "";
         }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            txtUserID.Text = "admin";
+            pw.Password = "admin123";
+        }
     }
 }

shangjian/XGL/Views/DryingRoomUC.xaml

@@ -6,6 +6,30 @@
              xmlns:local="clr-namespace:XGL.Views"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800" Loaded="UserControl_Loaded">
+    <UserControl.Resources>
+        <Style x:Key="ApplicantList_ListBox_Style" TargetType="{x:Type ListBox}">
+            <Setter Property="Background" Value="#00000000"/>
+            <Setter Property="BorderBrush" Value="#00000000"/>
+            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
+            <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
+            <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
+            <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显示-->  
+                    </ItemsPanelTemplate>
+                </Setter.Value>
+            </Setter> 
+        </Style>
+    </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="0.1*"/>
@@ -14,8 +38,8 @@
         </Grid.RowDefinitions>
         <StackPanel Orientation="Horizontal" Grid.Row="0" VerticalAlignment="Center">
             <StackPanel Orientation="Horizontal">
-                <Label Content="请选择烘房：" VerticalContentAlignment="Center" FontSize="16"/>
-                <ComboBox x:Name="comboDryRoomInfo" Width="200" SelectionChanged="comboDryRoomInfo_SelectionChanged"></ComboBox>
+                <Label Content="请选择烘房：" VerticalContentAlignment="Center" FontSize="16" Margin="20,0,0,0"/>
+                <ComboBox x:Name="comboDryRoomInfo" Width="200" VerticalContentAlignment="Center" SelectionChanged="comboDryRoomInfo_SelectionChanged"></ComboBox>
             </StackPanel>
             <StackPanel Orientation="Horizontal" Margin="10,0,0,0">
                 <Label Content="当前温度：" VerticalContentAlignment="Center" FontSize="16"/>
@@ -26,7 +50,10 @@
                 <Label x:Name="lbCurrPressure" Width="40" VerticalContentAlignment="Center" FontSize="16"></Label>
             </StackPanel>
         </StackPanel>
-        <ListBox Grid.Row="1" x:Name="DringRoomOuterListBox"></ListBox>
-        <ListBox Grid.Row="2" x:Name="DringRoomListBox"></ListBox>
+        
+        <!--<ListBox Grid.Row="1" x:Name="DringRoomOuterListBox"></ListBox>-->
+        <ListBox Grid.Row="2" x:Name="DringRoomListBox" Style="{DynamicResource ApplicantList_ListBox_Style}"  Margin="20,0,0,0">
+           
+        </ListBox>
     </Grid>
 </UserControl>

shangjian/XGL/Views/DryingRoomUC.xaml.cs

@@ -39,14 +39,14 @@ namespace XGL.Views
 
         private void GetDringRoomData()
         {
-            DataTable dt = dringRoomService.GetDringRoomData(comboDryRoomInfo.Text);
+            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)
             {
-                int i = 0;
                 index = i++;
                 string rfid = item["rfid"].ToString();
                 string workorder_code = item["workorder_code"].ToString();
@@ -70,8 +70,12 @@ namespace XGL.Views
 
             List<EquipmentMode> listEquip = Utils.ToDataList<EquipmentMode>(dt);
             //comboDryRoomInfo.SelectedValuePath = "quipName";
-            comboDryRoomInfo.DisplayMemberPath = "quipCode";
+            //comboDryRoomInfo.DisplayMemberPath = "quipCode";
+            //comboDryRoomInfo.ItemsSource = listEquip;
+            //绑定
             comboDryRoomInfo.ItemsSource = listEquip;
+            comboDryRoomInfo.SelectedValuePath = "quipCode";
+            comboDryRoomInfo.DisplayMemberPath = "quipName";
             comboDryRoomInfo.SelectedIndex = 0;
         }
 
@@ -85,6 +89,6 @@ namespace XGL.Views
     {
         public int type { get; set; }
         public string quipCode { get; set; }
-        public int quipName { get; set; }
+        public string quipName { get; set; }
     }
 }

shangjian/XGL/Views/LanJu_Prepare.xaml

@@ -162,7 +162,8 @@
                         SelectionMode="Single"
                         CellStyle="{StaticResource CustomCellStyle}"
                         FrozenColumnCount="1"
-                        IsReadOnly="True">
+                        IsReadOnly="True"
+                        FontSize="24" Foreground="Black" FontWeight="Bold">
                         <DataGrid.ColumnHeaderStyle>
                             <Style TargetType="DataGridColumnHeader">
                                 <Setter Property="HorizontalContentAlignment" Value="Center" />
@@ -173,6 +174,14 @@
                             </Style>
                         </DataGrid.ColumnHeaderStyle>
                         <DataGrid.Columns>
+                            <DataGridTemplateColumn Header=" 序号" Width="80" MinWidth="10" IsReadOnly="True">
+                                <DataGridTemplateColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow}}, Path=Header}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0"></TextBlock>
+                                    </DataTemplate>
+                                </DataGridTemplateColumn.CellTemplate>
+                            </DataGridTemplateColumn>
+                            
                             <DataGridTemplateColumn Width="350" Header="操作">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
@@ -205,7 +214,7 @@
                                     </DataTemplate>
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn>
-                            <DataGridTextColumn Width="200" Header="序号" />
+                          
                             <!--<DataGridTextColumn
                                 Width="250"
                                 Binding="{Binding WorkOrderCode}"
@@ -240,7 +249,7 @@
                                 Header="订单编码" />
                             <DataGridTextColumn
                                 Width="450"
-                                Binding="{Binding ProductName}"
+                                Binding="{Binding product_name}"
                                 Header="产品名称" />
                             <DataGridTextColumn
                                 Width="200"

shangjian/XGL/Views/LanJu_Prepare.xaml.cs

@@ -63,6 +63,7 @@ namespace XGL.Views
                     wet.product_name = i["product_name"].ToString();
 
                     wet.material_code = i["material_code"].ToString();
+                    wet.material_name = i["material_name"].ToString();
                     wet.plan_time = Convert.ToDateTime(i["plan_time"].ToString());
                     wet.bucket_code = i["bucket_code"].ToString();
                     wet.shift_desc = i["shift_desc"].ToString();
@@ -115,29 +116,34 @@ namespace XGL.Views
             string material = (WorkOrder.SelectedItem as WetMaterialModel).material_code;
             string sync_flag = (WorkOrder.SelectedItem as WetMaterialModel).sync_flag; 
             string status = (WorkOrder.SelectedItem as WetMaterialModel).status;
-            if (!sync_flag.Equals("Y"))
+            if (sync_flag.Equals("Y"))
             {
                 CustomMessageBox.Show("该工单已同步，请选择其他的工单！", CustomMessageBoxIcon.Warning);
                 return;
             }
 
-            if (!status.Equals("w0"))
+            if (!status.Equals("w1"))
             {
-                CustomMessageBox.Show("该工单不符合条件，请选择其他的工单！", CustomMessageBoxIcon.Warning);
-                return;
-            }
-            //获取WMS齐套率
-            var wmsState = userDbWareHouse.GetWorkOrderQitaoLv(orderID);
-            if (wmsState == null || wmsState.Rows[0][0].Equals("0"))
-            {
-                CustomMessageBox.Show("该工单未准备好，请稍后再试！", CustomMessageBoxIcon.Warning);
-                return;
+                if (status != "")
+                {
+                    CustomMessageBox.Show("该工单不符合条件，请选择其他的工单！", CustomMessageBoxIcon.Warning);
+                    return;
+                } 
             }
+
+            //获取WMS齐套率，湿料计划先不用
+            //var wmsState = userDbWareHouse.GetWorkOrderQitaoLv(orderID);
+            //if (wmsState == null || wmsState.Rows[0][0].Equals("0"))
+            //{
+            //    CustomMessageBox.Show("该工单未准备好，请稍后再试！", CustomMessageBoxIcon.Warning);
+            //    return;
+            //}
+
             //获取湿料计划指定的成型机
             var cxjDt = userDbWareHouse.GetCXJList(orderID);
             if (cxjDt == null || cxjDt.Rows.Count == 0)
             {
-                CustomMessageBox.Show("该工单未指定成型机，请稍后再试！", CustomMessageBoxIcon.Warning);
+                CustomMessageBox.Show("该工单未指定料罐、成型机，请稍后再试！", CustomMessageBoxIcon.Warning);
                 return;
             }
 
@@ -156,14 +162,13 @@ namespace XGL.Views
                 // 输出嵌套列表的值
                 foreach (var innerList in data)
                 {
-                    if (innerList[0].Equals("GX01"))
-                    {
+                    
                         if (innerList[1].Contains("C"))
                         {
                             //记录成型机列表
                             cxjList.Add(innerList[1]);
                         }
-                    }
+                    
                 }
             }
             cxjList = cxjList.Distinct().ToList();//去重
@@ -174,9 +179,9 @@ namespace XGL.Views
 
 
             MaterialPlanModel materialPlanModel = new MaterialPlanModel();
-            skuInfo sku = new skuInfo();
+           
             List<WetMaterialModel> listWetMaterial = Utils.ToDataList<WetMaterialModel>(dt);
-            List<unloadNoInfo> unloadNoInfoList = new List<unloadNoInfo>();
+         
             List<skuInfo> skuInfoList = new List<skuInfo>();
 
             materialPlanModel.reqCode = CommonFunc.Common.GetUUID();
@@ -186,10 +191,11 @@ namespace XGL.Views
 
             foreach (var item in cxjList)
             {
+                skuInfo sku = new skuInfo();
                 sku.sku = material;
                 sku.loadNo = item;
                 unloadNoInfo unloadNoInfo = new unloadNoInfo();
-
+                List<unloadNoInfo> unloadNoInfoList = new List<unloadNoInfo>();
                 foreach (var buckt in bucketList)
                 {
                     unloadNoInfo.unloadNo = buckt;

shangjian/XGL/XGL.csproj

@@ -211,6 +211,7 @@
     <Compile Include="Tools\ModuleUC.xaml.cs">
       <DependentUpon>ModuleUC.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Tools\NetStatusToColorConvert.cs" />
     <Compile Include="Tools\MyValueConverter.cs" />
     <Compile Include="UControl\ordertj.xaml.cs">
       <DependentUpon>ordertj.xaml</DependentUpon>