zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

dev_DY_CC
lvzb 11 months ago
parent
ff785022ae e1de200c28
commit
89f985f240
16 changed files with 4681 additions and 198 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Dtos/SplitPackingRecDto.cs
  2. 10
      be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Inputs/SplitPackingRecEditInput.cs
  3. 140
      be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/SplitPackings/SplitPackingRecAutoMapperProfile.cs
  4. 55
      be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRec.cs
  5. 4385
      be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/Migrations/20240627020919_Basedata20240627.Designer.cs
  6. 107
      be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/Migrations/20240627020919_Basedata20240627.cs
  7. 114
      be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/Migrations/BasedataDbContextModelSnapshot.cs
  8. 6
      be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/SplitPackings/SplitPackingRecDbContextModelCreatingExtensions.cs
  9. 4
      be/Modules/Label/src/Win_in.Sfs.Label.Application/InventoryLabels/InventoryLabelAppService.cs
  10. 4
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/InspectJobs/InspectJobAppService.cs
  11. 4
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/PurchaseReceiptJobs/PurchaseReceiptJobAppService.cs
  12. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PurchaseReceiptNotes/PurchaseReceiptNoteAppService.cs
  13. 7
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PutawayNotes/PutawayNoteAppService.cs
  14. 4
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs
  15. 4
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/PurchaseReceiptRequests/PurchaseReceiptRequestAppService.cs
  16. 19
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/PurchaseReceiptNoteEventHandler.cs

14
be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Dtos/SplitPackingRecDto.cs
View File

