diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo index 77933ea..127ddfc 100644 Binary files a/shangjian/.vs/BL/v17/.suo and b/shangjian/.vs/BL/v17/.suo differ diff --git a/shangjian/.vs/BL/v17/HierarchyCache.v1.txt b/shangjian/.vs/BL/v17/HierarchyCache.v1.txt index aab8c4d..7b0b58e 100644 Binary files a/shangjian/.vs/BL/v17/HierarchyCache.v1.txt and b/shangjian/.vs/BL/v17/HierarchyCache.v1.txt differ diff --git a/shangjian/CentralControl/bin/Debug/CentralControl.exe b/shangjian/CentralControl/bin/Debug/CentralControl.exe index edfe7c6..ae1e705 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 65ce62f..2eb8522 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/CommonFunc.dll b/shangjian/CentralControl/bin/Debug/CommonFunc.dll index f591a25..7010d7d 100644 Binary files a/shangjian/CentralControl/bin/Debug/CommonFunc.dll and b/shangjian/CentralControl/bin/Debug/CommonFunc.dll differ diff --git a/shangjian/CentralControl/bin/Debug/CommonFunc.pdb b/shangjian/CentralControl/bin/Debug/CommonFunc.pdb index 9e04a33..a65e607 100644 Binary files a/shangjian/CentralControl/bin/Debug/CommonFunc.pdb and b/shangjian/CentralControl/bin/Debug/CommonFunc.pdb differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Data.dll b/shangjian/CentralControl/bin/Debug/XGL.Data.dll index 2fedc1a..ab36292 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 79401db..2d4f080 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/bin/Debug/XGL.Models.dll b/shangjian/CentralControl/bin/Debug/XGL.Models.dll index 19c3c94..13e7442 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Models.dll and b/shangjian/CentralControl/bin/Debug/XGL.Models.dll differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Models.pdb b/shangjian/CentralControl/bin/Debug/XGL.Models.pdb index d8b6d40..16208f0 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Models.pdb and b/shangjian/CentralControl/bin/Debug/XGL.Models.pdb differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Thrift.dll b/shangjian/CentralControl/bin/Debug/XGL.Thrift.dll index 8ebf9f7..bc5a9ec 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Thrift.dll and b/shangjian/CentralControl/bin/Debug/XGL.Thrift.dll differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb b/shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb index b13127b..7c1351d 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb and b/shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb differ diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache index eec3e1e..054270c 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 edfe7c6..ae1e705 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 65ce62f..2eb8522 100644 Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.pdb and b/shangjian/CentralControl/obj/Debug/CentralControl.pdb differ diff --git a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll index f591a25..7010d7d 100644 Binary files a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll and b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll differ diff --git a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb index 9e04a33..a65e607 100644 Binary files a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb and b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb differ diff --git a/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll b/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll index 19c3c94..13e7442 100644 Binary files a/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll and b/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll differ diff --git a/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb b/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb index d8b6d40..16208f0 100644 Binary files a/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb and b/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb differ diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache index 1f8ef51..52fe477 100644 Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache and b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache differ diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll index f591a25..7010d7d 100644 Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll and b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll differ diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb index 9e04a33..a65e607 100644 Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb and b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb differ diff --git a/shangjian/LanJuLib/bin/Debug/CommonFunc.dll b/shangjian/LanJuLib/bin/Debug/CommonFunc.dll index f591a25..7010d7d 100644 Binary files a/shangjian/LanJuLib/bin/Debug/CommonFunc.dll and b/shangjian/LanJuLib/bin/Debug/CommonFunc.dll differ diff --git a/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb b/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb index 9e04a33..a65e607 100644 Binary files a/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb and b/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb differ diff --git a/shangjian/LanJuLib/bin/Debug/XGL.Models.dll b/shangjian/LanJuLib/bin/Debug/XGL.Models.dll index 19c3c94..13e7442 100644 Binary files a/shangjian/LanJuLib/bin/Debug/XGL.Models.dll and b/shangjian/LanJuLib/bin/Debug/XGL.Models.dll differ diff --git a/shangjian/LanJuLib/bin/Debug/XGL.Models.pdb b/shangjian/LanJuLib/bin/Debug/XGL.Models.pdb index d8b6d40..16208f0 100644 Binary files a/shangjian/LanJuLib/bin/Debug/XGL.Models.pdb and b/shangjian/LanJuLib/bin/Debug/XGL.Models.pdb differ diff --git a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache index 9aa1a51..cf0df8e 100644 Binary files a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache and b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache differ diff --git a/shangjian/XGL.Data/DBService/DBService.cs b/shangjian/XGL.Data/DBService/DBService.cs index 97f2848..584e7c7 100644 --- a/shangjian/XGL.Data/DBService/DBService.cs +++ b/shangjian/XGL.Data/DBService/DBService.cs @@ -646,14 +646,21 @@ select a.TrayCode,a.ProductBarNo,a.carcode,a.createtime,a.lineno,b.HadNumber public DataTable GetWetPlanInfo() { - string sql = $@"select wet.id,wet.factory_code,wet.prod_code, wet.sync_flag,wet.plan_time, + //删除湿料计划主表 + // string sql = $@"select wet.id,wet.factory_code,wet.prod_code, wetDetail.sync_flag,wet.plan_time, + //wetDetail.workorder_id,bucket_id,bucket_code,material_code,material_name, + //wetDetail.product_name,wet.shift_desc,prod_line_code,workorder.status,workorder.workorder_code + //from pro_wet_material_plan wet + //LEFT JOIN pro_wet_material_plan_detail wetDetail + //on wet.id = wetDetail.wet_material_plan_id + //left join pro_order_workorder workorder on workorder.workorder_id = wetDetail.workorder_id where 1=1 and workorder.status = 'w1' and workorder.end_flag = '1' and CONVERT(VARCHAR(10), wet.plan_time , 120)= CONVERT(VARCHAR(10), GetDate() , 120)"; + //workorder.status = 'w1' and + string sql = $@"select wetDetail.id,wetDetail.factory_code,wetDetail.material_code as prod_code, wetDetail.sync_flag,wetDetail.plan_time, wetDetail.workorder_id,bucket_id,bucket_code,material_code,material_name, -wetDetail.product_name,wet.shift_desc,prod_line_code,workorder.status,sync_flag -from pro_wet_material_plan wet -LEFT JOIN pro_wet_material_plan_detail wetDetail -on wet.id = wetDetail.wet_material_plan_id -left join pro_order_workorder workorder on workorder.workorder_id = wetDetail.workorder_id where 1=1 and workorder.status = 'w1' and workorder.end_flag = '1' and CONVERT(VARCHAR(10), wet.plan_time , 120)= CONVERT(VARCHAR(10), GetDate() , 120) -"; //where CONVERT(VARCHAR(10), wet.plan_time , 120)= CONVERT(VARCHAR(10), GetDate() , 120) +wetDetail.material_name as product_name,wetDetail.shift_desc,prod_line_code,workorder.status,workorder.workorder_code +from pro_wet_material_plan_detail wetDetail +left join pro_order_workorder workorder on workorder.workorder_id = wetDetail.workorder_id where 1=1 and + workorder.end_flag = '1' and CONVERT(VARCHAR(10), wetDetail.plan_time , 120)= CONVERT(VARCHAR(10), GetDate() , 120)"; DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) { @@ -703,12 +710,13 @@ order by order_num"; //where CONVERT(VARCHAR(10), wet.plan_time , 120)= CONVERT /// 更新湿料计划同步状态、工单状态 /// /// - public bool UpdateSycnFlag(string wetPlanID,string workOrderID) + public bool UpdateSycnFlag(string workOrderID) { List sqlList = new List(); - string sql = $@"update pro_wet_material_plan set sync_flag = 'Y' where id = '{wetPlanID}'"; - string sql1 = $@"update pro_order_workorder set status = 'w2' where workorder_id = '{workOrderID}'"; - + string sql = $@"update pro_wet_material_plan_detail set sync_flag = 'Y', update_by = '{LoginUser.UserName}',update_time = GETDATE() where workorder_id = '{workOrderID}' "; + string sql1 = $@"update pro_order_workorder set status = 'w2', update_by = '{LoginUser.UserName}',update_time = GETDATE() where workorder_id = '{workOrderID}' "; + sqlList.Add(sql); + sqlList.Add(sql1); return Utils.netClientDBHelper.executeBatchSql(sqlList); } @@ -720,12 +728,19 @@ order by order_num"; //where CONVERT(VARCHAR(10), wet.plan_time , 120)= CONVERT /// public DataTable GetCXJList(string workOrderNo) { + //根据湿料计划获取所有工单用到的成型机 + //string sql = $@"select prod_line_code,bucket_code + //from pro_wet_material_plan wet + //LEFT JOIN pro_wet_material_plan_detail wetDetail + //on wet.id = wetDetail.wet_material_plan_id + //left join pro_order_workorder workorder on workorder.workorder_id = wetDetail.workorder_id + //where wet.id = '{workOrderNo}'"; + + //根据工单获取成型机 string sql = $@"select prod_line_code,bucket_code - from pro_wet_material_plan wet - LEFT JOIN pro_wet_material_plan_detail wetDetail - on wet.id = wetDetail.wet_material_plan_id - left join pro_order_workorder workorder on workorder.workorder_id = wetDetail.workorder_id - where wet.id = '{workOrderNo}'"; +from pro_order_workorder workorder +LEFT JOIN pro_wet_material_plan_detail wetDetail on workorder.workorder_id = wetDetail.workorder_id +where workorder.workorder_id = '{workOrderNo}'"; DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) diff --git a/shangjian/XGL.Data/DBService/DringRoomService.cs b/shangjian/XGL.Data/DBService/DringRoomService.cs index 528302b..aa714f5 100644 --- a/shangjian/XGL.Data/DBService/DringRoomService.cs +++ b/shangjian/XGL.Data/DBService/DringRoomService.cs @@ -41,7 +41,7 @@ namespace XGL.Data.DBService { //获取绑定中，且RFID没有出烘房（在烘房内）的数据 string sql = $@"SELECT rfid,workorder_code,product_name,product_code,isnull(car_num,0) as car_num,isnull([begin],'1900-01-01 08:00:00') as [begin],ord.status FROM [dbo].[mes_material_transfer_result] res -LEFT JOIN pro_order_workorder ord on res.OrderCode = ord.workorder_id"; +LEFT JOIN pro_order_workorder ord on res.OrderCode = ord.workorder_id where equipmentCode = '{devicecode}' and rfid_status = '1' and rfid not in(select rfid from mes_material_transfer_result where taskcode = '1' and rfid_status = '1')"; //where rfid !=null and equipmentCode = '{devicecode}' and rfid_status = '1' and rfid not in(select rfid from mes_material_transfer_result where taskcode = '1' and rfid_status = '1') diff --git a/shangjian/XGL.Data/DBService/FormingMachineService.cs b/shangjian/XGL.Data/DBService/FormingMachineService.cs index 9af7ecc..5ac913b 100644 --- a/shangjian/XGL.Data/DBService/FormingMachineService.cs +++ b/shangjian/XGL.Data/DBService/FormingMachineService.cs @@ -19,7 +19,7 @@ namespace XGL.Data.DBService public DataTable GetFormingMachineInfo(string devicecode) { - string sql = $@"SELECT workorder_code,product_name,product_code,isnull(car_num,0) as car_num,isnull([begin],'1900-01-01 08:00:00') as [begin],ord.status FROM [dbo].[mes_material_transfer_result] res + string sql = $@"SELECT ord.workorder_code,res.OrderCode,product_name,product_code,isnull(car_num,0) as car_num,isnull([begin],'1900-01-01 08:00:00') as [begin],ord.status FROM [dbo].[mes_material_transfer_result] res LEFT JOIN pro_order_workorder ord on res.OrderCode = ord.workorder_id where equipmentCode = '{devicecode}'; "; @@ -78,10 +78,10 @@ where equipmentCode = '{devicecode}'; "; /// public DataTable GetCompleteHistoryList(string devicecode) { - + //taskcode=1,当前机台完成，ord.status = 'w3'当前工单完成 string sql = $@"SELECT workorder_code,product_name,product_code,isnull(car_num,0) as car_num,isnull([begin],'1900-00-00') as [begin],beout,ord.status,product_date,ord.create_time FROM [dbo].[mes_material_transfer_result] res LEFT JOIN pro_order_workorder ord on res.OrderCode = ord.workorder_id -where ord.status = 'w3' and equipmentCode = '{devicecode}'; "; +where res.taskcode = '1' and equipmentCode = '{devicecode}'; "; DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) diff --git a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll index f591a25..7010d7d 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll and b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb index 9e04a33..a65e607 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb and b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll index 2fedc1a..ab36292 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 79401db..2d4f080 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/bin/x86/Debug/XGL.Models.dll b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll index 19c3c94..13e7442 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb index d8b6d40..16208f0 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb differ diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache index ea9fa3d..00394bc 100644 Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache and b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache differ diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll index 2fedc1a..ab36292 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 79401db..2d4f080 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.Model/Model/OrderPrepare/WetMaterialModel.cs b/shangjian/XGL.Model/Model/OrderPrepare/WetMaterialModel.cs index 35e5f09..0665d10 100644 --- a/shangjian/XGL.Model/Model/OrderPrepare/WetMaterialModel.cs +++ b/shangjian/XGL.Model/Model/OrderPrepare/WetMaterialModel.cs @@ -16,7 +16,7 @@ namespace XGL.Models.Model.OrderPrepare public DateTime plan_time { get; set; } public string workorder_id { get; set; } - + public string workorder_code { get; set; } public string bucket_id { get; set; } public string bucket_code { get; set; } public string material_code { get; set; } diff --git a/shangjian/XGL.Model/bin/Debug/XGL.Models.dll b/shangjian/XGL.Model/bin/Debug/XGL.Models.dll index 19c3c94..13e7442 100644 Binary files a/shangjian/XGL.Model/bin/Debug/XGL.Models.dll and b/shangjian/XGL.Model/bin/Debug/XGL.Models.dll differ diff --git a/shangjian/XGL.Model/bin/Debug/XGL.Models.pdb b/shangjian/XGL.Model/bin/Debug/XGL.Models.pdb index d8b6d40..16208f0 100644 Binary files a/shangjian/XGL.Model/bin/Debug/XGL.Models.pdb and b/shangjian/XGL.Model/bin/Debug/XGL.Models.pdb differ diff --git a/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.AssemblyReference.cache b/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.AssemblyReference.cache index 709a5dc..3149550 100644 Binary files a/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.AssemblyReference.cache and b/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.AssemblyReference.cache differ diff --git a/shangjian/XGL.Model/obj/Debug/XGL.Models.dll b/shangjian/XGL.Model/obj/Debug/XGL.Models.dll index 19c3c94..13e7442 100644 Binary files a/shangjian/XGL.Model/obj/Debug/XGL.Models.dll and b/shangjian/XGL.Model/obj/Debug/XGL.Models.dll differ diff --git a/shangjian/XGL.Model/obj/Debug/XGL.Models.pdb b/shangjian/XGL.Model/obj/Debug/XGL.Models.pdb index d8b6d40..16208f0 100644 Binary files a/shangjian/XGL.Model/obj/Debug/XGL.Models.pdb and b/shangjian/XGL.Model/obj/Debug/XGL.Models.pdb differ diff --git a/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll b/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll index 8ebf9f7..bc5a9ec 100644 Binary files a/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll and b/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll differ diff --git a/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb b/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb index b13127b..7c1351d 100644 Binary files a/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb and b/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb differ diff --git a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll index 8ebf9f7..bc5a9ec 100644 Binary files a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll and b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll differ diff --git a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb index b13127b..7c1351d 100644 Binary files a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb and b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb differ diff --git a/shangjian/XGL/App.config b/shangjian/XGL/App.config index d313696..d3ea11a 100644 --- a/shangjian/XGL/App.config +++ b/shangjian/XGL/App.config @@ -12,7 +12,7 @@ - + diff --git a/shangjian/XGL/Tools/BtnBackGroundColorConverter.cs b/shangjian/XGL/Tools/BtnBackGroundColorConverter.cs index c6ffb9b..f0f89f8 100644 --- a/shangjian/XGL/Tools/BtnBackGroundColorConverter.cs +++ b/shangjian/XGL/Tools/BtnBackGroundColorConverter.cs @@ -13,21 +13,20 @@ namespace XGL.Tools { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - int second = 0; if (value != null) { if (value.Equals("正常")) - return Brushes.Green; + return "Green"; else - return Brushes.Red; + return "Red"; } else - return Brushes.Red; + return "Red"; } public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) { - return ""; + return Brushes.Red; } } } diff --git a/shangjian/XGL/Tools/ModuleUC.xaml b/shangjian/XGL/Tools/ModuleUC.xaml index f7c4e2a..ce7c70f 100644 --- a/shangjian/XGL/Tools/ModuleUC.xaml +++ b/shangjian/XGL/Tools/ModuleUC.xaml @@ -5,16 +5,16 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:XGL.Tools" mc:Ignorable="d" - d:DesignHeight="150" d:DesignWidth="150"> + d:DesignHeight="250" d:DesignWidth="250"> - + + diff --git a/shangjian/XGL/Views/LanJu_Operator.xaml.cs b/shangjian/XGL/Views/LanJu_Operator.xaml.cs index 53a6139..d66aad4 100644 --- a/shangjian/XGL/Views/LanJu_Operator.xaml.cs +++ b/shangjian/XGL/Views/LanJu_Operator.xaml.cs @@ -33,8 +33,7 @@ namespace XGL.Views public static LanJu_Operator lanJu_Operator; Frame frame = new Frame() { Content = new Views.LanJu_InOut()}; string deviceCode = Utils.GetAppSetting("DeviceCode"); - List orderList = new List(); - FoamingMacModel order = new FoamingMacModel(); + Timer timerDeciveState = new Timer(); public enum WindowID { @@ -58,7 +57,21 @@ namespace XGL.Views new Action(() => { LbDeviceState.Content = dt.Rows[0][0].ToString() == "1" ? "正常" : "异常"; } ), System.Windows.Threading.DispatcherPriority.Render); - + //if (dt.Rows[0][0].ToString() == "1") + //{ + // this.Dispatcher.Invoke( + // new Action(() => { LbDeviceState.Background = Brushes.Green; } + // ), + // System.Windows.Threading.DispatcherPriority.Render); + //} + //else + //{ + // this.Dispatcher.Invoke( + // new Action(() => { LbDeviceState.Background = Brushes.Red; } + // ), + // System.Windows.Threading.DispatcherPriority.Render); + + //} } public void WindowChange(WindowID windowID) @@ -135,12 +148,15 @@ namespace XGL.Views { try { + List orderList = new List(); + //modelWareHouse = new List(); //userDbWareHouse = new DBService(); - DataTable dt = formingMachineService.GetFormingMachineInfo(deviceCode); + DataTable dt = formingMachineService.GetFormingMachineInfo(deviceCode); if (dt == null) return; foreach (DataRow i in dt.Rows) - { + { + FoamingMacModel order = new FoamingMacModel(); order.workorder_code = i["workorder_code"].ToString(); order.product_name = i["product_name"].ToString(); @@ -152,6 +168,7 @@ namespace XGL.Views orderList.Add(order); } + this.dgWorkOrderInfo.ItemsSource = null; this.dgWorkOrderInfo.ItemsSource = orderList; } catch (Exception ex) @@ -163,9 +180,19 @@ namespace XGL.Views private void btnPause_Click(object sender, RoutedEventArgs e) { var selectedRow = dgWorkOrderInfo.SelectedItem as FoamingMacModel; + if (selectedRow == null) + { + MessageBox.Show("请选择你要暂停的工单！", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Warning); + return; + } var workordercode = selectedRow.workorder_code; formingMachineService.PauseWorkOrder(workordercode); GetWorkOrderInfo(); } + + private void dgWorkOrderInfo_LoadingRow(object sender, DataGridRowEventArgs e) + { + e.Row.Header = (e.Row.GetIndex() + 1).ToString(); + } } } diff --git a/shangjian/XGL/Views/LanJu_Prepare.xaml b/shangjian/XGL/Views/LanJu_Prepare.xaml index 0a99f99..a608b63 100644 --- a/shangjian/XGL/Views/LanJu_Prepare.xaml +++ b/shangjian/XGL/Views/LanJu_Prepare.xaml @@ -40,14 +40,59 @@ - + - + + + @@ -92,6 +137,7 @@ Margin="25,0,0,0" AutoGenerateColumns="False" FrozenColumnCount="1" + EnableColumnVirtualization="False" ScrollViewer.HorizontalScrollBarVisibility="Visible"> @@ -180,8 +233,82 @@ - + + + + + + + + + + + + + + + + + @@ -214,71 +341,7 @@ - - - - - - - - - - - - + diff --git a/shangjian/XGL/Views/LanJu_Prepare.xaml.cs b/shangjian/XGL/Views/LanJu_Prepare.xaml.cs index 4fa7680..1615472 100644 --- a/shangjian/XGL/Views/LanJu_Prepare.xaml.cs +++ b/shangjian/XGL/Views/LanJu_Prepare.xaml.cs @@ -38,8 +38,8 @@ namespace XGL.Views DBService userDbWareHouse = new DBService(); WorkOrder list_modelWareHouse = new WorkOrder(); - List wetList = new List(); - WetMaterialModel wet = new WetMaterialModel(); + + string messageOrderCode = ""; DataTable dt; /// @@ -52,14 +52,17 @@ namespace XGL.Views { try { + List wetList = new List(); //modelWareHouse = new List(); //userDbWareHouse = new DBService(); dt = userDbWareHouse.GetWetPlanInfo(); if (dt == null) return; foreach (DataRow i in dt.Rows) { + WetMaterialModel wet = new WetMaterialModel(); wet.id = i["id"].ToString(); wet.workorder_id = i["workorder_id"].ToString(); + wet.workorder_code = i["workorder_code"].ToString(); wet.product_name = i["product_name"].ToString(); wet.material_code = i["material_code"].ToString(); @@ -79,6 +82,7 @@ namespace XGL.Views // list_modelWareHouse.BatchCode = i["BatchCode"].ToString(); // modelWareHouse.Add(list_modelWareHouse); } + this.WorkOrder.ItemsSource = null; this.WorkOrder.ItemsSource = wetList; } catch (Exception ex) @@ -129,7 +133,7 @@ namespace XGL.Views { GetWorkOrder(); } - private void btnStartOrders_Click(object sender, RoutedEventArgs e) + private async void btnStartOrders_Click(object sender, RoutedEventArgs e) { CheckUserWin checkUserWin = new CheckUserWin(); checkUserWin.ShowDialog(); @@ -172,7 +176,11 @@ namespace XGL.Views //} //获取湿料计划指定的成型机 - var cxjDt = userDbWareHouse.GetCXJList(orderID); + //var cxjDt = userDbWareHouse.GetCXJList(orderID); + + //根据工单获取成型机 + var cxjDt = userDbWareHouse.GetCXJList(workorderID); + if (cxjDt == null || cxjDt.Rows.Count == 0) { CustomMessageBox.Show("该工单未指定料罐、成型机，请稍后再试！", CustomMessageBoxIcon.Warning); @@ -219,17 +227,17 @@ namespace XGL.Views materialPlanModel.reqCode = CommonFunc.Common.GetUUID(); materialPlanModel.reqTime = DateTime.Now.ToString(); materialPlanModel.factory = Utils.GetAppSetting("SiteCode"); - materialPlanModel.planNo = orderID; + materialPlanModel.planNo = workorderID; - foreach (var item in cxjList) + foreach (var item in bucketList) { skuInfo sku = new skuInfo(); sku.sku = material; sku.loadNo = item; List unloadNoInfoList = new List(); - foreach (var buckt in bucketList) + foreach (var buckt in cxjList) { unloadNoInfo unloadNoInfo = new unloadNoInfo(); unloadNoInfo.unloadNo = buckt; @@ -245,13 +253,17 @@ namespace XGL.Views var jsonContent = JsonConvert.SerializeObject(materialPlanModel); RestHelper restClient = new RestHelper(); - var response = restClient.PostAsync(apiUrl, jsonContent); + var response = await restClient.PostAsync(apiUrl, jsonContent); - Console.WriteLine(response); + //Console.WriteLine(response); //更新湿料计划同步状态 - var updatestatus = userDbWareHouse.UpdateSycnFlag(orderID, workorderID); + var updatestatus = userDbWareHouse.UpdateSycnFlag(workorderID); if (!updatestatus) LogHelper.instance.log.Info("更新湿料计划同步状态失败！"); + else + { + GetWorkOrder(); + } } private void SOP_Click(object sender, RoutedEventArgs e) @@ -263,5 +275,22 @@ namespace XGL.Views { } + + + private void btnRefresh_Click(object sender, RoutedEventArgs e) + { + GetWorkOrder(); + } + + /// + /// 增加序号 + /// + /// + /// + private void USERLIST_LoadingRow(object sender, DataGridRowEventArgs e) + { + e.Row.Header = (e.Row.GetIndex() + 1).ToString(); + } + } } diff --git a/shangjian/XGL/XGL.csproj b/shangjian/XGL/XGL.csproj index 5cb70d9..66dadb3 100644 --- a/shangjian/XGL/XGL.csproj +++ b/shangjian/XGL/XGL.csproj @@ -212,8 +212,10 @@ ModuleUC.xaml + + ordertj.xaml diff --git a/shangjian/XGL/bin/x86/Debug/CentralControl.exe b/shangjian/XGL/bin/x86/Debug/CentralControl.exe index edfe7c6..ae1e705 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 65ce62f..2eb8522 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/CommonFunc.dll b/shangjian/XGL/bin/x86/Debug/CommonFunc.dll index f591a25..7010d7d 100644 Binary files a/shangjian/XGL/bin/x86/Debug/CommonFunc.dll and b/shangjian/XGL/bin/x86/Debug/CommonFunc.dll differ diff --git a/shangjian/XGL/bin/x86/Debug/CommonFunc.pdb b/shangjian/XGL/bin/x86/Debug/CommonFunc.pdb index 9e04a33..a65e607 100644 Binary files a/shangjian/XGL/bin/x86/Debug/CommonFunc.pdb and b/shangjian/XGL/bin/x86/Debug/CommonFunc.pdb differ diff --git a/shangjian/XGL/bin/x86/Debug/XGL.Data.dll b/shangjian/XGL/bin/x86/Debug/XGL.Data.dll index 2fedc1a..ab36292 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 79401db..2d4f080 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.Models.dll b/shangjian/XGL/bin/x86/Debug/XGL.Models.dll index 19c3c94..13e7442 100644 Binary files a/shangjian/XGL/bin/x86/Debug/XGL.Models.dll and b/shangjian/XGL/bin/x86/Debug/XGL.Models.dll differ diff --git a/shangjian/XGL/bin/x86/Debug/XGL.Models.pdb b/shangjian/XGL/bin/x86/Debug/XGL.Models.pdb index d8b6d40..16208f0 100644 Binary files a/shangjian/XGL/bin/x86/Debug/XGL.Models.pdb and b/shangjian/XGL/bin/x86/Debug/XGL.Models.pdb differ diff --git a/shangjian/XGL/bin/x86/Debug/XGL.Thrift.dll b/shangjian/XGL/bin/x86/Debug/XGL.Thrift.dll index 8ebf9f7..bc5a9ec 100644 Binary files a/shangjian/XGL/bin/x86/Debug/XGL.Thrift.dll and b/shangjian/XGL/bin/x86/Debug/XGL.Thrift.dll differ diff --git a/shangjian/XGL/bin/x86/Debug/XGL.Thrift.pdb b/shangjian/XGL/bin/x86/Debug/XGL.Thrift.pdb index b13127b..7c1351d 100644 Binary files a/shangjian/XGL/bin/x86/Debug/XGL.Thrift.pdb and b/shangjian/XGL/bin/x86/Debug/XGL.Thrift.pdb differ diff --git a/shangjian/XGL/bin/x86/Debug/XGL.exe b/shangjian/XGL/bin/x86/Debug/XGL.exe index 7b2a398..8deca3f 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 63cb808..d3ea11a 100644 --- a/shangjian/XGL/bin/x86/Debug/XGL.exe.config +++ b/shangjian/XGL/bin/x86/Debug/XGL.exe.config @@ -8,11 +8,11 @@ - + - + diff --git a/shangjian/XGL/bin/x86/Debug/XGL.pdb b/shangjian/XGL/bin/x86/Debug/XGL.pdb index 193d2ec..8a2e1a9 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 ffa4e1e..c65238f 100644 --- a/shangjian/XGL/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs +++ b/shangjian/XGL/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs @@ -1,62 +1,2 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// 运行时版本: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 72fcde7..c48957c 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 5e9a0e8..0f0ca9c 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}" "923A471F5F1852E93CCBA311D226CC1C728BF607B35C758D0B9F3BB2EBDCAEF4" +#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E4F3F2A075151D49F3744644EF28E46A664290FCA9AB049824420D662E2B475C" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -49,7 +49,7 @@ namespace XGL.Views { #line hidden - #line 106 "..\..\..\..\Views\LanJu_Operator.xaml" + #line 110 "..\..\..\..\Views\LanJu_Operator.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Label LbDeviceState; @@ -57,7 +57,7 @@ namespace XGL.Views { #line hidden - #line 202 "..\..\..\..\Views\LanJu_Operator.xaml" + #line 208 "..\..\..\..\Views\LanJu_Operator.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button btnPause; @@ -65,7 +65,7 @@ namespace XGL.Views { #line hidden - #line 304 "..\..\..\..\Views\LanJu_Operator.xaml" + #line 310 "..\..\..\..\Views\LanJu_Operator.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DataGrid dgWorkOrderInfo; @@ -73,7 +73,7 @@ namespace XGL.Views { #line hidden - #line 428 "..\..\..\..\Views\LanJu_Operator.xaml" + #line 436 "..\..\..\..\Views\LanJu_Operator.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ContentControl Window1; @@ -81,7 +81,7 @@ namespace XGL.Views { #line hidden - #line 436 "..\..\..\..\Views\LanJu_Operator.xaml" + #line 444 "..\..\..\..\Views\LanJu_Operator.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ContentControl Window2; @@ -133,7 +133,7 @@ namespace XGL.Views { case 3: this.btnPause = ((System.Windows.Controls.Button)(target)); - #line 203 "..\..\..\..\Views\LanJu_Operator.xaml" + #line 209 "..\..\..\..\Views\LanJu_Operator.xaml" this.btnPause.Click += new System.Windows.RoutedEventHandler(this.btnPause_Click); #line default @@ -141,7 +141,7 @@ namespace XGL.Views { return; case 4: - #line 250 "..\..\..\..\Views\LanJu_Operator.xaml" + #line 256 "..\..\..\..\Views\LanJu_Operator.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click); #line default @@ -149,7 +149,7 @@ namespace XGL.Views { return; case 5: - #line 271 "..\..\..\..\Views\LanJu_Operator.xaml" + #line 277 "..\..\..\..\Views\LanJu_Operator.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click); #line default @@ -157,10 +157,16 @@ namespace XGL.Views { return; case 6: this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target)); + + #line 316 "..\..\..\..\Views\LanJu_Operator.xaml" + this.dgWorkOrderInfo.LoadingRow += new System.EventHandler(this.dgWorkOrderInfo_LoadingRow); + + #line default + #line hidden return; case 7: - #line 355 "..\..\..\..\Views\LanJu_Operator.xaml" + #line 363 "..\..\..\..\Views\LanJu_Operator.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click); #line default @@ -168,7 +174,7 @@ namespace XGL.Views { return; case 8: - #line 368 "..\..\..\..\Views\LanJu_Operator.xaml" + #line 376 "..\..\..\..\Views\LanJu_Operator.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Complete_Click); #line default 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 5e9a0e8..0f0ca9c 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}" "923A471F5F1852E93CCBA311D226CC1C728BF607B35C758D0B9F3BB2EBDCAEF4" +#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E4F3F2A075151D49F3744644EF28E46A664290FCA9AB049824420D662E2B475C" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -49,7 +49,7 @@ namespace XGL.Views { #line hidden - #line 106 "..\..\..\..\Views\LanJu_Operator.xaml" + #line 110 "..\..\..\..\Views\LanJu_Operator.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Label LbDeviceState; @@ -57,7 +57,7 @@ namespace XGL.Views { #line hidden - #line 202 "..\..\..\..\Views\LanJu_Operator.xaml" + #line 208 "..\..\..\..\Views\LanJu_Operator.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button btnPause; @@ -65,7 +65,7 @@ namespace XGL.Views { #line hidden - #line 304 "..\..\..\..\Views\LanJu_Operator.xaml" + #line 310 "..\..\..\..\Views\LanJu_Operator.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DataGrid dgWorkOrderInfo; @@ -73,7 +73,7 @@ namespace XGL.Views { #line hidden - #line 428 "..\..\..\..\Views\LanJu_Operator.xaml" + #line 436 "..\..\..\..\Views\LanJu_Operator.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ContentControl Window1; @@ -81,7 +81,7 @@ namespace XGL.Views { #line hidden - #line 436 "..\..\..\..\Views\LanJu_Operator.xaml" + #line 444 "..\..\..\..\Views\LanJu_Operator.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ContentControl Window2; @@ -133,7 +133,7 @@ namespace XGL.Views { case 3: this.btnPause = ((System.Windows.Controls.Button)(target)); - #line 203 "..\..\..\..\Views\LanJu_Operator.xaml" + #line 209 "..\..\..\..\Views\LanJu_Operator.xaml" this.btnPause.Click += new System.Windows.RoutedEventHandler(this.btnPause_Click); #line default @@ -141,7 +141,7 @@ namespace XGL.Views { return; case 4: - #line 250 "..\..\..\..\Views\LanJu_Operator.xaml" + #line 256 "..\..\..\..\Views\LanJu_Operator.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click); #line default @@ -149,7 +149,7 @@ namespace XGL.Views { return; case 5: - #line 271 "..\..\..\..\Views\LanJu_Operator.xaml" + #line 277 "..\..\..\..\Views\LanJu_Operator.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click); #line default @@ -157,10 +157,16 @@ namespace XGL.Views { return; case 6: this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target)); + + #line 316 "..\..\..\..\Views\LanJu_Operator.xaml" + this.dgWorkOrderInfo.LoadingRow += new System.EventHandler(this.dgWorkOrderInfo_LoadingRow); + + #line default + #line hidden return; case 7: - #line 355 "..\..\..\..\Views\LanJu_Operator.xaml" + #line 363 "..\..\..\..\Views\LanJu_Operator.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click); #line default @@ -168,7 +174,7 @@ namespace XGL.Views { return; case 8: - #line 368 "..\..\..\..\Views\LanJu_Operator.xaml" + #line 376 "..\..\..\..\Views\LanJu_Operator.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Complete_Click); #line default 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 9c3f836..39a99dc 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}" "A013331107A454E06F5A24DC34534744EC128738FB5427748396E5162631E760" +#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F430F137153B10D1FB7EFC67A79F115AF750C771080C3D4ECBEAEFB55E18CF05" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -42,7 +42,15 @@ namespace XGL.Views { public partial class LanJu_Prepare : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector, System.Windows.Markup.IStyleConnector { - #line 155 "..\..\..\..\Views\LanJu_Prepare.xaml" + #line 197 "..\..\..\..\Views\LanJu_Prepare.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Button btnRefresh; + + #line default + #line hidden + + + #line 208 "..\..\..\..\Views\LanJu_Prepare.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DataGrid WorkOrder; @@ -89,14 +97,29 @@ namespace XGL.Views { return; case 2: - #line 113 "..\..\..\..\Views\LanJu_Prepare.xaml" + #line 159 "..\..\..\..\Views\LanJu_Prepare.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.btnStartOrders_Click); #line default #line hidden return; case 3: + this.btnRefresh = ((System.Windows.Controls.Button)(target)); + + #line 198 "..\..\..\..\Views\LanJu_Prepare.xaml" + this.btnRefresh.Click += new System.Windows.RoutedEventHandler(this.btnRefresh_Click); + + #line default + #line hidden + return; + case 4: this.WorkOrder = ((System.Windows.Controls.DataGrid)(target)); + + #line 216 "..\..\..\..\Views\LanJu_Prepare.xaml" + this.WorkOrder.LoadingRow += new System.EventHandler(this.USERLIST_LoadingRow); + + #line default + #line hidden return; } this._contentLoaded = true; @@ -111,25 +134,25 @@ namespace XGL.Views { void System.Windows.Markup.IStyleConnector.Connect(int connectionId, object target) { switch (connectionId) { - case 4: - - #line 198 "..\..\..\..\Views\LanJu_Prepare.xaml" - ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click); - - #line default - #line hidden - break; case 5: - #line 205 "..\..\..\..\Views\LanJu_Prepare.xaml" - ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SOP_Click); + #line 325 "..\..\..\..\Views\LanJu_Prepare.xaml" + ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click); #line default #line hidden break; case 6: - #line 212 "..\..\..\..\Views\LanJu_Prepare.xaml" + #line 332 "..\..\..\..\Views\LanJu_Prepare.xaml" + ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SOP_Click); + + #line default + #line hidden + break; + case 7: + + #line 339 "..\..\..\..\Views\LanJu_Prepare.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click); #line default 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 9c3f836..39a99dc 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}" "A013331107A454E06F5A24DC34534744EC128738FB5427748396E5162631E760" +#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F430F137153B10D1FB7EFC67A79F115AF750C771080C3D4ECBEAEFB55E18CF05" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -42,7 +42,15 @@ namespace XGL.Views { public partial class LanJu_Prepare : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector, System.Windows.Markup.IStyleConnector { - #line 155 "..\..\..\..\Views\LanJu_Prepare.xaml" + #line 197 "..\..\..\..\Views\LanJu_Prepare.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Button btnRefresh; + + #line default + #line hidden + + + #line 208 "..\..\..\..\Views\LanJu_Prepare.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DataGrid WorkOrder; @@ -89,14 +97,29 @@ namespace XGL.Views { return; case 2: - #line 113 "..\..\..\..\Views\LanJu_Prepare.xaml" + #line 159 "..\..\..\..\Views\LanJu_Prepare.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.btnStartOrders_Click); #line default #line hidden return; case 3: + this.btnRefresh = ((System.Windows.Controls.Button)(target)); + + #line 198 "..\..\..\..\Views\LanJu_Prepare.xaml" + this.btnRefresh.Click += new System.Windows.RoutedEventHandler(this.btnRefresh_Click); + + #line default + #line hidden + return; + case 4: this.WorkOrder = ((System.Windows.Controls.DataGrid)(target)); + + #line 216 "..\..\..\..\Views\LanJu_Prepare.xaml" + this.WorkOrder.LoadingRow += new System.EventHandler(this.USERLIST_LoadingRow); + + #line default + #line hidden return; } this._contentLoaded = true; @@ -111,25 +134,25 @@ namespace XGL.Views { void System.Windows.Markup.IStyleConnector.Connect(int connectionId, object target) { switch (connectionId) { - case 4: - - #line 198 "..\..\..\..\Views\LanJu_Prepare.xaml" - ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click); - - #line default - #line hidden - break; case 5: - #line 205 "..\..\..\..\Views\LanJu_Prepare.xaml" - ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SOP_Click); + #line 325 "..\..\..\..\Views\LanJu_Prepare.xaml" + ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click); #line default #line hidden break; case 6: - #line 212 "..\..\..\..\Views\LanJu_Prepare.xaml" + #line 332 "..\..\..\..\Views\LanJu_Prepare.xaml" + ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SOP_Click); + + #line default + #line hidden + break; + case 7: + + #line 339 "..\..\..\..\Views\LanJu_Prepare.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click); #line default diff --git a/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache b/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache index 6e44ba6..c86faf9 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 81f0ba4..ea50c15 100644 --- a/shangjian/XGL/obj/x86/Debug/XGL.csproj.CoreCompileInputs.cache +++ b/shangjian/XGL/obj/x86/Debug/XGL.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -3c4a6a332e7492750f23abf774be6b469961c61b +78ad0d5001c3faeee3bf14d7a8e5e51faa35ac21 diff --git a/shangjian/XGL/obj/x86/Debug/XGL.exe b/shangjian/XGL/obj/x86/Debug/XGL.exe index 7b2a398..8deca3f 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 d35c01f..6a5c406 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 193d2ec..8a2e1a9 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 19835b9..5190946 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 -68-368259376 +701842115673 511587517384 CSS\DataGridClass.xaml;CSS\NormalSmlBtnClass.xaml;CSS\SearchBtnClass.xaml;CSS\Style.xaml;CSS\SearchTextClass.xaml;CSS\TabControl.xaml;FormItem\FormBlankingBoard.xaml;FormItem\FormBoard.xaml;FormItem\FormChargingBoard.xaml;FormItem\FormLocator.xaml;FormItem\FormOutBoxBoard.xaml;FormItem\FormShowSelect.xaml;FormItem\Main.xaml;LoginPage.xaml;MainWindow.xaml;Tools\ModuleUC.xaml;UControl\ordertj.xaml;UControl\orderzfzy.xaml;UControl\orderzy.xaml;UControl\product_order.xaml;UControl\product_ordertj.xaml;UControl\product_orderzfzy.xaml;UControl\product_orderzy.xaml;UControl\UCArea.xaml;UControl\UCBoard.xaml;UControl\UCCar.xaml;UControl\UCCarL.xaml;UControl\UCLMix.xaml;UControl\UCMix.xaml;UControl\UCMixR.xaml;UControl\UCPermissionList.xaml;UControl\UCPostionList.xaml;UControl\UCProgressBar.xaml;UControl\UCRoleList.xaml;UControl\UCRProgressBar.xaml;UControl\UCStorage.xaml;UControl\UCStorageNew.xaml;UControl\UCStorageNewx.xaml;UControl\UCTakeOff.xaml;UControl\UCUserList.xaml;Views\CheckUserWin.xaml;Views\DryingRoomUC.xaml;Views\LanJu_Complete.xaml;Views\LanJu_DeviceItems.xaml;Views\LanJu_Flow.xaml;Views\LanJu_Index.xaml;Views\LanJu_InOut.xaml;Views\LanJu_Material.xaml;Views\LanJu_NowUser.xaml;Views\LanJu_Operator.xaml;Views\LanJu_Paused.xaml;Views\LanJu_Prepare.xaml;Views\LanJu_User.xaml;Views\LanJu_UserRecord.xaml; diff --git a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.i.cache b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.i.cache index 12a68b6..2621bc7 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 -69-1780281133 +71430093916 511587517384 CSS\DataGridClass.xaml;CSS\NormalSmlBtnClass.xaml;CSS\SearchBtnClass.xaml;CSS\Style.xaml;CSS\SearchTextClass.xaml;CSS\TabControl.xaml;FormItem\FormBlankingBoard.xaml;FormItem\FormBoard.xaml;FormItem\FormChargingBoard.xaml;FormItem\FormLocator.xaml;FormItem\FormOutBoxBoard.xaml;FormItem\FormShowSelect.xaml;FormItem\Main.xaml;LoginPage.xaml;MainWindow.xaml;Tools\ModuleUC.xaml;UControl\ordertj.xaml;UControl\orderzfzy.xaml;UControl\orderzy.xaml;UControl\product_order.xaml;UControl\product_ordertj.xaml;UControl\product_orderzfzy.xaml;UControl\product_orderzy.xaml;UControl\UCArea.xaml;UControl\UCBoard.xaml;UControl\UCCar.xaml;UControl\UCCarL.xaml;UControl\UCLMix.xaml;UControl\UCMix.xaml;UControl\UCMixR.xaml;UControl\UCPermissionList.xaml;UControl\UCPostionList.xaml;UControl\UCProgressBar.xaml;UControl\UCRoleList.xaml;UControl\UCRProgressBar.xaml;UControl\UCStorage.xaml;UControl\UCStorageNew.xaml;UControl\UCStorageNewx.xaml;UControl\UCTakeOff.xaml;UControl\UCUserList.xaml;Views\CheckUserWin.xaml;Views\DryingRoomUC.xaml;Views\LanJu_Complete.xaml;Views\LanJu_DeviceItems.xaml;Views\LanJu_Flow.xaml;Views\LanJu_Index.xaml;Views\LanJu_InOut.xaml;Views\LanJu_Material.xaml;Views\LanJu_NowUser.xaml;Views\LanJu_Operator.xaml;Views\LanJu_Paused.xaml;Views\LanJu_Prepare.xaml;Views\LanJu_User.xaml;Views\LanJu_UserRecord.xaml; -False +True diff --git a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref index 6410da6..8f1fcd6 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;;