18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

Browse Source
This commit is contained in:
tongfei
2023-11-23 11:12:13 +08:00
parent 3cc575aa23 2d517e948a
commit c4f90f0c7e
9 changed files with 115 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
View File

Binary file not shown.

4
src/WMS.Web.Api/Controllers/TestController.cs
View File

@@ -50,12 +50,12 @@ namespace WMS.Web.Api.Controllers
//var bc = await _erpService.BillQueryForTransferOutOutStock(null, DateTime.Now.AddDays(-10));
//var b=await _erpService.BillQueryForAssembledAppOutStock_Assembly(null, DateTime.Now.AddDays(-10));
//var b2 = await _erpService.BillQueryForAssembledAppOutStock_Dassembly(null, DateTime.Now.AddDays(-10));
var result = await this._outStockTaskService.Sync(null);
//var result = await this._outStockTaskService.Sync(null);
//var t=await _outStockTaskRepositories.Get(1);
// t.Details[0].Remark = "sdf";
// t.Details[0].ErpDetails[0].SaleBillNo = "sdfsfsbbbb";
// var s = await _outStockTaskRepositories.Edit(t);
// await _boxService.Sync();
await _boxService.Sync();
//var res = await this._erpService.BillQueryForAssembledAppOutStock_Dassembly(null,DateTime.Now.AddDays(-300));
//var result= await this._erpService.BillQueryForPurchaseInStock();
//var result = await this._erpService.BillQueryForOrg();

40
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -1092,6 +1092,41 @@
生成单据号
</summary>
</member>
<member name="T:WMS.Web.Domain.Entitys.OutStockBoxsDetails">
<summary>
对应金蝶的明细
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockBoxsDetails.Id">
<summary>
主键 订单编号
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockBoxsDetails.DetailId">
<summary>
任务单明细Id
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockBoxsDetails.BoxId">
<summary>
任务单明细Id
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockBoxsDetails.SerialNumbers">
<summary>
序列号
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockBoxsDetails.SubStockId">
<summary>
仓位
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockBoxsDetails.Qty">
<summary>
出库数量
</summary>
</member>
<member name="T:WMS.Web.Domain.Entitys.OutStockDetails">
<summary>
wms出库单明细
@@ -1127,6 +1162,11 @@
对应erp明细 同一个物料 存在于不同的来源单中(合并后出现多条)
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockDetails.BoxsDetails">
<summary>
出库时对应箱信息
</summary>
</member>
<member name="T:WMS.Web.Domain.Entitys.OutStockErpDetails">
<summary>
对应金蝶的明细

48
src/WMS.Web.Domain/Entitys/OutStockBoxsDetails.cs Normal file
View File

@@ -0,0 +1,48 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
using WMS.Web.Core;
namespace WMS.Web.Domain.Entitys
{
/// <summary>
/// 对应金蝶的明细
/// </summary>
[Serializable]
[Table("t_wms_outstock_boxs_details")]
public class OutStockBoxsDetails : EntityBase
{
public OutStockBoxsDetails() { }
/// <summary>
/// 主键 订单编号
/// </summary>
[Column("Id")]
public override int Id { get; set; }
/// <summary>
/// 任务单明细Id
/// </summary>
[Column("DetailId")]
public int DetailId { get; set; }
/// <summary>
/// 任务单明细Id
/// </summary>
[Column("BoxId")]
public int BoxId { get; set; }
/// <summary>
/// 序列号
/// </summary>
[Column("SerialNumbers")]
public List<string> SerialNumbers { get; set; } = new List<string>();
/// <summary>
/// 仓位
///</summary>
[Column("SubStockId")]
public int SubStockId { get; set; }
/// <summary>
/// 出库数量
///</summary>
[Column("Qty")]
public decimal Qty { get; set; }
}
}

4
src/WMS.Web.Domain/Entitys/OutStockDetails.cs
View File

@@ -51,5 +51,9 @@ namespace WMS.Web.Domain.Entitys
/// 对应erp明细 同一个物料 存在于不同的来源单中(合并后出现多条)
/// </summary>
public List<OutStockErpDetails> ErpDetails { get; set; } = new List<OutStockErpDetails>();
/// <summary>
/// 出库时对应箱信息
/// </summary>
public List<OutStockBoxsDetails> BoxsDetails { get; set; } = new List<OutStockBoxsDetails>();
}
}

1
src/WMS.Web.Domain/Mappers/OutStockMapper.cs
View File

@@ -32,6 +32,7 @@ namespace WMS.Web.Domain.Mappers
.ForMember(x => x.Id, ops => ops.Ignore())
.ForMember(x => x.DetailId, ops => ops.Ignore())
.ForMember(x => x.Qty, ops => ops.Ignore());
CreateMap<SaveOutStockDetailsRequest, OutStockBoxsDetails>();
CreateMap<OutStockTask, GetOutStockTaskByNoResponse>();

1
src/WMS.Web.Domain/Services/BoxService.cs
View File

@@ -48,6 +48,7 @@ namespace WMS.Web.Domain.Services
public async Task<Result> Sync()
{
DateTime begin = await _erpOpsSyncDateRepositories.Get(ErpOpsSyncType.Ops);
begin= begin.AddYears(-1);
OpsBoxRequest request = new OpsBoxRequest(begin, DateTime.Now);
var list = await _opsService.GetBox(request);
var nos = list.Select(s => s.BoxBillNo).ToList();

3
src/WMS.Web.Domain/Services/OutStockService.cs
View File

@@ -95,6 +95,9 @@ namespace WMS.Web.Domain.Services
oErpDetail.Qty = c.qty;
outd.ErpDetails.Add(oErpDetail);
}
var boxs = dto.Details.Where(w => w.MaterialId == mid).ToList();
outd.BoxsDetails = _mapper.Map<List<OutStockBoxsDetails>>(boxs);
outd.Qty = qty;
outd.SerialNumbers.AddRange(dtoDetails.SelectMany(s => s.SerialNumbers));
entity.Details.Add(outd);

15
src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs
View File

@@ -103,6 +103,11 @@ namespace WMS.Web.Repositories.Configuration
.WithOne()
.HasForeignKey(p => p.DetailId)
.OnDelete(DeleteBehavior.Cascade);
ent.HasMany(p => p.BoxsDetails)
.WithOne()
.HasForeignKey(p => p.DetailId)
.OnDelete(DeleteBehavior.Cascade);
});
builder.Entity<OutStockErpDetails>(ent =>
@@ -110,6 +115,16 @@ namespace WMS.Web.Repositories.Configuration
ent.ToTable("t_wms_outstock_erp_details");
ent.HasKey(x => x.Id);
});
builder.Entity<OutStockBoxsDetails>(ent =>
{
ent.ToTable("t_wms_outstock_boxs_details");
ent.HasKey(x => x.Id);
ent.Property(f => f.SerialNumbers).HasConversion(
v => JsonConvert.SerializeObject(v),
v => JsonConvert.DeserializeObject<List<string>>(v));
});
#endregion
#region 出库任务单