Browse Source

Merge branch 'dev_DY_CC' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_DY_CC

dev_DY_CC
周红军 11 months ago
parent
commit
d6fb1ee362
  1. 1
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/FawtygAutoMapperProfile.cs
  2. 4
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/DeliveryReader.cs
  3. 10
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/TyrpIncomingBackgroundWorker.cs
  4. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/CustomerReturnNoteConverter.cs
  5. 10
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TyrpOutgoingBackgroundWorker.cs
  6. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/appsettings.json
  7. 9
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/DeliverRequest/DeliverRequestExchangeDto.cs
  8. 10
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml
  9. 13
      be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Dicts/DictAppService.cs
  10. 4
      be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Job/EnumJobStatus.cs
  11. 5
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/DeliverJobs/DTOs/DeliverJobDTO.cs
  12. 5
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/DeliverJobs/Inputs/DeliverJobEditInput.cs
  13. 5
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/DeliverNotes/DTOs/DeliverNoteDTO.cs
  14. 6
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/DeliverNotes/Inputs/DeliverNoteEditInput.cs
  15. 4
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/DeliverRequests/DTOs/DeliverRequestDTO.cs
  16. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/DeliverRequests/Inputs/DeliverRequestEditInput.cs
  17. 5
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/DeliverRequests/Inputs/DeliverRequestImportInput.cs
  18. 4
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferRequests/Inputs/TransferRequestImportInput.cs
  19. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/InjectionPlanJobs/InjectionPlanJobAppService.cs
  20. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs
  21. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs
  22. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs
  23. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
  24. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs
  25. 8
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestAppService.cs
  26. 4
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/DeliverJobs/DeliverJob.cs
  27. 5
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/DeliverNotes/DeliverNote.cs
  28. 5
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/DeliverRequests/DeliverRequest.cs
  29. 1
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/DeliverJobs/DeliverJobDbContextModelCreatingExtensions.cs
  30. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/DeliverNotes/DeliverNoteDbContextModelCreatingExtensions.cs
  31. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/DeliverRequests/DeliverRequestDbContextModelCreatingExtensions.cs
  32. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/InjectionPlanJobEventHandler.cs
  33. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/AssembleIssueJobEventHandler.cs
  34. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/CoatingIssueJobEventHandler.cs
  35. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/InjectionIssueJobEventHandler.cs
  36. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/KittingIssueJobEventHandler.cs
  37. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/SparePartIssueJobEventHandler.cs

1
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/FawtygAutoMapperProfile.cs

@ -250,7 +250,6 @@ public class FawtygAutoMapperProfile : Profile
.Ignore(x => x.StdPackQty);
CreateMap<DeliverRequestExchangeDto, DeliverRequestEditInput>()
.Ignore(x => x.DeliverPlanNumber)
.Ignore(x => x.ExtraProperties)
.Ignore(x => x.Details)
.Ignore(x => x.CustomerAddressCode)

4
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/DeliveryReader.cs

