From 0e804ed5d2f2c8d4af281a6402664884ca967a8c Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Mon, 4 Nov 2024 21:58:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9VOLTA=E6=88=AA=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DS.WMS.Core/Op/EDI/VOLTAEdiHelper.cs | 28 +++++++++---------- .../Method/BookingSlot/BookingSlotService.cs | 8 +++--- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/Op/EDI/VOLTAEdiHelper.cs b/ds-wms-service/DS.WMS.Core/Op/EDI/VOLTAEdiHelper.cs index a4130dc5..adc8b387 100644 --- a/ds-wms-service/DS.WMS.Core/Op/EDI/VOLTAEdiHelper.cs +++ b/ds-wms-service/DS.WMS.Core/Op/EDI/VOLTAEdiHelper.cs @@ -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)) { diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs index 5172db25..b6f5d736 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs @@ -4959,15 +4959,15 @@ namespace DS.WMS.Core.Op.Method if (req.Id == 0) { - var model = req.Adapt(); + var model = req.Adapt(); - await tenantDb.Insertable(model).ExecuteCommandAsync(); + await tenantDb.Insertable(model).ExecuteCommandAsync(); } else { - var model = req.Adapt(); + var model = req.Adapt(); - await tenantDb.Updateable(model).ExecuteCommandAsync(); + await tenantDb.Updateable(model).ExecuteCommandAsync(); } return DataResult.Successed("成功");