修改了序列号增加参数

This commit is contained in:
2025-05-08 15:23:53 +08:00
parent 6d0e2e0068
commit 8114b95a71
4 changed files with 35 additions and 2 deletions

View File

@@ -5005,6 +5005,21 @@
是否激活过(只有做过 盘点 采购和非采购上架 出库回退上架 才算激活) 是否激活过(只有做过 盘点 采购和非采购上架 出库回退上架 才算激活)
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Core.Dto.MaterialResponse.IsTwo">
<summary>
是否套装
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.MaterialResponse.TwoSerialNumber">
<summary>
第二个序列号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.MaterialResponse.IsNotCount">
<summary>
是否不参与记数
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.MaterialSubStock"> <member name="T:WMS.Web.Core.Dto.MaterialSubStock">
<summary> <summary>
物料对应的仓位有哪些 物料对应的仓位有哪些

View File

@@ -61,5 +61,20 @@ namespace WMS.Web.Core.Dto
/// 是否激活过(只有做过 盘点 采购和非采购上架 出库回退上架 才算激活) /// 是否激活过(只有做过 盘点 采购和非采购上架 出库回退上架 才算激活)
///</summary> ///</summary>
public bool IsActivate { get; set; } = false; public bool IsActivate { get; set; } = false;
/// <summary>
/// 是否套装
/// </summary>
public int? IsTwo { get; set; }
/// <summary>
/// 第二个序列号
/// </summary>
public string TwoSerialNumber { get; set; }
/// <summary>
/// 是否不参与记数
/// </summary>
public string IsNotCount { get; set; }
} }
} }

View File

@@ -514,6 +514,7 @@ namespace WMS.Web.Domain.Services
if (dto.Boxs.Select(x => x.BoxId).Distinct().Count() != dto.Boxs.Select(x => x.BoxId).Count()) if (dto.Boxs.Select(x => x.BoxId).Distinct().Count() != dto.Boxs.Select(x => x.BoxId).Count())
return Result<InStock>.ReFailure(ResultCodes.BoxOutStockTaskBoxError); return Result<InStock>.ReFailure(ResultCodes.BoxOutStockTaskBoxError);
} }
//1.1过滤的明细0数量入库的明细要过滤掉 //1.1过滤的明细0数量入库的明细要过滤掉
dto.Boxs.ForEach(x => dto.Boxs.ForEach(x =>
@@ -568,7 +569,7 @@ namespace WMS.Web.Domain.Services
//3.1先数据映射 //3.1先数据映射
var dets = _mapper.Map<List<InStockDetails>>(box.Details); var dets = _mapper.Map<List<InStockDetails>>(box.Details);
//3.2遍历赋值boxID和仓库和仓位和来源单和供应商和组织 //3.2遍历赋值boxID和仓库和仓位和来源单和供应商和组织
dets.ForEach(item => dets.ForEach(item =>
{ {
item.TaskId = dto.TaskId; item.TaskId = dto.TaskId;
item.SourceBillNo = task.SourceBillNo; item.SourceBillNo = task.SourceBillNo;

View File

@@ -313,7 +313,9 @@ namespace WMS.Web.Repositories
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber); response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber);
if (entity.boxInventory != null) if (entity.boxInventory != null)
response.IsBoxInventory = entity.boxInventory.Details.SelectMany(s => s.SerialNumbers).Where(w => serialNumber.Equals(w)).Count() >= 1 ? true : false; response.IsBoxInventory = entity.boxInventory.Details.SelectMany(s => s.SerialNumbers).Where(w => serialNumber.Equals(w)).Count() >= 1 ? true : false;
response.IsTwo = entity.serial.IsTwo;
response.TwoSerialNumber=entity.serial.TwoSerialNumber.Replace(entity.serial.SerialNumber,"").Replace(",","");
response.IsNotCount=entity.serial.IsNotCount;
return response; return response;
} }