@ -11,9 +11,9 @@ using Win_in.Sfs.Basedata.Domain.Shared;
namespace Win_in.Sfs.Basedata.Application.Contracts;
public class SplitPackingRecDTO : SfsBaseDataDTOBase
, IHasPurchaseInfoDto
, IHasProductionInfoDto
, IHasQualityInfoDto
//, IHasPurchaseInfoDto
//, IHasProductionInfoDto
//, IHasQualityInfoDto
{
/// <summary>
@ -244,8 +244,8 @@ public class SplitPackingRecDTO : SfsBaseDataDTOBase
/// <summary>
/// 订单号
/// </summary>
[Display(Name = "订单号")]
public string PoNumber { get; set; }
//[Display(Name = "订单号")]
//public string PoNumber { get; set; }
/// <summary>
/// 要货看板号
@ -256,8 +256,8 @@ public class SplitPackingRecDTO : SfsBaseDataDTOBase
/// <summary>
/// 发货单号
/// </summary>
[Display(Name = "发货单号")]
public string AsnNumber { get; set; }
//[Display(Name = "发货单号")]
//public string AsnNumber { get; set; }
//--------------------------------ProductionInfo
/// <summary>

10
be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Inputs/SplitPackingRecEditInput.cs
View File

@ -13,7 +13,7 @@ namespace Win_in.Sfs.Basedata.Application.Contracts;
public class SplitPackingRecEditInput : SfsBaseDataCreateOrUpdateInputBase
, IHasPurchaseInfoDto
//, IHasPurchaseInfoDto
, IHasProductionInfoDto
, IHasQualityInfoDto
{
@ -252,8 +252,8 @@ public class SplitPackingRecEditInput : SfsBaseDataCreateOrUpdateInputBase
/// <summary>
/// 订单号
/// </summary>
[Display(Name = "订单号")]
public string PoNumber { get; set; }
//[Display(Name = "订单号")]
//public string PoNumber { get; set; }
/// <summary>
/// 要货看板号
@ -264,8 +264,8 @@ public class SplitPackingRecEditInput : SfsBaseDataCreateOrUpdateInputBase
/// <summary>
/// 发货单号
/// </summary>
[Display(Name = "发货单号")]
public string AsnNumber { get; set; }
//[Display(Name = "发货单号")]
//public string AsnNumber { get; set; }
//--------------------------------ProductionInfo
/// <summary>

140
be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/SplitPackings/SplitPackingRecAutoMapperProfile.cs
View File

@ -9,15 +9,15 @@ public partial class BasedataApplicationAutoMapperProfile : Profile
{
private void SplitPackingRecAutoMapperProfile()
{
CreateMap<SplitPackingRec, SplitPackingRecDTO>()
.MapPurchaseInfo()
.MapProductionInfo()
.MapQualityInfo();
CreateMap<SplitPackingRec, SplitPackingRecDTO>();
//.MapPurchaseInfo()
//.MapProductionInfo()
//.MapQualityInfo();
CreateMap<SplitPackingRecEditInput, SplitPackingRec>()
.MapQualityInfoDto()
.MapPurchaseInfoDto()
.MapProductionInfoDto()
//.MapQualityInfoDto()
//.MapPurchaseInfoDto()
//.MapProductionInfoDto()
.Ignore(t => t.FromTopPackingCode)
.Ignore(t => t.ToTopPackingCode)
.Ignore(t => t.LastModificationTime)
@ -30,71 +30,71 @@ public partial class BasedataApplicationAutoMapperProfile : Profile
}
}
public static class LabelCommonMapperExtensions
{
public static IMappingExpression<TSource, TDestination> MapPurchaseInfo<TSource, TDestination>(
this IMappingExpression<TSource, TDestination> m)
where TSource : IHasPurchaseInfo
where TDestination : IHasPurchaseInfoDto
{
return m
.ForMember(dest => dest.SupplierCode, opts => opts.MapFrom(src => src.PurchaseInfo.SupplierCode))
.ForMember(dest => dest.PoNumber, opts => opts.MapFrom(src => src.PurchaseInfo.PoNumber))
.ForMember(dest => dest.RpNumber, opts => opts.MapFrom(src => src.PurchaseInfo.RpNumber))
.ForMember(dest => dest.AsnNumber, opts => opts.MapFrom(src => src.PurchaseInfo.AsnNumber))
;
}
//public static class LabelCommonMapperExtensions
//{
// public static IMappingExpression<TSource, TDestination> MapPurchaseInfo<TSource, TDestination>(
// this IMappingExpression<TSource, TDestination> m)
// where TSource : IHasPurchaseInfo
// where TDestination : IHasPurchaseInfoDto
// {
// return m
// .ForMember(dest => dest.SupplierCode, opts => opts.MapFrom(src => src.PurchaseInfo.SupplierCode))
// .ForMember(dest => dest.PoNumber, opts => opts.MapFrom(src => src.PurchaseInfo.PoNumber))
// .ForMember(dest => dest.RpNumber, opts => opts.MapFrom(src => src.PurchaseInfo.RpNumber))
// .ForMember(dest => dest.AsnNumber, opts => opts.MapFrom(src => src.PurchaseInfo.AsnNumber))
// ;
// }
public static IMappingExpression<TSource, TDestination> MapProductionInfo<TSource, TDestination>(
this IMappingExpression<TSource, TDestination> m)
where TSource : IHasProductionInfo
where TDestination : IHasProductionInfoDto
{
return m
.ForMember(dest => dest.ProdLine, opts => opts.MapFrom(src => src.ProductionInfo.ProdLine))
.ForMember(dest => dest.Team, opts => opts.MapFrom(src => src.ProductionInfo.Team))
.ForMember(dest => dest.Shift, opts => opts.MapFrom(src => src.ProductionInfo.Shift))
;
}
// public static IMappingExpression<TSource, TDestination> MapProductionInfo<TSource, TDestination>(
// this IMappingExpression<TSource, TDestination> m)
// where TSource : IHasProductionInfo
// where TDestination : IHasProductionInfoDto
// {
// return m
// .ForMember(dest => dest.ProdLine, opts => opts.MapFrom(src => src.ProductionInfo.ProdLine))
// .ForMember(dest => dest.Team, opts => opts.MapFrom(src => src.ProductionInfo.Team))
// .ForMember(dest => dest.Shift, opts => opts.MapFrom(src => src.ProductionInfo.Shift))
// ;
// }
public static IMappingExpression<TSource, TDestination> MapPurchaseInfoDto<TSource, TDestination>(
this IMappingExpression<TSource, TDestination> m)
where TSource : IHasPurchaseInfoDto
where TDestination : IHasPurchaseInfo
{
return m
.ForMember(dest => dest.PurchaseInfo, opts => opts.MapFrom(src => new PurchaseInfo(src.SupplierCode, src.PoNumber, src.RpNumber, src.AsnNumber)))
;
}
// public static IMappingExpression<TSource, TDestination> MapPurchaseInfoDto<TSource, TDestination>(
// this IMappingExpression<TSource, TDestination> m)
// where TSource : IHasPurchaseInfoDto
// where TDestination : IHasPurchaseInfo
// {
// return m
// .ForMember(dest => dest.PurchaseInfo, opts => opts.MapFrom(src => new PurchaseInfo(src.SupplierCode, src.PoNumber, src.RpNumber, src.AsnNumber)))
// ;
// }
public static IMappingExpression<TSource, TDestination> MapProductionInfoDto<TSource, TDestination>(
this IMappingExpression<TSource, TDestination> m)
where TSource : IHasProductionInfoDto
where TDestination : IHasProductionInfo
{
return m
.ForMember(dest => dest.ProductionInfo, opts => opts.MapFrom(src => new ProductionInfo(src.ProdLine, src.Team, src.Shift)))
;
}
// public static IMappingExpression<TSource, TDestination> MapProductionInfoDto<TSource, TDestination>(
// this IMappingExpression<TSource, TDestination> m)
// where TSource : IHasProductionInfoDto
// where TDestination : IHasProductionInfo
// {
// return m
// .ForMember(dest => dest.ProductionInfo, opts => opts.MapFrom(src => new ProductionInfo(src.ProdLine, src.Team, src.Shift)))
// ;
// }
public static IMappingExpression<TSource, TDestination> MapQualityInfo<TSource, TDestination>(
this IMappingExpression<TSource, TDestination> m)
where TSource : IHasQualityInfo
where TDestination : IHasQualityInfoDto
{
return m
.ForMember(dest => dest.QLevel, opts => opts.MapFrom(src => src.QualityInfo.QLevel))
.ForMember(dest => dest.QualityFile, opts => opts.MapFrom(src => src.QualityInfo.QualityFile))
;
}
// public static IMappingExpression<TSource, TDestination> MapQualityInfo<TSource, TDestination>(
// this IMappingExpression<TSource, TDestination> m)
// where TSource : IHasQualityInfo
// where TDestination : IHasQualityInfoDto
// {
// return m
// .ForMember(dest => dest.QLevel, opts => opts.MapFrom(src => src.QualityInfo.QLevel))
// .ForMember(dest => dest.QualityFile, opts => opts.MapFrom(src => src.QualityInfo.QualityFile))
// ;
// }
public static IMappingExpression<TSource, TDestination> MapQualityInfoDto<TSource, TDestination>(
this IMappingExpression<TSource, TDestination> m)
where TSource : IHasQualityInfoDto
where TDestination : IHasQualityInfo
{
return m
.ForMember(dest => dest.QualityInfo, opts => opts.MapFrom(src => new QualityInfo(src.QLevel, src.QualityFile)))
;
}
}
// public static IMappingExpression<TSource, TDestination> MapQualityInfoDto<TSource, TDestination>(
// this IMappingExpression<TSource, TDestination> m)
// where TSource : IHasQualityInfoDto
// where TDestination : IHasQualityInfo
// {
// return m
// .ForMember(dest => dest.QualityInfo, opts => opts.MapFrom(src => new QualityInfo(src.QLevel, src.QualityFile)))
// ;
// }
//}

55
be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRec.cs
View File

@ -15,9 +15,9 @@ namespace Win_in.Sfs.Basedata.Domain;
/// </summary>
public class SplitPackingRec : SfsBaseDataAggregateRootBase
, IHasItem
, IHasPurchaseInfo
, IHasQualityInfo
, IHasProductionInfo
//, IHasPurchaseInfo
//, IHasQualityInfo
//, IHasProductionInfo
{
/// <summary>
/// 操作类型
@ -200,17 +200,60 @@ public class SplitPackingRec : SfsBaseDataAggregateRootBase
/// <summary>
/// 质量信息
/// </summary>
public QualityInfo QualityInfo { get; set; } = new();
//public QualityInfo QualityInfo { get; set; } = new();
/// <summary>
/// 质量等级
/// </summary>
[MaxLength(SfsEfCorePropertyConst.CodeLength)]
public string QLevel { get; set; }
/// <summary>
/// 质检文件
/// </summary>
[MaxLength(SfsEfCorePropertyConst.CodeLength)]
public string QualityFile { get; set; }
/// <summary>
/// 采购信息
/// </summary>
public PurchaseInfo PurchaseInfo { get; set; } = new();
//public PurchaseInfo PurchaseInfo { get; set; } = new();
/// <summary>
/// 供应商代码
/// </summary>
[MaxLength(SfsEfCorePropertyConst.CodeLength)]
public string SupplierCode { get; set; }
/// <summary>
/// 要货计划号
/// </summary>
[MaxLength(SfsEfCorePropertyConst.CodeLength)]
public string RpNumber { get; set; }
/// <summary>
/// 生产信息
/// </summary>
public ProductionInfo ProductionInfo { get; set; } = new();
//public ProductionInfo ProductionInfo { get; set; } = new();
/// <summary>
/// 生产线
/// </summary>
[MaxLength(SfsEfCorePropertyConst.CodeLength)]
public string ProdLine { get; set; }
/// <summary>
/// 班组
/// </summary>
[MaxLength(SfsEfCorePropertyConst.CodeLength)]
public string Team { get; set; }
/// <summary>
/// 班次
/// </summary>
[MaxLength(SfsEfCorePropertyConst.CodeLength)]
public string Shift { get; set; }
/// <summary>
/// 规格

4385
be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/Migrations/20240627020919_Basedata20240627.Designer.cs
View File

File diff suppressed because it is too large

107
be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/Migrations/20240627020919_Basedata20240627.cs
View File

@ -0,0 +1,107 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Win_in.Sfs.Basedata.Migrations
{
public partial class Basedata20240627 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "PurchaseInfo_AsnNumber1",
table: "Basedata_SplitPackingRec");
migrationBuilder.DropColumn(
name: "PurchaseInfo_PoNumber1",
table: "Basedata_SplitPackingRec");
migrationBuilder.RenameColumn(
name: "QualityInfo_QualityFile",
table: "Basedata_SplitPackingRec",
newName: "QualityFile");
migrationBuilder.RenameColumn(
name: "QualityInfo_QLevel",
table: "Basedata_SplitPackingRec",
newName: "QLevel");
migrationBuilder.RenameColumn(
name: "PurchaseInfo_SupplierCode",
table: "Basedata_SplitPackingRec",
newName: "SupplierCode");
migrationBuilder.RenameColumn(
name: "PurchaseInfo_RpNumber",
table: "Basedata_SplitPackingRec",
newName: "RpNumber");
migrationBuilder.RenameColumn(
name: "ProductionInfo_Team",
table: "Basedata_SplitPackingRec",
newName: "Team");
migrationBuilder.RenameColumn(
name: "ProductionInfo_Shift",
table: "Basedata_SplitPackingRec",
newName: "Shift");
migrationBuilder.RenameColumn(
name: "ProductionInfo_ProdLine",
table: "Basedata_SplitPackingRec",
newName: "ProdLine");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "Team",
table: "Basedata_SplitPackingRec",
newName: "ProductionInfo_Team");
migrationBuilder.RenameColumn(
name: "SupplierCode",
table: "Basedata_SplitPackingRec",
newName: "PurchaseInfo_SupplierCode");
migrationBuilder.RenameColumn(
name: "Shift",
table: "Basedata_SplitPackingRec",
newName: "ProductionInfo_Shift");
migrationBuilder.RenameColumn(
name: "RpNumber",
table: "Basedata_SplitPackingRec",
newName: "PurchaseInfo_RpNumber");
migrationBuilder.RenameColumn(
name: "QualityFile",
table: "Basedata_SplitPackingRec",
newName: "QualityInfo_QualityFile");
migrationBuilder.RenameColumn(
name: "QLevel",
table: "Basedata_SplitPackingRec",
newName: "QualityInfo_QLevel");
migrationBuilder.RenameColumn(
name: "ProdLine",
table: "Basedata_SplitPackingRec",
newName: "ProductionInfo_ProdLine");
migrationBuilder.AddColumn<string>(
name: "PurchaseInfo_AsnNumber1",
table: "Basedata_SplitPackingRec",
type: "nvarchar(64)",
maxLength: 64,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "PurchaseInfo_PoNumber1",
table: "Basedata_SplitPackingRec",
type: "nvarchar(64)",
maxLength: 64,
nullable: true);
}
}
}

