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

1

Browse Source
DS7_JinGang
hanxuntao 2 years ago
parent dca2f59dbf
commit 16d39a3814
3 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File

22
D7MqClient/D7MqClient/JFtoDjyBackNo.cs
Unescape Escape View File

@ -80,6 +80,7 @@ namespace D7MqClient
strSql2.Append("update op_seae set IRCODE='" + IRCODE + "' where BSNO='" + BSNO + "' AND ISNULL(IRCODE,'')=''"); strSql2.Append("update op_seae set IRCODE='" + IRCODE + "' where BSNO='" + BSNO + "' AND ISNULL(IRCODE,'')=''");
SqlCommand cmd2 = new SqlCommand(strSql2.ToString(), dbcon); SqlCommand cmd2 = new SqlCommand(strSql2.ToString(), dbcon);
cmd2.ExecuteNonQuery(); cmd2.ExecuteNonQuery();
logger.Debug($"执行语句1：{strSql2.ToString()}");
} }
if (!string.IsNullOrEmpty(CUSTNO)) if (!string.IsNullOrEmpty(CUSTNO))
{ {
@ -87,6 +88,7 @@ namespace D7MqClient
strSql.Append("update op_seae set IRCODE='" + IRCODE + "' where CUSTNO='" + CUSTNO + "' AND ISNULL(IRCODE,'')=''"); strSql.Append("update op_seae set IRCODE='" + IRCODE + "' where CUSTNO='" + CUSTNO + "' AND ISNULL(IRCODE,'')=''");
SqlCommand cmd = new SqlCommand(strSql.ToString(), dbcon); SqlCommand cmd = new SqlCommand(strSql.ToString(), dbcon);
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
logger.Debug($"执行语句1：{strSql.ToString()}");
} }
} }
else else
@ -98,33 +100,46 @@ namespace D7MqClient
strSql.Append("update t_op_seae set IRCODE='" + IRCODE + "' where 业务编号='" + feeback.FeedbackData.BSNO + "'"); strSql.Append("update t_op_seae set IRCODE='" + IRCODE + "' where 业务编号='" + feeback.FeedbackData.BSNO + "'");
SqlCommand cmd = new SqlCommand(strSql.ToString(), dbcon); SqlCommand cmd = new SqlCommand(strSql.ToString(), dbcon);
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
} logger.Debug($"执行语句1：{strSql.ToString()}");
}
} }
} }
else if (feeback.FeedbackType == "MBLNO") else if (feeback.FeedbackType == "MBLNO")
{ {
if (!string.IsNullOrEmpty(feeback.FeedbackData.BSNO) && !string.IsNullOrEmpty(feeback.FeedbackData.MBLNO)) if (!string.IsNullOrEmpty(feeback.FeedbackData.MBLNO))
{ {
if (DSVER == "7") if (DSVER == "7")
{ {
var CUSTNO = ""; var CUSTNO = "";
var BSNO = ""; var BSNO = "";
var IRCODE = "";
if (!string.IsNullOrEmpty(feeback.FeedbackData.BSNO)) BSNO = feeback.FeedbackData.BSNO; if (!string.IsNullOrEmpty(feeback.FeedbackData.BSNO)) BSNO = feeback.FeedbackData.BSNO;
if (!string.IsNullOrEmpty(feeback.FeedbackData.FR)) CUSTNO = feeback.FeedbackData.FR; if (!string.IsNullOrEmpty(feeback.FeedbackData.FR)) CUSTNO = feeback.FeedbackData.FR;
if (!string.IsNullOrEmpty(feeback.FeedbackData.IRCode)) IRCODE = feeback.FeedbackData.IRCode;
if (!string.IsNullOrEmpty(BSNO)) if (!string.IsNullOrEmpty(BSNO))
{ {
var strSql2 = new StringBuilder(); var strSql2 = new StringBuilder();
strSql2.Append("update op_seae set MBLNO='" + feeback.FeedbackData.MBLNO + "' where BSNO='" + BSNO + "' AND ISNULL(MBLNO,'')=''"); strSql2.Append("update op_seae set MBLNO='" + feeback.FeedbackData.MBLNO + "' where BSNO='" + BSNO + "' AND ISNULL(MBLNO,'')=''");
SqlCommand cmd2 = new SqlCommand(strSql2.ToString(), dbcon); SqlCommand cmd2 = new SqlCommand(strSql2.ToString(), dbcon);
cmd2.ExecuteNonQuery(); cmd2.ExecuteNonQuery();
logger.Debug($"执行语句1：{strSql2.ToString()}");
} }
if (!string.IsNullOrEmpty(CUSTNO)) if (!string.IsNullOrEmpty(CUSTNO))
{ {
var strSql = new StringBuilder(); var strSql = new StringBuilder();
strSql.Append("update op_seae set MBLNO='" + feeback.FeedbackData.MBLNO + "' where CUSTNO='" + CUSTNO + "' AND ISNULL(MBLNO,'')='' "); strSql.Append("update op_seae set MBLNO='" + feeback.FeedbackData.MBLNO + "' where IRCODE='" + CUSTNO + "' AND ISNULL(MBLNO,'')='' ");
SqlCommand cmd = new SqlCommand(strSql.ToString(), dbcon);
cmd.ExecuteNonQuery();
logger.Debug($"执行语句1：{strSql.ToString()}");
}
if (!string.IsNullOrEmpty(IRCODE))
{
var strSql = new StringBuilder();
strSql.Append("update op_seae set MBLNO='" + feeback.FeedbackData.MBLNO + "' where IRCODE='" + IRCODE + "' AND ISNULL(MBLNO,'')='' ");
SqlCommand cmd = new SqlCommand(strSql.ToString(), dbcon); SqlCommand cmd = new SqlCommand(strSql.ToString(), dbcon);
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
logger.Debug($"执行语句1：{strSql.ToString()}");
} }
} }
else else
@ -133,6 +148,7 @@ namespace D7MqClient
strSql.Append("update t_op_seae set 主提单号='" + feeback.FeedbackData.MBLNO + "' where 业务编号='" + feeback.FeedbackData.BSNO + "' AND ISNULL(主提单号,'')='' "); strSql.Append("update t_op_seae set 主提单号='" + feeback.FeedbackData.MBLNO + "' where 业务编号='" + feeback.FeedbackData.BSNO + "' AND ISNULL(主提单号,'')='' ");
SqlCommand cmd = new SqlCommand(strSql.ToString(), dbcon); SqlCommand cmd = new SqlCommand(strSql.ToString(), dbcon);
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
logger.Debug($"执行语句1：{strSql.ToString()}");
} }
} }
} }

