diff --git a/webapi/WindowsFormsApp1/APIChannel.cs b/webapi/WindowsFormsApp1/APIChannel.cs index 79120e6..034d5f8 100644 --- a/webapi/WindowsFormsApp1/APIChannel.cs +++ b/webapi/WindowsFormsApp1/APIChannel.cs @@ -96,7 +96,6 @@ namespace WindowsFormsApp1 "VALUES( {0},'{1}','{2}', '{3}', '{4}', '{5}', '{6}', '{7}', '{8}', '{9}', '{10}',{11})", outtask.wms_id, -1, 0, outtask.barcode, outtask.control_type, outtask.tasklevel, outtask.warehouse, outtask.startdevice, outtask.warehouse, outtask.enddevice, outtask.begintime, 0)); dbo.ExceSQL(outtask.sql.ToString()); - } else { isOk++; @@ -160,27 +159,22 @@ namespace WindowsFormsApp1 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; - if (dv.Count == 1) + if (dv.Count == 1)//存在需要删除的任务 { int stepOk = Convert.ToInt32(dv[0]["FIntoStepOK"]);//拆分下发 if (stepOk == 0)//未拆分 { try { - sql = "delete from t_manage_task where FMANAGEID = '" + wms_wcs_cancel.taskId + "'"; - int count = dbo.ExecuteSql(sql); - if (count > 0) - { - wcs_wms_cancel.code = 0; - wcs_wms_cancel.msg = ""; - wcs_wms_cancel.data = ""; - } - else - { - wcs_wms_cancel.code = 1; - wcs_wms_cancel.msg = "取消任务失败,WCS无法删除任务!"; - wcs_wms_cancel.data = "数据库删除数据失败"; - } + //暂不考虑数据库执行删除指令失败的情况 + 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); + wcs_wms_cancel.code = 0; + wcs_wms_cancel.msg = ""; + wcs_wms_cancel.data = ""; } catch (Exception ex) {