Browse Source

add device

master
SHENGJIHU 3 weeks ago
parent
commit
25cdb6c924
  1. 1063
      调度分布式系统_天津康师傅顶益项目/ControlMonitorClient/FrmControlMonitor.designer.cs
  2. 14616
      调度分布式系统_天津康师傅顶益项目/ControlMonitorClient/FrmControlMonitor.resx
  3. 6
      调度分布式系统_天津康师傅顶益项目/WcfControlMonitorLib/CDisassembleTask.cs
  4. BIN
      路径拆分表.xlsx
  5. BIN
      路径表.xlsx

1063
调度分布式系统_天津康师傅顶益项目/ControlMonitorClient/FrmControlMonitor.designer.cs

File diff suppressed because it is too large

14616
调度分布式系统_天津康师傅顶益项目/ControlMonitorClient/FrmControlMonitor.resx

File diff suppressed because it is too large

6
调度分布式系统_天津康师傅顶益项目/WcfControlMonitorLib/CDisassembleTask.cs

@ -1130,9 +1130,9 @@ namespace WcfControlMonitorLib
).Append(" and F_ManageTaskKindIndex=").Append(dv[j]["F_ManageTaskKindIndex"]);
dbo.ExceSQL(sql.ToString());
CommonClassLib.CCarryConvert.WriteDarkCasket("CreateMonitor", "拆分标记成功(R-1)", "", dv[i]["FID"].ToString());
CommonClassLib.CCarryConvert.WriteDarkCasket("CreateMonitor", "拆分标记成功(R-1)", "", dv[j]["FID"].ToString());
DisassembleUnallow.Clear();
UpdateDisassembleUnallow(DisassembleUnallow, Convert.ToInt32(dv[i]["FID"]));
UpdateDisassembleUnallow(DisassembleUnallow, Convert.ToInt32(dv[j]["FID"]));
#region 20101028增加出库关联
deviceInfo = Model.CGetInfo.GetDeviceInfo(Convert.ToInt32(dv[j]["FSTACK"]));
@ -1278,7 +1278,7 @@ namespace WcfControlMonitorLib
{
continue;
}
//被锁定
//被锁定,判断该堆垛机是否停用
sql.Remove(0, sql.Length);
sql.Append("SELECT F_DeviceIndex, F_LockedState FROM T_Base_Device where F_DeviceIndex=").Append(dvStack[i]["F_StackIndex"]).Append(" and (F_LockedState>0 or F_ManTaskReserve>0)");
dv1 = dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView;

BIN
路径拆分表.xlsx

Binary file not shown.

BIN
路径表.xlsx

Binary file not shown.
Loading…
Cancel
Save