From a0c7f71ebc7994e4ce8e626155155142d1df78a6 Mon Sep 17 00:00:00 2001 From: hehaibing-1996 Date: Thu, 16 Jan 2025 19:45:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=83=A8=E5=88=86=20?= =?UTF-8?q?=E7=89=A9=E6=96=99=E7=BB=91=E5=AE=9A=EF=BC=88wcs=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=EF=BC=89=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WCS.BLL/DbModels/STZL/MatDetailCurrentInfo.cs | 8 + WCS.BLL/DbModels/STZL/OrderTypeInfo.cs | 22 ++ WCS.BLL/Manager/DbInit.cs | 2 +- .../BatchBindMatDetail/ShelfTypeModel.cs | 12 + WCS.Model/ApiModel/Home/ShelfTypeModel.cs | 1 - .../BatchBindMatDetailController.cs | 267 ++++++++++++++ WCS.WebApi/Controllers/HomeController.cs | 8 +- 货架标准上位机/Tool/GetBaseData.cs | 6 +- .../ViewModels/InOutRecordViewModel.cs | 10 +- .../ViewModels/MatDetailCurrentInfoViewModel.cs | 14 +- .../ViewModels/MatInventoryDetailViewModel.cs | 10 +- .../ViewModels/OutInventoryAddDucumentViewModel.cs | 10 +- .../ViewModels/ShelfInfoAddOrUpdateViewModel.cs | 8 +- .../ViewModels/ShelfInfoViewModel.cs | 14 +- .../Views/BatchBindMatDetailView.xaml | 325 ++++++++++++++++++ .../Views/BatchBindMatDetailView.xaml.cs | 90 +++++ .../Views/MainWindows/MainWindow1.xaml | 2 +- 17 files changed, 766 insertions(+), 43 deletions(-) create mode 100644 WCS.BLL/DbModels/STZL/OrderTypeInfo.cs create mode 100644 WCS.Model/ApiModel/BatchBindMatDetail/ShelfTypeModel.cs create mode 100644 WCS.WebApi/Controllers/BatchBindMatDetailController.cs create mode 100644 货架标准上位机/Views/BatchBindMatDetailView.xaml create mode 100644 货架标准上位机/Views/BatchBindMatDetailView.xaml.cs diff --git a/WCS.BLL/DbModels/STZL/MatDetailCurrentInfo.cs b/WCS.BLL/DbModels/STZL/MatDetailCurrentInfo.cs index a02432e..bcff7d9 100644 --- a/WCS.BLL/DbModels/STZL/MatDetailCurrentInfo.cs +++ b/WCS.BLL/DbModels/STZL/MatDetailCurrentInfo.cs @@ -89,11 +89,19 @@ namespace WCS.BLL.DbModels public int MatQty { get; set; } #endregion + #region 单据属性 + /// + /// 单据编号 + /// + [SugarColumn(ColumnName = "order_number", Length = 64, IsNullable = true, ColumnDescription = "单据编号")] + public string OrderNumber { get; set; } + /// /// 站位编号 用于物料批量绑定时区分是哪个工位绑定的明细 /// [SugarColumn(ColumnName = "station_code", Length = 64, IsNullable = true, ColumnDescription = "站位编号")] public string StationCode { get; set; } + #endregion /// /// 更新人 diff --git a/WCS.BLL/DbModels/STZL/OrderTypeInfo.cs b/WCS.BLL/DbModels/STZL/OrderTypeInfo.cs new file mode 100644 index 0000000..248461a --- /dev/null +++ b/WCS.BLL/DbModels/STZL/OrderTypeInfo.cs @@ -0,0 +1,22 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WCS.BLL.DbModels +{ + /// + /// 货架类型 + /// + [SugarTable("wcs_order_type")] + public class OrderTypeInfo + { + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsNullable = false, IsIdentity = true)] + public int Id { get; set; } + + [SugarColumn(ColumnName = "order_type_name", Length = 64, IsNullable = false, ColumnDescription = "单据类型名称")] + public string OrderTypeName { get; set; } = string.Empty; + } +} diff --git a/WCS.BLL/Manager/DbInit.cs b/WCS.BLL/Manager/DbInit.cs index 7b2f53c..7214c14 100644 --- a/WCS.BLL/Manager/DbInit.cs +++ b/WCS.BLL/Manager/DbInit.cs @@ -71,7 +71,7 @@ namespace WCS.BLL.Manager Logs.Write("【初始化数据库】创建数据库", LogsType.StartBoot); DbHelp.db.CodeFirst.InitTables(typeof(ShelfInfo), typeof(MatBaseInfo), typeof(ShelfTypeInfo) - ,typeof(LocationInfo), typeof(LocationAreaInfo),typeof(MatDetailCurrentInfo) + , typeof(LocationInfo), typeof(LocationAreaInfo), typeof(MatDetailCurrentInfo), typeof(OrderTypeInfo) , typeof(InventoryDetail), typeof(OutOrder), typeof(OutOrderDetail), typeof(OutOrderMatDetail) , typeof(MatInfo), typeof(StoreInfo) , typeof(StockTakingOrder), typeof(StockTakingOrderMatDetail), typeof(InOutRecord) diff --git a/WCS.Model/ApiModel/BatchBindMatDetail/ShelfTypeModel.cs b/WCS.Model/ApiModel/BatchBindMatDetail/ShelfTypeModel.cs new file mode 100644 index 0000000..d9478d6 --- /dev/null +++ b/WCS.Model/ApiModel/BatchBindMatDetail/ShelfTypeModel.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WCS.Model.ApiModel.Home +{ + public class OrderTypeModel + { + public int? Id { get; set; } + public string OrderTypeName { get; set; } + } +} diff --git a/WCS.Model/ApiModel/Home/ShelfTypeModel.cs b/WCS.Model/ApiModel/Home/ShelfTypeModel.cs index 930c07e..506151f 100644 --- a/WCS.Model/ApiModel/Home/ShelfTypeModel.cs +++ b/WCS.Model/ApiModel/Home/ShelfTypeModel.cs @@ -8,6 +8,5 @@ namespace WCS.Model.ApiModel.Home { public int? Id { get; set; } public string ShelfTypeName { get; set; } - } } diff --git a/WCS.WebApi/Controllers/BatchBindMatDetailController.cs b/WCS.WebApi/Controllers/BatchBindMatDetailController.cs new file mode 100644 index 0000000..61f0fdb --- /dev/null +++ b/WCS.WebApi/Controllers/BatchBindMatDetailController.cs @@ -0,0 +1,267 @@ +using Microsoft.AspNetCore.Mvc; +using WCS.BLL.DbModels; +using WCS.BLL.Services.IService; +using WCS.DAL.Db; +using WCS.DAL.DbModels; +using WCS.Model; +using WCS.Model.ApiModel; +using WCS.Model.ApiModel.Home; +using WCS.Model.ApiModel.PDAMatBind; +using WCS.Model.ApiModel.User; +using WCS.Model.WebSocketModel; + +namespace WCS.WebApi.Controllers +{ + /// + /// PDA物料绑定相关接口 + /// + [ApiController] + [Route("[controller]")] + public class BatchBindMatDetailController : ControllerBase + { + public IWarningService _warningService { get; set; } + + public BatchBindMatDetailController(IWarningService warningService) + { + _warningService = warningService; + } + + [Route("getShelfTypes")] + [HttpPost(Name = "getShelfTypes")] + public async Task getShelfTypes(RequestBase request) + { + try + { + //直接获取当前所有货架类型并返回 + var shelfTypes = DbHelp.db.Queryable() + .Select(t => new ShelfTypeModel() + { + Id = t.Id, + ShelfTypeName = t.ShelfTypeName + }) + .ToList(); + return new PageQueryResponse() + { + Code = 200, + Message = "success", + Data = new PageQueryResponseData + { + Lists = shelfTypes, + Count = shelfTypes.Count + } + }; + } + catch (Exception ex) + { + return new PageQueryResponse() + { + Code = 300, + Message = $"查询失败:{ex.Message}", + }; + } + } + + + [Route("getShelfInfoByLocationCode")] + [HttpPost(Name = "getShelfInfoByLocationCode")] + public async Task getShelfInfoByLocationCode(GetShelfInfoByLocationCodeRequest request) + { + //判断参数 + if (string.IsNullOrEmpty(request.LocationCode)) + { + return new ResponseCommon() + { + Code = 201, + Message = "工位编码为空！", + Data = null, + }; + } + + //获取是否存在当前工位 + var location = await DbHelp.db.Queryable() + .Where(t => t.LocationCode == request.LocationCode) + .Where(t => t.IsEnable == true) + .FirstAsync(); + if (location == null) + { + return new ResponseCommon() + { + Code = 201, + Message = $"工位[{request.LocationCode}]不存在或已被禁用!\r\n请联系系统管理人员维护工位信息！", + Data = null, + }; + } + + //获取当前工位的货架 + var shelf = await DbHelp.db.Queryable() + .Where(t => t.CurrentLocationId == location.Id && t.TransStatus == TransStatusEnum.静止 + || t.DestinationLocationId == location.Id && t.TransStatus == TransStatusEnum.运输中)//解决产线人员 呼叫后货架未到的时候绑定的问题 + .Where(t => t.IsEnable) + .FirstAsync(); + + return new ResponseBase() + { + Code = 200, + Message = $"success", + Data = new GetShelfInfoByLocationReturnData() + { + LocationId = location.Id, + LocationCode = request.LocationCode, + ShelfId = shelf?.Id, + ShelfCode = shelf?.ShelfCode, + }, + }; + + } + + //[Route("bindMatDetail")] + //[HttpPost(Name = "bindMatDetail")] + //public async Task bindMatDetail(BindMatDetailRequest request) + //{ + // try + // { + // #region 参数校验 + // //判断参数 + // if (request.LocationId == 0 || string.IsNullOrEmpty(request.LocationCode)) + // { + // return new ResponseCommon() + // { + // Code = 201, + // Message = "工位或工位编码为空！", + // Data = null, + // }; + // } + + // if (request.ShelfId == 0 || string.IsNullOrEmpty(request.ShelfCode)) + // { + + // return new ResponseCommon() + // { + // Code = 201, + // Message = "货架或货架编码为空！", + // Data = null, + // }; + // } + + // if (request.MatBaseInfoId == 0 || string.IsNullOrEmpty(request.MatCode)) + // { + // return new ResponseCommon() + // { + // Code = 201, + // Message = "未选择物料！", + // Data = null, + // }; + // } + + // if (request.Qty <= 0) + // { + // return new ResponseCommon() + // { + // Code = 201, + // Message = "数量应大于等于1！", + // Data = null, + // }; + // } + // #endregion + + // #region 数据校验 + // //判断参数 + // if (string.IsNullOrEmpty(request.LocationCode)) + // { + // return new ResponseCommon() + // { + // Code = 201, + // Message = "工位编码为空！", + // Data = null, + // }; + // } + + // //获取是否存在当前工位 + // var location = await DbHelp.db.Queryable() + // .Where(t => t.Id == request.LocationId) + // .Where(t => t.IsEnable == true) + // .FirstAsync(); + // if (location == null) + // { + // return new ResponseCommon() + // { + // Code = 201, + // Message = $"工位[{request.LocationCode}]不存在或已被禁用!\r\n请联系系统管理人员维护工位信息！", + // Data = null, + // }; + // } + + // //获取当前工位的货架 + // var shelf = await DbHelp.db.Queryable() + // .Where(t => t.Id == request.ShelfId) + // .Where(t => t.CurrentLocationId == location.Id && t.TransStatus == TransStatusEnum.静止 + // || t.DestinationLocationId == location.Id && t.TransStatus == TransStatusEnum.运输中)//解决产线人员 呼叫后货架未到的时候绑定的问题 + // .Where(t => t.IsEnable == true) + // .FirstAsync(); + // if (shelf == null) + // { + // return new ResponseCommon() + // { + // Code = 205, + // Message = $"货架[{request.ShelfCode}],已不在工位上!\r\n请进行【货架呼叫】！", + // Data = null, + // }; + // } + + // //获取物料基础信息 + // var matBaseInfo = await DbHelp.db.Queryable() + // .Where(t => t.Id == request.MatBaseInfoId) + // .Where(t => t.IsEnable == true) + // .FirstAsync(); + // if (matBaseInfo == null) + // { + // return new ResponseCommon() + // { + // Code = 201, + // Message = $"不存在物料[{request.MatCode}]或已被禁用！", + // Data = null, + // }; + // } + // #endregion + + // //校验合格 进行保存 + // var matDetailCurrentInfo = new MatDetailCurrentInfo() + // { + // ShlefId = shelf.Id, + // ShelfCode = shelf.ShelfCode, + // ShelfType = shelf.ShelfTypeName, + // //ShelfArea = shelf.ShelfArea, + + // MatCode = matBaseInfo.MatCode, + // MatName = matBaseInfo.MatName, + // MatSupplier = matBaseInfo.MatSupplier, + // MatCustomer = matBaseInfo.MatCustomer, + // MatSpec = matBaseInfo.MatSpec, + // MatUnit = matBaseInfo.MatUnit, + // MatQty = request.Qty, + + // ModifyUser = request.UserName, + // }; + // DbHelp.db.Insertable(matDetailCurrentInfo).ExecuteCommand(); + + // return new ResponseCommon() + // { + // Code = 200, + // Message = "success", + // Data = null, + // }; + // } + // catch (Exception ex) + // { + // return new ResponseCommon() + // { + // Code = 201, + // Message = ex.Message, + // Data = null, + // }; + // } + //} + + + } +} diff --git a/WCS.WebApi/Controllers/HomeController.cs b/WCS.WebApi/Controllers/HomeController.cs index f850f64..142952a 100644 --- a/WCS.WebApi/Controllers/HomeController.cs +++ b/WCS.WebApi/Controllers/HomeController.cs @@ -245,17 +245,17 @@ namespace WCS.WebApi.Controllers { //直接获取当前所有货架类型并返回 var shelfTypes = DbHelp.db.Queryable() - .Select(t => new ShelfTypeModel() + .Select(t => new OrderTypeModel() { Id = t.Id, ShelfTypeName = t.ShelfTypeName }) .ToList(); - return new PageQueryResponse() + return new PageQueryResponse() { Code = 200, Message = "success", - Data = new PageQueryResponseData + Data = new PageQueryResponseData { Lists = shelfTypes, Count = shelfTypes.Count @@ -264,7 +264,7 @@ namespace WCS.WebApi.Controllers } catch (Exception ex) { - return new PageQueryResponse() + return new PageQueryResponse() { Code = 300, Message = $"查询失败:{ex.Message}", diff --git a/货架标准上位机/Tool/GetBaseData.cs b/货架标准上位机/Tool/GetBaseData.cs index 13d94e5..3b362bb 100644 --- a/货架标准上位机/Tool/GetBaseData.cs +++ b/货架标准上位机/Tool/GetBaseData.cs @@ -13,7 +13,7 @@ namespace 智慧物流软件系统.Tool { public static class GetBaseData { - public static List GetShelfType() + public static List GetShelfType() { var body = new RequestBase() { @@ -21,12 +21,12 @@ namespace 智慧物流软件系统.Tool DeviceType = LocalFile.Config.DeviceType, }; - var Result = ApiHelp.GetDataFromHttp>(LocalFile.Config.ApiIpHost + "home/getShelfTypes", body, "POST"); + var Result = ApiHelp.GetDataFromHttp>(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(); } + else { return new List(); } } public static List GetLocationAreaInfos() diff --git a/货架标准上位机/ViewModels/InOutRecordViewModel.cs b/货架标准上位机/ViewModels/InOutRecordViewModel.cs index b17d2b6..5d26510 100644 --- a/货架标准上位机/ViewModels/InOutRecordViewModel.cs +++ b/货架标准上位机/ViewModels/InOutRecordViewModel.cs @@ -40,8 +40,8 @@ namespace 智慧物流软件系统.ViewModel InitShelfTypeItems(); } - private List shelfTypeItems; - public List ShelfTypeItems + private List shelfTypeItems; + public List ShelfTypeItems { get { return shelfTypeItems; } set @@ -50,8 +50,8 @@ namespace 智慧物流软件系统.ViewModel } } - private ShelfTypeModel selectedShelfTypeItem; - public ShelfTypeModel SelectedShelfTypeItem + private OrderTypeModel selectedShelfTypeItem; + public OrderTypeModel SelectedShelfTypeItem { get { return selectedShelfTypeItem; } set @@ -71,7 +71,7 @@ namespace 智慧物流软件系统.ViewModel DeviceType = LocalFile.Config.DeviceType, }; - var Result = ApiHelp.GetDataFromHttp>(LocalFile.Config.ApiIpHost + "home/getShelfTypes", body, "POST"); + var Result = ApiHelp.GetDataFromHttp>(LocalFile.Config.ApiIpHost + "home/getShelfTypes", body, "POST"); if (Result != null && Result.Data != null && Result.Data.Lists.Count() > 0) { ShelfTypeItems = Result.Data.Lists; diff --git a/货架标准上位机/ViewModels/MatDetailCurrentInfoViewModel.cs b/货架标准上位机/ViewModels/MatDetailCurrentInfoViewModel.cs index 23a2473..b7213ab 100644 --- a/货架标准上位机/ViewModels/MatDetailCurrentInfoViewModel.cs +++ b/货架标准上位机/ViewModels/MatDetailCurrentInfoViewModel.cs @@ -123,8 +123,8 @@ namespace 智慧物流软件系统.ViewModel } } - private List shelfTypeItems; - public List ShelfTypeItems + private List shelfTypeItems; + public List ShelfTypeItems { get { return shelfTypeItems; } set @@ -133,8 +133,8 @@ namespace 智慧物流软件系统.ViewModel } } - private ShelfTypeModel? selectedShelfTypeItem; - public ShelfTypeModel? SelectedShelfTypeItem + private OrderTypeModel? selectedShelfTypeItem; + public OrderTypeModel? SelectedShelfTypeItem { get { return selectedShelfTypeItem; } set @@ -147,8 +147,8 @@ namespace 智慧物流软件系统.ViewModel //调用接口更新！ Task.Run(() => { - ShelfTypeItems = new List(); - ShelfTypeItems.Add(new ShelfTypeModel { Id = null, ShelfTypeName = "全部" }); + ShelfTypeItems = new List(); + ShelfTypeItems.Add(new OrderTypeModel { Id = null, ShelfTypeName = "全部" }); var body = new RequestBase() { @@ -156,7 +156,7 @@ namespace 智慧物流软件系统.ViewModel DeviceType = LocalFile.Config.DeviceType, }; - var Result = ApiHelp.GetDataFromHttp>(LocalFile.Config.ApiIpHost + "home/getShelfTypes", body, "POST"); + var Result = ApiHelp.GetDataFromHttp>(LocalFile.Config.ApiIpHost + "home/getShelfTypes", body, "POST"); if (Result != null && Result.Data != null && Result.Data.Lists.Count() > 0) { ShelfTypeItems.AddRange(Result.Data.Lists); diff --git a/货架标准上位机/ViewModels/MatInventoryDetailViewModel.cs b/货架标准上位机/ViewModels/MatInventoryDetailViewModel.cs index a50d2dd..dbe56e0 100644 --- a/货架标准上位机/ViewModels/MatInventoryDetailViewModel.cs +++ b/货架标准上位机/ViewModels/MatInventoryDetailViewModel.cs @@ -177,8 +177,8 @@ namespace 智慧物流软件系统.ViewModel } } - private List shelfTypeItems; - public List ShelfTypeItems + private List shelfTypeItems; + public List ShelfTypeItems { get { return shelfTypeItems; } set @@ -197,7 +197,7 @@ namespace 智慧物流软件系统.ViewModel DeviceType = LocalFile.Config.DeviceType, }; - var Result = ApiHelp.GetDataFromHttp>(LocalFile.Config.ApiIpHost + "home/getShelfTypes", body, "POST"); + var Result = ApiHelp.GetDataFromHttp>(LocalFile.Config.ApiIpHost + "home/getShelfTypes", body, "POST"); if (Result != null && Result.Data != null && Result.Data.Lists.Count() > 0) { ShelfTypeItems = Result.Data.Lists; @@ -205,8 +205,8 @@ namespace 智慧物流软件系统.ViewModel }); } - private ShelfTypeModel selectedShelfTypeItem; - public ShelfTypeModel SelectedShelfTypeItem + private OrderTypeModel selectedShelfTypeItem; + public OrderTypeModel SelectedShelfTypeItem { get { return selectedShelfTypeItem; } set diff --git a/货架标准上位机/ViewModels/OutInventoryAddDucumentViewModel.cs b/货架标准上位机/ViewModels/OutInventoryAddDucumentViewModel.cs index dcf71cc..0b9eb17 100644 --- a/货架标准上位机/ViewModels/OutInventoryAddDucumentViewModel.cs +++ b/货架标准上位机/ViewModels/OutInventoryAddDucumentViewModel.cs @@ -38,8 +38,8 @@ namespace 智慧物流软件系统.ViewModels } } - private List shelfTypeItems; - public List ShelfTypeItems + private List shelfTypeItems; + public List ShelfTypeItems { get { return shelfTypeItems; } set @@ -58,7 +58,7 @@ namespace 智慧物流软件系统.ViewModels DeviceType = LocalFile.Config.DeviceType, }; - var Result = ApiHelp.GetDataFromHttp>(LocalFile.Config.ApiIpHost + "home/getShelfTypes", body, "POST"); + var Result = ApiHelp.GetDataFromHttp>(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 ShelfTypeModel selectedShelfTypeItem; - public ShelfTypeModel SelectedShelfTypeItem + private OrderTypeModel selectedShelfTypeItem; + public OrderTypeModel SelectedShelfTypeItem { get { return selectedShelfTypeItem; } set diff --git a/货架标准上位机/ViewModels/ShelfInfoAddOrUpdateViewModel.cs b/货架标准上位机/ViewModels/ShelfInfoAddOrUpdateViewModel.cs index dcfb5a4..f3ee6a2 100644 --- a/货架标准上位机/ViewModels/ShelfInfoAddOrUpdateViewModel.cs +++ b/货架标准上位机/ViewModels/ShelfInfoAddOrUpdateViewModel.cs @@ -54,8 +54,8 @@ namespace 智慧物流软件系统.ViewModel }; } - private List shelfTypeItems; - public List ShelfTypeItems + private List shelfTypeItems; + public List ShelfTypeItems { get { return shelfTypeItems; } set @@ -64,8 +64,8 @@ namespace 智慧物流软件系统.ViewModel } } - private ShelfTypeModel selectedShelfTypeItem; - public ShelfTypeModel SelectedShelfTypeItem + private OrderTypeModel selectedShelfTypeItem; + public OrderTypeModel SelectedShelfTypeItem { get { return selectedShelfTypeItem; } set diff --git a/货架标准上位机/ViewModels/ShelfInfoViewModel.cs b/货架标准上位机/ViewModels/ShelfInfoViewModel.cs index 91cdae0..37ab20e 100644 --- a/货架标准上位机/ViewModels/ShelfInfoViewModel.cs +++ b/货架标准上位机/ViewModels/ShelfInfoViewModel.cs @@ -64,8 +64,8 @@ namespace 智慧物流软件系统.ViewModel } } - private List shelfTypeItems; - public List ShelfTypeItems + private List shelfTypeItems; + public List ShelfTypeItems { get { return shelfTypeItems; } set @@ -74,8 +74,8 @@ namespace 智慧物流软件系统.ViewModel } } - private ShelfTypeModel? selectedShelfTypeItem; - public ShelfTypeModel? SelectedShelfTypeItem + private OrderTypeModel? selectedShelfTypeItem; + public OrderTypeModel? SelectedShelfTypeItem { get { return selectedShelfTypeItem; } set @@ -89,8 +89,8 @@ namespace 智慧物流软件系统.ViewModel //调用接口更新！ Task.Run(() => { - ShelfTypeItems = new List(); - ShelfTypeItems.Add(new ShelfTypeModel { Id = null, ShelfTypeName = "全部" }); + ShelfTypeItems = new List(); + ShelfTypeItems.Add(new OrderTypeModel { Id = null, ShelfTypeName = "全部" }); var body = new RequestBase() { @@ -98,7 +98,7 @@ namespace 智慧物流软件系统.ViewModel DeviceType = LocalFile.Config.DeviceType, }; - var Result = ApiHelp.GetDataFromHttp>(LocalFile.Config.ApiIpHost + "home/getShelfTypes", body, "POST"); + var Result = ApiHelp.GetDataFromHttp>(LocalFile.Config.ApiIpHost + "home/getShelfTypes", body, "POST"); if (Result != null && Result.Data != null && Result.Data.Lists.Count() > 0) { ShelfTypeItems.AddRange(Result.Data.Lists); diff --git a/货架标准上位机/Views/BatchBindMatDetailView.xaml b/货架标准上位机/Views/BatchBindMatDetailView.xaml new file mode 100644 index 0000000..0ee3555 --- /dev/null +++ b/货架标准上位机/Views/BatchBindMatDetailView.xaml @@ -0,0 +1,325 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 10条/页 + 20条/页 + 50条/页 + 100条/页 + 500条/页 + + + + + + + + + + + + + + + + +