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

优化

Browse Source
This commit is contained in:
tongfei
2024-03-18 11:03:51 +08:00
parent c0520b5cd3
commit 896450fd23
49 changed files with 394 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/WMS.Web.Domain/Services/InStockTaskService.cs
View File

@@ -380,7 +380,7 @@ namespace WMS.Web.Domain.Services
var erp_data = erp_list.Where(t => t.ErpDetailId == x.ErpDetailId).FirstOrDefault();
if (erp_data != null)
{
if (erp_data.MaterialId != x.MaterialId)
if (erp_data.MaterialNumber != x.MaterialNumber)
{
//给老的物料应收数量改为0
x.AccruedQty = 0;
@@ -400,7 +400,7 @@ namespace WMS.Web.Domain.Services
var local_data = data_list_details_new.Where(t => t.ErpDetailId == item.ErpDetailId).ToList();
if (local_data != null && local_data.Count != 0)
{
var isHaveMater_detail = local_data.Where(t => t.MaterialId == item.MaterialId).Any();
var isHaveMater_detail = local_data.Where(t => t.MaterialNumber == item.MaterialNumber).Any();
if (!isHaveMater_detail)
{
//明细的物料改变了：新的物料重新添加一条明细
@@ -496,7 +496,7 @@ namespace WMS.Web.Domain.Services
var erp_data = erp_list.FirstOrDefault(a => a.ErpDetailId == det.ErpDetailId && a.BillNo == order.SourceBillNo);
if (erp_data != null)
{
if (erp_data.MaterialId == det.MaterialId)
if (erp_data.MaterialNumber == det.MaterialNumber)
{
//物料相同的，就改变数值
det.Remark = erp_data.Remark;
@@ -523,7 +523,7 @@ namespace WMS.Web.Domain.Services
var order= data_list.Where(x => x.SourceBillNo == erp_data.BillNo).FirstOrDefault();
if (order != null)
{
var IsHaveNewMaterial = order.Details.Where(x => x.ErpDetailId == erp_data.ErpDetailId && erp_data.MaterialId == x.MaterialId).Any();
var IsHaveNewMaterial = order.Details.Where(x => x.ErpDetailId == erp_data.ErpDetailId && erp_data.MaterialNumber == x.MaterialNumber).Any();
if (!IsHaveNewMaterial)
{
//当物料相同，仓库不同或者物料不同，就新增一条明细
@@ -555,10 +555,10 @@ namespace WMS.Web.Domain.Services
{
//当应入库数量大于实际入库数量：状态就部分入库
//当应入库数量小于等于实际入库数量：状态就已入库
var details_Groups = order.Details.Where(x => x.AccruedQty != 0).GroupBy(x => x.MaterialId)
var details_Groups = order.Details.Where(x => x.AccruedQty != 0).GroupBy(x => x.MaterialNumber)
.Select(x => new
{
MaterialId = x.Key,
{
MaterialNumber = x.Key,
AccruedQtyTotal = x.Sum(t => t.AccruedQty),
ReceiveQtyTotal=x.Sum(t=>t.ReceiveQty),
RealityQtyTotal =x.Sum(t=>t.RealityQty)
@@ -573,15 +573,7 @@ namespace WMS.Web.Domain.Services
order.Status = InstockStatus.WaitInStock;
else if(details_Groups.Sum(x => x.RealityQtyTotal) >= details_Groups.Sum(x => x.AccruedQtyTotal))
order.Status = InstockStatus.Already;
//var AccruedQtyTotal = order.Details.Where(x => x.AccruedQty != 0).Sum(x => x.AccruedQty);
//var RealityQtyTotal = order.Details.Where(x => x.AccruedQty != 0).Sum(x => x.RealityQty);
//if (RealityQtyTotal != 0 && AccruedQtyTotal > RealityQtyTotal)
// order.Status = InstockStatus.Part;
//else if (AccruedQtyTotal <= RealityQtyTotal)
// order.Status = InstockStatus.Already;
});