diff --git a/WcfControlMonitorLib/SControlMonitor.cs b/WcfControlMonitorLib/SControlMonitor.cs index 8da9184..a5c628a 100644 --- a/WcfControlMonitorLib/SControlMonitor.cs +++ b/WcfControlMonitorLib/SControlMonitor.cs @@ -6619,37 +6619,37 @@ namespace WcfControlMonitorLib } //获取堆垛机设备信息 - var device= Model.CGetInfo.GetDeviceInfo(dcode); + //var device= Model.CGetInfo.GetDeviceInfo(dcode); - dvbc = dboMan.ExceSQL(string.Format("SELECT 条码 FROM V_Monitor_Task WHERE 设备指令索引={0})", device.TaskNo)).Tables[0].DefaultView;//从视图表获取任务条码 - if (dvbc.Count > 0) - { - if (dvbc[0]["条码"].ToString() == barcode.ToString())//条码和扫码结果一致正常回复 - { - witemnames[0].Append(Model.CGeneralFunction.DBGet).Append(".").Append(Convert.ToString(devinfo.Dbw2Address + 0)).Append(",b");//20130510 - wv[0].Clear(); - wv[0].Append("2"); - sdo = CommModeCreate.CreateSendDeviceOrder(devidx); - sdo.WriteDBData(witemnames, wv, devinfo.S7Connection); - } - else - {//条码和扫码结果不一致,暂定回复99 - witemnames[0].Append(Model.CGeneralFunction.DBGet).Append(".").Append(Convert.ToString(devinfo.Dbw2Address + 0)).Append(",b");//20130510 - wv[0].Clear(); - wv[0].Append("99"); - sdo = CommModeCreate.CreateSendDeviceOrder(devidx); - sdo.WriteDBData(witemnames, wv, devinfo.S7Connection); - } - } - else//无对应任务 暂定正常回复 - { + // dvbc = dboMan.ExceSQL(string.Format("SELECT 条码 FROM V_Monitor_Task WHERE 设备指令索引={0})", device.TaskNo)).Tables[0].DefaultView;//从视图表获取任务条码 + // if (dvbc.Count > 0) + // { + // if (dvbc[0]["条码"].ToString() == barcode.ToString())//条码和扫码结果一致正常回复 + // { + // witemnames[0].Append(Model.CGeneralFunction.DBGet).Append(".").Append(Convert.ToString(devinfo.Dbw2Address + 0)).Append(",b");//20130510 + // wv[0].Clear(); + // wv[0].Append("2"); + // sdo = CommModeCreate.CreateSendDeviceOrder(devidx); + // sdo.WriteDBData(witemnames, wv, devinfo.S7Connection); + // } + // else + // {//条码和扫码结果不一致,暂定回复99 + // witemnames[0].Append(Model.CGeneralFunction.DBGet).Append(".").Append(Convert.ToString(devinfo.Dbw2Address + 0)).Append(",b");//20130510 + // wv[0].Clear(); + // wv[0].Append("99"); + // sdo = CommModeCreate.CreateSendDeviceOrder(devidx); + // sdo.WriteDBData(witemnames, wv, devinfo.S7Connection); + // } + // } + // else//无对应任务 暂定正常回复 + // { witemnames[0].Append(Model.CGeneralFunction.DBGet).Append(".").Append(Convert.ToString(devinfo.Dbw2Address + 0)).Append(",b");//20130510 wv[0].Clear(); wv[0].Append("2"); sdo = CommModeCreate.CreateSendDeviceOrder(devidx); sdo.WriteDBData(witemnames, wv, devinfo.S7Connection); - } - b + //} + // CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "写条码应答", devidx.ToString(), "写标志2**源条码:" + barcode.ToString().ToUpper()); break; default: