|
|
|
@ -900,20 +900,28 @@ namespace DS.WMS.Core.Op.EDI
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (InttrEdi.UseForWarderCode)
|
|
|
|
|
if (bill.CARRIEREDICODE == "ANNU" || bill.CARRIEREDICODE == "CMDU" || bill.CARRIEREDICODE == "CHNL")
|
|
|
|
|
{
|
|
|
|
|
r.WriteLine("RFF+FF:" + bill.ORDERNO.Trim() + "'");
|
|
|
|
|
r.WriteLine("RFF+ON:" + bill.ORDERNO.Trim() + "'");
|
|
|
|
|
icount = icount + 2;
|
|
|
|
|
icount = icount + 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (bill.ORDERNO.Trim() != "")
|
|
|
|
|
if (InttrEdi.UseForWarderCode)
|
|
|
|
|
{
|
|
|
|
|
r.WriteLine("RFF+FF:" + bill.ORDERNO.Trim() + "'");
|
|
|
|
|
r.WriteLine("RFF+ON:" + bill.ORDERNO.Trim() + "'");
|
|
|
|
|
icount = icount + 2;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (bill.ORDERNO.Trim() != "")
|
|
|
|
|
{
|
|
|
|
|
r.WriteLine("RFF+FF:" + bill.ORDERNO.Trim() + "'");
|
|
|
|
|
r.WriteLine("RFF+ON:" + bill.ORDERNO.Trim() + "'");
|
|
|
|
|
icount = icount + 2;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (bill.CARRIEREDICODE != "COSU")
|
|
|
|
|