@ -98,11 +98,13 @@ public class DeliveryReader : IReader
var mesRequest = new DeliverRequestExchangeDto()
{
DeliverRequestType = Delivery.mesout_delivery_type == "0" ? EnumDeliverRequestType.FIS : EnumDeliverRequestType.Normal,
DeliverPlanNumber= Delivery.mesout_delivery_type == "0" ? Delivery.mesout_delivery_no : Delivery.mesout_delivery_plan,
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
DeliverTime = DateTime.TryParse(Delivery.mesout_delivery_wt, out DateTime dateTime1) ? dateTime1 : DateTime.Now,
MesTruckNumber=Delivery.mesout_delivery_carno,
};
var mesRequestDetail = new DeliverRequestDetailExchangeDto()
{

10
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/TyrpIncomingBackgroundWorker.cs

@ -119,6 +119,16 @@ public class TyrpIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
//转换Dictpj
await dictConverter.ConvertAsync(dictpjOutsFromExternalList).ConfigureAwait(false);
Logger.LogInformation($"Read ErpLocation");//ERP库位
var ErpLocationReader = workerContext.ServiceProvider.GetRequiredService<ErpLocationReader>();
var ErpLocationConverter = workerContext.ServiceProvider.GetRequiredService<ErpLocationConverter>();
//读取并保存ErpLocationItem
var erpLocationFromExternalList = await ErpLocationReader.ReadAsync().ConfigureAwait(false);
//转换ErpLocationItem
await ErpLocationConverter.ConvertAsync(erpLocationFromExternalList).ConfigureAwait(false);
Logger.LogInformation($"Read Customer");//客户资料
var CustomerReader = workerContext.ServiceProvider.GetRequiredService<CustomerReader>();
var CustomerConverter = workerContext.ServiceProvider.GetRequiredService<CustomerConverter>();

2
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/CustomerReturnNoteConverter.cs

@ -41,7 +41,7 @@ public class CustomerReturnNoteConverter : IOutgoingConverter
{
var outgoingToExternalList = new List<OutgoingToExternal>();
//获取要同步得数据
var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.UnplannedReceipt, EnumSystemType.ERP).ConfigureAwait(false);
var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.CustomerReturn, EnumSystemType.ERP).ConfigureAwait(false);
foreach (var outgoingFromWms in outgoingFromWmsList)
{
#region 主表

10
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TyrpOutgoingBackgroundWorker.cs

@ -156,12 +156,12 @@ public class TyrpOutgoingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
}
#endregion
#region --接口以关闭-- 退货单 UnplannedReceipt wmsoutm
#region --接口以关闭-- 退货单 CustomerReturn wmsoutm
//暂无此接口
//Logger.LogInformation($"Write CustomerReturnNote");//退货单
//var customerReturnNoteConvert = workerContext.ServiceProvider.GetRequiredService<CustomerReturnNoteConverter>();
//var customerReturnNoteList = await customerReturnNoteConvert.ConvertAsync().ConfigureAwait(false);
//await wmsoutmWriter.WriteAsync(customerReturnNoteList).ConfigureAwait(false);
Logger.LogInformation($"Write CustomerReturnNote");//退货单
var customerReturnNoteConvert = workerContext.ServiceProvider.GetRequiredService<CustomerReturnNoteConverter>();
var customerReturnNoteList = await customerReturnNoteConvert.ConvertAsync().ConfigureAwait(false);
await wmsoutmWriter.WriteAsync(customerReturnNoteList).ConfigureAwait(false);
#endregion
#region 客户退货单 CustomerReturn wmsoutm

4
be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/appsettings.json

@ -26,10 +26,10 @@
"RemoteServices": {
"BaseData": {
"BaseUrl": "http://localhost:59094/"
"BaseUrl": "http://dev.ccwin-in.com:60084/"
},
"Store": {
"BaseUrl": "http://localhost:59095/"
"BaseUrl": "http://dev.ccwin-in.com:60085/"
},
"Label": {
"BaseUrl": "http://dev.ccwin-in.com:60082/"

9
be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/DeliverRequest/DeliverRequestExchangeDto.cs

@ -27,7 +27,14 @@ public class DeliverRequestExchangeDto
/// 发货类型
/// </summary>
public EnumDeliverRequestType DeliverRequestType { get; set; }
/// <summary>
/// 看板件发货计划单号/JIS发货单号
/// </summary>
public string DeliverPlanNumber { get; set; }
/// <summary>
/// Mes车牌号
/// </summary>
public string MesTruckNumber { get; set; }
/// <summary>
/// 客户
/// </summary>

10
be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml

@ -626,6 +626,16 @@
发货类型
</summary>
</member>
<member name="P:Win_in.Sfs.Wms.DataExchange.WMS.DeliverRequest.DeliverRequestExchangeDto.DeliverPlanNumber">
<summary>
看板件发货计划单号/JIS发货单号
</summary>
</member>
<member name="P:Win_in.Sfs.Wms.DataExchange.WMS.DeliverRequest.DeliverRequestExchangeDto.MesTruckNumber">
<summary>
Mes车牌号
</summary>
</member>
<member name="P:Win_in.Sfs.Wms.DataExchange.WMS.DeliverRequest.DeliverRequestExchangeDto.CustomerCode">
<summary>
客户

13
be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Dicts/DictAppService.cs

@ -17,6 +17,7 @@ using System.Text;
using DocumentFormat.OpenXml.Office2010.ExcelAc;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Volo.Abp;
using Volo.Abp.Domain.Entities;
using Volo.Abp.Domain.Repositories;
using Win_in.Sfs.Shared;
@ -60,9 +61,17 @@ public class DictAppService : SfsBaseDataWithCodeAppServiceBase<Dict, DictDTO, S
[HttpPut]
[Route("{id}")]
public override Task<DictDTO> UpdateAsync(Guid id, DictEditInput input)
public override async Task<DictDTO> UpdateAsync(Guid id, DictEditInput input)
{
return base.UpdateAsync(id, input);
//return await base.UpdateAsync(id, input).ConfigureAwait(false); //lyf at 0621, 更新报错所以注释
var entity = await _repository.GetAsync(id).ConfigureAwait(false);
if (entity == null)
{
throw new UserFriendlyException($"根据Id取字典表为空:{id}");
}
ObjectMapper.Map<DictEditInput, Dict>(input, entity);
await _repository.UpdateAsync(entity, true).ConfigureAwait(false);
return ObjectMapper.Map<Dict, DictDTO>(entity);
}
[HttpPost("update")]

4
be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Job/EnumJobStatus.cs

@ -48,8 +48,8 @@ public enum EnumJobStatus
Cancelled = 9,
/// <summary>
///
/// 待库移
/// </summary>
[Display(Name = "待")]
[Display(Name = "待库移")]
Wait=30,
}

5
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/DeliverJobs/DTOs/DeliverJobDTO.cs

@ -38,5 +38,10 @@ public class DeliverJobDTO : SfsJobDTOBase<DeliverJobDetailDTO>
/// </summary>
[Display(Name = "发货请求单号")]
public string DeliverRequestNumber { get; set; }
/// <summary>
/// Mes车牌号
/// </summary>
[Display(Name = "Mes车牌号")]
public string MesTruckNumber { get; set; }
}

