diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpVgmSend/MsOpVgmSendDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpVgmSend/MsOpVgmSendDAL.cs index ce45baf0..d0b2f3d1 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpVgmSend/MsOpVgmSendDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpVgmSend/MsOpVgmSendDAL.cs @@ -705,7 +705,26 @@ namespace DSWeb.MvcShipping.DAL.MsOpVgmSendDAL cdc.op_seae_vgm_send.AddOrUpdate(updrec); //cdc.SaveChanges(); - result.OK("上传成功",updrec); + //result.OK("上传成功",updrec); + + + if (_r.data.carrierSendFlag < 0 || _r.data.ygtSendFlag < 0) + { + result.OK("上传成功,但存在以下问题:" + _r.data.sendRltMsg, updrec); + } + else + { + + if (string.IsNullOrWhiteSpace(_r.data.sendRltMsg)) + { + result.OK("上传成功", updrec); + } + else + { + result.OK($"上传成功:{_r.data.sendRltMsg}", updrec); + } + + } //记录日志 @@ -716,10 +735,20 @@ namespace DSWeb.MvcShipping.DAL.MsOpVgmSendDAL newrec.SENDTIME = updrec.SENDTIME; newrec.CTNNUM = updrec.CTNNUM; newrec.REMARK = updrec.REMARK; - if (!string.IsNullOrEmpty(_r.data.sendRltMsg)) + + if (_r.data.carrierSendFlag < 0 || _r.data.ygtSendFlag < 0) { - newrec.REMARK += " " + _r.data.sendRltMsg; + newrec.REMARK += " 发送失败:"+ _r.data.sendRltMsg; } + else + { + newrec.REMARK += " 发送成功:"+ _r.data.sendRltMsg; + } + + //if (!string.IsNullOrEmpty(_r.data.sendRltMsg)) + //{ + // newrec.REMARK += " " + _r.data.sendRltMsg; + //} newrec.SENDTYPE = updrec.SENDTYPE;