114
be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/Migrations/BasedataDbContextModelSnapshot.cs
View File

@ -3395,6 +3395,10 @@ namespace Win_in.Sfs.Basedata.Migrations
b.Property<DateTime>("PlanArriveDate")
.HasColumnType("datetime2");
b.Property<string>("ProdLine")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<DateTime>("ProduceDate")
.HasColumnType("datetime2");
@ -3410,6 +3414,14 @@ namespace Win_in.Sfs.Basedata.Migrations
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("QLevel")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("QualityFile")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("ReceiptRecNumber")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
@ -3421,6 +3433,14 @@ namespace Win_in.Sfs.Basedata.Migrations
b.Property<string>("Remark")
.HasColumnType("nvarchar(max)");
b.Property<string>("RpNumber")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("Shift")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("Specifications")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
@ -3429,6 +3449,10 @@ namespace Win_in.Sfs.Basedata.Migrations
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("SupplierCode")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("SupplierItemCode")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
@ -3449,6 +3473,10 @@ namespace Win_in.Sfs.Basedata.Migrations
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("Team")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<Guid?>("TenantId")
.HasColumnType("uniqueidentifier")
.HasColumnName("TenantId");
@ -4340,92 +4368,6 @@ namespace Win_in.Sfs.Basedata.Migrations
.IsRequired();
});
modelBuilder.Entity("Win_in.Sfs.Basedata.Domain.SplitPackingRec", b =>
{
b.OwnsOne("Win_in.Sfs.Basedata.ProductionInfo", "ProductionInfo", b1 =>
{
b1.Property<Guid>("SplitPackingRecId")
.HasColumnType("uniqueidentifier");
b1.Property<string>("ProdLine")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b1.Property<string>("Shift")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b1.Property<string>("Team")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b1.HasKey("SplitPackingRecId");
b1.ToTable("Basedata_SplitPackingRec");
b1.WithOwner()
.HasForeignKey("SplitPackingRecId");
});
b.OwnsOne("Win_in.Sfs.Basedata.PurchaseInfo", "PurchaseInfo", b1 =>
{
b1.Property<Guid>("SplitPackingRecId")
.HasColumnType("uniqueidentifier");
b1.Property<string>("AsnNumber")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)")
.HasColumnName("PurchaseInfo_AsnNumber1");
b1.Property<string>("PoNumber")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)")
.HasColumnName("PurchaseInfo_PoNumber1");
b1.Property<string>("RpNumber")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b1.Property<string>("SupplierCode")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b1.HasKey("SplitPackingRecId");
b1.ToTable("Basedata_SplitPackingRec");
b1.WithOwner()
.HasForeignKey("SplitPackingRecId");
});
b.OwnsOne("Win_in.Sfs.Basedata.QualityInfo", "QualityInfo", b1 =>
{
b1.Property<Guid>("SplitPackingRecId")
.HasColumnType("uniqueidentifier");
b1.Property<string>("QLevel")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b1.Property<string>("QualityFile")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b1.HasKey("SplitPackingRecId");
b1.ToTable("Basedata_SplitPackingRec");
b1.WithOwner()
.HasForeignKey("SplitPackingRecId");
});
b.Navigation("ProductionInfo");
b.Navigation("PurchaseInfo");
b.Navigation("QualityInfo");
});
modelBuilder.Entity("Win_in.Sfs.Basedata.Domain.Dict", b =>
{
b.Navigation("Items");

6
be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/SplitPackings/SplitPackingRecDbContextModelCreatingExtensions.cs
View File

@ -65,9 +65,9 @@ public static class SplitPackingRecDbContextModelCreatingExtensions
b.HasIndex(q => new { ToPackingCode = q.ToPackingCode });
//Relations
b.OwnsOne(q => q.PurchaseInfo);
b.OwnsOne(q => q.ProductionInfo);
b.OwnsOne(q => q.QualityInfo);
//b.OwnsOne(q => q.PurchaseInfo);
//b.OwnsOne(q => q.ProductionInfo);
//b.OwnsOne(q => q.QualityInfo);
});

