diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo
index 814a495..d45fbda 100644
Binary files a/shangjian/.vs/BL/v17/.suo and b/shangjian/.vs/BL/v17/.suo differ
diff --git a/shangjian/CentralControl/bin/Debug/CentralControl.exe b/shangjian/CentralControl/bin/Debug/CentralControl.exe
index 789ef5b..edfe7c6 100644
Binary files a/shangjian/CentralControl/bin/Debug/CentralControl.exe and b/shangjian/CentralControl/bin/Debug/CentralControl.exe differ
diff --git a/shangjian/CentralControl/bin/Debug/CentralControl.pdb b/shangjian/CentralControl/bin/Debug/CentralControl.pdb
index 5f41c34..65ce62f 100644
Binary files a/shangjian/CentralControl/bin/Debug/CentralControl.pdb and b/shangjian/CentralControl/bin/Debug/CentralControl.pdb differ
diff --git a/shangjian/CentralControl/bin/Debug/XGL.Data.dll b/shangjian/CentralControl/bin/Debug/XGL.Data.dll
index 2bac640..2fedc1a 100644
Binary files a/shangjian/CentralControl/bin/Debug/XGL.Data.dll and b/shangjian/CentralControl/bin/Debug/XGL.Data.dll differ
diff --git a/shangjian/CentralControl/bin/Debug/XGL.Data.pdb b/shangjian/CentralControl/bin/Debug/XGL.Data.pdb
index c03e316..79401db 100644
Binary files a/shangjian/CentralControl/bin/Debug/XGL.Data.pdb and b/shangjian/CentralControl/bin/Debug/XGL.Data.pdb differ
diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache
index 1ff2256..eec3e1e 100644
Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache and b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache differ
diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.exe b/shangjian/CentralControl/obj/Debug/CentralControl.exe
index 789ef5b..edfe7c6 100644
Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.exe and b/shangjian/CentralControl/obj/Debug/CentralControl.exe differ
diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.pdb b/shangjian/CentralControl/obj/Debug/CentralControl.pdb
index 5f41c34..65ce62f 100644
Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.pdb and b/shangjian/CentralControl/obj/Debug/CentralControl.pdb differ
diff --git a/shangjian/XGL.Data/DBService/DBService.cs b/shangjian/XGL.Data/DBService/DBService.cs
index 5a0be08..97f2848 100644
--- a/shangjian/XGL.Data/DBService/DBService.cs
+++ b/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 where 1=1 and workorder.status = 'w1'
+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)
DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
@@ -662,6 +662,27 @@ left join pro_order_workorder workorder on workorder.workorder_id = wetDetail.wo
return null;
}
+ ///
+ /// 查询工艺
+ ///
+ ///
+ public DataTable GetFlowInfo(string workorderno)
+ {
+ string sql = $@"SELECT process_code,process_name,order_num,next_process_code,next_process_name,color_code,workorder.workorder_code
+ FROM [dbo].[pro_route_process] process
+LEFT JOIN pro_route route on process.route_id = route.route_id
+LEFT JOIN pro_order_workorder workorder on route.route_code = workorder.route_code
+where workorder_code = '{workorderno}'
+order by order_num"; //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)
+ {
+ return dtset.Tables[0];
+ }
+ return null;
+ }
+
+
///
/// 获取工单是否齐套
///
diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll
index 2bac640..2fedc1a 100644
Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll differ
diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb
index c03e316..79401db 100644
Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb differ
diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll
index 2bac640..2fedc1a 100644
Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll and b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll differ
diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb
index c03e316..79401db 100644
Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb and b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb differ
diff --git a/shangjian/XGL/App.config b/shangjian/XGL/App.config
index 290378f..63cb808 100644
--- a/shangjian/XGL/App.config
+++ b/shangjian/XGL/App.config
@@ -12,7 +12,7 @@
-
+
@@ -23,7 +23,7 @@
-
+
diff --git a/shangjian/XGL/FormItem/Main.xaml.cs b/shangjian/XGL/FormItem/Main.xaml.cs
index be16ebc..6ab0f25 100644
--- a/shangjian/XGL/FormItem/Main.xaml.cs
+++ b/shangjian/XGL/FormItem/Main.xaml.cs
@@ -30,9 +30,7 @@ namespace XGL.FormItem
public static Main main;
Frame frame1 = new Frame() { Content = new Views.LanJu_Index()};
Timer timer = new Timer();
- LanJu_Prepare prepare = new LanJu_Prepare();
- LanJu_Operator op = new LanJu_Operator();
- DryingRoomUC dryingRoomUC = new DryingRoomUC();
+
System.Threading.Timer Time { get; set; }
@@ -84,17 +82,20 @@ namespace XGL.FormItem
}
private void InitPage()
- {
+ {
if (Utils.GetAppSetting("ClientMode").Equals("0"))
{
+ LanJu_Prepare prepare = new LanJu_Prepare();
this.Index.Content = prepare;
}
else if (Utils.GetAppSetting("ClientMode").Equals("1"))
{
+ LanJu_Operator op = new LanJu_Operator();
this.Index.Content = op;
}
else
{
+ DryingRoomUC dryingRoomUC = new DryingRoomUC();
this.Index.Content = dryingRoomUC;
}
}
diff --git a/shangjian/XGL/Tools/BtnBackGroundColorConverter.cs b/shangjian/XGL/Tools/BtnBackGroundColorConverter.cs
new file mode 100644
index 0000000..c6ffb9b
--- /dev/null
+++ b/shangjian/XGL/Tools/BtnBackGroundColorConverter.cs
@@ -0,0 +1,33 @@
+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 BtnBackGroundColorConverter : IValueConverter
+ {
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ int second = 0;
+ if (value != null)
+ {
+ if (value.Equals("正常"))
+ return Brushes.Green;
+ else
+ return Brushes.Red;
+ }
+ else
+ return Brushes.Red;
+ }
+
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ return "";
+ }
+ }
+}
diff --git a/shangjian/XGL/Views/LanJu_Operator.xaml b/shangjian/XGL/Views/LanJu_Operator.xaml
index 746f29c..1056a43 100644
--- a/shangjian/XGL/Views/LanJu_Operator.xaml
+++ b/shangjian/XGL/Views/LanJu_Operator.xaml
@@ -12,6 +12,8 @@
mc:Ignorable="d" Loaded="UCOperator_Loaded">
+
+
+ Background="{Binding RelativeSource={RelativeSource Mode=Self},Path=Content, Converter={StaticResource ButtonContentToBackgroundColorConverter}}" Content="正常" Foreground="White" FontSize="14">
+
- {
+ {
DataTable dt = formingMachineService.GetFormingMachineState(deviceCode);
- if (dt != null && dt.Rows.Count > 0)
- {
-
- // 在这里更新UI元素
- LbDeviceState.Content = dt.Rows[0][0].ToString() == "1" ? "正常" : "异常";
-
- }
- });
+ if (dt == null) return;
+ // 使用Dispatcher来在UI线程上更新UI
+ this.Dispatcher.Invoke(
+ new Action(() => { LbDeviceState.Content = dt.Rows[0][0].ToString() == "1" ? "正常" : "异常"; }
+ ),
+ System.Windows.Threading.DispatcherPriority.Render);
+
}
public void WindowChange(WindowID windowID)
diff --git a/shangjian/XGL/Views/LanJu_Prepare.xaml b/shangjian/XGL/Views/LanJu_Prepare.xaml
index 9c82f95..0a99f99 100644
--- a/shangjian/XGL/Views/LanJu_Prepare.xaml
+++ b/shangjian/XGL/Views/LanJu_Prepare.xaml
@@ -202,14 +202,14 @@
Height="30"
Margin="25,0,0,0"
Background="#4294C6"
- Content="查看SOP" />
+ Content="查看SOP" Click="SOP_Click"/>
+ Content="查看物料" Click="Material_Click"/>
diff --git a/shangjian/XGL/Views/LanJu_Prepare.xaml.cs b/shangjian/XGL/Views/LanJu_Prepare.xaml.cs
index 756c116..260301c 100644
--- a/shangjian/XGL/Views/LanJu_Prepare.xaml.cs
+++ b/shangjian/XGL/Views/LanJu_Prepare.xaml.cs
@@ -87,13 +87,44 @@ namespace XGL.Views
}
}
+
private void Flow_Click(object sender, RoutedEventArgs e)
{
- var selectedRow = WorkOrder.SelectedItem as WorkOrder;
- var workordercode = selectedRow.WorkOrderCode;
+ int index = 0;
+ Button flowButton = (Button)sender;
+ DataGridRow row = FindParent(flowButton);
+ if (row != null)
+ {
+ // 获取对应行的数据项对象
+ var rowDataItem = row.Item;
+ // 获取行号
+ index = row.GetIndex();
+ }
+
+ var selectedRow = WorkOrder.Items[index] as WorkOrder;
+ var workordercode = selectedRow.WorkOrderCode;
+ dt = userDbWareHouse.GetFlowInfo(workordercode);
}
+ private T FindParent(DependencyObject child) where T : DependencyObject
+ {
+ DependencyObject parent = VisualTreeHelper.GetParent(child);
+
+ if (parent is T)
+ {
+ return (T)parent;
+ }
+
+ if (parent != null)
+ {
+ return FindParent(parent);
+ }
+
+ return null;
+ }
+
+
private void UserControl_Loaded(object sender, RoutedEventArgs e)
{
GetWorkOrder();
@@ -173,10 +204,10 @@ namespace XGL.Views
}
}
cxjList = cxjList.Distinct().ToList();//去重
-
+ bucketList = bucketList.Distinct().ToList();
//var jsonObject = JsonConvert.DeserializeObject(jsonStrCXJList);
- string apiUrl = "http://example.com/api/endpoint";
+ string apiUrl = "http://192.168.202.28:9001/api/v1/ReceiveMesMsg/materialPlanSync";
MaterialPlanModel materialPlanModel = new MaterialPlanModel();
@@ -221,5 +252,15 @@ namespace XGL.Views
if (!updatestatus)
LogHelper.instance.log.Info("更新湿料计划同步状态失败！");
}
+
+ private void SOP_Click(object sender, RoutedEventArgs e)
+ {
+
+ }
+
+ private void Material_Click(object sender, RoutedEventArgs e)
+ {
+
+ }
}
}
diff --git a/shangjian/XGL/XGL.csproj b/shangjian/XGL/XGL.csproj
index 0bbbcf4..5cb70d9 100644
--- a/shangjian/XGL/XGL.csproj
+++ b/shangjian/XGL/XGL.csproj
@@ -208,6 +208,7 @@
Main.xaml
+
ModuleUC.xaml
diff --git a/shangjian/XGL/bin/x86/Debug/CentralControl.exe b/shangjian/XGL/bin/x86/Debug/CentralControl.exe
index 789ef5b..edfe7c6 100644
Binary files a/shangjian/XGL/bin/x86/Debug/CentralControl.exe and b/shangjian/XGL/bin/x86/Debug/CentralControl.exe differ
diff --git a/shangjian/XGL/bin/x86/Debug/CentralControl.pdb b/shangjian/XGL/bin/x86/Debug/CentralControl.pdb
index 5f41c34..65ce62f 100644
Binary files a/shangjian/XGL/bin/x86/Debug/CentralControl.pdb and b/shangjian/XGL/bin/x86/Debug/CentralControl.pdb differ
diff --git a/shangjian/XGL/bin/x86/Debug/XGL.Data.dll b/shangjian/XGL/bin/x86/Debug/XGL.Data.dll
index 2bac640..2fedc1a 100644
Binary files a/shangjian/XGL/bin/x86/Debug/XGL.Data.dll and b/shangjian/XGL/bin/x86/Debug/XGL.Data.dll differ
diff --git a/shangjian/XGL/bin/x86/Debug/XGL.Data.pdb b/shangjian/XGL/bin/x86/Debug/XGL.Data.pdb
index c03e316..79401db 100644
Binary files a/shangjian/XGL/bin/x86/Debug/XGL.Data.pdb and b/shangjian/XGL/bin/x86/Debug/XGL.Data.pdb differ
diff --git a/shangjian/XGL/bin/x86/Debug/XGL.exe b/shangjian/XGL/bin/x86/Debug/XGL.exe
index 72f6460..7b2a398 100644
Binary files a/shangjian/XGL/bin/x86/Debug/XGL.exe and b/shangjian/XGL/bin/x86/Debug/XGL.exe differ
diff --git a/shangjian/XGL/bin/x86/Debug/XGL.exe.config b/shangjian/XGL/bin/x86/Debug/XGL.exe.config
index 290378f..63cb808 100644
--- a/shangjian/XGL/bin/x86/Debug/XGL.exe.config
+++ b/shangjian/XGL/bin/x86/Debug/XGL.exe.config
@@ -12,7 +12,7 @@
-
+
@@ -23,7 +23,7 @@
-
+
diff --git a/shangjian/XGL/bin/x86/Debug/XGL.pdb b/shangjian/XGL/bin/x86/Debug/XGL.pdb
index 5bbcb18..193d2ec 100644
Binary files a/shangjian/XGL/bin/x86/Debug/XGL.pdb and b/shangjian/XGL/bin/x86/Debug/XGL.pdb differ
diff --git a/shangjian/XGL/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs b/shangjian/XGL/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs
index c65238f..ffa4e1e 100644
--- a/shangjian/XGL/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs
+++ b/shangjian/XGL/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs
@@ -1,2 +1,62 @@
-
+//------------------------------------------------------------------------------
+//
+// 此代码由工具生成。
+// 运行时版本:4.0.30319.42000
+//
+// 对此文件的更改可能会导致不正确的行为，并且如果
+// 重新生成代码，这些更改将会丢失。
+//
+//------------------------------------------------------------------------------
+
+namespace XamlGeneratedNamespace {
+
+
+ ///
+ /// GeneratedInternalTypeHelper
+ ///
+ [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 {
+
+ ///
+ /// CreateInstance
+ ///
+ 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);
+ }
+
+ ///
+ /// GetPropertyValue
+ ///
+ 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);
+ }
+
+ ///
+ /// SetPropertyValue
+ ///
+ 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);
+ }
+
+ ///
+ /// CreateDelegate
+ ///
+ 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)));
+ }
+
+ ///
+ /// AddEventHandler
+ ///
+ protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
+ eventInfo.AddEventHandler(target, handler);
+ }
+ }
+}
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml
index 1d64365..72fcde7 100644
Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml and b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.cs
index b7bf1ce..5e9a0e8 100644
--- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.cs
+++ b/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}" "68237B91A8A2E3D55441027A55A5911DD4A1E43F40363D724C13524E9FCA7AEB"
+#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "923A471F5F1852E93CCBA311D226CC1C728BF607B35C758D0B9F3BB2EBDCAEF4"
//------------------------------------------------------------------------------
//
// 此代码由工具生成。
@@ -49,7 +49,7 @@ namespace XGL.Views {
#line hidden
- #line 104 "..\..\..\..\Views\LanJu_Operator.xaml"
+ #line 106 "..\..\..\..\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 199 "..\..\..\..\Views\LanJu_Operator.xaml"
+ #line 202 "..\..\..\..\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 301 "..\..\..\..\Views\LanJu_Operator.xaml"
+ #line 304 "..\..\..\..\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 425 "..\..\..\..\Views\LanJu_Operator.xaml"
+ #line 428 "..\..\..\..\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 433 "..\..\..\..\Views\LanJu_Operator.xaml"
+ #line 436 "..\..\..\..\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 200 "..\..\..\..\Views\LanJu_Operator.xaml"
+ #line 203 "..\..\..\..\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 247 "..\..\..\..\Views\LanJu_Operator.xaml"
+ #line 250 "..\..\..\..\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 268 "..\..\..\..\Views\LanJu_Operator.xaml"
+ #line 271 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click);
#line default
@@ -160,7 +160,7 @@ namespace XGL.Views {
return;
case 7:
- #line 352 "..\..\..\..\Views\LanJu_Operator.xaml"
+ #line 355 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click);
#line default
@@ -168,7 +168,7 @@ namespace XGL.Views {
return;
case 8:
- #line 365 "..\..\..\..\Views\LanJu_Operator.xaml"
+ #line 368 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Complete_Click);
#line default
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.i.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.i.cs
index b7bf1ce..5e9a0e8 100644
--- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.i.cs
+++ b/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}" "68237B91A8A2E3D55441027A55A5911DD4A1E43F40363D724C13524E9FCA7AEB"
+#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "923A471F5F1852E93CCBA311D226CC1C728BF607B35C758D0B9F3BB2EBDCAEF4"
//------------------------------------------------------------------------------
//
// 此代码由工具生成。
@@ -49,7 +49,7 @@ namespace XGL.Views {
#line hidden
- #line 104 "..\..\..\..\Views\LanJu_Operator.xaml"
+ #line 106 "..\..\..\..\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 199 "..\..\..\..\Views\LanJu_Operator.xaml"
+ #line 202 "..\..\..\..\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 301 "..\..\..\..\Views\LanJu_Operator.xaml"
+ #line 304 "..\..\..\..\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 425 "..\..\..\..\Views\LanJu_Operator.xaml"
+ #line 428 "..\..\..\..\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 433 "..\..\..\..\Views\LanJu_Operator.xaml"
+ #line 436 "..\..\..\..\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 200 "..\..\..\..\Views\LanJu_Operator.xaml"
+ #line 203 "..\..\..\..\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 247 "..\..\..\..\Views\LanJu_Operator.xaml"
+ #line 250 "..\..\..\..\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 268 "..\..\..\..\Views\LanJu_Operator.xaml"
+ #line 271 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click);
#line default
@@ -160,7 +160,7 @@ namespace XGL.Views {
return;
case 7:
- #line 352 "..\..\..\..\Views\LanJu_Operator.xaml"
+ #line 355 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click);
#line default
@@ -168,7 +168,7 @@ namespace XGL.Views {
return;
case 8:
- #line 365 "..\..\..\..\Views\LanJu_Operator.xaml"
+ #line 368 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Complete_Click);
#line default
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.cs
index 616cb3b..9c3f836 100644
--- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.cs
+++ b/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}" "0182AD141BA6B9E92CBA0965950F2ABD60C838873A7649ECB40E9F4C9B6EE2F4"
+#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A013331107A454E06F5A24DC34534744EC128738FB5427748396E5162631E760"
//------------------------------------------------------------------------------
//
// 此代码由工具生成。
@@ -113,9 +113,25 @@ namespace XGL.Views {
{
case 4:
- #line 190 "..\..\..\..\Views\LanJu_Prepare.xaml"
+ #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 default
+ #line hidden
+ break;
+ case 6:
+
+ #line 212 "..\..\..\..\Views\LanJu_Prepare.xaml"
+ ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click);
+
#line default
#line hidden
break;
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.i.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.i.cs
index 616cb3b..9c3f836 100644
--- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.i.cs
+++ b/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}" "0182AD141BA6B9E92CBA0965950F2ABD60C838873A7649ECB40E9F4C9B6EE2F4"
+#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A013331107A454E06F5A24DC34534744EC128738FB5427748396E5162631E760"
//------------------------------------------------------------------------------
//
// 此代码由工具生成。
@@ -113,9 +113,25 @@ namespace XGL.Views {
{
case 4:
- #line 190 "..\..\..\..\Views\LanJu_Prepare.xaml"
+ #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 default
+ #line hidden
+ break;
+ case 6:
+
+ #line 212 "..\..\..\..\Views\LanJu_Prepare.xaml"
+ ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click);
+
#line default
#line hidden
break;
diff --git a/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache b/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache
index 8b20f91..6e44ba6 100644
Binary files a/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache and b/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache differ
diff --git a/shangjian/XGL/obj/x86/Debug/XGL.csproj.CoreCompileInputs.cache b/shangjian/XGL/obj/x86/Debug/XGL.csproj.CoreCompileInputs.cache
index 587a1ff..81f0ba4 100644
--- a/shangjian/XGL/obj/x86/Debug/XGL.csproj.CoreCompileInputs.cache
+++ b/shangjian/XGL/obj/x86/Debug/XGL.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-b21fa0716a1395cff443356e03733b56cb99423e
+3c4a6a332e7492750f23abf774be6b469961c61b
diff --git a/shangjian/XGL/obj/x86/Debug/XGL.exe b/shangjian/XGL/obj/x86/Debug/XGL.exe
index 72f6460..7b2a398 100644
Binary files a/shangjian/XGL/obj/x86/Debug/XGL.exe and b/shangjian/XGL/obj/x86/Debug/XGL.exe differ
diff --git a/shangjian/XGL/obj/x86/Debug/XGL.g.resources b/shangjian/XGL/obj/x86/Debug/XGL.g.resources
index a6d0ee0..d35c01f 100644
Binary files a/shangjian/XGL/obj/x86/Debug/XGL.g.resources and b/shangjian/XGL/obj/x86/Debug/XGL.g.resources differ
diff --git a/shangjian/XGL/obj/x86/Debug/XGL.pdb b/shangjian/XGL/obj/x86/Debug/XGL.pdb
index 5bbcb18..193d2ec 100644
Binary files a/shangjian/XGL/obj/x86/Debug/XGL.pdb and b/shangjian/XGL/obj/x86/Debug/XGL.pdb differ
diff --git a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache
index bba73f6..19835b9 100644
--- a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache
+++ b/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
-67151576072
+68-368259376
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;
diff --git a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.i.cache b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.i.cache
index 594bc7b..12a68b6 100644
--- a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.i.cache
+++ b/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
-68-1260445685
+69-1780281133
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;
-True
+False
diff --git a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref
index 8f1fcd6..6410da6 100644
--- a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref
+++ b/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;;