diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpTaskController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpTaskController.cs index 759eceeb..e48a857a 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOpTaskController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpTaskController.cs @@ -241,7 +241,7 @@ namespace DSWeb.MvcShipping.Controllers { //20230129 关贸云 报关业务导入 - result = MsOpTaskDAL.关贸云报关从任务台导入报关业务(enumValue.TASKNO, Convert.ToString(Session["SHOWNAME"]).ToString().Trim(),Convert.ToString(Session["USERID"]).ToString().Trim()); + result = MsOpTaskDAL.关贸云报关从任务台导入报关业务(enumValue, Convert.ToString(Session["SHOWNAME"]).ToString().Trim(),Convert.ToString(Session["USERID"]).ToString().Trim()); } else { @@ -279,6 +279,7 @@ namespace DSWeb.MvcShipping.Controllers } + public ContentResult UpTaskEmail(string data) { diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpTask/MsOpTaskDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpTask/MsOpTaskDAL.cs index 8fdf41a3..5912d2e0 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpTask/MsOpTaskDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpTask/MsOpTaskDAL.cs @@ -994,13 +994,15 @@ namespace DSWeb.Areas.MvcShipping.DAL return result; } - public static DBResult 关贸云报关从任务台导入报关业务(string TASKNO,string OP,string userid) + public static DBResult 关贸云报关从任务台导入报关业务(OpTask TASK,string OP,string userid) { var result = new DBResult(); try { //提取两个op_logicinfo中的json + var TASKNO = TASK.TASKNO; + var 报关业务logic = BasicDataRefDAL.GetLogicInfo(TASKNO, "关贸云报关"); var 报关业务json = ""; @@ -1036,7 +1038,7 @@ namespace DSWeb.Areas.MvcShipping.DAL } result.OK("导入完成"); - + SetTaskSuccess(TASK, OP); } catch (Exception e) { @@ -1047,6 +1049,17 @@ namespace DSWeb.Areas.MvcShipping.DAL #endregion + public static void SetTaskSuccess(OpTask TASK,string USERNAME) + { + T_ALL_DA T_ALL_DA = new EntityDA.T_ALL_DA(); + var blUpSQL = " insert into op_task_state (GID,TASKNO,TASKSTATUS,OP,OPTIME) values (newid(),'" + TASK.TASKNO + "','已完成','" + USERNAME + "',GETDATE())"; + bool bl = T_ALL_DA.GetExecuteSqlCommand(blUpSQL); + + blUpSQL = " update op_task set ISCOMPLETE=1,TASKSTATUS='已完成',COMPLETETYPE='人工',COMPLETETIME=GETDATE(),OP='" + USERNAME + "' where GID='" + TASK.GID + "'"; + bl = T_ALL_DA.GetExecuteSqlCommand(blUpSQL); + } + + #region 参照部分