ICM-WCS/wcs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决上次提交后的编译报错

Browse Source
This commit is contained in:
hehaibing-1996
2025-01-18 11:37:55 +08:00
parent a0c7f71ebc
commit 7bce65917d
8 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WCS.Model/ApiModel/BatchBindMatDetail/ShelfTypeModel.cs → WCS.Model/ApiModel/BatchBindMatDetail/OrderTypeModel.cs
View File

@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
namespace WCS.Model.ApiModel.Home
namespace WCS.Model.ApiModel
{
public class OrderTypeModel
{

26
WCS.WebApi/Controllers/BatchBindMatDetailController.cs
View File

@ -26,34 +26,34 @@ namespace WCS.WebApi.Controllers
_warningService = warningService;
}
[Route("getShelfTypes")]
[HttpPost(Name = "getShelfTypes")]
public async Task<ResponseBase> getShelfTypes(RequestBase request)
[Route("getOrderTypes")]
[HttpPost(Name = "getOrderTypes")]
public async Task<ResponseBase> getOrderTypes(RequestBase request)
{
try
{
//直接获取当前所有货架类型并返回
var shelfTypes = DbHelp.db.Queryable<ShelfTypeInfo>()
.Select(t => new ShelfTypeModel()
var OrderTypes = DbHelp.db.Queryable<OrderTypeInfo>()
.Select(t => new OrderTypeModel()
{
Id = t.Id,
ShelfTypeName = t.ShelfTypeName
OrderTypeName = t.OrderTypeName
})
.ToList();
return new PageQueryResponse<ShelfTypeModel>()
return new PageQueryResponse<OrderTypeModel>()
{
Code = 200,
Message = "success",
Data = new PageQueryResponseData<ShelfTypeModel>
Data = new PageQueryResponseData<OrderTypeModel>
{
Lists = shelfTypes,
Count = shelfTypes.Count
Lists = OrderTypes,
Count = OrderTypes.Count
}
};
}
catch (Exception ex)
{
return new PageQueryResponse<ShelfTypeModel>()
return new PageQueryResponse<OrderTypeModel>()
{
Code = 300,
Message = $"查询失败:{ex.Message}",
@ -62,8 +62,8 @@ namespace WCS.WebApi.Controllers
}
[Route("getShelfInfoByLocationCode")]
[HttpPost(Name = "getShelfInfoByLocationCode")]
[Route("getShelfInfoByLocationCode1")]
[HttpPost(Name = "getShelfInfoByLocationCode1")]
public async Task<ResponseBase> getShelfInfoByLocationCode(GetShelfInfoByLocationCodeRequest request)
{
//判断参数

8
WCS.WebApi/Controllers/HomeController.cs
View File

@ -245,17 +245,17 @@ namespace WCS.WebApi.Controllers
{
//直接获取当前所有货架类型并返回
var shelfTypes = DbHelp.db.Queryable<ShelfTypeInfo>()
.Select(t => new OrderTypeModel()
.Select(t => new ShelfTypeInfo()
{
Id = t.Id,
ShelfTypeName = t.ShelfTypeName
})
.ToList();
return new PageQueryResponse<OrderTypeModel>()
return new PageQueryResponse<ShelfTypeInfo>()
{
Code = 200,
Message = "success",
Data = new PageQueryResponseData<OrderTypeModel>
Data = new PageQueryResponseData<ShelfTypeInfo>
{
Lists = shelfTypes,
Count = shelfTypes.Count
@ -264,7 +264,7 @@ namespace WCS.WebApi.Controllers
}
catch (Exception ex)
{
return new PageQueryResponse<OrderTypeModel>()
return new PageQueryResponse<ShelfTypeInfo>()
{
Code = 300,
Message = $"查询失败:{ex.Message}",

6
货架标准上位机/Tool/GetBaseData.cs
View File

@ -13,7 +13,7 @@ namespace 智慧物流软件系统.Tool
{
public static class GetBaseData
{
public static List<OrderTypeModel> GetShelfType()
public static List<ShelfTypeModel> GetShelfType()
{
var body = new RequestBase()
{
@ -21,12 +21,12 @@ namespace 智慧物流软件系统.Tool
DeviceType = LocalFile.Config.DeviceType,
};
var Result = ApiHelp.GetDataFromHttp<PageQueryResponse<OrderTypeModel>>(LocalFile.Config.ApiIpHost + "home/getShelfTypes", body, "POST");
var Result = ApiHelp.GetDataFromHttp<PageQueryResponse<ShelfTypeModel>>(LocalFile.Config.ApiIpHost + "home/getShelfTypes", body, "POST");
if (Result != null && Result.Data != null && Result.Data.Lists.Count() > 0)
{
return Result.Data.Lists;
}
else { return new List<OrderTypeModel>(); }
else { return new List<ShelfTypeModel>(); }
}
public static List<LocationAreaInfoModel> GetLocationAreaInfos()

14
货架标准上位机/ViewModels/MatDetailCurrentInfoViewModel.cs
View File

@ -123,8 +123,8 @@ namespace 智慧物流软件系统.ViewModel
}
}
private List<OrderTypeModel> shelfTypeItems;
public List<OrderTypeModel> ShelfTypeItems
private List<ShelfTypeModel> shelfTypeItems;
public List<ShelfTypeModel> ShelfTypeItems
{
get { return shelfTypeItems; }
set
@ -133,8 +133,8 @@ namespace 智慧物流软件系统.ViewModel
}
}
private OrderTypeModel? selectedShelfTypeItem;
public OrderTypeModel? SelectedShelfTypeItem
private ShelfTypeModel? selectedShelfTypeItem;
public ShelfTypeModel? SelectedShelfTypeItem
{
get { return selectedShelfTypeItem; }
set
@ -147,8 +147,8 @@ namespace 智慧物流软件系统.ViewModel
//调用接口更新！
Task.Run(() =>
{
ShelfTypeItems = new List<OrderTypeModel>();
ShelfTypeItems.Add(new OrderTypeModel { Id = null, ShelfTypeName = "全部" });
ShelfTypeItems = new List<ShelfTypeModel>();
ShelfTypeItems.Add(new ShelfTypeModel { Id = null, ShelfTypeName = "全部" });
var body = new RequestBase()
{
@ -156,7 +156,7 @@ namespace 智慧物流软件系统.ViewModel
DeviceType = LocalFile.Config.DeviceType,
};
var Result = ApiHelp.GetDataFromHttp<PageQueryResponse<OrderTypeModel>>(LocalFile.Config.ApiIpHost + "home/getShelfTypes", body, "POST");
var Result = ApiHelp.GetDataFromHttp<PageQueryResponse<ShelfTypeModel>>(LocalFile.Config.ApiIpHost + "home/getShelfTypes", body, "POST");
if (Result != null && Result.Data != null && Result.Data.Lists.Count() > 0)
{
ShelfTypeItems.AddRange(Result.Data.Lists);

10
货架标准上位机/ViewModels/OutInventoryAddDucumentViewModel.cs
View File

@ -38,8 +38,8 @@ namespace 智慧物流软件系统.ViewModels
}
}
private List<OrderTypeModel> shelfTypeItems;
public List<OrderTypeModel> ShelfTypeItems
private List<ShelfTypeModel> shelfTypeItems;
public List<ShelfTypeModel> ShelfTypeItems
{
get { return shelfTypeItems; }
set
@ -58,7 +58,7 @@ namespace 智慧物流软件系统.ViewModels
DeviceType = LocalFile.Config.DeviceType,
};
var Result = ApiHelp.GetDataFromHttp<PageQueryResponse<OrderTypeModel>>(LocalFile.Config.ApiIpHost + "home/getShelfTypes", body, "POST");
var Result = ApiHelp.GetDataFromHttp<PageQueryResponse<ShelfTypeModel>>(LocalFile.Config.ApiIpHost + "home/getShelfTypes", body, "POST");
if (Result != null && Result.Data != null && Result.Data.Lists.Count() > 0)
{
ShelfTypeItems = Result.Data.Lists;
@ -67,8 +67,8 @@ namespace 智慧物流软件系统.ViewModels
});
}
private OrderTypeModel selectedShelfTypeItem;
public OrderTypeModel SelectedShelfTypeItem
private ShelfTypeModel selectedShelfTypeItem;
public ShelfTypeModel SelectedShelfTypeItem
{
get { return selectedShelfTypeItem; }
set

8
货架标准上位机/ViewModels/ShelfInfoAddOrUpdateViewModel.cs
View File

@ -54,8 +54,8 @@ namespace 智慧物流软件系统.ViewModel
};
}
private List<OrderTypeModel> shelfTypeItems;
public List<OrderTypeModel> ShelfTypeItems
private List<ShelfTypeModel> shelfTypeItems;
public List<ShelfTypeModel> ShelfTypeItems
{
get { return shelfTypeItems; }
set
@ -64,8 +64,8 @@ namespace 智慧物流软件系统.ViewModel
}
}
private OrderTypeModel selectedShelfTypeItem;
public OrderTypeModel SelectedShelfTypeItem
private ShelfTypeModel selectedShelfTypeItem;
public ShelfTypeModel SelectedShelfTypeItem
{
get { return selectedShelfTypeItem; }
set

14
货架标准上位机/ViewModels/ShelfInfoViewModel.cs
View File

@ -64,8 +64,8 @@ namespace 智慧物流软件系统.ViewModel
}
}
private List<OrderTypeModel> shelfTypeItems;
public List<OrderTypeModel> ShelfTypeItems
private List<ShelfTypeModel> shelfTypeItems;
public List<ShelfTypeModel> ShelfTypeItems
{
get { return shelfTypeItems; }
set
@ -74,8 +74,8 @@ namespace 智慧物流软件系统.ViewModel
}
}
private OrderTypeModel? selectedShelfTypeItem;
public OrderTypeModel? SelectedShelfTypeItem
private ShelfTypeModel? selectedShelfTypeItem;
public ShelfTypeModel? SelectedShelfTypeItem
{
get { return selectedShelfTypeItem; }
set
@ -89,8 +89,8 @@ namespace 智慧物流软件系统.ViewModel
//调用接口更新！
Task.Run(() =>
{
ShelfTypeItems = new List<OrderTypeModel>();
ShelfTypeItems.Add(new OrderTypeModel { Id = null, ShelfTypeName = "全部" });
ShelfTypeItems = new List<ShelfTypeModel>();
ShelfTypeItems.Add(new ShelfTypeModel { Id = null, ShelfTypeName = "全部" });
var body = new RequestBase()
{
@ -98,7 +98,7 @@ namespace 智慧物流软件系统.ViewModel
DeviceType = LocalFile.Config.DeviceType,
};
var Result = ApiHelp.GetDataFromHttp<PageQueryResponse<OrderTypeModel>>(LocalFile.Config.ApiIpHost + "home/getShelfTypes", body, "POST");
var Result = ApiHelp.GetDataFromHttp<PageQueryResponse<ShelfTypeModel>>(LocalFile.Config.ApiIpHost + "home/getShelfTypes", body, "POST");
if (Result != null && Result.Data != null && Result.Data.Lists.Count() > 0)
{
ShelfTypeItems.AddRange(Result.Data.Lists);