4
be/Modules/Label/src/Win_in.Sfs.Label.Application/InventoryLabels/InventoryLabelAppService.cs
View File

@ -209,9 +209,9 @@ public class InventoryLabelAppService
packRec.QLevel = inputObj.QLevel;//
packRec.QualityFile = inputObj.QualityFile;
packRec.SupplierCode = inputObj.SupplierCode;
packRec.PoNumber = inputObj.PoNumber;
//packRec.PoNumber = inputObj.PoNumber;
packRec.RpNumber = inputObj.RpNumber;
packRec.AsnNumber = inputObj.AsnNumber;
//packRec.AsnNumber = inputObj.AsnNumber;
packRec.ProdLine = inputObj.ProdLine;
packRec.Team = inputObj.Team;
packRec.Shift = inputObj.Shift;//

4
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/InspectJobs/InspectJobAppService.cs
View File

@ -225,8 +225,8 @@ public class InspectJobAppService
newDetail.InspectQty = input.ToQty;
newDetail.GoodQty = input.ToQty;
//newDetail.CreationTime = CommonHelper.CurTime;
decimal maxPoLine = job.Details.Max(itm => itm.PoLine.TryToDecimalZero());
newDetail.PoLine = (maxPoLine + 1).ToString(); //行号自增
//decimal maxPoLine = job.Details.Max(itm => itm.PoLine.TryToDecimalZero());
//newDetail.PoLine = (maxPoLine + 1).ToString(); //行号自增
job.Details.Add(newDetail);
//修改源箱
detail.ReceiveQty = input.FromQty - input.ToQty;

