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

修改下货纸比对

Browse Source
usertest
jianghaiqing 4 months ago
parent be6a3ad193
commit 611f0e5349
4 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File

24
ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/Mapper/AddTaskPlatMapsterSetup.cs
Unescape Escape View File

@ -228,20 +228,20 @@ namespace DS.WMS.Core.TaskPlat.Dtos.Mapper
} }
{ {
TypeAdapterConfig<SeaExport, TaskBookingOrderDto>.NewConfig().TwoWays() TypeAdapterConfig<SeaExport, TaskBookingOrderDto>.NewConfig()
.Map(dest => dest.MasterBlNo, src => src.MBLNO) .Map(dest => dest.MasterBlNo, src => src.MBLNO)
.Map(dest => dest.HouseBlNo, src => src.HBLNO) .Map(dest => dest.HouseBlNo, src => src.HBLNO)
.Map(dest => dest.BookingNo, src => src.BookingNo) .Map(dest => dest.BookingNo, src => src.BookingNo)
.Map(dest => dest.ContrNo, src => src.ContractNo) .Map(dest => dest.ContrNo, src => src.ContractNo)
.Map(dest => dest.ServContrNo, src => src.ServiceContractNo) .Map(dest => dest.ServContrNo, src => src.ServiceContractNo)
.Map(dest => dest.ShipperId, src => src.ShipperId.ToString()) .Map(dest => dest.ShipperId, src => src.ShipperId)
.Map(dest => dest.ConsigneeId, src => src.ConsigneeId.ToString()) .Map(dest => dest.ConsigneeId, src => src.ConsigneeId)
.Map(dest => dest.NotifyPartyId, src => src.NotifyPartyId.ToString()) .Map(dest => dest.NotifyPartyId, src => src.NotifyPartyId)
.Map(dest => dest.Shipper, src => src.Shipper) .Map(dest => dest.Shipper, src => src.Shipper)
.Map(dest => dest.Consignee, src => src.Consignee) .Map(dest => dest.Consignee, src => src.Consignee)
.Map(dest => dest.NotifyParty, src => src.NotifyParty) .Map(dest => dest.NotifyParty, src => src.NotifyParty)
.Map(dest => dest.NotifyPrt2, src => src.SecondNotifyParty) .Map(dest => dest.NotifyPrt2, src => src.SecondNotifyParty)
.Map(dest => dest.YardId, src => src.YardId.ToString()) .Map(dest => dest.YardId, src => src.YardId)
.Map(dest => dest.Yard, src => src.Yard) .Map(dest => dest.Yard, src => src.Yard)
.Map(dest => dest.VesselId, src => src.VesselId) .Map(dest => dest.VesselId, src => src.VesselId)
.Map(dest => dest.Vessel, src => src.Vessel) .Map(dest => dest.Vessel, src => src.Vessel)
@ -253,21 +253,21 @@ namespace DS.WMS.Core.TaskPlat.Dtos.Mapper
.Map(dest => dest.ClosingDate, src => src.ClosingDate.HasValue ? src.ClosingDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "") .Map(dest => dest.ClosingDate, src => src.ClosingDate.HasValue ? src.ClosingDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "")
.Map(dest => dest.CloseDocDate, src => src.CloseDocDate.HasValue ? src.CloseDocDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "") .Map(dest => dest.CloseDocDate, src => src.CloseDocDate.HasValue ? src.CloseDocDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "")
.Map(dest => dest.CloseVGMDate, src => src.CloseVgmDate.HasValue ? src.CloseVgmDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "") .Map(dest => dest.CloseVGMDate, src => src.CloseVgmDate.HasValue ? src.CloseVgmDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "")
.Map(dest => dest.PlaceReceiptId, src => src.ReceiptPlaceId.ToString()) .Map(dest => dest.PlaceReceiptId, src => src.ReceiptPlaceId)
.Map(dest => dest.PlaceReceipt, src => src.ReceiptPlace) .Map(dest => dest.PlaceReceipt, src => src.ReceiptPlace)
.Map(dest => dest.PortLoadId, src => src.LoadPortId.ToString()) .Map(dest => dest.PortLoadId, src => src.LoadPortId)
.Map(dest => dest.PortLoad, src => src.LoadPort) .Map(dest => dest.PortLoad, src => src.LoadPort)
.Map(dest => dest.PortDischargeId, src => src.DischargePortId.ToString()) .Map(dest => dest.PortDischargeId, src => src.DischargePortId)
.Map(dest => dest.PortDischarge, src => src.DischargePort) .Map(dest => dest.PortDischarge, src => src.DischargePort)
.Map(dest => dest.PlaceDeliveryId, src => src.DeliveryPlaceId.ToString()) .Map(dest => dest.PlaceDeliveryId, src => src.DeliveryPlaceId)
.Map(dest => dest.PlaceDelivery, src => src.DeliveryPlace) .Map(dest => dest.PlaceDelivery, src => src.DeliveryPlace)
.Map(dest => dest.DestinationId, src => src.DestinationId.ToString()) .Map(dest => dest.DestinationId, src => src.DestinationId)
.Map(dest => dest.Destination, src => src.Destination) .Map(dest => dest.Destination, src => src.Destination)
.Map(dest => dest.NoBill, src => src.NoBill) .Map(dest => dest.NoBill, src => src.NoBill)
.Map(dest => dest.CopyNoBill, src => src.CopyNoBill) .Map(dest => dest.CopyNoBill, src => src.CopyNoBill)
.Map(dest => dest.IssueType, src => src.IssueType) .Map(dest => dest.IssueType, src => src.IssueType)
.Map(dest => dest.IssueDate, src => src.IssueDate.HasValue ? src.IssueDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "") .Map(dest => dest.IssueDate, src => src.IssueDate.HasValue ? src.IssueDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "")
.Map(dest => dest.IssuePlaceId, src => src.IssuePlaceId.ToString()) .Map(dest => dest.IssuePlaceId, src => src.IssuePlaceId)
.Map(dest => dest.IssuePlace, src => src.IssuePlace) .Map(dest => dest.IssuePlace, src => src.IssuePlace)
.Map(dest => dest.Blfrt, src => src.MBLFrt) .Map(dest => dest.Blfrt, src => src.MBLFrt)
.Map(dest => dest.PrepardAt, src => src.PrepareAt) .Map(dest => dest.PrepardAt, src => src.PrepareAt)
@ -282,7 +282,7 @@ namespace DS.WMS.Core.TaskPlat.Dtos.Mapper
.Map(dest => dest.CBM, src => src.CBM) .Map(dest => dest.CBM, src => src.CBM)
.Map(dest => dest.TotalNO, src => src.TotalNo) .Map(dest => dest.TotalNO, src => src.TotalNo)
.Map(dest => dest.CntrTotal, src => src.CntrTotal) .Map(dest => dest.CntrTotal, src => src.CntrTotal)
.Map(dest => dest.CarrierId, src => src.CarrierId.ToString()) .Map(dest => dest.CarrierId, src => src.CarrierId)
.Map(dest => dest.Carrier, src => src.Carrier) .Map(dest => dest.Carrier, src => src.Carrier)
.Map(dest => dest.CargoId, src => src.CargoId) .Map(dest => dest.CargoId, src => src.CargoId)
.Map(dest => dest.DClass, src => src.DangerClass) .Map(dest => dest.DClass, src => src.DangerClass)

2
ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj.user
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<NameOfLastUsedPublishProfile>D:\Source\Repos\DS8\ds-wms-service\DS.WMS.OpApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID> <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath> <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
</PropertyGroup> </PropertyGroup>

10
ds-wms-service/DS.WMS.OpApi/appsettings.json
Unescape Escape View File

@ -86,7 +86,9 @@
"IP": "47.104.73.97", "IP": "47.104.73.97",
"Port": "7115", "Port": "7115",
"SenderKey": "SEFBZkh5V3R1TGxtdlBIcTF4QmNMWURCS08vb2EvTzVxS0F0eDFKdlgyS3lKVUx6K3JRRE94Q2kvcWZMRytZeWxyVkhLdk9hRGpzVStPamhIUXd5NU9FMjhFTktwUlZ2eThJZGlQd3p5dUk9", "SenderKey": "SEFBZkh5V3R1TGxtdlBIcTF4QmNMWURCS08vb2EvTzVxS0F0eDFKdlgyS3lKVUx6K3JRRE94Q2kvcWZMRytZeWxyVkhLdk9hRGpzVStPamhIUXd5NU9FMjhFTktwUlZ2eThJZGlQd3p5dUk9",
"SendUrl": "/api/RulesEngineManage/ExcuteWorkFlow" "SendUrl": "/api/RulesEngineManage/ExcuteWorkFlow",
"RulesEngineSender": "Dongsheng8",
"RulesEngineSenderName": "东胜8"
}, },
"MSKAPIService": { "MSKAPIService": {
"UserKey": "wu", "UserKey": "wu",
@ -98,5 +100,9 @@
}, },
"BCCompare": { "BCCompare": {
"Url": "http://localhost:5110/api/TaskBookingAmendmentParser/ExcuteBookingAmendmentCompare" "Url": "http://localhost:5110/api/TaskBookingAmendmentParser/ExcuteBookingAmendmentCompare"
} },
"ShippingOrderCompare": {
"Url": "http://47.104.73.97:7115/api/TaskShippingOrderCompare/ExcuteShippingOrderCompare",
"ResultUrl": "http://47.104.73.97:7115/api/TaskShippingOrderCompare/CompareResult"
}
} }

