Browse Source

服务端调度任务号int改long,修改相关逻辑

master
志铭 吕 2 months ago
parent
commit
ba76b6b692
  1. 16
      WcfControlMonitorLib/CCallService.cs
  2. 4
      webapi/WindowsFormsApp1/APIChannel.cs

16
WcfControlMonitorLib/CCallService.cs

@ -1031,7 +1031,7 @@ namespace WcfControlMonitorLib
/// <param name="ask_data"></param>
/// <param name="resp_data"></param>
/// <returns></returns>
public static string UpdateTaskStatusToWMS(int Managertask_Id,int state,out WMS_WCS_PARAM_UPDATE resp_data)
public static string UpdateTaskStatusToWMS(long Managertask_Id,int state,out WMS_WCS_PARAM_UPDATE resp_data)
{
string bResult = string.Empty;
bool sResult = true;
@ -1373,6 +1373,8 @@ namespace WcfControlMonitorLib
{
try
{
StringBuilder sql = new StringBuilder();
StringBuilder sql2 = new StringBuilder();
string bResult = "";
DataView dataIOtaskstart = new DataView();
//DataView dvl = new DataView();
@ -1393,7 +1395,7 @@ namespace WcfControlMonitorLib
for (int i = 0; i < dataIOtaskstart.Count; i++)
{
CommonClassLib.CCarryConvert.WriteDarkCasket("CallService", "taskStatusReporstart", "准备开始调用wms服务:", $"ID:{dataIOtaskstart[i]["CONTROL_ID"]},条码{dataIOtaskstart[i]["STOCK_BARCODE"]}");
UpdateTaskStatusToWMS(Convert.ToInt16(dataIOtaskstart[i]["CONTROL_ID"]),1,out WMS_WCS_PARAM_UPDATE resp_data);//1任务开始
UpdateTaskStatusToWMS(Convert.ToInt64(dataIOtaskstart[i]["CONTROL_ID"]),1,out WMS_WCS_PARAM_UPDATE resp_data);//1任务开始
if (resp_data.code == 0)
{ //成功
sql.Clear();
@ -1409,7 +1411,7 @@ namespace WcfControlMonitorLib
#endregion
#region 发送任务完成给LCS
sql.Clear();
sql.Append("select * from IO_CONTROL WHERE CONTROL_STATUS = 999 OR CONTROL_STATUS = 900 OR CONTROL_STATUS = 970 and IsSendLCS=1 and CONTROL_TASK_TYPE<>99 ");//查询还未发送给WMS但是任务状态已经是完成的状态的任务
sql.Append("select * from IO_CONTROL WHERE (CONTROL_STATUS = 999 OR CONTROL_STATUS = 900 OR CONTROL_STATUS = 970) and CONTROL_TASK_TYPE<>99 ");//查询还未发送给WMS但是任务状态已经是完成的状态的任务 不用校验issendlcs=1的情况,防止还没上传给WMS就报错了
dataIOtask2finish = dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView;
if (dataIOtask2finish.Count > 0)
@ -1417,7 +1419,7 @@ namespace WcfControlMonitorLib
for (int i = 0; i < dataIOtask2finish.Count; i++)
{
CommonClassLib.CCarryConvert.WriteDarkCasket("CallService", "taskStatusReporfinish", "准备开始调用wms服务:", $"ID:{dataIOtask2finish[i]["CONTROL_ID"]},条码{dataIOtask2finish[i]["STOCK_BARCODE"]}");
UpdateTaskStatusToWMS(Convert.ToInt16(dataIOtask2finish[i]["CONTROL_ID"]),2, out WMS_WCS_PARAM_UPDATE resp_data);//2任务结束
UpdateTaskStatusToWMS(Convert.ToInt64(dataIOtask2finish[i]["CONTROL_ID"]),2, out WMS_WCS_PARAM_UPDATE resp_data);//2任务结束
if (resp_data.code == 0)
{ //成功
sql.Clear();
@ -1440,7 +1442,7 @@ namespace WcfControlMonitorLib
for (int i = 0; i < dataIOBacktaskfinish.Count; i++)
{
sql.Clear();
sql.Append($"delete from IO_CONTROL where MANAGE_ID={dataIOtask2finish[i]["MANAGE_ID"]}");//查询还未发送给WMS但是任务状态已经是拆分完的状态的任务
sql.Append($"delete from IO_CONTROL where CONTROL_ID={dataIOBacktaskfinish[i]["CONTROL_ID"]}");//查询还未发送给WMS但是任务状态已经是拆分完的状态的任务
dbo.ExceSQL(sql.ToString());
}
}
@ -1467,6 +1469,8 @@ namespace WcfControlMonitorLib
{
try
{
StringBuilder sql =new StringBuilder();
StringBuilder sql2 = new StringBuilder();
DataView dv = new DataView(); DataView dvl = new DataView();
string dtime = DateTime.Now.ToString("u");
dtime = dtime.Substring(0, dtime.Length - 1);
@ -1521,6 +1525,8 @@ namespace WcfControlMonitorLib
while (!exitThreadInAGVPLCAsk)
{
try {
StringBuilder sql = new StringBuilder();
StringBuilder sql2 = new StringBuilder();
DataView dv = new DataView(); DataView dvl = new DataView();
string dtime = DateTime.Now.ToString("u");
dtime = dtime.Substring(0, dtime.Length - 1);

4
webapi/WindowsFormsApp1/APIChannel.cs

@ -86,7 +86,7 @@ namespace WindowsFormsApp1
// CCallService.OUT_MOVE_RES outReturn = new CCallService.OUT_MOVE_RES();
foreach (var task in outdata)
{
// task.taskId = task.taskId.Trim('D').Trim('C');
IO_CONTROL outtask = new IO_CONTROL(task, wms_wcs.msgTime, wms_wcs.priority.ToString());
if (outtask.CheckData( out string msg) == true)
{
@ -718,7 +718,7 @@ namespace WindowsFormsApp1
error_code.Append(";").Append("条码为空");
}
if (int.TryParse(this.wms_id, out int controlid) == false)
if (long.TryParse(this.wms_id, out long controlid) == false)
{
error_code.Append(";").Append(all_checking["CONTROL_ID_NOT_NUM"].des); //controlid不为数字
}

Loading…
Cancel
Save