4
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/PurchaseReceiptJobs/PurchaseReceiptJobAppService.cs
View File

@ -253,8 +253,8 @@ public class PurchaseReceiptJobAppService :
newDetail.HandledQty = detail.HandledQty > 0 ? input.ToQty : 0;
//newDetail.CreationTime = CommonHelper.CurTime;
newDetail.PurchaseReceiptInspectStatus = EnumPurchaseReceiptInspect.INSP; //俊城沟通，改成 未扫描
decimal maxPoLine = job.Details.Max(itm => itm.PoLine.TryToDecimalZero());
newDetail.PoLine = (maxPoLine + 1).ToString(); //行号自增
//decimal maxPoLine = job.Details.Max(itm => itm.PoLine.TryToDecimalZero());
//newDetail.PoLine = (maxPoLine + 1).ToString(); //行号自增
job.Details.Add(newDetail);
//修改源箱
detail.RecommendQty = input.FromQty - input.ToQty;

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PurchaseReceiptNotes/PurchaseReceiptNoteAppService.cs
View File

@ -123,7 +123,7 @@ public class PurchaseReceiptNoteAppService :
.Where(p => p.PurchaseReceiptInspectStatus == EnumPurchaseReceiptInspect.NORECEIPT).ToList());
foreach(var item in purchaseReceiptNoteDetailDTOS)
{
item.Qty = item.RecommendQty - item.HandledQty;
item.Qty = item.RecommendQty ;
}
return purchaseReceiptNoteDetailDTOS;

