Browse Source

修改WCS-LCS接口

master
志铭 吕 3 months ago
parent
commit
fbb00fcb70
  1. 2
      WcfControlMonitorLib/CCallService.cs
  2. 2
      WcfControlMonitorLib/CObtainTask.cs
  3. 6
      webapi/WindowsFormsApp1/APIChannel.cs

2
WcfControlMonitorLib/CCallService.cs

@ -629,7 +629,7 @@ namespace WcfControlMonitorLib
/// <summary> /// <summary>
/// 任务优先级 /// 任务优先级
/// </summary> /// </summary>
public string priority { get; set; }
public int priority { get; set; }
/// <summary> /// <summary>
/// 下发时间 /// 下发时间
/// </summary> /// </summary>

2
WcfControlMonitorLib/CObtainTask.cs

@ -196,8 +196,8 @@ namespace WcfControlMonitorLib
sbs.Append(" and END_DEVICE_CODE='").Append(dvc[i]["F_DeviceIndex"]).Append("'"); sbs.Append(" and END_DEVICE_CODE='").Append(dvc[i]["F_DeviceIndex"]).Append("'");
sbs.Append(" order by CONTROL_TASK_LEVEL desc,CONTROL_BEGIN_TIME asc,CONTROL_ID asc "); sbs.Append(" order by CONTROL_TASK_LEVEL desc,CONTROL_BEGIN_TIME asc,CONTROL_ID asc ");
dvIOC = dboM.ExceSQL(sbs.ToString()).Tables[0].DefaultView; dvIOC = dboM.ExceSQL(sbs.ToString()).Tables[0].DefaultView;
for (int inew = 0; inew < dvIOC.Count; inew++)
{ {
for (int inew = 0; inew < dvIOC.Count; inew++)
ObtainDoubleForkTask(dvIOC[inew]["CONTROL_ID"], "0"); ObtainDoubleForkTask(dvIOC[inew]["CONTROL_ID"], "0");
} }
leftTask = leftTask - dvIOC.Count; leftTask = leftTask - dvIOC.Count;

6
webapi/WindowsFormsApp1/APIChannel.cs

@ -262,7 +262,7 @@ namespace WindowsFormsApp1
if (dv.Count == 1) if (dv.Count == 1)
{ {
string sql1 = "updata t_manage_task set F_MonitorTaskLevel="+ wms_wcs_cancel.priority+ " where FID = '" + wms_wcs_cancel.taskId + "'";
string sql1 = "update t_manage_task set FTaskLevel="+ wms_wcs_cancel.priority+ " where FID = '" + wms_wcs_cancel.taskId + "'";
int count = dbo.ExecuteSql(sql1); int count = dbo.ExecuteSql(sql1);
if (count > 0) if (count > 0)
{ {
@ -289,6 +289,8 @@ namespace WindowsFormsApp1
wcs_wms_cancel.data = "数据库删除数据失败"; wcs_wms_cancel.data = "数据库删除数据失败";
} }
} }
returnJson = Model.JsonHelper.Serializer(wcs_wms_cancel);
CommonClassLib.CCarryConvert.WriteLog("WEBAPI", "返回报文", returnJson, "");
return returnJson; return returnJson;
} }
catch (Exception ex) catch (Exception ex)
@ -305,7 +307,7 @@ namespace WindowsFormsApp1
}; };
#endregion #endregion
#region WMS调用, 在此处理,入库任务 单条形式
#region WMS调用, 在此处理,入库任务 单条形式 无用
Post["/api/wcs/thirdParty/deliverWmsInTask", true] = async (x, ct) => Post["/api/wcs/thirdParty/deliverWmsInTask", true] = async (x, ct) =>
{ {
try try

Loading…
Cancel
Save