diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index 5c024a8c..f34b5c4e 100644
Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ
diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs
index 7348913d..1f9600dd 100644
--- a/src/WMS.Web.Api/Controllers/TestController.cs
+++ b/src/WMS.Web.Api/Controllers/TestController.cs
@@ -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();
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index d65f9cc9..578ce693 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -1092,6 +1092,41 @@
生成单据号
+
+
+ 对应金蝶的明细
+
+
+
+
+ 主键 订单编号
+
+
+
+
+ 任务单明细Id
+
+
+
+
+ 任务单明细Id
+
+
+
+
+ 序列号
+
+
+
+
+ 仓位
+
+
+
+
+ 出库数量
+
+
wms出库单明细
@@ -1127,6 +1162,11 @@
对应erp明细 同一个物料 存在于不同的来源单中(合并后出现多条)
+
+
+ 出库时对应箱信息
+
+
对应金蝶的明细
diff --git a/src/WMS.Web.Domain/Entitys/OutStockBoxsDetails.cs b/src/WMS.Web.Domain/Entitys/OutStockBoxsDetails.cs
new file mode 100644
index 00000000..b6ca49fa
--- /dev/null
+++ b/src/WMS.Web.Domain/Entitys/OutStockBoxsDetails.cs
@@ -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
+{
+ ///
+ /// 对应金蝶的明细
+ ///
+ [Serializable]
+ [Table("t_wms_outstock_boxs_details")]
+ public class OutStockBoxsDetails : EntityBase
+ {
+ public OutStockBoxsDetails() { }
+ ///
+ /// 主键 订单编号
+ ///
+ [Column("Id")]
+ public override int Id { get; set; }
+ ///
+ /// 任务单明细Id
+ ///
+ [Column("DetailId")]
+ public int DetailId { get; set; }
+ ///
+ /// 任务单明细Id
+ ///
+ [Column("BoxId")]
+ public int BoxId { get; set; }
+ ///
+ /// 序列号
+ ///
+ [Column("SerialNumbers")]
+ public List SerialNumbers { get; set; } = new List();
+ ///
+ /// 仓位
+ ///
+ [Column("SubStockId")]
+ public int SubStockId { get; set; }
+ ///
+ /// 出库数量
+ ///
+ [Column("Qty")]
+ public decimal Qty { get; set; }
+ }
+}
diff --git a/src/WMS.Web.Domain/Entitys/OutStockDetails.cs b/src/WMS.Web.Domain/Entitys/OutStockDetails.cs
index 1122367d..8965ad79 100644
--- a/src/WMS.Web.Domain/Entitys/OutStockDetails.cs
+++ b/src/WMS.Web.Domain/Entitys/OutStockDetails.cs
@@ -51,5 +51,9 @@ namespace WMS.Web.Domain.Entitys
/// 对应erp明细 同一个物料 存在于不同的来源单中(合并后出现多条)
///
public List ErpDetails { get; set; } = new List();
+ ///
+ /// 出库时对应箱信息
+ ///
+ public List BoxsDetails { get; set; } = new List();
}
}
diff --git a/src/WMS.Web.Domain/Mappers/OutStockMapper.cs b/src/WMS.Web.Domain/Mappers/OutStockMapper.cs
index 3e9a7f08..53323ad4 100644
--- a/src/WMS.Web.Domain/Mappers/OutStockMapper.cs
+++ b/src/WMS.Web.Domain/Mappers/OutStockMapper.cs
@@ -32,7 +32,8 @@ 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();
+
CreateMap();
CreateMap();
diff --git a/src/WMS.Web.Domain/Services/BoxService.cs b/src/WMS.Web.Domain/Services/BoxService.cs
index 000fe806..c7ed1e4e 100644
--- a/src/WMS.Web.Domain/Services/BoxService.cs
+++ b/src/WMS.Web.Domain/Services/BoxService.cs
@@ -48,6 +48,7 @@ namespace WMS.Web.Domain.Services
public async Task 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();
diff --git a/src/WMS.Web.Domain/Services/OutStockService.cs b/src/WMS.Web.Domain/Services/OutStockService.cs
index f112035e..ec1857b5 100644
--- a/src/WMS.Web.Domain/Services/OutStockService.cs
+++ b/src/WMS.Web.Domain/Services/OutStockService.cs
@@ -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>(boxs);
+
outd.Qty = qty;
outd.SerialNumbers.AddRange(dtoDetails.SelectMany(s => s.SerialNumbers));
entity.Details.Add(outd);
diff --git a/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs b/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs
index 95328a6d..56e205f0 100644
--- a/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs
+++ b/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs
@@ -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(ent =>
@@ -110,6 +115,16 @@ namespace WMS.Web.Repositories.Configuration
ent.ToTable("t_wms_outstock_erp_details");
ent.HasKey(x => x.Id);
});
+
+ builder.Entity(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>(v));
+ });
#endregion
#region 出库任务单