32
DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs
Unescape Escape View File

@ -4227,23 +4227,33 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
} }
if (IsNADFW == 1) if (carrier == "ANNU" || carrier == "CMDU" || carrier == "CHNL")
{ {
r.WriteLine("RFF+FF:" + bill.ORDERNO.Trim() + "'"); r.WriteLine("RFF+FF:" + bill.CUSTNO.Trim() + "'");
r.WriteLine("RFF+ON:" + bill.ORDERNO.Trim() + "'"); icount = icount + 1;
icount = icount + 2;
} }
else else
{ {
if (bill.ORDERNO.Trim() != "")
if (IsNADFW == 1)
{ {
r.WriteLine("RFF+FF:" + bill.ORDERNO.Trim() + "'"); r.WriteLine("RFF+FF:" + bill.ORDERNO.Trim() + "'");
r.WriteLine("RFF+ON:" + bill.ORDERNO.Trim() + "'"); r.WriteLine("RFF+ON:" + bill.ORDERNO.Trim() + "'");
icount = icount + 2; icount = icount + 2;
} }
else { else
r.WriteLine("RFF+FF:" + bill.CUSTNO.Trim() + "'"); {
icount = icount + 1; if (bill.ORDERNO.Trim() != "")
{
r.WriteLine("RFF+FF:" + bill.ORDERNO.Trim() + "'");
r.WriteLine("RFF+ON:" + bill.ORDERNO.Trim() + "'");
icount = icount + 2;
}
else
{
r.WriteLine("RFF+FF:" + bill.CUSTNO.Trim() + "'");
icount = icount + 1;
}
} }
} }
@ -4282,7 +4292,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
r.WriteLine("RFF+CT:" + formatEdiStr("txt", bill.CONTRACTNO) + "'"); r.WriteLine("RFF+CT:" + formatEdiStr("txt", bill.CONTRACTNO) + "'");
r.WriteLine("RFF+FF:" + bill.CUSTNO + "'"); //r.WriteLine("RFF+FF:" + bill.CUSTNO + "'");
if (bill.BLFRT.IndexOf("PREPAID") >= 0) if (bill.BLFRT.IndexOf("PREPAID") >= 0)
r.WriteLine("CPI+4++P'"); r.WriteLine("CPI+4++P'");
@ -25758,8 +25768,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
tempstr += Convert.ToDateTime(bill.ETD).ToString("yyyyMMdd");//22 //Booking Date//M//X(8)//191 //198 //YYYYMMDD tempstr += Convert.ToDateTime(bill.ETD).ToString("yyyyMMdd");//22 //Booking Date//M//X(8)//191 //198 //YYYYMMDD
} }
//tempstr += eta;//23 //Slot Owner//M//X(3)//199 //201 // //tempstr += eta;//23 //Slot Owner//M//X(3)//199 //201 //
tempstr += GetSpaceStr("PI", 3);//24 //Cntr Operator//M//X(3)//202 //204 // tempstr += GetSpaceStr("PIL", 3);//24 //Cntr Operator//M//X(3)//202 //204 //
tempstr += GetSpaceStr("PI", 3);//25 //Filler//M//X(46)//205 //250 //Spaces tempstr += GetSpaceStr("PIL", 3);//25 //Filler//M//X(46)//205 //250 //Spaces
r.WriteLine(GetSpaceStr(tempstr, 250)); r.WriteLine(GetSpaceStr(tempstr, 250));
#endregion #endregion

2
DSWeb/Areas/SysMng/Controllers/USERINFOController.cs
Unescape Escape View File

@ -129,6 +129,8 @@ namespace DSWeb.Areas.SysMng.Controllers
headData.DbOperationType = DbOperationType.DbotUpd; headData.DbOperationType = DbOperationType.DbotUpd;
headData.ModelUIStatus = "E"; headData.ModelUIStatus = "E";
//} //}
var modb = new ModelObjectRepository(); var modb = new ModelObjectRepository();
result = modb.Save(headData, result = modb.Save(headData,
ModelObjectConvert<USERINFOmb>.ToModelObjectList(bodyList), ModelObjectConvert<USERINFOmb>.ToModelObjectList(bodyList),

Write Preview
Loading…
Cancel
Save