12
ds-wms-service/DS.WMS.TaskApi/appsettings.json
Unescape Escape View File

@ -67,5 +67,17 @@
}, },
"BCCompare": { "BCCompare": {
"Url": "http://localhost:5110/api/TaskBookingAmendmentParser/ExcuteBookingAmendmentCompare" "Url": "http://localhost:5110/api/TaskBookingAmendmentParser/ExcuteBookingAmendmentCompare"
},
"ShippingOrderCompare": {
"Url": "http://47.104.73.97:7115/api/TaskShippingOrderCompare/ExcuteShippingOrderCompare",
"ResultUrl": "http://47.104.73.97:7115/api/TaskShippingOrderCompare/CompareResult"
},
"ExcuteRuleService": {
"IP": "47.104.73.97",
"Port": "7115",
"SenderKey": "SEFBZkh5V3R1TGxtdlBIcTF4QmNMWURCS08vb2EvTzVxS0F0eDFKdlgyS3lKVUx6K3JRRE94Q2kvcWZMRytZeWxyVkhLdk9hRGpzVStPamhIUXd5NU9FMjhFTktwUlZ2eThJZGlQd3p5dUk9",
"SendUrl": "/api/RulesEngineManage/ExcuteWorkFlow",
"RulesEngineSender": "Dongsheng8",
"RulesEngineSenderName": "东胜8"
} }
} }

Write Preview
Loading…
Cancel
Save