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

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

Browse Source
This commit is contained in:
tongfei
2024-04-11 15:07:29 +08:00
parent 304160e11a 05aa8ce1f6
commit 6116d18f74
5 changed files with 10 additions and 10 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/SysConfigController.cs
View File

@@ -492,8 +492,8 @@ namespace WMS.Web.Api.Controllers
/// <param name="orgCode">组织编码</param> /// <param name="orgCode">组织编码</param>
/// <param name="IsOps">是否需要支持老ops条码查询</param> /// <param name="IsOps">是否需要支持老ops条码查询</param>
/// <param name="serialStatus"> /// <param name="serialStatus">
/// 盘点 所有的序列号 0或者不传 /// 盘点 改箱 所有的序列号 0或者不传
/// 非采购上架 改箱 (非激活的或者(激活被冻结)) 1 /// 非采购上架 (非激活的或者(激活被冻结)) 1
/// 出库回退上架 (激活被冻结) 2 /// 出库回退上架 (激活被冻结) 2
/// 入库回退下架 (激活非冻结) 3 /// 入库回退下架 (激活非冻结) 3
/// 出库 (激活非冻结) 3 /// 出库 (激活非冻结) 3

4
src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
View File

@@ -685,8 +685,8 @@
<param name="orgCode">组织编码</param> <param name="orgCode">组织编码</param>
<param name="IsOps">是否需要支持老ops条码查询</param> <param name="IsOps">是否需要支持老ops条码查询</param>
<param name="serialStatus"> <param name="serialStatus">
盘点 所有的序列号 0或者不传 盘点 改箱 所有的序列号 0或者不传
非采购上架 改箱 (非激活的或者(激活被冻结)) 1 非采购上架 (非激活的或者(激活被冻结)) 1
出库回退上架 (激活被冻结) 2 出库回退上架 (激活被冻结) 2
入库回退下架 (激活非冻结) 3 入库回退下架 (激活非冻结) 3
出库 (激活非冻结) 3 出库 (激活非冻结) 3

4
src/WMS.Web.Core/Dto/MaterialResponse.cs
View File

@@ -56,10 +56,10 @@ namespace WMS.Web.Core.Dto
/// <summary> /// <summary>
/// 是否冻结 /// 是否冻结
///</summary> ///</summary>
public bool? IsDelete { get; set; } = false; public bool IsDelete { get; set; } = false;
/// <summary> /// <summary>
/// 是否激活过(只有做过 盘点 采购和非采购上架 出库回退上架 才算激活) /// 是否激活过(只有做过 盘点 采购和非采购上架 出库回退上架 才算激活)
///</summary> ///</summary>
public bool? IsActivate { get; set; } = false; public bool IsActivate { get; set; } = false;
} }
} }

8
src/WMS.Web.Repositories/SerialNumbersRepositories.cs
View File

@@ -272,8 +272,8 @@ namespace WMS.Web.Repositories
response.SubStockCode = entity?.boxInventory?.SubStockCode ?? ""; response.SubStockCode = entity?.boxInventory?.SubStockCode ?? "";
response.StockCode = entity?.boxInventory?.StockCode ?? ""; response.StockCode = entity?.boxInventory?.StockCode ?? "";
response.SerialNumber = entity.serial.SerialNumber; response.SerialNumber = entity.serial.SerialNumber;
response.IsDelete = entity.serial.IsDelete; response.IsDelete = entity.serial.IsDelete ?? false;
response.IsActivate = entity.serial.IsActivate; response.IsActivate = entity.serial.IsActivate ?? false;
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber); response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber);
response.MaterialNumber = entity.serial.MaterialNumber; response.MaterialNumber = entity.serial.MaterialNumber;
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber); response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber);
@@ -320,8 +320,8 @@ namespace WMS.Web.Repositories
response.SubStockCode = entity?.boxInventory?.SubStockCode ?? ""; response.SubStockCode = entity?.boxInventory?.SubStockCode ?? "";
response.StockCode = entity?.boxInventory?.StockCode ?? ""; response.StockCode = entity?.boxInventory?.StockCode ?? "";
response.SerialNumber = entity.serial.SerialNumber; response.SerialNumber = entity.serial.SerialNumber;
response.IsDelete = entity.serial.IsDelete; response.IsDelete = entity.serial.IsDelete ?? false;
response.IsActivate = entity.serial.IsActivate; response.IsActivate = entity.serial.IsActivate ?? false;
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber); response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber);
response.MaterialNumber = entity.serial.MaterialNumber; response.MaterialNumber = entity.serial.MaterialNumber;
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber); response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber);