|
|
|
@ -427,10 +427,10 @@ namespace Myshipping.Application.EDI.VOLTA
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrWhiteSpace(headData.ISSUETYPE) && !new string[] { "ORI", "TER", "EXP" }.Contains(headData.ISSUETYPE))
|
|
|
|
|
{
|
|
|
|
|
error = error + "<br />提单号:" + headData.MBLNO + "签单方式未识别";
|
|
|
|
|
}
|
|
|
|
|
//if (!string.IsNullOrWhiteSpace(headData.ISSUETYPE) && !new string[] { "ORI", "TER", "EXP" }.Contains(headData.ISSUETYPE))
|
|
|
|
|
//{
|
|
|
|
|
// error = error + "<br />提单号:" + headData.MBLNO + "签单方式未识别";
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
if (string.IsNullOrEmpty(headData.DESCRIPTION))
|
|
|
|
|
{
|
|
|
|
@ -833,20 +833,20 @@ namespace Myshipping.Application.EDI.VOLTA
|
|
|
|
|
}
|
|
|
|
|
else ISSUETYPE = "EXP";
|
|
|
|
|
*/
|
|
|
|
|
//if (bill.ISSUETYPE == "ORIGINAL")
|
|
|
|
|
//{
|
|
|
|
|
// ISSUETYPE = "ORI";
|
|
|
|
|
//}
|
|
|
|
|
//else if (bill.ISSUETYPE == "TELEX")
|
|
|
|
|
//{
|
|
|
|
|
// ISSUETYPE = "TER";
|
|
|
|
|
//}
|
|
|
|
|
//else ISSUETYPE = "EXP";
|
|
|
|
|
|
|
|
|
|
if (new string[] { "ORI", "TER", "EXP" }.Contains(bill.ISSUETYPE))
|
|
|
|
|
if (bill.ISSUETYPE == "ORIGINAL")
|
|
|
|
|
{
|
|
|
|
|
ISSUETYPE = bill.ISSUETYPE;
|
|
|
|
|
ISSUETYPE = "ORI";
|
|
|
|
|
}
|
|
|
|
|
else if (bill.ISSUETYPE == "TELEX")
|
|
|
|
|
{
|
|
|
|
|
ISSUETYPE = "TER";
|
|
|
|
|
}
|
|
|
|
|
else ISSUETYPE = "EXP";
|
|
|
|
|
|
|
|
|
|
//if (new string[] { "ORI", "TER", "EXP" }.Contains(bill.ISSUETYPE))
|
|
|
|
|
//{
|
|
|
|
|
// ISSUETYPE = bill.ISSUETYPE;
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
r.WriteLine("03:" + ISSUETYPE + ":" + bill.ISSUEPLACEID.Trim() + ":" + bill.ISSUEPLACE.Trim() + ":" + GetDateStr(bill.ISSUEDATE, "yyyyMMdd") + ":" + GetBillNum2(bill.NOBILL) + ":" + bill.PREPARDAT + ":" + bill.PAYABLEAT + "'");
|
|
|
|
|
icount++;
|
|
|
|
|