5
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/DeliverJobs/Inputs/DeliverJobEditInput.cs

@ -73,5 +73,10 @@ public class DeliverJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateInp
/// </summary>
[Display(Name = "发货计划单号")]
public string DeliverPlanNumber { get; set; }
/// <summary>
/// Mes车牌号
/// </summary>
[Display(Name = "Mes车牌号")]
public string MesTruckNumber { get; set; }
#endregion
}

5
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/DeliverNotes/DTOs/DeliverNoteDTO.cs

@ -54,6 +54,11 @@ public class DeliverNoteDTO : SfsStoreDTOBase<DeliverNoteDetailDTO>
/// <returns></returns>
[Display(Name = "打印次数")]
public int CountPrint { get; set; }
/// <summary>
/// Mes车牌号
/// </summary>
[Display(Name = "Mes车牌号")]
public string MesTruckNumber { get; set; }
/// <summary>
/// 发货类型

6
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/DeliverNotes/Inputs/DeliverNoteEditInput.cs

@ -57,7 +57,11 @@ public class DeliverNoteEditInput : SfsStoreCreateOrUpdateInputBase
/// </summary>
[Display(Name = "发货类型")]
public EnumDeliverRequestType DeliverRequestType { get; set; }
/// <summary>
/// Mes车牌号
/// </summary>
[Display(Name = "Mes车牌号")]
public string MesTruckNumber { get; set; }
/// <summary>
/// 明细列表
/// </summary>

4
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/DeliverRequests/DTOs/DeliverRequestDTO.cs

@ -31,4 +31,8 @@ public class DeliverRequestDTO : SfsStoreRequestDTOBase<DeliverRequestDetailDTO>
/// </summary>
[Display(Name = "客户地址")]
public string CustomerAddressCode { get; set; }
/// <summary>
/// Mes车牌号
/// </summary>
public string MesTruckNumber { get; set; }
}

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/DeliverRequests/Inputs/DeliverRequestEditInput.cs

@ -33,6 +33,8 @@ public class DeliverRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase
[Display(Name = "发货类型")]
public EnumDeliverRequestType DeliverRequestType { get; set; }
[Display(Name = "Mes车牌号")]
public string MesTruckNumber { get; set; }
[Display(Name = "明细列表")]
public List<DeliverRequestDetailInput> Details { get; set; }

5
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/DeliverRequests/Inputs/DeliverRequestImportInput.cs

@ -69,6 +69,11 @@ public class DeliverRequestImportInput : SfsStoreImportInputBase
[Display(Name = "Mes发货计划号")]
public string MesDeliveryPlan { get; set; }
/// <summary>
/// Mes车牌号
/// </summary>
[Display(Name = "Mes车牌号")]
public string MesTruckNumber { get; set; }
/// <summary>
/// 底盘号
/// </summary>
[Display(Name = "底盘号")]

4
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferRequests/Inputs/TransferRequestImportInput.cs

@ -1,3 +1,4 @@
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using Win_in.Sfs.Shared.Application.Contracts;
using Win_in.Sfs.Shared.Domain.Shared;
@ -73,7 +74,8 @@ public class TransferRequestImportInput : SfsStoreImportInputBase
/// </summary>
[Display(Name = "状态")]
[Required(ErrorMessage = "{0}是必填项")]
public EnumInventoryStatus Status { get; set; }
[ValueMapping("合格", EnumInventoryStatus.OK)]
public string Status { get; set; }
#region 回调服务相关
/// <summary>

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/InjectionPlanJobs/InjectionPlanJobAppService.cs

