Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api
This commit is contained in:
@@ -1288,7 +1288,7 @@ namespace WMS.Web.Domain.Services.Public
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
return ResultList<Erp_SubStockDto>.ReFailure("错误", 10002);
|
||||
return ResultList<Erp_SubStockDto>.ReFailure(ResultCodes.ErpSubStockError);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -445,7 +445,7 @@ namespace WMS.Web.Domain.Services
|
||||
{
|
||||
var serialNumbers = takeStocks.SelectMany(s => s.Details).SelectMany(s => s.SerialNumbers).ToList();
|
||||
var entityList = await _serialNumbersRepositories.GetEntityList(serialNumbers);
|
||||
var boxIds = entityList.Select(s => s.BoxId).ToList();
|
||||
var boxIds = takeStocks.SelectMany(s=>s.Details).Select(s => s.BoxId).ToList();
|
||||
var boxList = await _boxRepositories.GetEntityList(boxIds);
|
||||
|
||||
List<Box> box_New_List = new List<Box>();
|
||||
|
||||
@@ -56,6 +56,7 @@ namespace WMS.Web.Domain.Values
|
||||
public static ValueTuple<int, string> ErpOrgError = (80004, "获取Erp相关组织数据失败,请稍候再试!");
|
||||
public static ValueTuple<int, string> ErpSupplierError = (80005, "获取Erp相关供应商数据失败,请稍候再试!");
|
||||
public static ValueTuple<int, string> ErpStockError = (80006, "获取Erp相关仓库数据失败,请稍候再试!");
|
||||
public static ValueTuple<int, string> ErpSubStockError = (80006, "获取Erp相关子仓库数据失败,请稍候再试!");
|
||||
public static ValueTuple<int, string> ErpMaterialError = (80007, "获取Erp相关物料数据失败,请稍候再试!");
|
||||
public static ValueTuple<int, string> BoxHaveError = (80008, "箱号已收货");
|
||||
public static ValueTuple<int, string> AdjustError = (80009, "与金蝶校准发生错误,请稍候再试!");
|
||||
|
||||
Reference in New Issue
Block a user