diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo
index e3baedd..e303ecf 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 914c1db..f3703f3 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 33d3a67..788210a 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 d4799a5..c102b3b 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 6cb428f..e5e6b7b 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 9b91f71..de3c6f8 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 914c1db..f3703f3 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 33d3a67..788210a 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/FormingMachineService.cs b/shangjian/XGL.Data/DBService/FormingMachineService.cs
index c57cfc3..9a61a5e 100644
--- a/shangjian/XGL.Data/DBService/FormingMachineService.cs
+++ b/shangjian/XGL.Data/DBService/FormingMachineService.cs
@@ -17,8 +17,49 @@ namespace XGL.Data.DBService
///
///
///
- public DataTable GetFormingMachineInfo(string devicecode)
- {
+ public DataTable GetFormingMachineInfo(string devicecode,string workDate)
+ {
+ // string sql = $@"SELECT DISTINCT
+ // ord.workorder_id,
+ // ord.workorder_code,
+ // res.OrderCode,
+ // ord.product_name,
+ // product_code,
+ // isnull( car_num, 0 ) AS car_num,
+ // isnull( plan_time, '1900-01-01 08:00:00' ) AS plan_time,
+ // ord.status ,
+ // ord.route_code,
+ // ord.attr1,
+ // ord.shift_id
+ //FROM
+ // mes_material_transfer_result res
+ // LEFT JOIN pro_order_workorder ord ON res.OrderCode = ord.workorder_id
+ // LEFT JOIN pro_wet_material_plan_detail wet ON wet.workorder_id = res.OrderCode
+ // LEFT JOIN pro_rfid_process_detail rfid ON rfid.workorder_code = ord.workorder_code
+ // AND rfid.rfid = res.rfid
+ //WHERE
+ // equipmentCode = '{devicecode}'
+ // AND rfid.create_time >= (
+ // SELECT
+ // CONCAT ( CONVERT ( VARCHAR ( 10 ), GetDate( ), 120 ), ' ', Shift_Start_Time ) AS Shift_Start_Time
+ // FROM
+ // base_shifts_t
+ // WHERE
+ // Shift_Start_Time <= CONVERT ( TIME, GETDATE( ) )
+ // AND Shift_End_Time > CONVERT ( TIME, GETDATE( ) )
+ // )
+ // AND rfid.create_time<= (
+ // SELECT
+ // CONCAT ( CONVERT ( VARCHAR ( 10 ), GetDate( ), 120 ), ' ', Shift_End_Time ) AS Shift_End_Time
+ // FROM
+ // base_shifts_t
+ // WHERE
+ // Shift_Start_Time <= CONVERT ( TIME, GETDATE( ) )
+ // AND Shift_End_Time > CONVERT ( TIME, GETDATE( ) )
+ // ) And ord.prod_line_code like '%{devicecode}%'
+ //ORDER BY
+ // ( isnull( plan_time, '1900-01-01 08:00:00' ) ) DESC";
+
string sql = $@"SELECT DISTINCT
ord.workorder_id,
ord.workorder_code,
@@ -30,36 +71,19 @@ namespace XGL.Data.DBService
ord.status ,
ord.route_code,
ord.attr1,
- ord.shift_id
+ ord.shift_id ,(select count(*) from pro_rfid_process_detail
+where CONVERT(VARCHAR(10), create_time , 120) = CONVERT(VARCHAR(10), '2023-10-20', 120 ) and workorder_code = ord.workorder_code) as totalCount
FROM
- mes_material_transfer_result res
- LEFT JOIN pro_order_workorder ord ON res.OrderCode = ord.workorder_id
+pro_order_workorder ord
+ LEFT JOIN mes_material_transfer_result res ON res.OrderCode = ord.workorder_id
LEFT JOIN pro_wet_material_plan_detail wet ON wet.workorder_id = res.OrderCode
LEFT JOIN pro_rfid_process_detail rfid ON rfid.workorder_code = ord.workorder_code
AND rfid.rfid = res.rfid
WHERE
- equipmentCode = '{devicecode}'
- AND rfid.create_time >= (
- SELECT
- CONCAT ( CONVERT ( VARCHAR ( 10 ), GetDate( ), 120 ), ' ', Shift_Start_Time ) AS Shift_Start_Time
- FROM
- base_shifts_t
- WHERE
- Shift_Start_Time <= CONVERT ( TIME, GETDATE( ) )
- AND Shift_End_Time > CONVERT ( TIME, GETDATE( ) )
- )
- AND rfid.create_time<= (
- SELECT
- CONCAT ( CONVERT ( VARCHAR ( 10 ), GetDate( ), 120 ), ' ', Shift_End_Time ) AS Shift_End_Time
- FROM
- base_shifts_t
- WHERE
- Shift_Start_Time <= CONVERT ( TIME, GETDATE( ) )
- AND Shift_End_Time > CONVERT ( TIME, GETDATE( ) )
- ) And ord.prod_line_code like '%{devicecode}%'
+ CONVERT(VARCHAR(10), wet.plan_time , 120) = CONVERT(VARCHAR(10), '{workDate}', 120 )
+ And ord.prod_line_code like '%{devicecode}%'
ORDER BY
( isnull( plan_time, '1900-01-01 08:00:00' ) ) DESC";
-
DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
{
diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll
index d4799a5..c102b3b 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 6cb428f..e5e6b7b 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 d4799a5..c102b3b 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 6cb428f..e5e6b7b 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/Views/LanJu_Operator.xaml.cs b/shangjian/XGL/Views/LanJu_Operator.xaml.cs
index 82d5795..fd52539 100644
--- a/shangjian/XGL/Views/LanJu_Operator.xaml.cs
+++ b/shangjian/XGL/Views/LanJu_Operator.xaml.cs
@@ -108,9 +108,76 @@ namespace XGL.Views
{
List orderList = new List();
+ int currHour = DateTime.Now.Hour;
+ int currMinute = DateTime.Now.Minute;
+ //modelWareHouse = new List();
+ //userDbWareHouse = new DBService();
+ int shiftId = 0;
+ DataTable shiftlist = formingMachineService.GetShiftList();
+ string endTimeRecord = "";
+ string startTimeRecord = "";
+ foreach (DataRow shift in shiftlist.Rows)
+ {
+ string[] timeStart = shift["Shift_Start_Time"].ToString().Split(':');
+ string[] timeEnd = shift["Shift_End_Time"].ToString().Split(':');
+
+ // 创建两个不带日期的时间点
+ TimeSpan currTime = new TimeSpan(currHour, currMinute, 0); // 获取当前小时+分钟数
+ TimeSpan startTime = new TimeSpan(Convert.ToInt32(timeStart[0]), Convert.ToInt32(timeStart[1]), 0); // 表示9小时45分钟0秒
+ TimeSpan endTime = new TimeSpan(Convert.ToInt32(timeEnd[0]), Convert.ToInt32(timeEnd[1]), 0);
+ // 比较当前时间点和班次开始的时间点
+ int comparisonResultStart = TimeSpan.Compare(currTime, startTime);
+ // 比较当前时间点和班次结束的时间点
+ int comparisonResultEnd = TimeSpan.Compare(currTime, endTime);
+ //if (comparisonResultStart > 0) { Console.WriteLine("time1 大于 time2"); }
+ if (comparisonResultStart >= 0 && comparisonResultEnd < 0)
+ {
+ endTimeRecord = shift["Shift_Start_Time"].ToString();
+ startTimeRecord = shift["Shift_End_Time"].ToString();
+ shiftId = Convert.ToInt32(shift["shift_id"].ToString());
+ break;
+ }
+ else if (comparisonResultStart >= 0 || comparisonResultEnd < 0)
+ {
+ endTimeRecord = shift["Shift_Start_Time"].ToString();
+ startTimeRecord = shift["Shift_End_Time"].ToString();
+ shiftId = Convert.ToInt32(shift["shift_id"].ToString());
+ break;
+ }
+ //if (Convert.ToInt32(timeStart[0]) <= currHourWithDecimal && currHourWithDecimal < Convert.ToInt32(timeEnd[0]))
+ //{
+ // shiftId = shift.shiftId;
+ // break;
+ //}
+ //else if (currHourWithDecimal >= Convert.ToInt32(timeStart[0]) || currHourWithDecimal < Convert.ToInt32(timeEnd[0]))
+ //{
+ // shiftId = shift.shiftId;
+ // break;
+ //}
+ }
+
+ string[] endTimeReally = endTimeRecord.Split(':');
+ string[] startTimeReally = startTimeRecord.Split(':');
+ DateTime currShiftDate = DateTime.Now.Date;
+ TimeSpan currTimeNew = new TimeSpan(currHour, currMinute, 0); // 获取当前小时+分钟数
+ TimeSpan startTimeNew = new TimeSpan(Convert.ToInt32(startTimeReally[0]), Convert.ToInt32(startTimeReally[1]), 0); // 表示9小时45分钟0秒
+ TimeSpan endTimeNew = new TimeSpan(Convert.ToInt32(endTimeReally[0]), Convert.ToInt32(endTimeReally[1]), 0); // 表示9小时45分钟0秒
+ //计算白夜班工作日期用
+ int resultstart = TimeSpan.Compare(currTimeNew, startTimeNew);
+ // 比较当前时间点和班次结束的时间点
+ int resultEnd = TimeSpan.Compare(currTimeNew, endTimeNew);
+
+ //夜班、
+ if (resultstart < 0 && resultEnd < 0)
+ {
+ currShiftDate = DateTime.Now.Date.AddDays(-1);
+ }
+
+
+
//modelWareHouse = new List();
userDbWareHouse = new DBService();
- DataTable dt = formingMachineService.GetFormingMachineInfo(deviceCode);
+ DataTable dt = formingMachineService.GetFormingMachineInfo(deviceCode, currShiftDate.ToString());
if (dt == null) return;
foreach (DataRow i in dt.Rows)
{
@@ -127,6 +194,7 @@ namespace XGL.Views
order.process_id = i["route_code"].ToString();
order.attr1 = i["attr1"].ToString();
isbaiye= i["shift_id"].ToString();
+ order.totalCount = i["totalCount"].ToString();
if (isbaiye=="5")
{
order.isbai = "白班";
@@ -152,6 +220,7 @@ namespace XGL.Views
{
this.dgWorkOrderInfo.ItemsSource = null;
this.dgWorkOrderInfo.ItemsSource = orderList;//dt.DefaultView;
+ dgWorkOrderInfo.SelectedIndex = 0;
}
),
System.Windows.Threading.DispatcherPriority.Render);
@@ -169,9 +238,76 @@ namespace XGL.Views
{
List orderList = new List();
+ int currHour = DateTime.Now.Hour;
+ int currMinute = DateTime.Now.Minute;
+ //modelWareHouse = new List();
+ //userDbWareHouse = new DBService();
+ int shiftId = 0;
+ DataTable shiftlist = formingMachineService.GetShiftList();
+ string endTimeRecord = "";
+ string startTimeRecord = "";
+ foreach (DataRow shift in shiftlist.Rows)
+ {
+ string[] timeStart = shift["Shift_Start_Time"].ToString().Split(':');
+ string[] timeEnd = shift["Shift_End_Time"].ToString().Split(':');
+
+ // 创建两个不带日期的时间点
+ TimeSpan currTime = new TimeSpan(currHour, currMinute, 0); // 获取当前小时+分钟数
+ TimeSpan startTime = new TimeSpan(Convert.ToInt32(timeStart[0]), Convert.ToInt32(timeStart[1]), 0); // 表示9小时45分钟0秒
+ TimeSpan endTime = new TimeSpan(Convert.ToInt32(timeEnd[0]), Convert.ToInt32(timeEnd[1]), 0);
+ // 比较当前时间点和班次开始的时间点
+ int comparisonResultStart = TimeSpan.Compare(currTime, startTime);
+ // 比较当前时间点和班次结束的时间点
+ int comparisonResultEnd = TimeSpan.Compare(currTime, endTime);
+ //if (comparisonResultStart > 0) { Console.WriteLine("time1 大于 time2"); }
+ if (comparisonResultStart >= 0 && comparisonResultEnd < 0)
+ {
+ endTimeRecord = shift["Shift_Start_Time"].ToString();
+ startTimeRecord = shift["Shift_End_Time"].ToString();
+ shiftId = Convert.ToInt32(shift["shift_id"].ToString());
+ break;
+ }
+ else if (comparisonResultStart >= 0 || comparisonResultEnd < 0)
+ {
+ endTimeRecord = shift["Shift_Start_Time"].ToString();
+ startTimeRecord = shift["Shift_End_Time"].ToString();
+ shiftId = Convert.ToInt32(shift["shift_id"].ToString());
+ break;
+ }
+ //if (Convert.ToInt32(timeStart[0]) <= currHourWithDecimal && currHourWithDecimal < Convert.ToInt32(timeEnd[0]))
+ //{
+ // shiftId = shift.shiftId;
+ // break;
+ //}
+ //else if (currHourWithDecimal >= Convert.ToInt32(timeStart[0]) || currHourWithDecimal < Convert.ToInt32(timeEnd[0]))
+ //{
+ // shiftId = shift.shiftId;
+ // break;
+ //}
+ }
+
+ string[] endTimeReally = endTimeRecord.Split(':');
+ string[] startTimeReally = startTimeRecord.Split(':');
+ DateTime currShiftDate = DateTime.Now.Date;
+ TimeSpan currTimeNew = new TimeSpan(currHour, currMinute, 0); // 获取当前小时+分钟数
+ TimeSpan startTimeNew = new TimeSpan(Convert.ToInt32(startTimeReally[0]), Convert.ToInt32(startTimeReally[1]), 0); // 表示9小时45分钟0秒
+ TimeSpan endTimeNew = new TimeSpan(Convert.ToInt32(endTimeReally[0]), Convert.ToInt32(endTimeReally[1]), 0); // 表示9小时45分钟0秒
+ //计算白夜班工作日期用
+ int resultstart = TimeSpan.Compare(currTimeNew, startTimeNew);
+ // 比较当前时间点和班次结束的时间点
+ int resultEnd = TimeSpan.Compare(currTimeNew, endTimeNew);
+
+ //夜班、
+ if (resultstart < 0 && resultEnd < 0)
+ {
+ currShiftDate = DateTime.Now.Date.AddDays(-1);
+ }
+
+
+
//modelWareHouse = new List();
userDbWareHouse = new DBService();
- DataTable dt = formingMachineService.GetFormingMachineInfo(deviceCode);
+ DataTable dt = formingMachineService.GetFormingMachineInfo(deviceCode,currShiftDate.ToString());
if (dt == null) return;
foreach (DataRow i in dt.Rows)
{
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 9082cde..8797e21 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 3f59b72..df656e4 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}" "F3847F260B2AA5AA860550FA9CC5C0DD5E5EB17D5DB5AFA561237C65F7B3C7A9"
+#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B92E7E61C39C901A7FA4616B61E410627571E415C6089F472C16239020DF5B90"
//------------------------------------------------------------------------------
//
// 此代码由工具生成。
@@ -98,7 +98,7 @@ namespace XGL.Views {
#line hidden
- #line 517 "..\..\..\..\Views\LanJu_Operator.xaml"
+ #line 518 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ContentControl Window1;
@@ -216,13 +216,13 @@ namespace XGL.Views {
case 10:
this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
- #line 388 "..\..\..\..\Views\LanJu_Operator.xaml"
+ #line 389 "..\..\..\..\Views\LanJu_Operator.xaml"
this.dgWorkOrderInfo.LoadingRow += new System.EventHandler(this.dgWorkOrderInfo_LoadingRow);
#line default
#line hidden
- #line 393 "..\..\..\..\Views\LanJu_Operator.xaml"
+ #line 394 "..\..\..\..\Views\LanJu_Operator.xaml"
this.dgWorkOrderInfo.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.dgWorkOrderInfo_SelectionChanged);
#line default
@@ -230,7 +230,7 @@ namespace XGL.Views {
return;
case 11:
- #line 449 "..\..\..\..\Views\LanJu_Operator.xaml"
+ #line 450 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_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 814e806..df656e4 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,5 +1,4 @@
-// Updated by XamlIntelliSenseFileGenerator 2023-10-19 17:52:59
-#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F3847F260B2AA5AA860550FA9CC5C0DD5E5EB17D5DB5AFA561237C65F7B3C7A9"
+#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B92E7E61C39C901A7FA4616B61E410627571E415C6089F472C16239020DF5B90"
//------------------------------------------------------------------------------
//
// 此代码由工具生成。
@@ -34,217 +33,215 @@ using System.Windows.Shell;
using XGL.Tools;
-namespace XGL.Views
-{
-
-
+namespace XGL.Views {
+
+
///
/// LanJu_Operator
///
- public partial class LanJu_Operator : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector
- {
-
-#line default
-#line hidden
-
-
-#line 217 "..\..\..\..\Views\LanJu_Operator.xaml"
+ public partial class LanJu_Operator : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
+
+
+ #line 3 "..\..\..\..\Views\LanJu_Operator.xaml"
+ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+ internal XGL.Views.LanJu_Operator UCOperator;
+
+ #line default
+ #line hidden
+
+
+ #line 217 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnPause;
-
-#line default
-#line hidden
-
-
-#line 238 "..\..\..\..\Views\LanJu_Operator.xaml"
+
+ #line default
+ #line hidden
+
+
+ #line 238 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnRecover;
-
-#line default
-#line hidden
-
-
-#line 325 "..\..\..\..\Views\LanJu_Operator.xaml"
+
+ #line default
+ #line hidden
+
+
+ #line 325 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnRefresh;
-
-#line default
-#line hidden
-
-
-#line 344 "..\..\..\..\Views\LanJu_Operator.xaml"
+
+ #line default
+ #line hidden
+
+
+ #line 344 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnCheckLog;
-
-#line default
-#line hidden
-
-
-#line 364 "..\..\..\..\Views\LanJu_Operator.xaml"
+
+ #line default
+ #line hidden
+
+
+ #line 364 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnViewPlcvalue;
-
-#line default
-#line hidden
-
-
-#line 378 "..\..\..\..\Views\LanJu_Operator.xaml"
+
+ #line default
+ #line hidden
+
+
+ #line 378 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.DataGrid dgWorkOrderInfo;
-
-#line default
-#line hidden
-
-
-#line 517 "..\..\..\..\Views\LanJu_Operator.xaml"
+
+ #line default
+ #line hidden
+
+
+ #line 518 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ContentControl Window1;
-
-#line default
-#line hidden
-
+
+ #line default
+ #line hidden
+
private bool _contentLoaded;
-
+
///
/// InitializeComponent
///
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
- public void InitializeComponent()
- {
- if (_contentLoaded)
- {
+ public void InitializeComponent() {
+ if (_contentLoaded) {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/XGL;component/views/lanju_operator.xaml", System.UriKind.Relative);
-
-#line 1 "..\..\..\..\Views\LanJu_Operator.xaml"
+
+ #line 1 "..\..\..\..\Views\LanJu_Operator.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
-
-#line default
-#line hidden
+
+ #line default
+ #line hidden
}
-
+
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
- void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target)
- {
+ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
switch (connectionId)
{
- case 1:
- this.UCOperator = ((XGL.Views.LanJu_Operator)(target));
-
-#line 12 "..\..\..\..\Views\LanJu_Operator.xaml"
- this.UCOperator.Loaded += new System.Windows.RoutedEventHandler(this.UCOperator_Loaded);
-
-#line default
-#line hidden
- return;
- case 2:
- this.btnPause = ((System.Windows.Controls.Button)(target));
-
-#line 218 "..\..\..\..\Views\LanJu_Operator.xaml"
- this.btnPause.Click += new System.Windows.RoutedEventHandler(this.btnPause_Click);
-
-#line default
-#line hidden
- return;
- case 3:
- this.btnRecover = ((System.Windows.Controls.Button)(target));
-
-#line 244 "..\..\..\..\Views\LanJu_Operator.xaml"
- this.btnRecover.Click += new System.Windows.RoutedEventHandler(this.btnRecover_Click);
-
-#line default
-#line hidden
- return;
- case 4:
-
-#line 265 "..\..\..\..\Views\LanJu_Operator.xaml"
- ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
-
-#line default
-#line hidden
- return;
- case 5:
-
-#line 286 "..\..\..\..\Views\LanJu_Operator.xaml"
- ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click);
-
-#line default
-#line hidden
- return;
- case 6:
-
-#line 308 "..\..\..\..\Views\LanJu_Operator.xaml"
- ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
-
-#line default
-#line hidden
- return;
- case 7:
- this.btnRefresh = ((System.Windows.Controls.Button)(target));
-
-#line 336 "..\..\..\..\Views\LanJu_Operator.xaml"
- this.btnRefresh.Click += new System.Windows.RoutedEventHandler(this.btnRefresh_Click);
-
-#line default
-#line hidden
- return;
- case 8:
- this.btnCheckLog = ((System.Windows.Controls.Button)(target));
-
-#line 355 "..\..\..\..\Views\LanJu_Operator.xaml"
- this.btnCheckLog.Click += new System.Windows.RoutedEventHandler(this.btnCheckLog_Click);
-
-#line default
-#line hidden
- return;
- case 9:
- this.btnViewPlcvalue = ((System.Windows.Controls.Button)(target));
-
-#line 375 "..\..\..\..\Views\LanJu_Operator.xaml"
- this.btnViewPlcvalue.Click += new System.Windows.RoutedEventHandler(this.btnViewPlcvalue_Click);
-
-#line default
-#line hidden
- return;
- case 10:
- this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
-
-#line 388 "..\..\..\..\Views\LanJu_Operator.xaml"
- this.dgWorkOrderInfo.LoadingRow += new System.EventHandler(this.dgWorkOrderInfo_LoadingRow);
-
-#line default
-#line hidden
-
-#line 393 "..\..\..\..\Views\LanJu_Operator.xaml"
- this.dgWorkOrderInfo.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.dgWorkOrderInfo_SelectionChanged);
-
-#line default
-#line hidden
- return;
- case 11:
-
-#line 449 "..\..\..\..\Views\LanJu_Operator.xaml"
- ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click);
-
-#line default
-#line hidden
- return;
- case 12:
- this.Window1 = ((System.Windows.Controls.ContentControl)(target));
- return;
+ case 1:
+ this.UCOperator = ((XGL.Views.LanJu_Operator)(target));
+
+ #line 12 "..\..\..\..\Views\LanJu_Operator.xaml"
+ this.UCOperator.Loaded += new System.Windows.RoutedEventHandler(this.UCOperator_Loaded);
+
+ #line default
+ #line hidden
+ return;
+ case 2:
+ this.btnPause = ((System.Windows.Controls.Button)(target));
+
+ #line 218 "..\..\..\..\Views\LanJu_Operator.xaml"
+ this.btnPause.Click += new System.Windows.RoutedEventHandler(this.btnPause_Click);
+
+ #line default
+ #line hidden
+ return;
+ case 3:
+ this.btnRecover = ((System.Windows.Controls.Button)(target));
+
+ #line 244 "..\..\..\..\Views\LanJu_Operator.xaml"
+ this.btnRecover.Click += new System.Windows.RoutedEventHandler(this.btnRecover_Click);
+
+ #line default
+ #line hidden
+ return;
+ case 4:
+
+ #line 265 "..\..\..\..\Views\LanJu_Operator.xaml"
+ ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
+
+ #line default
+ #line hidden
+ return;
+ case 5:
+
+ #line 286 "..\..\..\..\Views\LanJu_Operator.xaml"
+ ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click);
+
+ #line default
+ #line hidden
+ return;
+ case 6:
+
+ #line 308 "..\..\..\..\Views\LanJu_Operator.xaml"
+ ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
+
+ #line default
+ #line hidden
+ return;
+ case 7:
+ this.btnRefresh = ((System.Windows.Controls.Button)(target));
+
+ #line 336 "..\..\..\..\Views\LanJu_Operator.xaml"
+ this.btnRefresh.Click += new System.Windows.RoutedEventHandler(this.btnRefresh_Click);
+
+ #line default
+ #line hidden
+ return;
+ case 8:
+ this.btnCheckLog = ((System.Windows.Controls.Button)(target));
+
+ #line 355 "..\..\..\..\Views\LanJu_Operator.xaml"
+ this.btnCheckLog.Click += new System.Windows.RoutedEventHandler(this.btnCheckLog_Click);
+
+ #line default
+ #line hidden
+ return;
+ case 9:
+ this.btnViewPlcvalue = ((System.Windows.Controls.Button)(target));
+
+ #line 375 "..\..\..\..\Views\LanJu_Operator.xaml"
+ this.btnViewPlcvalue.Click += new System.Windows.RoutedEventHandler(this.btnViewPlcvalue_Click);
+
+ #line default
+ #line hidden
+ return;
+ case 10:
+ this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
+
+ #line 389 "..\..\..\..\Views\LanJu_Operator.xaml"
+ this.dgWorkOrderInfo.LoadingRow += new System.EventHandler(this.dgWorkOrderInfo_LoadingRow);
+
+ #line default
+ #line hidden
+
+ #line 394 "..\..\..\..\Views\LanJu_Operator.xaml"
+ this.dgWorkOrderInfo.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.dgWorkOrderInfo_SelectionChanged);
+
+ #line default
+ #line hidden
+ return;
+ case 11:
+
+ #line 450 "..\..\..\..\Views\LanJu_Operator.xaml"
+ ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click);
+
+ #line default
+ #line hidden
+ return;
+ case 12:
+ this.Window1 = ((System.Windows.Controls.ContentControl)(target));
+ return;
}
this._contentLoaded = true;
}
-
- internal System.Windows.Controls.UserControl UCOperator;
}
}
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 f2cf3be..b7079f7 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}" "76BD54D8BF0F6E7A8ECE2C47CABDF52FA9C4E66EFEDF9883C833C0084D24E9C7"
+#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "33D69CB452FE5F2299BE31D78D3CBA48CA38056C209EE3FE643789B3726A24D3"
//------------------------------------------------------------------------------
//
// 此代码由工具生成。
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 f2cf3be..b7079f7 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}" "76BD54D8BF0F6E7A8ECE2C47CABDF52FA9C4E66EFEDF9883C833C0084D24E9C7"
+#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "33D69CB452FE5F2299BE31D78D3CBA48CA38056C209EE3FE643789B3726A24D3"
//------------------------------------------------------------------------------
//
// 此代码由工具生成。
diff --git a/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache b/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache
index 467f5bf..a0602ae 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.exe b/shangjian/XGL/obj/x86/Debug/XGL.exe
index 2be9614..7b6c0b2 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 2a132f9..e6131ae 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 762d5fe..4f78f49 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.lref b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref
index 75d1333..a78ede1 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;;