@ -64,7 +64,7 @@ public class InjectionPlanJobAppService
}
/// <summary>
/// 判断是不是在最底层 如果不是则把状态变更为待 并把库移推荐的From和To赋值
/// 判断是不是在最底层 如果不是则把状态变更为待库移 并把库移推荐的From和To赋值
/// </summary>
/// <param name="input"></param>
/// <returns></returns>

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs

@ -564,7 +564,7 @@ public class AssembleIssueJobAppService
}
/// <summary>
/// 判断是不是在最底层 如果不是则把状态变更为待 并把库移推荐的From和To赋值
/// 判断是不是在最底层 如果不是则把状态变更为待库移 并把库移推荐的From和To赋值
/// </summary>
/// <param name="input"></param>
/// <returns></returns>

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs

@ -559,7 +559,7 @@ public class CoatingIssueJobAppService
}
/// <summary>
/// 判断是不是在最底层 如果不是则把状态变更为待 并把库移推荐的From和To赋值
/// 判断是不是在最底层 如果不是则把状态变更为待库移 并把库移推荐的From和To赋值
/// </summary>
/// <param name="input"></param>
/// <returns></returns>

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs

@ -512,7 +512,7 @@ public class InjectionIssueJobAppService
}
/// <summary>
/// 判断是不是在最底层 如果不是则把状态变更为待 并把库移推荐的From和To赋值
/// 判断是不是在最底层 如果不是则把状态变更为待库移 并把库移推荐的From和To赋值
/// </summary>
/// <param name="input"></param>
/// <returns></returns>

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs

@ -509,7 +509,7 @@ public class KittingIssueJobAppService
}
/// <summary>
/// 判断是不是在最底层 如果不是则把状态变更为待 并把库移推荐的From和To赋值
/// 判断是不是在最底层 如果不是则把状态变更为待库移 并把库移推荐的From和To赋值
/// </summary>
/// <param name="input"></param>
/// <returns></returns>

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs

@ -493,7 +493,7 @@ public class SparePartIssueJobAppService
}
/// <summary>
/// 判断是不是在最底层 如果不是则把状态变更为待 并把库移推荐的From和To赋值
/// 判断是不是在最底层 如果不是则把状态变更为待库移 并把库移推荐的From和To赋值
/// </summary>
/// <param name="input"></param>
/// <returns></returns>

8
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestAppService.cs

@ -72,6 +72,14 @@ IItemBasicAppService itemBasicAppService)
{
throw new UserFriendlyException($"同一发货类型、发货时间、客户的存在相同零件号!");
}
if(request.DeliverRequestType== EnumDeliverRequestType.FIS)
{
request.DeliverPlanNumber = request.Details.First().MesDeliveryNo;
}
else if (request.DeliverRequestType == EnumDeliverRequestType.Normal)
{
request.DeliverPlanNumber = request.Details.First().MesDeliveryPlan;
}
foreach (var detail in request.Details)
{
var itemBasicDto = await _itemBasicAppService.GetByCodeAsync(detail.ItemCode).ConfigureAwait(false);

4
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/DeliverJobs/DeliverJob.cs

@ -41,6 +41,10 @@ public class DeliverJob : SfsJobAggregateRootBase<DeliverJobDetail>
/// </summary>
[IgnoreUpdate]
public string DeliverPlanNumber { get; set; }
/// <summary>
/// Mes车牌号
/// </summary>
public string MesTruckNumber { get; set; }
/// <summary>
/// 任务明细

5
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/DeliverNotes/DeliverNote.cs

@ -60,7 +60,10 @@ public class DeliverNote : SfsStoreAggregateRootBase<DeliverNoteDetail>, IHasJob
/// <returns></returns>
[Display(Name = "打印次数")]
public int CountPrint { get; set; }
/// <summary>
/// Mes车牌号
/// </summary>
public string MesTruckNumber { get; set; }
/// <summary>
/// 明细列表
/// </summary>

5
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/DeliverRequests/DeliverRequest.cs

@ -20,7 +20,6 @@ public class DeliverRequest : SfsStoreRequestAggregateRootBase<DeliverRequestDet
/// <summary>
/// 发货计划单号
/// </summary>
[IgnoreUpdate]
public string DeliverPlanNumber { get; set; }
/// <summary>
@ -39,6 +38,10 @@ public class DeliverRequest : SfsStoreRequestAggregateRootBase<DeliverRequestDet
/// 发货类型
/// </summary>
public EnumDeliverRequestType DeliverRequestType { get; set; }
/// <summary>
/// Mes车牌号
/// </summary>
public string MesTruckNumber { get; set; }
/// <summary>
/// 任务明细

1
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/DeliverJobs/DeliverJobDbContextModelCreatingExtensions.cs

@ -24,6 +24,7 @@ public static class DeliverJobDbContextModelCreatingExtensions
b.Property(q => q.DeliverRequestNumber).HasMaxLength(SfsPropertyConst.CodeLength);
b.Property(q => q.CustomerCode).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength);
b.Property(q => q.CustomerAddressCode).HasMaxLength(SfsPropertyConst.CodeLength);
b.Property(q => q.MesTruckNumber).HasMaxLength(SfsPropertyConst.CodeLength);
//Relations
b.HasMany(q => q.Details).WithOne().HasForeignKey(d => d.MasterID).IsRequired();
//Indexes

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/DeliverNotes/DeliverNoteDbContextModelCreatingExtensions.cs

