dengyu
/
DS7
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'QDHHYT' of http://60.209.125.238:20010/dengyu/DS7 into QDHHYT

Browse Source
QDHHYT
dengyu 1 week ago
parent 6d9748beb5 820652bcd4
commit 5a0a994cc7
5 changed files with 166 additions and 40 deletions
Show Stats Download Patch File Download Diff File

4
DSWeb/Areas/MvcShipping/Comm/MailMessage.cs
Unescape Escape View File

@ -42,6 +42,9 @@ namespace CommonTool.MailKit
multipart.Add(alternative); multipart.Add(alternative);
} }
if (mailBodyEntity.MailFiles != null)
{
//插入附件 //插入附件
foreach (var mailFile in mailBodyEntity.MailFiles) foreach (var mailFile in mailBodyEntity.MailFiles)
{ {
@ -52,6 +55,7 @@ namespace CommonTool.MailKit
multipart.Add(mimePart); multipart.Add(mimePart);
} }
} }
}
//组合邮件内容 //组合邮件内容
message.Body = multipart; message.Body = multipart;

68
DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs
Unescape Escape View File

@ -5605,6 +5605,15 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
db.ExecuteNonQuery(cmdDelete, tran); db.ExecuteNonQuery(cmdDelete, tran);
var cmdUpdateOrder = db.GetSqlStringCommand("update crm_seaeorder set ORSTATUS=4 where bsno='" + billno.BSNO + "'"); var cmdUpdateOrder = db.GetSqlStringCommand("update crm_seaeorder set ORSTATUS=4 where bsno='" + billno.BSNO + "'");
db.ExecuteNonQuery(cmdUpdateOrder, tran); db.ExecuteNonQuery(cmdUpdateOrder, tran);
var OPPRE = MsOpSeaePreDAL.MsOpSeaePreDAL.GetData(" ORDNO IN (SELECT ORDNO FROM crm_seaeorder WHERE BSNO='" + billno.BSNO + "')",db,tran);
if (!string.IsNullOrEmpty(OPPRE.ORDNO))
{
var cmdUpdateOrder2 = db.GetSqlStringCommand("update op_seae_pre set ISORDER=0,ISUP=0,ORDNO='' where ORDNO='" + OPPRE.ORDNO + "'");
db.ExecuteNonQuery(cmdUpdateOrder2, tran);
SENDCANCELORDNO(OPPRE, billno);
}
} }
else else
{ {
@ -5820,39 +5829,37 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
var mailtitle = "舱位回收 "; var mailtitle = "舱位回收 ";
if (!string.IsNullOrEmpty(headData.CARRIER)) if (!string.IsNullOrEmpty(opSeae.CARRIER))
mailtitle = mailtitle + headData.CARRIER; mailtitle = mailtitle + "-" + opSeae.CARRIER;
if (!string.IsNullOrEmpty(headData.ORDNO)) if (!string.IsNullOrEmpty(headData.ORDNO))
mailtitle = mailtitle + "-" + headData.ORDNO; mailtitle = mailtitle + "-" + headData.ORDNO;
if (!string.IsNullOrEmpty(headData.MBLNO)) if (!string.IsNullOrEmpty(opSeae.MBLNO))
mailtitle = mailtitle + "-" + headData.MBLNO; mailtitle = mailtitle + "-" + opSeae.MBLNO;
if (!string.IsNullOrEmpty(headData.MBLNO)) if (!string.IsNullOrEmpty(opSeae.LANE))
mailtitle = mailtitle + "-" + headData.MBLNO; mailtitle = mailtitle + "-" + opSeae.LANE;
if (!string.IsNullOrEmpty(headData.LANE)) if (!string.IsNullOrEmpty(opSeae.ETD))
mailtitle = mailtitle + "-" + headData.LANE; mailtitle = mailtitle + "-" + opSeae.ETD;
if (!string.IsNullOrEmpty(headData.ETD)) if (!string.IsNullOrEmpty(opSeae.PORTDISCHARGE))
mailtitle = mailtitle + "-" + headData.ETD; mailtitle = mailtitle + "-" + opSeae.PORTDISCHARGE;
if (!string.IsNullOrEmpty(headData.PORTDISCHARGE)) if (!string.IsNullOrEmpty(opSeae.COUNTRY))
mailtitle = mailtitle + "-" + headData.PORTDISCHARGE; mailtitle = mailtitle + "," + opSeae.COUNTRY;
if (!string.IsNullOrEmpty(headData.COUNTRY)) if (!string.IsNullOrEmpty(opSeae.CNTRTOTAL))
mailtitle = mailtitle + "," + headData.COUNTRY; mailtitle = mailtitle + "-" + opSeae.CNTRTOTAL;
if (!string.IsNullOrEmpty(headData.CNTRTOTAL))
mailtitle = mailtitle + "-" + headData.CNTRTOTAL;
var Body = new StringBuilder(); var Body = new StringBuilder();
Body.Append("<html> <Body>"); Body.Append("<html> <Body>");
Body.Append("<br />提单号：" + headData.MBLNO); Body.Append("<br />提单号：" + opSeae.MBLNO);
Body.Append("<br />运费协议号：" + headData.CONTRACTNO); Body.Append("<br />运费协议号：" + opSeae.CONTRACTNO);
Body.Append("<br />货物标识：" + opSeae.CARGOID); Body.Append("<br />货物标识：" + opSeae.CARGOID);
Body.Append("<br />开船日期：" + headData.ETD); Body.Append("<br />开船日期：" + opSeae.ETD);
Body.Append("<br />箱型箱量：" + headData.CNTRTOTAL); Body.Append("<br />箱型箱量：" + opSeae.CNTRTOTAL);
Body.Append("<br />起运港：" + headData.PORTLOAD); Body.Append("<br />起运港：" + opSeae.PORTLOAD);
Body.Append("<br />目的港及国家：" + headData.PORTDISCHARGE+","+headData.COUNTRY); Body.Append("<br />目的港及国家：" + opSeae.PORTDISCHARGE+","+ opSeae.COUNTRY);
Body.Append("<br />五字代码：" + headData.PORTDISCHARGEID); Body.Append("<br />五字代码：" + opSeae.PORTDISCHARGEID);
Body.Append("<br />船名航次：" + headData.VESSEL + headData.VOYNO); Body.Append("<br />船名航次：" + opSeae.VESSEL + opSeae.VOYNO);
Body.Append("<br />订舱代理：" + headData.FORWARDER); Body.Append("<br />订舱代理：" + opSeae.FORWARDER);
Body.Append("<br />订舱号：" + headData.ORDERNO); Body.Append("<br />订舱号：" + opSeae.ORDERNO);
Body.Append("<br />退仓客户：" + headData.CUSTOMERNAME); Body.Append("<br />退仓客户：" + opSeae.CUSTOMERNAME);
Body.Append("</Body></html> "); Body.Append("</Body></html> ");
var mailto = ""; var mailto = "";
void mailtoAdd(string mail) void mailtoAdd(string mail)
@ -5862,7 +5869,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
else else
mailto = mailto + ";" + mail; mailto = mailto + ";" + mail;
} }
var oplist = SysUserDAL.GetDataList("U.SHOWNAME='" + headData.CUSTSERVICE + "'"); var oplist = SysUserDAL.GetDataList("U.SHOWNAME='" + opSeae.CUSTSERVICE + "'");
foreach (var opbs in oplist) foreach (var opbs in oplist)
{ {
if (opbs.EMAIL1 != "") if (opbs.EMAIL1 != "")
@ -5875,13 +5882,13 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
{ {
result = SendMailWithNoFile(mailtitle, Body.ToString(), "", mailto, ""); result = SendMailWithNoFile(mailtitle, Body.ToString(), mailto, "");
} }
return result; return result;
} }
public static DBResult SendMailWithNoFile(string title, string context, string filePath, string MailToAddress, string username) public static DBResult SendMailWithNoFile(string title, string context, string MailToAddress, string username)
{ {
var result = new DBResult(); var result = new DBResult();
@ -5909,7 +5916,6 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
PARAMVALUE = MsSysParamSetDAL.GetData("PARAMNAME='MAILISSSL'"); PARAMVALUE = MsSysParamSetDAL.GetData("PARAMNAME='MAILISSSL'");
if (PARAMVALUE.PARAMVALUE == "1") MAILISSSL = true; if (PARAMVALUE.PARAMVALUE == "1") MAILISSSL = true;
filePath = System.Web.HttpContext.Current.Server.MapPath(filePath);
try try
{ {
var recipients = new List<string>(); var recipients = new List<string>();

116
DSWeb/Areas/MvcShipping/DAL/MsOpSeaePre/MsOpSeaePreDAL.cs
Unescape Escape View File

@ -122,7 +122,26 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaePreDAL
} }
return new MsOpSeaePre(); return new MsOpSeaePre();
} }
static public MsOpSeaePre GetData(string condition, Database db, DbTransaction tran)
{
String strSql = "SELECT [BSNO],[MASTERNO],[CUSTOMERNAME],[MBLNO],[CONTRACTNO],[VESSEL],[VOYNO],[ETD],[CLOSINGDATE],[CLOSEDOCDATE],[ETA]"
+ ",CNTR1,CNTR2,CNTR3,CNTR4,CNTR5,CNTR6,CNTR7,CNTR8,CNTR9,CNTR10,OTCNTR"
+ ",(select top 1 showname from [user] where GID=op_seae_pre.CREATEUSER) as CREATEUSER,(select top 1 showname from [user] where GID=op_seae_pre.MODIFIEDUSER) as MODIFIEDUSER"
+ ",[PORTLOADID],[PORTLOAD],[PORTDISCHARGEID],[PORTDISCHARGE],[LANE],[CARRIER],[FORWARDER],[BSSTATUS],[CNTRTOTAL],[OP],[REMARK],[CREATEUSER],[CREATETIME],[MODIFIEDUSER],[MODIFIEDTIME] "
+ ",CASE WHEN len(PORTDISCHARGEID)<>5 THEN '' ELSE (select top 1 c_country_name from t_sys_country_code where c_country_code=LEFT(PORTDISCHARGEID,2)) END as COUNTRY "
+ ",ORDERNO,CUSTSERVICE,HSCODE,GOODSNAME,SALEDEPT,ISUP,ISORDER,ORDNO,TEU,KGS,COST,SELL FROM op_seae_pre";
if (!string.IsNullOrEmpty(condition))
{
strSql += " where " + condition;
}
var list = SetData(strSql, db, tran);
if (list.Count > 0)
{
return list[0];
}
return new MsOpSeaePre();
}
static public List<MsOpSeaePre> GetHisDataList(string strCondition, string userid, string usercode, string companyid, string sort = null) static public List<MsOpSeaePre> GetHisDataList(string strCondition, string userid, string usercode, string companyid, string sort = null)
{ {
@ -314,7 +333,104 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaePreDAL
return headList; return headList;
} }
private static List<MsOpSeaePre> SetData(String strSql, Database db, DbTransaction tran)
{
var headList = new List<MsOpSeaePre>();
using (IDataReader reader = db.ExecuteReader(tran, CommandType.Text, strSql.ToString()))
{
while (reader.Read())
{
MsOpSeaePre data = new MsOpSeaePre();
#region Set DB data to Object
data.BSNO = Convert.ToString(reader["BSNO"]);
data.MASTERNO = Convert.ToString(reader["MASTERNO"]);
data.CUSTOMERNAME = Convert.ToString(reader["CUSTOMERNAME"]);
data.MBLNO = Convert.ToString(reader["MBLNO"]);
data.CONTRACTNO = Convert.ToString(reader["CONTRACTNO"]);
data.CUSTOMERNAME = Convert.ToString(reader["CUSTOMERNAME"]);
data.VESSEL = Convert.ToString(reader["VESSEL"]);
data.VOYNO = Convert.ToString(reader["VOYNO"]);
if (reader["ETD"] != DBNull.Value)
data.ETD = Convert.ToDateTime(reader["ETD"]).ToString("yyyy-MM-dd");
data.PORTLOAD = Convert.ToString(reader["PORTLOAD"]);
data.PORTDISCHARGE = Convert.ToString(reader["PORTDISCHARGE"]);
data.PORTLOADID = Convert.ToString(reader["PORTLOADID"]);
data.PORTDISCHARGEID = Convert.ToString(reader["PORTDISCHARGEID"]);
data.LANE = Convert.ToString(reader["LANE"]);
data.CARRIER = Convert.ToString(reader["CARRIER"]);
data.FORWARDER = Convert.ToString(reader["FORWARDER"]);
data.BSSTATUS = Convert.ToString(reader["BSSTATUS"]);
data.CNTRTOTAL = Convert.ToString(reader["CNTRTOTAL"]);
data.COUNTRY = Convert.ToString(reader["COUNTRY"]);
data.OP = Convert.ToString(reader["OP"]);
data.REMARK = Convert.ToString(reader["REMARK"]);
data.CREATEUSER = Convert.ToString(reader["CREATEUSER"]);
if (reader["CREATETIME"] != DBNull.Value)
data.CREATETIME = Convert.ToDateTime(reader["CREATETIME"]);
data.MODIFIEDUSER = Convert.ToString(reader["MODIFIEDUSER"]);
if (reader["MODIFIEDTIME"] != DBNull.Value)
data.MODIFIEDTIME = Convert.ToDateTime(reader["MODIFIEDTIME"]);
if (reader["CLOSINGDATE"] != DBNull.Value)
data.CLOSINGDATE = Convert.ToDateTime(reader["CLOSINGDATE"]).ToString("yyyy-MM-dd HH:mm:ss");//截港日期
if (reader["CLOSEDOCDATE"] != DBNull.Value)
data.CLOSEDOCDATE = Convert.ToDateTime(reader["CLOSEDOCDATE"]).ToString("yyyy-MM-dd HH:mm:ss");//截港日期
if (reader["CNTR1"] != DBNull.Value)
data.CNTR1 = Convert.ToInt32(reader["CNTR1"]);//箱型1
if (reader["CNTR2"] != DBNull.Value)
data.CNTR2 = Convert.ToInt32(reader["CNTR2"]);//箱型2
if (reader["CNTR3"] != DBNull.Value)
data.CNTR3 = Convert.ToInt32(reader["CNTR3"]);//箱型3
if (reader["CNTR4"] != DBNull.Value)
data.CNTR4 = Convert.ToInt32(reader["CNTR4"]);//箱型4
if (reader["CNTR5"] != DBNull.Value)
data.CNTR5 = Convert.ToInt32(reader["CNTR5"]);//箱型5
if (reader["CNTR6"] != DBNull.Value)
data.CNTR6 = Convert.ToInt32(reader["CNTR6"]);//箱型6
if (reader["CNTR7"] != DBNull.Value)
data.CNTR7 = Convert.ToInt32(reader["CNTR7"]);//箱型7
if (reader["CNTR8"] != DBNull.Value)
data.CNTR8 = Convert.ToInt32(reader["CNTR8"]);//箱型8
if (reader["CNTR9"] != DBNull.Value)
data.CNTR9 = Convert.ToInt32(reader["CNTR9"]);//箱型9
if (reader["CNTR10"] != DBNull.Value)
data.CNTR10 = Convert.ToInt32(reader["CNTR10"]);//箱型10
if (reader["OTCNTR"] != DBNull.Value)
data.OTCNTR = Convert.ToInt32(reader["OTCNTR"]);//其他箱型
if (!string.IsNullOrEmpty(data.ETD) && (data.BSSTATUS == "船公司已放舱未使用"))
{
if ((Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd")).AddDays(2)) >= (Convert.ToDateTime(data.ETD)))
{
data.LISTSTATUS = "1";
}
}
else data.LISTSTATUS = "0";
//if (reader["BSLOCK"] != DBNull.Value)
// data.BSLOCK = Convert.ToBoolean(reader["BSLOCK"]);
if (reader["ISUP"] != DBNull.Value)
data.ISUP = Convert.ToBoolean(reader["ISUP"]);
if (reader["ISORDER"] != DBNull.Value)
data.ISORDER = Convert.ToBoolean(reader["ISORDER"]);
data.ORDERNO = Convert.ToString(reader["ORDERNO"]);
data.CUSTSERVICE = Convert.ToString(reader["CUSTSERVICE"]);
data.HSCODE = Convert.ToString(reader["HSCODE"]);
data.GOODSNAME = Convert.ToString(reader["GOODSNAME"]);
data.SALEDEPT = Convert.ToString(reader["SALEDEPT"]);
data.ORDNO = Convert.ToString(reader["ORDNO"]);
if (reader["TEU"] != DBNull.Value)
data.TEU = Convert.ToInt32(reader["TEU"]);//其他箱型
if (reader["KGS"] != DBNull.Value)
data.KGS = Convert.ToDecimal(reader["KGS"]);//其他箱型
data.COST = Convert.ToString(reader["COST"]);
data.SELL = Convert.ToString(reader["SELL"]);
#endregion
headList.Add(data);
}
reader.Close();
}
return headList;
}
#endregion #endregion
#region 批量修改 #region 批量修改

2
DSWeb/DSWeb.csproj.user
Unescape Escape View File

@ -4,7 +4,7 @@
<ProjectView>ShowAllFiles</ProjectView> <ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>D:\DONGSHENG7\DS7HHYT\DSWeb\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\DONGSHENG7\DS7HHYT\DSWeb\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />
<IISExpressAnonymousAuthentication /> <IISExpressAnonymousAuthentication />

4
DSWeb/Web.config
Unescape Escape View File

@ -115,8 +115,8 @@
<add name="sydevzsh" connectionString="Server=123.235.53.14,12456 ;Database=Shippingweb_QDJHYT;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" /> <add name="sydevzsh" connectionString="Server=123.235.53.14,12456 ;Database=Shippingweb_QDJHYT;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
--> -->
<!-- 锦海运通测试 http://221.215.122.2:8081/login.aspx qdjhyt admin 888666 --> <!-- 锦海运通测试 http://221.215.122.2:8081/login.aspx qdjhyt admin 888666 -->
<add name="DongShengDB" connectionString="Server=123.235.53.14,12456 ;Database=Shippingweb_QDJHYTCS;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" /> <add name="DongShengDB" connectionString="Server=221.215.122.2,12456;Database=2024_0322;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=123.235.53.14,12456 ;Database=Shippingweb_QDJHYTCS;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" /> <add name="sydevzsh" connectionString="Server=221.215.122.2,12456;Database=2024_0322;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
</connectionStrings> </connectionStrings>
<!-- <!--

Write Preview
Loading…
Cancel
Save