diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Delivery/Delivery.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Delivery/Delivery.cs index 85f87fca3..d9a082057 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Delivery/Delivery.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Delivery/Delivery.cs @@ -1,3 +1,4 @@ +using System; using System.ComponentModel.DataAnnotations; using Volo.Abp.Domain.Entities; @@ -41,7 +42,7 @@ public class Delivery : Entity /// /// 写入时间 /// - public string mesout_delivery_wt { get; set; } + public DateTime mesout_delivery_wt { get; set; } /// /// 发货单号 /// diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Delivery/DeliveryDbContextModelCreatingExtensions.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Delivery/DeliveryDbContextModelCreatingExtensions.cs index 4ae9db369..992fd5e4f 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Delivery/DeliveryDbContextModelCreatingExtensions.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Delivery/DeliveryDbContextModelCreatingExtensions.cs @@ -16,7 +16,7 @@ public static class DeliveryDbContextModelCreatingExtensions b.ConfigureByConvention(); //Properties - b.Property(q => q.mesout_delivery_id).HasMaxLength(20); + b.Property(q => q.mesout_delivery_id).HasMaxLength(40); b.Property(q => q.mesout_delivery_type).HasMaxLength(1); b.Property(q => q.mesout_delivery_part).HasMaxLength(20); b.Property(q => q.mesout_delivery_identity_no).HasMaxLength(20); diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/DeliveryReader.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/DeliveryReader.cs index 8a6db9768..7b942b3a1 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/DeliveryReader.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/DeliveryReader.cs @@ -104,8 +104,8 @@ public class DeliveryReader : IReader CustomerCode = Delivery.mesout_delivery_customer, Number = Delivery.mesout_delivery_no, Worker = "MESFY", - ActiveDate = DateTime.TryParse(Delivery.mesout_delivery_wt, out DateTime dateTime) ? dateTime : DateTime.Now, - DeliverTime = DateTime.TryParse(Delivery.mesout_delivery_wt, out DateTime dateTime1) ? dateTime1 : DateTime.Now, + ActiveDate = Delivery.mesout_delivery_wt, + DeliverTime =Delivery.mesout_delivery_wt, MesTruckNumber="", }; var mesRequestDetail = new DeliverRequestDetailExchangeDto() diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs index f528be89f..a0678442f 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs @@ -129,7 +129,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA var balanceLst = await _balanceAppService.GetRecommendBalancesByLocationsAsync(input).ConfigureAwait(false); if (balanceLst.Count == 0) { - throw new UserFriendlyException($"无推荐库存!"); + throw new UserFriendlyException($"无推荐库存零件号:{input.ItemCode}库位{input.Locations[0]}!"); } var sumQty = balanceLst.Sum(itm => itm.Qty); if (detail.Qty > sumQty)