From 988190a13cc6c52ff29f13de7bb9b900605bca85 Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Wed, 13 Dec 2023 14:10:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/BackRecordController.cs | 4 +-
src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml | 4 +-
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 135 ++++++++++------
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 36 ++++-
.../Dto/BackRecord/BackRecordOnOffRequest.cs | 42 +++++
.../Inventory/BoxInventoryBackGenerateDto.cs | 5 +
src/WMS.Web.Domain/Entitys/BackRecord.cs | 17 +++
src/WMS.Web.Domain/Entitys/InStock.cs | 2 +-
.../IService/IBackRecordService.cs | 2 +-
.../IService/IBoxInventoryService.cs | 4 +-
.../Services/BackRecordService.cs | 26 ++--
.../Services/BoxInventoryService.cs | 144 +++++++++---------
src/WMS.Web.Domain/Services/InStockService.cs | 4 +-
.../InStockTaskRepositories.cs | 2 +-
14 files changed, 267 insertions(+), 160 deletions(-)
create mode 100644 src/WMS.Web.Core/Dto/BackRecord/BackRecordOnOffRequest.cs
diff --git a/src/WMS.Web.Api/Controllers/BackRecordController.cs b/src/WMS.Web.Api/Controllers/BackRecordController.cs
index 15bf4c13..8f3d2c38 100644
--- a/src/WMS.Web.Api/Controllers/BackRecordController.cs
+++ b/src/WMS.Web.Api/Controllers/BackRecordController.cs
@@ -88,7 +88,7 @@ namespace WMS.Web.Api.Controllers
///
[HttpPost]
[Route("OnShelf")]
- public async Task OnShelf([FromBody] SaveBackRecordRequest dto)
+ public async Task OnShelf([FromBody] BackRecordOnOffRequest dto)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
@@ -103,7 +103,7 @@ namespace WMS.Web.Api.Controllers
///
[HttpPost]
[Route("OffShelf")]
- public async Task OffShelf([FromBody] SaveBackRecordRequest dto)
+ public async Task OffShelf([FromBody] BackRecordOnOffRequest dto)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
index 8a39cd50..96a36ff3 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
@@ -23,14 +23,14 @@
-
+
出库回退上架-pda
-
+
入库回退下架-pda
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index ff15b72d..84ff4d45 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -85,6 +85,86 @@
+
+
+ 出入库回退上下架:请求对象
+
+
+
+
+ 出入库方式:1按箱,2按产品
+
+
+
+
+ 组织编码
+
+
+
+
+ 仓库code
+
+
+
+
+ 仓位ID
+
+
+
+
+ 明细
+
+
+
+
+ 保存出入库回退上下架明细:请求对象
+
+
+
+
+ 扫的箱号ID
+
+
+
+
+ 序列号所属箱不能为空
+
+
+
+
+ 物料ID
+
+
+
+
+ 数量
+
+
+
+
+ 仓库code
+
+
+
+
+ 仓位ID
+
+
+
+
+ 序列号集
+
+
+
+
+ 保存出入库回退上下架:请求对象
+
+
+
+
+ 明细
+
+
出入库回退-查询请求对象
@@ -200,56 +280,6 @@
序列号集
-
-
- 保存出入库回退上下架明细:请求对象
-
-
-
-
- 扫的箱号ID
-
-
-
-
- 序列号所属箱不能为空
-
-
-
-
- 物料ID
-
-
-
-
- 数量
-
-
-
-
- 仓库code
-
-
-
-
- 仓位ID
-
-
-
-
- 序列号集
-
-
-
-
- 保存出入库回退上下架:请求对象
-
-
-
-
- 明细
-
-
根据箱号获取物料信息
@@ -2386,6 +2416,11 @@
类型:1为入库,2为出库
+
+
+ 出入库存-方式(详情见枚举值):必填;1-box按箱,2-product按产品
+
+
箱ID
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 9440e101..8f76b690 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -19,6 +19,11 @@
单据编号
+
+
+ 出入库方式:1按箱,2按产品
+
+
类型:1为入库回退下架,2为出库回退上架
@@ -34,6 +39,21 @@
操作时间
+
+
+ 组织编码
+
+
+
+
+ 仓库编码
+
+
+
+
+ 仓位ID
+
+
明细
@@ -488,7 +508,7 @@
- 入库方式:1按箱,2按产品
+ 出入库方式:1按箱,2按产品
@@ -2337,7 +2357,7 @@
出入库回退上下架:服务接口
-
+
回退上下架
@@ -2375,11 +2395,11 @@
-
+
入库回退上下架-箱库存的变更
-
+
@@ -3493,7 +3513,7 @@
出入库回退上下架:服务接口
-
+
回退上下架
@@ -3523,11 +3543,11 @@
-
+
入库回退上下架-箱库存的变更
-
+
@@ -3543,7 +3563,7 @@
入库单-箱库存的变更
-
+
diff --git a/src/WMS.Web.Core/Dto/BackRecord/BackRecordOnOffRequest.cs b/src/WMS.Web.Core/Dto/BackRecord/BackRecordOnOffRequest.cs
new file mode 100644
index 00000000..98f753ee
--- /dev/null
+++ b/src/WMS.Web.Core/Dto/BackRecord/BackRecordOnOffRequest.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+
+namespace WMS.Web.Core.Dto.BackRecord
+{
+ ///
+ /// 出入库回退上下架:请求对象
+ ///
+ public class BackRecordOnOffRequest
+ {
+ ///
+ /// 出入库方式:1按箱,2按产品
+ ///
+ [Required(ErrorMessage = "出入库方式不能为空")]
+ public int Method { get; set; }
+
+ ///
+ /// 组织编码
+ ///
+ [Required(ErrorMessage = "组织编码不能为空")]
+ public string OrgCode { get; set; }
+
+ ///
+ /// 仓库code
+ ///
+ [Required(ErrorMessage = "仓库不能为空")]
+ public string StockCode { get; set; }
+
+ ///
+ /// 仓位ID
+ ///
+ [Required(ErrorMessage = "仓位不能为空")]
+ public int SubStockId { get; set; }
+
+ ///
+ /// 明细
+ ///
+ public List Details { get; set; } = new List();
+ }
+}
diff --git a/src/WMS.Web.Core/Dto/Inventory/BoxInventoryBackGenerateDto.cs b/src/WMS.Web.Core/Dto/Inventory/BoxInventoryBackGenerateDto.cs
index 8ddf1549..4bd2624b 100644
--- a/src/WMS.Web.Core/Dto/Inventory/BoxInventoryBackGenerateDto.cs
+++ b/src/WMS.Web.Core/Dto/Inventory/BoxInventoryBackGenerateDto.cs
@@ -14,6 +14,11 @@ namespace WMS.Web.Core.Dto.Inventory
///
public int InventoryInOutType { get; set; }
+ ///
+ /// 出入库存-方式(详情见枚举值):必填;1-box按箱,2-product按产品
+ ///
+ public int InventoryInOutMethod { get; set; }
+
///
/// 箱ID
///
diff --git a/src/WMS.Web.Domain/Entitys/BackRecord.cs b/src/WMS.Web.Domain/Entitys/BackRecord.cs
index c77d24f8..08b65bef 100644
--- a/src/WMS.Web.Domain/Entitys/BackRecord.cs
+++ b/src/WMS.Web.Domain/Entitys/BackRecord.cs
@@ -22,6 +22,10 @@ namespace WMS.Web.Domain.Entitys
///
public string BillNo { get; set; }
///
+ /// 出入库方式:1按箱,2按产品
+ ///
+ public InventoryInOutMethod Method { get; set; }
+ ///
/// 类型:1为入库回退下架,2为出库回退上架
///
public BackRecordType Type { get; set; }
@@ -34,6 +38,19 @@ namespace WMS.Web.Domain.Entitys
///
public DateTime CreateTime { get; set; }
+ ///
+ /// 组织编码
+ ///
+ public string OrgCode { get; set; }
+ ///
+ /// 仓库编码
+ ///
+ public string StockCode { get; set; }
+ ///
+ /// 仓位ID
+ ///
+ public int SubStockId { get; set; }
+
///
/// 明细
///
diff --git a/src/WMS.Web.Domain/Entitys/InStock.cs b/src/WMS.Web.Domain/Entitys/InStock.cs
index ad9803d6..2cb0889f 100644
--- a/src/WMS.Web.Domain/Entitys/InStock.cs
+++ b/src/WMS.Web.Domain/Entitys/InStock.cs
@@ -27,7 +27,7 @@ namespace WMS.Web.Domain.Entitys
///
public InstockType Type { get; set; }
///
- /// 入库方式:1按箱,2按产品
+ /// 出入库方式:1按箱,2按产品
///
public InventoryInOutMethod Method { get; set; }
///
diff --git a/src/WMS.Web.Domain/IService/IBackRecordService.cs b/src/WMS.Web.Domain/IService/IBackRecordService.cs
index 7ee6e0b7..08a7cbcc 100644
--- a/src/WMS.Web.Domain/IService/IBackRecordService.cs
+++ b/src/WMS.Web.Domain/IService/IBackRecordService.cs
@@ -21,6 +21,6 @@ namespace WMS.Web.Domain.IService
///
///
///
- Task BackShelf(SaveBackRecordRequest dto, BackRecordType type, LoginInDto loginInfo);
+ Task BackShelf(BackRecordOnOffRequest dto, BackRecordType type, LoginInDto loginInfo);
}
}
diff --git a/src/WMS.Web.Domain/IService/IBoxInventoryService.cs b/src/WMS.Web.Domain/IService/IBoxInventoryService.cs
index d2983dd8..95c7a263 100644
--- a/src/WMS.Web.Domain/IService/IBoxInventoryService.cs
+++ b/src/WMS.Web.Domain/IService/IBoxInventoryService.cs
@@ -40,10 +40,10 @@ namespace WMS.Web.Domain.IService
///
/// 入库回退上下架-箱库存的变更
///
- ///
+ ///
///
///
- Task GenerateBackBox(List dtoDatas, bool isTransaction);
+ Task GenerateBackBox(BackRecord dtoData, bool isTransaction);
///
/// 盘点-箱库存的变更
diff --git a/src/WMS.Web.Domain/Services/BackRecordService.cs b/src/WMS.Web.Domain/Services/BackRecordService.cs
index c3e58dd1..caa4b3bb 100644
--- a/src/WMS.Web.Domain/Services/BackRecordService.cs
+++ b/src/WMS.Web.Domain/Services/BackRecordService.cs
@@ -56,7 +56,7 @@ namespace WMS.Web.Domain.Services
///
///
///
- public async Task BackShelf(SaveBackRecordRequest dto, BackRecordType type, LoginInDto loginInfo)
+ public async Task BackShelf(BackRecordOnOffRequest dto, BackRecordType type, LoginInDto loginInfo)
{
IDbContextTransaction _transaction = _basicsRepositories.GetTransaction();
bool isRollback = false;
@@ -67,22 +67,18 @@ namespace WMS.Web.Domain.Services
return Result.ReFailure(ResultCodes.ErpStockNoData);
var entity = new BackRecord();
+ entity.Method =(InventoryInOutMethod)dto.Method;
+ entity.OrgCode = dto.OrgCode;
+ entity.StockCode = dto.StockCode;
+ entity.SubStockId = dto.SubStockId;
entity.Type = type;
entity.Details = _mapper.Map>(dto.Details);
- entity.Details.ForEach(x =>
- {
- var stock = stocks.Where(t => t.Code == x.StockCode).FirstOrDefault();
- if (stock != null)
- x.OrgCode = stock.ErpOrgCode;
- });
entity.Create(loginInfo.UserInfo.StaffId);
-
entity = await _backRecordRepositories.Add(entity, isTransaction);
-
-
-
if (entity == null)
return Result.ReFailure(ResultCodes.DateWriteError);
+
+
//保存成功后:序列号跟踪流程添加
var serialNumber_result = await _serialNumberService.BackRecord(entity, loginInfo, isTransaction);
if (!serialNumber_result.IsSuccess)
@@ -90,7 +86,7 @@ namespace WMS.Web.Domain.Services
#region 需要改箱操作
//获取目标箱和原箱信息
- var current_box_about = dto.Details.GroupBy(x => new { x.BoxId, x.SubStockId, x.StockCode }).Select(x => new { x.Key.BoxId, x.Key.SubStockId, x.Key.StockCode }).ToList();
+ var current_box_about = dto.Details.GroupBy(x => new { x.BoxId }).Select(x => new { x.Key.BoxId }).ToList();
var current_sernub_box = dto.Details.GroupBy(x => x.SerialNumberBoxId).Select(x => x.Key).ToList();
//要改箱的数据集合
@@ -106,7 +102,7 @@ namespace WMS.Web.Domain.Services
var changeBox = new SaveChangeBoxRecordRequest();
changeBox.SrcBoxId = serBoxId;
changeBox.DestBoxId = boxAbout.BoxId;
- changeBox.SubStockId = boxAbout.SubStockId;
+ changeBox.SubStockId = entity.SubStockId;
ganenrateChangeBoxs.Add(changeBox);
}
}
@@ -135,9 +131,7 @@ namespace WMS.Web.Domain.Services
#endregion
//保存成功后:变更库存
- var entitys = new List();
- entitys.Add(entity);
- var boxInventoryResult = await _boxInventoryService.GenerateBackBox(entitys, isTransaction);
+ var boxInventoryResult = await _boxInventoryService.GenerateBackBox(entity, isTransaction);
if (!boxInventoryResult.IsSuccess)
return boxInventoryResult;
diff --git a/src/WMS.Web.Domain/Services/BoxInventoryService.cs b/src/WMS.Web.Domain/Services/BoxInventoryService.cs
index 4f30103c..f221acd2 100644
--- a/src/WMS.Web.Domain/Services/BoxInventoryService.cs
+++ b/src/WMS.Web.Domain/Services/BoxInventoryService.cs
@@ -212,39 +212,36 @@ namespace WMS.Web.Domain.Services
///
/// 入库回退上下架-箱库存的变更
///
- ///
+ ///
///
///
- public async Task GenerateBackBox(List dtoDatas, bool isTransaction)
+ public async Task GenerateBackBox(BackRecord dtoData, bool isTransaction)
{
//1.判断来源数据是否存在
- if (dtoDatas == null || dtoDatas.Count == 0)
+ if (dtoData == null)
return Result.ReFailure(ResultCodes.InventoryNoSourceError);
- var generateDtoList = new List();
+
//物料收发明细dtos
var InventoryInOutDetailsGenerateDtoList = new List();
- #region 入库组装
- //入库的明细
- var dtoDetails_in = dtoDatas.Where(x => x.Type == BackRecordType.OutstockOn).SelectMany(x => x.Details).ToList();
-
//2.1组织:头部
- var generateDtoList_in = dtoDetails_in.GroupBy(x => new { x.BoxId, x.OrgCode, x.StockCode, x.SubStockId })
+ var generateDtoList = dtoData.Details.GroupBy(x => new { x.BoxId })
.Select(x => new BoxInventoryBackGenerateDto()
{
BoxId = x.Key.BoxId,
- OrgCode = x.Key.OrgCode,
- StockCode = x.Key.StockCode,
- SubStockId = x.Key.SubStockId,
- InventoryInOutType = (int)InventoryInOutType.In
+ OrgCode = dtoData.OrgCode,
+ StockCode = dtoData.StockCode,
+ SubStockId = dtoData.SubStockId,
+ InventoryInOutMethod = (int)dtoData.Method,
+ InventoryInOutType = dtoData.Type == BackRecordType.OutstockOn ? (int)InventoryInOutType.In : (int)InventoryInOutType.Out
}).ToList();
//3.遍历:组装明细
- generateDtoList_in.ForEach(x =>
+ generateDtoList.ForEach(x =>
{
- foreach (var detItem in dtoDetails_in)
+ foreach (var detItem in dtoData.Details)
{
//3.1箱是当前的
if (detItem.BoxId == x.BoxId)
@@ -258,62 +255,21 @@ namespace WMS.Web.Domain.Services
}
}
});
- #endregion
- #region 出库组装
- //出库的明细
- var dtoDetails_out = dtoDatas.Where(x => x.Type == BackRecordType.InstockOff).SelectMany(x => x.Details).ToList();
-
- //2.1组织:头部
- var generateDtoList_out = dtoDetails_out.GroupBy(x => new { x.BoxId, x.OrgCode, x.StockCode, x.SubStockId })
- .Select(x => new BoxInventoryBackGenerateDto()
- {
- BoxId = x.Key.BoxId,
- OrgCode = x.Key.OrgCode,
- StockCode = x.Key.StockCode,
- SubStockId = x.Key.SubStockId,
- InventoryInOutType = (int)InventoryInOutType.Out
- }).ToList();
-
-
- //3.遍历:组装明细
- generateDtoList_out.ForEach(x =>
- {
- foreach (var detItem in dtoDetails_out)
- {
- //3.1箱是当前的
- if (detItem.BoxId == x.BoxId)
- {
- //3.2组装明细
- var det = new BoxInventoryBackDetailsGenerateDto();
- det.MaterialId = detItem.MaterialId;
- det.Qty = detItem.Qty;
- det.SerialNumbers = detItem.SerialNumbers;
- x.Details.Add(det);
- }
- }
- });
- #endregion
- generateDtoList.AddRange(generateDtoList_in);
- generateDtoList.AddRange(generateDtoList_out);
//4.提交处理
var result = await this.ExeBackBox(generateDtoList, isTransaction);
if (!result.IsSuccess)
return result;
//5.组装物料收发明细dto
- foreach (var item in dtoDatas.SelectMany(x => x.Details).ToList())
+ foreach (var item in dtoData.Details)
{
- var entity = dtoDatas.Where(x => x.Id == item.Fid).FirstOrDefault();
- if (entity != null)
- {
- var inventoryInOutDet = _inventoryInOutDetailsService.GenerateDto(
- item.BoxId, item.MaterialId,
- item.OrgCode, item.StockCode,
- item.SubStockId, OrderType.Back,
- entity.BillNo, item.Qty, (entity.Type == BackRecordType.InstockOff ? InventoryInOutType.Out : InventoryInOutType.In));
- InventoryInOutDetailsGenerateDtoList.Add(inventoryInOutDet);
- }
+ var inventoryInOutDet = _inventoryInOutDetailsService.GenerateDto(
+ item.BoxId, item.MaterialId,
+ item.OrgCode, item.StockCode,
+ item.SubStockId, OrderType.Back,
+ dtoData.BillNo, item.Qty, (dtoData.Type == BackRecordType.InstockOff ? InventoryInOutType.Out : InventoryInOutType.In));
+ InventoryInOutDetailsGenerateDtoList.Add(inventoryInOutDet);
}
//5.提交物料收发明细:新增
if (InventoryInOutDetailsGenerateDtoList.Count != 0)
@@ -437,7 +393,7 @@ namespace WMS.Web.Domain.Services
///
/// 入库单-箱库存的变更
///
- ///
+ ///
///
///
public async Task GenerateInStockBox(InStock dtoData, bool isTransaction)
@@ -562,11 +518,11 @@ namespace WMS.Web.Domain.Services
{
if (x.BoxId == detItem.BoxId)
{
- var current_det= dtoData.Details.Where(x => x.Id == detItem.DetailId).FirstOrDefault();
+ var current_det = dtoData.Details.Where(x => x.Id == detItem.DetailId).FirstOrDefault();
//2.2组装明细
var det = new BoxInventoryGenerateDetailsDto();
- det.MaterialId = current_det==null?0: current_det.MaterialId;
+ det.MaterialId = current_det == null ? 0 : current_det.MaterialId;
det.Qty = detItem.Qty;
det.SerialNumbers = detItem.SerialNumbers;
x.Details.Add(det);
@@ -946,19 +902,33 @@ namespace WMS.Web.Domain.Services
if (boxInventory == null)
{
- //当前箱的序列号
- var current_box_serNums = serialNumbers.Where(t => t.BoxId == dto.BoxId).ToList();
-
//3.2组装要新增的箱库存信息:箱和明细和序列号
var addEntity = _mapper.Map(dto);
addEntity.Details = _mapper.Map>(dto.Details);
- //赋值序列号
- addEntity.Details.ForEach(x =>
+ #region 序列号处理
+ if (dto.InventoryInOutMethod == (int)InventoryInOutMethod.Box)
{
- var current_box_mat_serNums=current_box_serNums.Where(m => m.MaterialId == x.MaterialId).Select(t => t.SerialNumber).ToList();
- x.SerialNumbers.AddRange(current_box_mat_serNums);
- });
+ //当前箱的序列号
+ var current_box_serNums = serialNumbers.Where(t => t.BoxId == dto.BoxId).ToList();
+ //赋值序列号
+ addEntity.Details.ForEach(x =>
+ {
+ var current_box_mat_serNums = current_box_serNums.Where(m => m.MaterialId == x.MaterialId).Select(t => t.SerialNumber).ToList();
+ x.SerialNumbers.AddRange(current_box_mat_serNums);
+ });
+ }
+ else
+ {
+ //赋值序列号
+ addEntity.Details.ForEach(x =>
+ {
+ var current_box_mat_serNums = dto.Details.Where(m => m.MaterialId == x.MaterialId).FirstOrDefault();
+ if (current_box_mat_serNums != null && current_box_mat_serNums.MaterialId == x.MaterialId)
+ x.SerialNumbers.AddRange(current_box_mat_serNums.SerialNumbers);
+ });
+ }
+ #endregion
add_entitys.Add(addEntity);
}
else
@@ -981,9 +951,33 @@ namespace WMS.Web.Domain.Services
else
{
updateDetail.Qty = updateDetail.Qty + dtoItem.Qty;
- updateDetail.SerialNumbers.AddRange(dtoItem.SerialNumbers);
}
}
+
+ #region 序列号处理
+ if (dto.InventoryInOutMethod == (int)InventoryInOutMethod.Box)
+ {
+ //当前箱的序列号
+ var current_box_serNums = serialNumbers.Where(t => t.BoxId == dto.BoxId).ToList();
+ //赋值序列号
+ update_entity.Details.ForEach(x =>
+ {
+ var current_box_mat_serNums = current_box_serNums.Where(m => m.MaterialId == x.MaterialId).Select(t => t.SerialNumber).ToList();
+ x.SerialNumbers.AddRange(current_box_mat_serNums);
+ });
+ }
+ else
+ {
+ //赋值序列号
+ update_entity.Details.ForEach(x =>
+ {
+ var current_box_mat_serNums = dto.Details.Where(m => m.MaterialId == x.MaterialId).FirstOrDefault();
+ if (current_box_mat_serNums != null && current_box_mat_serNums.MaterialId == x.MaterialId)
+ x.SerialNumbers.AddRange(current_box_mat_serNums.SerialNumbers);
+ });
+ }
+ #endregion
+
update_entitys.Add(update_entity);
}
diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs
index f2257392..e1d2d62e 100644
--- a/src/WMS.Web.Domain/Services/InStockService.cs
+++ b/src/WMS.Web.Domain/Services/InStockService.cs
@@ -283,7 +283,7 @@ namespace WMS.Web.Domain.Services
if (current_entityDets != null && current_entityDets.Count != 0 && x.ErpDetailId == current_entityDets.FirstOrDefault().ErpDetailId)
{
var current_entityDet_matQty = current_entityDets.Sum(x => x.Qty);
- x.DeliveredQty = x.ReceiveQty;
+ x.DeliveredQty = x.DeliveredQty+ current_entityDet_matQty;
x.RealityQty = x.RealityQty + current_entityDet_matQty;
}
});
@@ -421,7 +421,7 @@ namespace WMS.Web.Domain.Services
{
var current_entityDet_matQty = current_entityDets.Sum(x => x.Qty);
x.ReceiveQty = x.ReceiveQty + current_entityDet_matQty;
- x.DeliveredQty = x.ReceiveQty;
+ x.DeliveredQty = x.DeliveredQty + current_entityDet_matQty;
x.RealityQty = x.RealityQty + current_entityDet_matQty;
}
});
diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
index e3558a17..3f3a89e7 100644
--- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
@@ -286,7 +286,7 @@ namespace WMS.Web.Repositories
//找到入库单:通过erp明细ID
var erpDetIds = list.GroupBy(x => x.ErpDetailId).Select(x => x.Key).ToList();
- var instockDets= await _context.InStockDetails.Where(x => erpDetIds.Contains(x.ErpDetailId)).ToListAsync();
+ var instockDets= await _context.InStockDetails.Where(x =>erpDetIds.Contains(x.ErpDetailId)).ToListAsync();
if (instockDets != null && instockDets.Count != 0)
{
list.ForEach(x =>