From bffe23880e0906782db8770e660a7ba60c90dd37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BF=97=E9=93=AD=20=E5=90=95?= <896951544@qq.com> Date: Thu, 15 May 2025 16:53:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1=E6=9C=AA?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E7=8A=B6=E6=80=81=E5=85=81=E8=AE=B8=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webapi/WindowsFormsApp1/APIChannel.cs | 59 ++++++++++++++++++--------- 1 file changed, 39 insertions(+), 20 deletions(-) diff --git a/webapi/WindowsFormsApp1/APIChannel.cs b/webapi/WindowsFormsApp1/APIChannel.cs index a7229de..311ca04 100644 --- a/webapi/WindowsFormsApp1/APIChannel.cs +++ b/webapi/WindowsFormsApp1/APIChannel.cs @@ -150,6 +150,7 @@ namespace WindowsFormsApp1 CCallService.WCS_WMS_PARAM_Priority wcs_wms_cancel = new CCallService.WCS_WMS_PARAM_Priority(); //返回的报文 string err = string.Empty; string returnJson = string.Empty; + StringBuilder sql = new StringBuilder(); DataView dv = new DataView(); DataView dv1 = new DataView(); if (wms_wcs_cancel != null) @@ -158,31 +159,47 @@ namespace WindowsFormsApp1 //canceldata = wms_wcs_cancel.data; // CCallService.CANCEL_RES_DATA cancelReturn = new CCallService.CANCEL_RES_DATA(); wms_wcs_cancel.taskId = wms_wcs_cancel.taskId.Trim('D').Trim('C'); - string sql = "select * from t_manage_task where FID = '" + wms_wcs_cancel.taskId + "'"; - dv = dbo.ExceSQL(sql).Tables[0].DefaultView; + sql.Clear(); + sql.Append("select * from t_manage_task where FID = '").Append(wms_wcs_cancel.taskId).Append("'"); + dv = dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView; if (dv.Count == 1)//存在需要删除的任务 { int stepOk = Convert.ToInt32(dv[0]["FIntoStepOK"]);//拆分下发 + int FSTATUS = Convert.ToInt32(dv[0]["FSTATUS"]);//任务未执行 if (stepOk == 0)//未拆分 { - try - { - //暂不考虑数据库执行删除指令失败的情况 - string sql1 = "delete from t_manage_task where FMANAGEID = '" + wms_wcs_cancel.taskId + "'"; - dbo.ExecuteSql(sql); - //同时还要删除IOControl表的任务信息 - string sql2 = "delete from IO_CONTROL where MANAGE_ID = '" + wms_wcs_cancel.taskId + "'"; - dbo.ExecuteSql(sql2); + //暂不考虑数据库执行删除指令失败的情况 + sql.Clear(); + sql.Append("delete from t_manage_task where FID = '").Append(wms_wcs_cancel.taskId).Append("'"); + dbo.ExecuteSql(sql.ToString()); + //同时还要删除IOControl表的任务信息 + sql.Clear(); + sql.Append("delete from IO_CONTROL where MANAGE_ID = '").Append(wms_wcs_cancel.taskId).Append("'"); + dbo.ExecuteSql(sql.ToString()); wcs_wms_cancel.code = 0; wcs_wms_cancel.msg = ""; wcs_wms_cancel.data = ""; - } - catch (Exception ex) - { - wcs_wms_cancel.code = 1; - wcs_wms_cancel.msg = "取消任务失败，WCS无法删除任务!"; + + } + else if (stepOk == 1 && FSTATUS == 0) { + sql.Clear(); + sql.Append("delete from T_Monitor_Task where F_ManageTaskIndex = '").Append(wms_wcs_cancel.taskId).Append("'"); + dbo.ExecuteSql(sql.ToString()); + sql.Clear(); + sql.Append("delete from t_manage_task where FID = '").Append(wms_wcs_cancel.taskId).Append("'"); + var count= dbo.ExecuteSql(sql.ToString()); + //暂不考虑数据库执行删除指令失败的情况 + + + //同时还要删除IOControl表的任务信息 + sql.Clear(); + sql.Append("delete from IO_CONTROL where MANAGE_ID = '").Append(wms_wcs_cancel.taskId).Append("'"); + dbo.ExecuteSql(sql.ToString()); + wcs_wms_cancel.code = 0; + wcs_wms_cancel.msg = ""; wcs_wms_cancel.data = ""; - } + + } else { @@ -207,11 +224,13 @@ namespace WindowsFormsApp1 wcs_wms_cancel.data = ""; } if (wcs_wms_cancel.code == 0) {//删除成功 - string sql1 = "select * from IO_CONTROL where CONTROL_ID = '" + wms_wcs_cancel.taskId + "'"; - dv1 = dbo.ExceSQL(sql1).Tables[0].DefaultView; + sql.Clear(); + sql.Append("select * from IO_CONTROL where CONTROL_ID = '").Append(wms_wcs_cancel.taskId).Append("'"); + dv1 = dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView; if (dv1.Count > 0) { - string sql2 = "delete from IO_CONTROL where CONTROL_ID = '" + wms_wcs_cancel.taskId + "'"; - dbo.ExceSQL(sql2); + sql.Clear(); + sql.Append("delete from IO_CONTROL where CONTROL_ID = '").Append(wms_wcs_cancel.taskId).Append("'"); + dbo.ExceSQL(sql.ToString()); } } }