@ -22,7 +22,7 @@ public static class DeliverNoteDbContextModelCreatingExtensions
b.Property(q => q.CustomerCode).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength);
b.Property(q => q.CustomerAddressCode).HasMaxLength(SfsPropertyConst.CodeLength);
b.Property(q => q.DeliverRequestType).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
b.Property(q => q.MesTruckNumber).HasMaxLength(SfsPropertyConst.CodeLength);
//Relations
b.HasMany(q => q.Details).WithOne().HasForeignKey(d => d.MasterID).IsRequired();

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/DeliverRequests/DeliverRequestDbContextModelCreatingExtensions.cs

@ -24,7 +24,7 @@ public static class DeliverRequestDbContextModelCreatingExtensions
b.Property(q => q.DeliverRequestType).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
b.Property(q => q.DeliverPlanNumber).HasMaxLength(SfsPropertyConst.CodeLength);
b.Property(q => q.RequestStatus).IsRequired().HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
b.Property(q => q.MesTruckNumber).HasMaxLength(SfsPropertyConst.CodeLength);
//Relations
b.HasMany(q => q.Details).WithOne().HasForeignKey(d => d.MasterID).IsRequired();

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/InjectionPlanJobEventHandler.cs

@ -202,7 +202,7 @@ public class InjectionPlanJobEventHandler :
}
/// <summary>
/// 判断是不是在最底层 如果不是则把状态变更为
/// 判断是不是在最底层 如果不是则把状态变更为待库移
/// </summary>
/// <param name="injectionJob"></param>
/// <returns></returns>

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/AssembleIssueJobEventHandler.cs

@ -214,7 +214,7 @@ public class AssembleIssueJobEventHandler :
}
/// <summary>
/// 判断是不是在最底层 如果不是则把状态变更为
/// 判断是不是在最底层 如果不是则把状态变更为待库移
/// </summary>
/// <param name="assembleIssueJob"></param>
/// <returns></returns>

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/CoatingIssueJobEventHandler.cs

@ -214,7 +214,7 @@ public class CoatingIssueJobEventHandler :
}
/// <summary>
/// 判断是不是在最底层 如果不是则把状态变更为
/// 判断是不是在最底层 如果不是则把状态变更为待库移
/// </summary>
/// <param name="coatingIssueJob"></param>
/// <returns></returns>

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/InjectionIssueJobEventHandler.cs

@ -213,7 +213,7 @@ public class InjectionIssueJobEventHandler :
}
/// <summary>
/// 判断是不是在最底层 如果不是则把状态变更为
/// 判断是不是在最底层 如果不是则把状态变更为待库移
/// </summary>
/// <param name="injectionIssueJob"></param>
/// <returns></returns>

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/KittingIssueJobEventHandler.cs

@ -213,7 +213,7 @@ public class KittingIssueJobEventHandler :
}
/// <summary>
/// 判断是不是在最底层 如果不是则把状态变更为
/// 判断是不是在最底层 如果不是则把状态变更为待库移
/// </summary>
/// <param name="kittingIssueJob"></param>
/// <returns></returns>

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/SparePartIssueJobEventHandler.cs

@ -213,7 +213,7 @@ public class SparePartIssueJobEventHandler :
}
/// <summary>
/// 判断是不是在最底层 如果不是则把状态变更为
/// 判断是不是在最底层 如果不是则把状态变更为待库移
/// </summary>
/// <param name="sparePartIssueJob"></param>
/// <returns></returns>

Loading…
Cancel
Save