diff --git a/WcfControlMonitorLib/CControl.cs b/WcfControlMonitorLib/CControl.cs index 010f9fc..185d170 100644 --- a/WcfControlMonitorLib/CControl.cs +++ b/WcfControlMonitorLib/CControl.cs @@ -3412,30 +3412,6 @@ namespace WcfControlMonitorLib } else { - #region 20201021_C2厂房，上报穿梭板将要前往哪一层 - //if(devinfo.IsShuttleBorad == 1 && deviceOrder == 4) - //{ - - // sql.Remove(0, sql.Length); - // sql.Append("SELECT * FROM SHUTTLE_POSITION WHERE F_DeviceIndex = ") - // .Append(deviceIdx.ToString()); - // DataView dv = dboM.ExceSQL(sql.ToString()).Tables[0].DefaultView; - // if (dv.Count > 0) - // { - // if (gc[1] != Convert.ToInt32(dv[0]["F_Postion"])) - // { - // sql.Remove(0, sql.Length); - // sql.Append("UPDATE SHUTTLE_POSITION SET F_Postion = ") - // .Append(gc[1].ToString()).Append(" WHERE F_DeviceIndex = ") - // .Append(deviceIdx.ToString()); - // dboM.ExecuteSql(sql.ToString()); - // CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "更新管理穿梭板位置", - // deviceIdx.ToString(), - // "更改为：" + gc[1].ToString("D2")); - // } - // } - //} - #endregion sendok = sdo.SendDeviceOrder(msgIdx, MonitorIndex, deviceOrder, deviceIdx, gc[0], gc[1], gc[2], gc[3], gc[4], gc[5]); } diff --git a/WcfControlMonitorLib/SControlMonitor.cs b/WcfControlMonitorLib/SControlMonitor.cs index 49c5be6..3534b74 100644 --- a/WcfControlMonitorLib/SControlMonitor.cs +++ b/WcfControlMonitorLib/SControlMonitor.cs @@ -5586,168 +5586,11 @@ namespace WcfControlMonitorLib .Append(devinfo.DeviceIndex).Append("and F_RunStatus<>").Append(devinfo.RunState); dbo.ExceSQL(sql.ToString()); - - - #region 娉ㄩ噴涓婃捣鏅熺锛岃幏鍙栫數姹犵數閲忎俊鎭 - - - //devinfo.Battery_Status = - // devicestates[tempdb2addr + 11] + (devicestates[tempdb2addr + 10] << 8); - ////devinfo.Battery_Status = devicestates[tempdb2addr + 13]; - //sql.Remove(0, sql.Length); - ////sql.Append("UPDATE SHUTTLE_POSITION SET F_BatteryStatus = ") - //// .Append(devinfo.Battery_Status).Append(", F_Postion = ").Append(yc).Append(" WHERE F_DeviceIndex = ") - //// .Append(devinfo.DeviceIndex); - //sql.Append("UPDATE SHUTTLE_POSITION SET F_BatteryStatus = ") - // .Append(devinfo.Battery_Status).Append(" WHERE F_DeviceIndex = ") - // .Append(devinfo.DeviceIndex).Append("and F_BatteryStatus<>").Append(devinfo.Battery_Status); - //dbo.ExceSQL(sql.ToString()); - - //if (yc != 0)//涓婃捣鏅熺锛 灞備俊鎭负0涓嶆洿鏂拌〃 - //{ - // sql.Remove(0, sql.Length); - // sql.Append("UPDATE SHUTTLE_POSITION SET F_Postion = ") - // .Append(yc).Append(" WHERE F_DeviceIndex = ") - // .Append(devinfo.DeviceIndex).Append("and F_Postion<>").Append(yc); - // dbo.ExceSQL(sql.ToString()); - - //} - - //#region 20210329_涓婃捣鏅熺锛屽鏋滅數姹犵數閲忎綆浜40锛岀敓鎴愬厖鐢电殑鎵嬪伐浠诲姟 姘戣埅浜屾墍 - - //if((devinfo.XCoor!=0 )&& (devinfo.YCoor != 0 ))//dzf - //{ - // if (devinfo.RunState == 0)//绌洪棽妯″紡鎵嶈兘涓嬭揪浠诲姟 - // { - // if (devinfo.Battery_Status < 40) - // { - // //鍒ゆ柇鏄惁鏈夎杞︾殑鍏呯數浠诲姟锛屾槸鍚︽鍦ㄥ厖鐢碉紝婊¤冻鏉′欢鍐嶇敓鎴愬厖鐢典换鍔 - // sql.Remove(0, sql.Length); - // sql.Append( - // "SELECT * FROM T_Manage_Task WHERE FCONTROLTASKTYPE = 6 AND FSTARTDEVICE = '") - // .Append(devinfo.DeviceIndex.ToString()).Append("'"); - // if (dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView.Count > 0) - // { - - // } - - // else - // { - // sql.Remove(0, sql.Length); - // sql.Append("SELECT * FROM T_Manage_Task WHERE 1<>1 and FSTACK = ") - // .Append(devinfo.DeviceIndex.ToString()); - // if (dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView.Count > 0) - // { - - // } - // //鐢熸垚鍏呯數浠诲姟 - // else//寮哄埗鐢熸垚鍏呯數浠诲姟 - // { - - // //娌℃湁璋冨害棰勭害閿佹椂鍊欑敓鎴愬厖鐢典换鍔 - // sql.Remove(0, sql.Length); - // sql.Append( - // "SELECT F_ManTaskReserve FROM T_Base_Device WHERE F_DeviceIndex = ") - // .Append(devinfo.DeviceIndex.ToString()); - // int FManTaskReserve = Convert.ToInt32( - // dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView[0] - // ["F_ManTaskReserve"]); - // if (FManTaskReserve == 0) - // { - // sql.Remove(0, sql.Length); - // sql.Append( - // "SELECT F_SwitchLock FROM T_Base_Device WHERE F_DeviceIndex = ") - // .Append(devinfo.DeviceIndex.ToString()); - // int iSwitchLock = Convert.ToInt32( - // dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView[0] - // ["F_SwitchLock"]); - // if (iSwitchLock == 0) - // { - // string strCell = string.Format("{0:D2}-{1:D2}-{2:D2}", 2, 2, yc); - // int hidx1 = ccf.GetTempManageIdx(); - // string dTime1 = DateTime.Now.ToString("u"); - // dTime1 = dTime1.Substring(0, dTime1.Length - 1); - // string strBarcode = DateTime.Now.ToString("yyyyMMddhhmmss"); - // mysql.Remove(0, mysql.Length); - // mysql.Append("INSERT INTO T_Manage_Task") - // .Append( - // "(FPALLETBARCODE,FID,F_ManageTaskKindIndex,F_RELATIVECONTORLID,FCONTROLTASKTYPE,FIntoStepOK,FSTARTDEVICE,FSTARTCELL,FENDDEVICE,FENDCELL,FBEGTIME,WORK_MODE,FUseAwayFork,FSTACK,FStartLayer,FEndLayer) values('") - // .Append("Charge").Append(devinfo.DeviceIndex) - // .Append("',") - // .Append(hidx1) - // .Append(",1,-1,6,0,").Append(devinfo.DeviceIndex).Append(",'").Append(strCell) - // .Append("','") - // .Append(18001).Append("','").Append(strCell) - // .Append("','").Append(dTime1) - // .Append("',0,0,11000, ").Append(yc).Append(",").Append(yc).Append(")"); - // dbo.ExecuteSql(mysql.ToString()); - // } - // } - - // } - - - - // } - - - // } - // } - //} - - - //if (devinfo.Battery_Status > 80) - //{ - // sql.Remove(0, sql.Length); - // sql.Append( - // "UPDATE T_Base_Device SET F_SwitchLock = 0 WHERE F_SwitchLock <> 0 and F_DeviceIndex = ") - // .Append(devinfo.DeviceIndex.ToString()); - // dbo.ExecuteSql(sql.ToString()); - //} - - //#endregion - - #endregion - Model.CGetInfo.SetDeviceMessage(devinfo); sss.Remove(0, sss.Length); sss.Append("**鏉＄爜锛").Append(bc).Append("**璇绘爣蹇" + devicestates[tempdb2addr + 0]).Append("**鐘舵" + state).Append("**浠诲姟鍙" + taskindex) .Append("**鍒楀潗鏍" + xc).Append("**灞傚潗鏍" + yc); CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "鏀跺埌鍫嗗灈鏈虹姸鎬", devidx.ToString(), sss.ToString()); - - #region 20201019_C2鍘傛埧锛屼笂鎶ョ┛姊澘鎵鍦ㄤ綅缃強鏄惁鍙敤 - //sql.Remove(0, sql.Length); - //sql.Append("SELECT DEVICE_LAYER, DEVICE_STAUTS FROM DEVICE_STAUTS WHERE DEVICE_CODE = '").Append(devinfo.DeviceIndex).Append("'"); - //dvbc = dboMan.ExceSQL(sql.ToString()).Tables[0].DefaultView; - //if(dvbc.Count > 0) - //{ - // int iLayer = Convert.ToInt32(dvbc[0]["DEVICE_LAYER"]); - // int iStatus = Convert.ToInt32(dvbc[0]["DEVICE_STAUTS"]); - // int iCurrnetStatus = state >= 30 ? 0 : 1; - // StringBuilder update = new StringBuilder(); - // if(iLayer != devinfo.YCoor) - // { - // update.Append("DEVICE_LAYER = ").Append(devinfo.YCoor); - // if(iStatus != iCurrnetStatus) - // { - // update.Append(", DEVICE_STAUTS = ").Append(iCurrnetStatus); - // } - // } - // else - // { - // if (iStatus != iCurrnetStatus) - // { - // update.Append("DEVICE_STAUTS = ").Append(iCurrnetStatus); - // } - // } - // if(iLayer != devinfo.YCoor || iStatus != iCurrnetStatus) - // { - // sql.Remove(0, sql.Length); - // sql.Append("UPDATE DEVICE_STAUTS SET ").Append(update.ToString()).Append(" WHERE DEVICE_CODE = ").Append(devinfo.DeviceIndex); - // dboMan.ExecuteSql(sql.ToString()); - // } - //} - #endregion } #region 娉ㄩ噴 by lyj 20171025 //devinfo.SplitByte_0 = (devicestates[tempdb2addr + (int)devinfo.Dbw2Getlength - 2] & 1) == 1 ? 1 : 0; diff --git a/webapi/WindowsFormsApp1/APIChannel.cs b/webapi/WindowsFormsApp1/APIChannel.cs index 9dbb700..1486f31 100644 --- a/webapi/WindowsFormsApp1/APIChannel.cs +++ b/webapi/WindowsFormsApp1/APIChannel.cs @@ -719,12 +719,12 @@ namespace WindowsFormsApp1 error_code.Append(";").Append(all_checking["CONTROL_ID_REPEAT"].des); //fid閲嶅 } - //sql.Clear(); - //sql.Append(string.Format(all_checking["BARCODE_REPEAT"].sql, barcode)); - //if (dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView.Count > 0) - //{ - // error_code.Append(";").Append(all_checking["BARCODE_REPEAT"].des); //鎵樼洏鏉＄爜閲嶅 - //} + sql.Clear(); + sql.Append(string.Format(all_checking["BARCODE_REPEAT"].sql, barcode)); + if (dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView.Count > 0) + { + error_code.Append(";").Append(all_checking["BARCODE_REPEAT"].des); //鎵樼洏鏉＄爜閲嶅 + } if (string.IsNullOrEmpty(tasklevel)) { error_code.Append(";").Append("浠诲姟浼樺厛绾т负绌"); @@ -759,11 +759,20 @@ namespace WindowsFormsApp1 } sql.Clear(); sql.Append(string.Format(all_checking["CELL_NOT_EXIST"].sql, startdevice)); - if (dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView.Count == 0) + var data= dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView; + if (data.Count == 0) { error_code.Append(";").Append("璧风偣").Append(all_checking["CELL_NOT_EXIST"].des); //璧风偣璐т綅涓嶅瓨鍦 } + else { + sql.Clear(); + sql.Append(string.Format(all_checking["CELL_NOT_EXIST"].sql, data[0]["FLaneWay"], enddevice)); + if (data.Count == 0) + { + error_code.Append(";").Append(all_checking["CELL_NOT_EXIST"].des); //璺緞涓嶅瓨鍦 + } + } int endGate = 0; if (int.TryParse(this.enddevice, out endGate) == false) @@ -795,10 +804,19 @@ namespace WindowsFormsApp1 sql.Clear(); sql.Append(string.Format(all_checking["CELL_NOT_EXIST"].sql, enddevice)); - if (dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView.Count == 0) + var data= dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView; + if (data.Count == 0) { error_code.Append(";").Append("缁堢偣").Append(all_checking["CELL_NOT_EXIST"].des); //缁堢偣璐т綅涓嶅瓨鍦 } + else { + sql.Clear(); + sql.Append(string.Format(all_checking["CELL_NOT_EXIST"].sql,startdevice , data[0]["FLaneWay"])); + if (data.Count == 0) + { + error_code.Append(";").Append(all_checking["CELL_NOT_EXIST"].des); //璺緞涓嶅瓨鍦 + } + } sql.Clear(); sql.Append(string.Format(all_checking["START_GATE_NOT_EXIST"].sql, startdevice)); if (dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView.Count == 0) @@ -823,7 +841,6 @@ namespace WindowsFormsApp1 if (dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView.Count == 0) { error_code.Append(";").Append("璧风偣").Append(all_checking["CELL_NOT_EXIST"].des); //璧风偣璐т綅涓嶅瓨鍦 - } sql.Clear(); sql.Append(string.Format(all_checking["CELL_NOT_EXIST"].sql, enddevice)); @@ -832,7 +849,7 @@ namespace WindowsFormsApp1 error_code.Append(";").Append("缁堢偣").Append(all_checking["CELL_NOT_EXIST"].des); //缁堢偣璐т綅涓嶅瓨鍦 } - //绉诲簱浠诲姟濡傛灉涓嶅悓灞傦紝鏍￠獙涓嶈绉 + //绉诲簱浠诲姟濡傛灉涓嶅悓灞傦紝鏍￠獙涓嶈绉 瀛樼枒 if (startdevice.Substring(6, 2) != enddevice.Substring(6, 2)) { error_code.Append(";").Append("绉诲簱浠诲姟璧风偣缁堢偣灞傚间笉鍚");