zhaoaomin 2 years ago
commit f0467c983a

Binary file not shown.

@ -42,3 +42,47 @@ D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\C
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CopyComplete
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.dll
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.pdb
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\Config\log4net.config
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\CommonFunc.dll.config
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\CommonFunc.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\CommonFunc.pdb
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\BCrypt.Net-Next.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\Google.Protobuf.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\log4net.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\MySql.Data.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\Newtonsoft.Json.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\NLog.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\NPOI.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\NPOI.OOXML.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\NPOI.OpenXml4Net.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\NPOI.OpenXmlFormats.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\QRCoder.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\System.Buffers.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\System.Data.SqlClient.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\System.Memory.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\System.Numerics.Vectors.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\System.Runtime.CompilerServices.Unsafe.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\XGL.Models.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\XGL.Models.pdb
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\XGL.Models.dll.config
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\BCrypt.Net-Next.xml
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\Google.Protobuf.xml
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\System.Buffers.xml
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\System.Data.SqlClient.xml
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\System.Memory.xml
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\System.Numerics.Vectors.xml
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\System.Runtime.CompilerServices.Unsafe.xml
E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.AssemblyReference.cache
E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\Tools\PauseOrderWin.baml
E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\Tools\PauseRecoverWin.baml
E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\HMessageBox.g.cs
E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\Tools\PauseOrderWin.g.cs
E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\Tools\PauseRecoverWin.g.cs
E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc_MarkupCompile.cache
E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc_MarkupCompile.lref
E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\HMessageBox.baml
E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.g.resources
E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CoreCompileInputs.cache
E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CopyComplete
E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.pdb

@ -895,7 +895,7 @@ where workorder.workorder_id = '{workOrderNo}'";
if (selectin!="")
{
//根据工单获取成型机
string sql = $@"SELECT Top 2000 * FROM [dbo].[mes_interface_log] where CONVERT(VARCHAR(10), creter_time , 120)= CONVERT(VARCHAR(10), '{datetime}' , 120) and remark like '%{selectin}%' order by creter_time desc ; ";
string sql = $@"SELECT Top 2000 * FROM [dbo].[mes_interface_log] where CONVERT(VARCHAR(10), creter_time , 120)= CONVERT(VARCHAR(10), '{datetime}' , 120) and remark like '%{selectin}%' and messsge like '%{key}%' order by creter_time desc ; ";
DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
@ -906,7 +906,7 @@ where workorder.workorder_id = '{workOrderNo}'";
else
{
//根据工单获取成型机
string sql = $@"SELECT Top 2000 * FROM [dbo].[mes_interface_log] where CONVERT(VARCHAR(10), creter_time , 120)= CONVERT(VARCHAR(10), '{datetime}' , 120) and remark like '%{key}%' order by creter_time desc ; ";
string sql = $@"SELECT Top 2000 * FROM [dbo].[mes_interface_log] where CONVERT(VARCHAR(10), creter_time , 120)= CONVERT(VARCHAR(10), '{datetime}' , 120) and messsge like '%{key}%' order by creter_time desc ; ";
DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)

@ -45,9 +45,18 @@ namespace XGL.Data.DBService
/// <returns></returns>
public DataTable GetDringRoomData(string devicecode,int inout)
{
//string sqlHF = $@"SELECT * FROM [dbo].[base_equipment_attached] where device_code='{devicecode}' and property='Intheoven' ;";
////获取绑定中且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 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')
string sql = $@"SELECT ROW_NUMBER() OVER (ORDER BY dry.create_time) AS RowNumber,rfid_no,device_code,type,dry.create_time,dry.update_time,factory_no,dry.workorder_code,material_code,product_name FROM [dbo].[mes_dryinghouse_info] dry
LEFT JOIN pro_order_workorder workorder on dry.workorder_code = workorder.workorder_code where device_code = '{devicecode}' and type = '{inout}' and dry.del_flag='0' order by dry.create_time ;";
//DataSet dtsetresult = Utils.netClientDBHelper.getDataSet(sqlHF);
//string adwdwad = dtsetresult.Tables[0].Rows[7].ToString();
//int number = Convert.ToInt32();
string sql = $@"SELECT TOP 23 ROW_NUMBER() OVER (ORDER BY dry.create_time) AS RowNumber,rfid_no,device_code,type,dry.create_time,dry.update_time,factory_no,dry.workorder_code,material_code,product_name FROM [dbo].[mes_dryinghouse_info] dry
LEFT JOIN pro_order_workorder workorder on dry.workorder_code = workorder.workorder_code where device_code = '{devicecode}' and type = '{inout}' and dry.del_flag='0' order by dry.create_time desc ;";
//获取绑定中且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 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')";

@ -12,7 +12,7 @@
<!--设备编码-->
<add key="DeviceCode" value="C3" />
<!--上位机类型 0:工单准备1成型机\shoupei2烘房,3:人员登录-->
<add key="ClientMode" value="3" />
<add key="ClientMode" value="1" />
<add key="SerialPort" value="COM5" />
<add key="DryingHouseList" value="H16,H17,H18" />
<!--线体编码-->

Loading…
Cancel
Save