7
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PutawayNotes/PutawayNoteAppService.cs
View File

@ -74,20 +74,21 @@ public class PutawayNoteAppService :
var splitPackingRecList = await _splitPackingRecAppService.GetListByToPackingCode(selectPackingCode.ToList()).ConfigureAwait(false);
//按照不同的条件分组
var group= splitPackingRecList.GroupBy(p => new {
p.SupplierCode,p.AsnNumber,p.PoNumber
p.SupplierCode,p.PurchaseInfo_AsnNumber,
p.PurchaseInfo_PoNumber
});
foreach (var groupWhere in group)
{
var tempEditInput = new PutawayNoteEditInput();
tempEditInput.Details = new List<PutawayNoteDetailInput>();
tempEditInput.SupplierCode = groupWhere.First().SupplierCode;
tempEditInput.AsnNumber = groupWhere.First().AsnNumber;
tempEditInput.AsnNumber = groupWhere.First().PurchaseInfo_AsnNumber;
tempEditInput.InspectNumber = string.Empty;
tempEditInput.JobNumber = string.Empty;
tempEditInput.ProductReceiptNumber = string.Empty;
tempEditInput.PurchaseReceiptRequestNumber = string.Empty;
tempEditInput.Type = EnumPutawayType.PurchasePutaway;
tempEditInput.Number = groupWhere.Key.PoNumber;
tempEditInput.Number = groupWhere.Key.PurchaseInfo_PoNumber;
foreach (var packingCode in groupWhere)
{
var detailInput=input.Details.First(p => p.ToPackingCode == packingCode.ToPackingCode);

4
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs
View File

@ -490,9 +490,9 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
packRec.QLevel = inputObj.QLevel;//
packRec.QualityFile = inputObj.QualityFile;
packRec.SupplierCode = inputObj.SupplierCode;
packRec.PoNumber = inputObj.PoNumber;
packRec.PurchaseInfo_PoNumber = inputObj.PoNumber;
packRec.RpNumber = inputObj.RpNumber;
packRec.AsnNumber = inputObj.AsnNumber;
packRec.PurchaseInfo_AsnNumber = inputObj.AsnNumber;
packRec.ProdLine = inputObj.ProdLine;
packRec.Team = inputObj.Team;
packRec.Shift = inputObj.Shift;//

4
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/PurchaseReceiptRequests/PurchaseReceiptRequestAppService.cs
View File

@ -227,8 +227,8 @@ public class PurchaseReceiptRequestAppService :
newDetail.PackingCode = input.ToPackingCode;
newDetail.Qty = input.ToQty;
//newDetail.CreationTime = CommonHelper.CurTime;
decimal maxPoLine = request.Details.Max(itm => itm.PoLine.TryToDecimalZero());
newDetail.PoLine = (maxPoLine + 1).ToString(); //行号自增
//decimal maxPoLine = request.Details.Max(itm => itm.PoLine.TryToDecimalZero());
//newDetail.PoLine = (maxPoLine + 1).ToString(); //行号自增
request.Details.Add(newDetail);
//修改源箱
detail.Qty = input.FromQty - input.ToQty;

19
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/PurchaseReceiptNoteEventHandler.cs
View File

@ -94,14 +94,19 @@ public class PurchaseReceiptNoteEventHandler
foreach (var detail in entity.Details)
{
var purchaseOrderDetailUpdateInput = new PurchaseOrderDetailUpdateInput()
//未收货状态不能更新
if(detail.PurchaseReceiptInspectStatus != EnumPurchaseReceiptInspect.NORECEIPT)
{
PoLine = detail.PoLine,
ItemCode = detail.ItemCode,
ReceivedQty = detail.Qty,
};
purchaseOrderDetailUpdateInputs.Add(purchaseOrderDetailUpdateInput);
var purchaseOrderDetailUpdateInput = new PurchaseOrderDetailUpdateInput()
{
PoLine = detail.PoLine,
ItemCode = detail.ItemCode,
ReceivedQty = detail.Qty,
};
purchaseOrderDetailUpdateInputs.Add(purchaseOrderDetailUpdateInput);
}
}
await _purchaseOrderAppService.UpdateDetailsAsync(entity.PoNumber, purchaseOrderDetailUpdateInputs).ConfigureAwait(false);

Write Preview
Loading…
Cancel
Save