diff --git a/shangjian/WPFupdate/update.cs b/shangjian/WPFupdate/update.cs index 581ca02..9420637 100644 --- a/shangjian/WPFupdate/update.cs +++ b/shangjian/WPFupdate/update.cs @@ -33,7 +33,7 @@ class Update // 设置要启动的应用程序名称和参数 - string appName = "XGL.exe"; // 替换为你的目标控制台应用程序的名称 + string appName = "XGLFinishPro.exe"; // 替换为你的目标控制台应用程序的名称 string appArguments = " ";// 替换为你的应用程序需要的参数 // 创建进程启动信息 diff --git a/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs b/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs index 41ac621..f4c154f 100644 --- a/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs +++ b/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs @@ -490,7 +490,7 @@ product_spc,shifts.shift_desc,prod_line_code,workorder.status,route_code,quantit from pro_order_workorder workorder left JOIN base_shifts_t shifts on workorder.shift_id = shifts.shift_id where 1=1 and - workorder.end_flag = '1' and CONVERT(VARCHAR(10), workorder.product_date , 120)= CONVERT(VARCHAR(10), '{date}' , 120) and workorder.prod_line_code like '%{deviceCode}%'"; + workorder.parent_order ='0' "; DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) { diff --git a/shangjian/XGL/Views/DryingRoomUC.xaml b/shangjian/XGL/Views/DryingRoomUC.xaml index 1ae122e..de75c87 100644 --- a/shangjian/XGL/Views/DryingRoomUC.xaml +++ b/shangjian/XGL/Views/DryingRoomUC.xaml @@ -5,7 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:XGL.Views" mc:Ignorable="d" - d:DesignHeight="450" d:DesignWidth="800" Loaded="UserControl_Loaded"> + d:DesignHeight="450" d:DesignWidth="800" Loaded="UserControl_Loaded"> +