chenjingyong
/
ds8-solution-pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改VOLTA截单

Browse Source
dev
jianghaiqing 3 weeks ago
parent a1fb034070
commit 0e804ed5d2
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File

28
ds-wms-service/DS.WMS.Core/Op/EDI/VOLTAEdiHelper.cs
Unescape Escape View File

@ -495,11 +495,11 @@ namespace DS.WMS.Core.Op.EDI
{
if (headData.CARRIEREDICODE == "HLCU")
{
error += formatlengthError("txt", headData.SHIPPER, 75, headData.MBLNO, "发货人", 6, "-", false);
error += formatlengthError("txt", headData.SHIPPER, 65, headData.MBLNO, "发货人", 6, "-", false);
}
else
{
error += formatlengthError("txt", headData.SHIPPER, 75, headData.MBLNO, "发货人", 6, "*", false);
error += formatlengthError("txt", headData.SHIPPER, 65, headData.MBLNO, "发货人", 6, "*", false);
}
}
}
@ -521,11 +521,11 @@ namespace DS.WMS.Core.Op.EDI
{
if (headData.CARRIEREDICODE == "HLCU")
{
error += formatlengthError("txt", headData.CONSIGNEE, 75, headData.MBLNO, "收货人", 6, "--", false);
error += formatlengthError("txt", headData.CONSIGNEE, 65, headData.MBLNO, "收货人", 6, "--", false);
}
else
{
error += formatlengthError("txt", headData.CONSIGNEE, 75, headData.MBLNO, "收货人", 6, "**", false);
error += formatlengthError("txt", headData.CONSIGNEE, 65, headData.MBLNO, "收货人", 6, "**", false);
}
}
}
@ -545,18 +545,18 @@ namespace DS.WMS.Core.Op.EDI
{
if (headData.CARRIEREDICODE == "HLCU")
{
error += formatlengthError("txt", headData.NOTIFYPARTY, 75, headData.MBLNO, "通知人", 6, "---", false);
error += formatlengthError("txt", headData.NOTIFYPARTY, 65, headData.MBLNO, "通知人", 6, "---", false);
}
else
{
error += formatlengthError("txt", headData.NOTIFYPARTY, 75, headData.MBLNO, "通知人", 6, "***", false);
error += formatlengthError("txt", headData.NOTIFYPARTY, 65, headData.MBLNO, "通知人", 6, "***", false);
}
}
}
if (!string.IsNullOrEmpty(headData.NOTIFYPARTY2))
{
error += formatlengthError("txt", headData.NOTIFYPARTY2, 75, headData.MBLNO, "第二通知人", 6, "", false);
error += formatlengthError("txt", headData.NOTIFYPARTY2, 65, headData.MBLNO, "第二通知人", 6, "", false);
}
var ctnlist = headData.CTNLIST;
@ -941,12 +941,12 @@ namespace DS.WMS.Core.Op.EDI
Shipping = formatEdiStr("txt", bill.SHIPPER);
ShippingList = formatlengthStr(Shipping, 75);
ShippingList = formatlengthStr(Shipping, 65);
if (ShippingList.Count != 0 && Shipping.Length > 0)
{
//2024-09-13 韩工确认最大行数6改为9
r.WriteLine("20::" + formatListStr(ShippingList, 9) + "'");
r.WriteLine("20::" + formatListStr(ShippingList, 6) + "'");
icount = icount + 1;
}
@ -954,7 +954,7 @@ namespace DS.WMS.Core.Op.EDI
Shipping = formatEdiStr("txt", bill.CONSIGNEE);
ShippingList = formatlengthStr(Shipping, 75);
ShippingList = formatlengthStr(Shipping, 65);
if (ShippingList.Count != 0 && Shipping.Length > 0)
{
@ -966,7 +966,7 @@ namespace DS.WMS.Core.Op.EDI
Shipping = formatEdiStr("txt", bill.NOTIFYPARTY);
ShippingList = formatlengthStr(Shipping, 75);
ShippingList = formatlengthStr(Shipping, 65);
if (ShippingList.Count != 0 && Shipping.Length > 0)
{
@ -978,7 +978,7 @@ namespace DS.WMS.Core.Op.EDI
Shipping = formatEdiStr("txt", !string.IsNullOrWhiteSpace(bill.NOTIFYPARTY2) ? bill.NOTIFYPARTY2 : "");
ShippingList = formatlengthStr(Shipping, 75);
ShippingList = formatlengthStr(Shipping, 65);
if (!string.IsNullOrWhiteSpace(Shipping))
{
@ -991,7 +991,7 @@ namespace DS.WMS.Core.Op.EDI
}
Shipping = bill.AMSCONSIGNEE;
ShippingList = formatlengthStr(Shipping, 75);
ShippingList = formatlengthStr(Shipping, 65);
if (!string.IsNullOrWhiteSpace(Shipping))
{
@ -1002,7 +1002,7 @@ namespace DS.WMS.Core.Op.EDI
Shipping = bill.AMSNOTIFYPARTY;
ShippingList = formatlengthStr(Shipping, 75);
ShippingList = formatlengthStr(Shipping, 65);
if (!string.IsNullOrWhiteSpace(Shipping))
{

8
ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs
Unescape Escape View File

@ -4959,15 +4959,15 @@ namespace DS.WMS.Core.Op.Method
if (req.Id == 0)
{
var model = req.Adapt<BookingSlotRollingDto>();
var model = req.Adapt<BookingSlotRolling>();
await tenantDb.Insertable<BookingSlotRollingDto>(model).ExecuteCommandAsync();
await tenantDb.Insertable<BookingSlotRolling>(model).ExecuteCommandAsync();
}
else
{
var model = req.Adapt<BookingSlotRollingDto>();
var model = req.Adapt<BookingSlotRolling>();
await tenantDb.Updateable<BookingSlotRollingDto>(model).ExecuteCommandAsync();
await tenantDb.Updateable<BookingSlotRolling>(model).ExecuteCommandAsync();
}
return DataResult.Successed("成功");

Write Preview
Loading…
Cancel
Save