diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo index f38dab6..4c35cc8 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 48c507d..935d974 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 40af050..015a3a9 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 7ce41cb..7eae922 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 1ac96da..9275d5c 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 d45929b..0f36a13 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 da2ea05..554d2ac 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 6e8be3a..f35e275 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 b1d4766..9baf824 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 bc5a9ec..61f542a 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 7c1351d..148ca2f 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 cf64437..3ef7eb1 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 48c507d..935d974 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 40af050..015a3a9 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 7ce41cb..7eae922 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 1ac96da..9275d5c 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 6e8be3a..f35e275 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 b1d4766..9baf824 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 21783d9..16d2689 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 7ce41cb..7eae922 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 1ac96da..9275d5c 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 7ce41cb..7eae922 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 1ac96da..9275d5c 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 6e8be3a..f35e275 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 b1d4766..9baf824 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 b5953e0..51c354e 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/Libs/System.Windows.Interactivity.dll b/shangjian/Libs/System.Windows.Interactivity.dll new file mode 100644 index 0000000..931c744 Binary files /dev/null and b/shangjian/Libs/System.Windows.Interactivity.dll differ diff --git a/shangjian/Libs/Telerik.Windows.Controls.dll b/shangjian/Libs/Telerik.Windows.Controls.dll new file mode 100644 index 0000000..3d48cc0 Binary files /dev/null and b/shangjian/Libs/Telerik.Windows.Controls.dll differ diff --git a/shangjian/Libs/WpfCustomControlLibrary1.dll b/shangjian/Libs/WpfCustomControlLibrary1.dll new file mode 100644 index 0000000..6393686 Binary files /dev/null and b/shangjian/Libs/WpfCustomControlLibrary1.dll differ diff --git a/shangjian/XGL.Data/DBService/DringRoomService.cs b/shangjian/XGL.Data/DBService/DringRoomService.cs index dfdb4c0..c1ac816 100644 --- a/shangjian/XGL.Data/DBService/DringRoomService.cs +++ b/shangjian/XGL.Data/DBService/DringRoomService.cs @@ -16,10 +16,16 @@ namespace XGL.Data.DBService /// /// /// - public DataTable GetDringRoomInfo() + public DataTable GetDringRoomInfo(string list) { - - string sql = $@"select equipment_code as quipCode,equipment_name as quipName,equipment_type_code from base_equipment where equipment_type_code = 'equ_type_hf'"; + string[] str = list.Split(','); + string where = ""; + foreach (string str2 in str) + { + where += $"'{str2}',"; + } + where = "("+where.Trim(',')+")"; + string sql = $@"select equipment_code as quipCode,equipment_name as quipName,equipment_type_code from base_equipment where equipment_type_code = 'equ_type_hf' and equipment_code in {where}"; DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) @@ -47,6 +53,25 @@ namespace XGL.Data.DBService //where rfid !=null and equipmentCode = '{devicecode}' and rfid_status = '1' and rfid not in(select rfid from mes_material_transfer_result where taskcode = '1' and rfid_status = '1') + DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); + if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) + { + return dtset.Tables[0]; + } + return null; + } + + /// + /// 获取烘房温湿度 + /// + /// + /// + /// + public DataTable GetTemperAndHumilly(string devicecode) + { + + string sql = $@"select isnull(isvalue,0) from base_equipment_attached where device_code = '{devicecode}' and (property='temperature' or property = 'humidity') ; "; + 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/FormingMachineService.cs b/shangjian/XGL.Data/DBService/FormingMachineService.cs index c9ec139..d1aa2e2 100644 --- a/shangjian/XGL.Data/DBService/FormingMachineService.cs +++ b/shangjian/XGL.Data/DBService/FormingMachineService.cs @@ -5,6 +5,7 @@ using System.Data; using System.Linq; using System.Text; using System.Threading.Tasks; +using XGL.Models.Model.FoamingMac; namespace XGL.Data.DBService { @@ -17,12 +18,13 @@ namespace XGL.Data.DBService /// /// public DataTable GetFormingMachineInfo(string devicecode) - { - - string sql = $@"SELECT ord.workorder_id,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 ,ord.route_code + { + string sql = $@"SELECT ord.workorder_id,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 ,ord.route_code,ord.attr1,work_batch_code,res.taskcode,res.rfid FROM [dbo].[mes_material_transfer_result] res LEFT JOIN pro_order_workorder ord on res.OrderCode = ord.workorder_id -where equipmentCode = '{devicecode}'; "; +LEFT JOIN pro_rfid_process_detail rfid on rfid.workorder_code = ord.workorder_code and rfid.rfid = res.rfid +where equipmentCode = '{devicecode}' and rfid_status = '1'; "; DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) @@ -93,7 +95,7 @@ where res.taskcode = '1' and equipmentCode = '{devicecode}'; "; } /// - /// 获取工单当前状态 + /// 获取工单当前状态,弃用 /// /// /// @@ -123,5 +125,55 @@ where res.taskcode = '1' and equipmentCode = '{devicecode}'; "; return issucc > 0 ? true : false; } + + /// + /// 更新工单 + /// + /// + /// + /// + public bool InsertData(FoamingMacModel formingModel) + { + + string sql = $@"INSERT INTO [lanju_op_xiaolan_ds].[dbo].[mes_material_transfer_result] ( + [id], + [begin], + [beout], + [equipmentCode], + [OrderCode], + [sku], + [planID], + [rfid], + [now_process_id], + [status], + [create_time], + [rfid_status], + [taskcode], + [state], + [update_time] +) +VALUES + ( + '{CommonFunc.Common.GetUUID()}', + 'GetDate()', + 'GetDate()', + '{Utils.GetAppSetting("DeviceCode")}', + '{formingModel.workorder_id}', + '{formingModel.product_code}', + '', + '{formingModel.rfid}', + '', + '4', + 'GetDate()', + '1', + '0', + '1', + 'GetDate()' + );"; + + int issucc = Utils.netClientDBHelper.executeUpdate(sql); + + return issucc > 0 ? true : false; + } } } diff --git a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll index 7ce41cb..7eae922 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 1ac96da..9275d5c 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 d45929b..0f36a13 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 da2ea05..554d2ac 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 6e8be3a..f35e275 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 b1d4766..9baf824 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 1038644..de06cda 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 d45929b..0f36a13 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 da2ea05..554d2ac 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/FoamingMac/FoamingMacModel.cs b/shangjian/XGL.Model/Model/FoamingMac/FoamingMacModel.cs index 267437c..a46abb0 100644 --- a/shangjian/XGL.Model/Model/FoamingMac/FoamingMacModel.cs +++ b/shangjian/XGL.Model/Model/FoamingMac/FoamingMacModel.cs @@ -23,5 +23,10 @@ namespace XGL.Models.Model.FoamingMac public string product_date { get; set; } public string create_by { get; set; } public string process_id { get; set; } + + public string attr1 { get; set; } + public string work_batch_code { get; set; } + public string taskcode { get; set; } + public string rfid { get; set; } } } diff --git a/shangjian/XGL.Model/bin/Debug/XGL.Models.dll b/shangjian/XGL.Model/bin/Debug/XGL.Models.dll index 6e8be3a..f35e275 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 b1d4766..9baf824 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 aa575d3..709a5dc 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 6e8be3a..f35e275 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 b1d4766..9baf824 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 bc5a9ec..61f542a 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 7c1351d..148ca2f 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 bc5a9ec..61f542a 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 7c1351d..148ca2f 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 4718bc0..34dac82 100644 --- a/shangjian/XGL/App.config +++ b/shangjian/XGL/App.config @@ -1,105 +1,108 @@  - - -
-
- - - - - - - - - - - - - - - - + + +
+
+ + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - http://192.168.1.125:8080/webservice/interfacesService - - - http://10.142.236.11:81/WebService.asmx - - - http://10.142.236.11:81/WebService.asmx - - - http://localhost:55277/WebService.asmx - - - - - http://10.142.236.11:81/WebService.asmx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://192.168.1.125:8080/webservice/interfacesService + + + http://10.142.236.11:81/WebService.asmx + + + http://10.142.236.11:81/WebService.asmx + + + http://localhost:55277/WebService.asmx + + + + + http://10.142.236.11:81/WebService.asmx + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shangjian/XGL/FormItem/Main.xaml b/shangjian/XGL/FormItem/Main.xaml index 79a536e..eabd08d 100644 --- a/shangjian/XGL/FormItem/Main.xaml +++ b/shangjian/XGL/FormItem/Main.xaml @@ -379,7 +379,7 @@ FontSize="20" Text="设备状态：" /> - + - + diff --git a/shangjian/XGL/LoginPage.xaml.cs b/shangjian/XGL/LoginPage.xaml.cs index acfb4f4..97b887e 100644 --- a/shangjian/XGL/LoginPage.xaml.cs +++ b/shangjian/XGL/LoginPage.xaml.cs @@ -47,7 +47,8 @@ namespace XGL { try { - this.dldh.IsActive = true;//遮罩层可见 + //this.dldh.IsActive = true;//遮罩层可见 + this.dldh.Visibility = Visibility.Visible;//遮罩层可见 zzdl.Visibility = Visibility.Visible; ul = new UserLogin { @@ -190,7 +191,8 @@ namespace XGL CustomMessageBox.Show("登录异常，请重试", CustomMessageBoxIcon.Error); break; } - dldh.IsActive = false; + //dldh.IsActive = false; + this.dldh.Visibility = Visibility.Hidden;//遮罩层可见 zzdl.Visibility = Visibility.Collapsed; } @@ -207,7 +209,8 @@ namespace XGL try { username.Focus(); - dldh.IsActive = false; + //dldh.IsActive = false; + this.dldh.Visibility = Visibility.Hidden;//遮罩层可见 zzdl.Visibility = Visibility.Collapsed; string name = Common.IniReadValue("登录明细", "loginUser"); username.Text = name; diff --git a/shangjian/XGL/Resources/startOrder.png b/shangjian/XGL/Resources/startOrder.png new file mode 100644 index 0000000..cce8990 Binary files /dev/null and b/shangjian/XGL/Resources/startOrder.png differ diff --git a/shangjian/XGL/Resources/startOrder.jpg b/shangjian/XGL/Resources/startOrder1.jpg similarity index 100% rename from shangjian/XGL/Resources/startOrder.jpg rename to shangjian/XGL/Resources/startOrder1.jpg diff --git a/shangjian/XGL/Tools/OrderInOutConverter.cs b/shangjian/XGL/Tools/OrderInOutConverter.cs new file mode 100644 index 0000000..421a80d --- /dev/null +++ b/shangjian/XGL/Tools/OrderInOutConverter.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Data; + +namespace XGL.Tools +{ + public class OrderInOutConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + // 根据输入值返回对应的输出值 已派发w1未派w0活动w2报工w3 + if (value.Equals("0")) + { + return "进"; + } + else + { + return "出"; + } + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + // 如果需要双向绑定，也需要实现 ConvertBack 方法 + throw new NotImplementedException(); + } + } +} diff --git a/shangjian/XGL/Views/CheckUserWin.xaml b/shangjian/XGL/Views/CheckUserWin.xaml index 5029f6d..88df865 100644 --- a/shangjian/XGL/Views/CheckUserWin.xaml +++ b/shangjian/XGL/Views/CheckUserWin.xaml @@ -32,8 +32,9 @@ - + + + + + + - + MinWidth="1000" + MinHeight="340" + Margin="20,20" + LoadingRow="dgWorkOrderInfo_LoadingRow" + HeadersVisibility="Column" + CellStyle="{StaticResource CustomCellStyle}" + HorizontalAlignment="Left" + VerticalAlignment="Top" IsReadOnly="True" + AutoGenerateColumns="False" CanUserAddRows="False"> + - + - + + - - - + + + + + + + @@ -431,8 +457,8 @@ @@ -454,7 +480,7 @@ Grid.RowSpan="5" Grid.Column="0" Grid.ColumnSpan="9" - Width="1920" - Height="800" /> + MinWidth="1000" + MinHeight="340"/> \ No newline at end of file diff --git a/shangjian/XGL/Views/LanJu_Operator.xaml.cs b/shangjian/XGL/Views/LanJu_Operator.xaml.cs index 944d768..07d7937 100644 --- a/shangjian/XGL/Views/LanJu_Operator.xaml.cs +++ b/shangjian/XGL/Views/LanJu_Operator.xaml.cs @@ -102,9 +102,9 @@ namespace XGL.Views try { List orderList = new List(); - + //modelWareHouse = new List(); - //userDbWareHouse = new DBService(); + userDbWareHouse = new DBService(); DataTable dt = formingMachineService.GetFormingMachineInfo(deviceCode); if (dt == null) return; foreach (DataRow i in dt.Rows) @@ -116,14 +116,18 @@ namespace XGL.Views order.product_code = i["product_code"].ToString(); order.car_num = Convert.ToInt32(i["car_num"].ToString()); - order.begin = Convert.ToDateTime(i["begin"].ToString()); + order.begin = Convert.ToDateTime(i["begin"].ToString()); order.status = i["status"].ToString(); order.process_id = i["route_code"].ToString(); + order.work_batch_code = i["work_batch_code"].ToString(); + order.attr1 = i["attr1"].ToString(); + order.taskcode = i["taskcode"].ToString(); + order.rfid = i["rfid"].ToString(); orderList.Add(order); - + } this.dgWorkOrderInfo.ItemsSource = null; - this.dgWorkOrderInfo.ItemsSource = orderList; + this.dgWorkOrderInfo.ItemsSource = orderList;//dt.DefaultView; } catch (Exception ex) { @@ -185,6 +189,7 @@ namespace XGL.Views private void Flow_Click(object sender, RoutedEventArgs e) { var selectedRow = dgWorkOrderInfo.SelectedItem as FoamingMacModel; + if (selectedRow == null) return; var workordercode = selectedRow.workorder_code; DataTable dt = userDbWareHouse.GetFlowInfo(workordercode); FlowInfoWin flowInfoWin = new FlowInfoWin(dt); @@ -199,7 +204,8 @@ namespace XGL.Views private void Material_Click(object sender, RoutedEventArgs e) { var selectedRow = dgWorkOrderInfo.SelectedItem as FoamingMacModel; - var processid = selectedRow.process_id; + if (selectedRow == null) return; + var processid = selectedRow.workorder_code; DataTable dt = userDbWareHouse.GetMaterialInfo(processid); LanJu_Material sopInfoWin = new LanJu_Material(dt); sopInfoWin.ShowDialog(); @@ -213,10 +219,28 @@ namespace XGL.Views private void Button_Click(object sender, RoutedEventArgs e) { var selectedRow = dgWorkOrderInfo.SelectedItem as FoamingMacModel; + if (selectedRow == null) return; var workordercode = selectedRow.workorder_code; DataTable dt = userDbWareHouse.GetSOPInfo(workordercode); SopInfoWin sopInfoWin = new SopInfoWin(dt); sopInfoWin.ShowDialog(); - } + } + + private void btnRefresh_Click(object sender, RoutedEventArgs e) + { + GetWorkOrderInfo(); + } + + private void btnComplete_Click(object sender, RoutedEventArgs e) + { + if (dgWorkOrderInfo.SelectedItems.Count == 0) + { + CustomMessageBox.Show("请选择要完成的数据", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning); + return; + } + var selectedRow = dgWorkOrderInfo.SelectedItem as FoamingMacModel; + ShouPeiWin shouPeiWin = new ShouPeiWin(selectedRow); + shouPeiWin.ShowDialog(); + } } } diff --git a/shangjian/XGL/Views/LanJu_Prepare.xaml b/shangjian/XGL/Views/LanJu_Prepare.xaml index 87b2273..1711485 100644 --- a/shangjian/XGL/Views/LanJu_Prepare.xaml +++ b/shangjian/XGL/Views/LanJu_Prepare.xaml @@ -133,16 +133,16 @@ x:Name="dgMaterialInfo" Grid.Row="1" Grid.Column="0" - Width="1500" - Height="309" + + MinHeight="309" Margin="25,0,0,0" CellStyle="{StaticResource CustomCellStyle}" - LoadingRow="dgMaterialInfo_LoadingRow" - HeadersVisibility="Column" + LoadingRow="dgMaterialInfo_LoadingRow" + HeadersVisibility="Column" AutoGenerateColumns="False" FrozenColumnCount="1" EnableColumnVirtualization="False" - ScrollViewer.HorizontalScrollBarVisibility="Visible"> + ScrollViewer.HorizontalScrollBarVisibility="Visible" IsReadOnly="True" CanUserAddRows="False">