From 732df4df327706984baef5febfc1fdd9636feb39 Mon Sep 17 00:00:00 2001 From: gwbvipvip Date: Mon, 22 Apr 2024 10:10:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseDto/BaseEPDto.cs | 0 .../BaseDto/DtoValidator.cs | 0 .../BaseDto/ResultSAASManageDto.cs | 0 .../BaseDto/UserAnalysis.cs | 0 .../Enum/ErrorCodeEnum.cs | 0 .../Service/Authorization/AuthServices.cs | 0 .../Authorization/Dtos/StoreAuthDto.cs | 0 .../Authorization/Services/AuthService.cs | 0 .../Authorization/Services/IAuthService.cs | 0 .../Service/CheckService/CheckServices.cs | 0 .../CheckService/Services/CheckServices.cs | 0 .../CheckService/Services/ICheckServices.cs | 0 .../Goods/Dtos/ResultGoodsResultDto.cs | 99 ++++++ .../Service/Goods/Services/GoodsServices.cs | 71 ++++ .../Service/Goods/Services/IGoodsServices.cs | 18 + .../Platform/Material/MaterialServices.cs | 0 .../Material/Services/IMaterialServices.cs | 0 .../Material/Services/MaterialService.cs | 0 .../BPA.SAAS.KitChenManage.Application.csproj | 3 + .../BPA.SAAS.KitChenManage.Application.xml | 317 ++++++++++++++++++ .../Device/DevicePushRecodeServices.cs | 28 ++ .../Services/DevicePushRecodeService.cs | 6 +- .../Services/IDevicePushRecodeService.cs | 18 + .../Food/Dtos/ResultSAASManageDto.cs | 99 ++++++ .../Food/FoodMenuServices.cs | 11 + .../Food/Services/FoodMenuService.cs | 49 +++ .../Food/Services/IFoodMenuService.cs | 6 + 27 files changed, 723 insertions(+), 2 deletions(-) rename BPA.SAAS.KitChenManage.Application/{AExternalPlatform => AExternalPlatform1}/BaseDto/BaseEPDto.cs (100%) rename BPA.SAAS.KitChenManage.Application/{AExternalPlatform => AExternalPlatform1}/BaseDto/DtoValidator.cs (100%) rename BPA.SAAS.KitChenManage.Application/{AExternalPlatform => AExternalPlatform1}/BaseDto/ResultSAASManageDto.cs (100%) rename BPA.SAAS.KitChenManage.Application/{AExternalPlatform => AExternalPlatform1}/BaseDto/UserAnalysis.cs (100%) rename BPA.SAAS.KitChenManage.Application/{AExternalPlatform => AExternalPlatform1}/Enum/ErrorCodeEnum.cs (100%) rename BPA.SAAS.KitChenManage.Application/{AExternalPlatform => AExternalPlatform1}/Service/Authorization/AuthServices.cs (100%) rename BPA.SAAS.KitChenManage.Application/{AExternalPlatform => AExternalPlatform1}/Service/Authorization/Dtos/StoreAuthDto.cs (100%) rename BPA.SAAS.KitChenManage.Application/{AExternalPlatform => AExternalPlatform1}/Service/Authorization/Services/AuthService.cs (100%) rename BPA.SAAS.KitChenManage.Application/{AExternalPlatform => AExternalPlatform1}/Service/Authorization/Services/IAuthService.cs (100%) rename BPA.SAAS.KitChenManage.Application/{AExternalPlatform => AExternalPlatform1}/Service/CheckService/CheckServices.cs (100%) rename BPA.SAAS.KitChenManage.Application/{AExternalPlatform => AExternalPlatform1}/Service/CheckService/Services/CheckServices.cs (100%) rename BPA.SAAS.KitChenManage.Application/{AExternalPlatform => AExternalPlatform1}/Service/CheckService/Services/ICheckServices.cs (100%) create mode 100644 BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Goods/Dtos/ResultGoodsResultDto.cs create mode 100644 BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Goods/Services/GoodsServices.cs create mode 100644 BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Goods/Services/IGoodsServices.cs rename BPA.SAAS.KitChenManage.Application/{AExternalPlatform => AExternalPlatform1}/Service/Platform/Material/MaterialServices.cs (100%) rename BPA.SAAS.KitChenManage.Application/{AExternalPlatform => AExternalPlatform1}/Service/Platform/Material/Services/IMaterialServices.cs (100%) rename BPA.SAAS.KitChenManage.Application/{AExternalPlatform => AExternalPlatform1}/Service/Platform/Material/Services/MaterialService.cs (100%) create mode 100644 BPA.SAAS.KitChenManage.Application/Food/Dtos/ResultSAASManageDto.cs diff --git a/BPA.SAAS.KitChenManage.Application/AExternalPlatform/BaseDto/BaseEPDto.cs b/BPA.SAAS.KitChenManage.Application/AExternalPlatform1/BaseDto/BaseEPDto.cs similarity index 100% rename from BPA.SAAS.KitChenManage.Application/AExternalPlatform/BaseDto/BaseEPDto.cs rename to BPA.SAAS.KitChenManage.Application/AExternalPlatform1/BaseDto/BaseEPDto.cs diff --git a/BPA.SAAS.KitChenManage.Application/AExternalPlatform/BaseDto/DtoValidator.cs b/BPA.SAAS.KitChenManage.Application/AExternalPlatform1/BaseDto/DtoValidator.cs similarity index 100% rename from BPA.SAAS.KitChenManage.Application/AExternalPlatform/BaseDto/DtoValidator.cs rename to BPA.SAAS.KitChenManage.Application/AExternalPlatform1/BaseDto/DtoValidator.cs diff --git a/BPA.SAAS.KitChenManage.Application/AExternalPlatform/BaseDto/ResultSAASManageDto.cs b/BPA.SAAS.KitChenManage.Application/AExternalPlatform1/BaseDto/ResultSAASManageDto.cs similarity index 100% rename from BPA.SAAS.KitChenManage.Application/AExternalPlatform/BaseDto/ResultSAASManageDto.cs rename to BPA.SAAS.KitChenManage.Application/AExternalPlatform1/BaseDto/ResultSAASManageDto.cs diff --git a/BPA.SAAS.KitChenManage.Application/AExternalPlatform/BaseDto/UserAnalysis.cs b/BPA.SAAS.KitChenManage.Application/AExternalPlatform1/BaseDto/UserAnalysis.cs similarity index 100% rename from BPA.SAAS.KitChenManage.Application/AExternalPlatform/BaseDto/UserAnalysis.cs rename to BPA.SAAS.KitChenManage.Application/AExternalPlatform1/BaseDto/UserAnalysis.cs diff --git a/BPA.SAAS.KitChenManage.Application/AExternalPlatform/Enum/ErrorCodeEnum.cs b/BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Enum/ErrorCodeEnum.cs similarity index 100% rename from BPA.SAAS.KitChenManage.Application/AExternalPlatform/Enum/ErrorCodeEnum.cs rename to BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Enum/ErrorCodeEnum.cs diff --git a/BPA.SAAS.KitChenManage.Application/AExternalPlatform/Service/Authorization/AuthServices.cs b/BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Authorization/AuthServices.cs similarity index 100% rename from BPA.SAAS.KitChenManage.Application/AExternalPlatform/Service/Authorization/AuthServices.cs rename to BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Authorization/AuthServices.cs diff --git a/BPA.SAAS.KitChenManage.Application/AExternalPlatform/Service/Authorization/Dtos/StoreAuthDto.cs b/BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Authorization/Dtos/StoreAuthDto.cs similarity index 100% rename from BPA.SAAS.KitChenManage.Application/AExternalPlatform/Service/Authorization/Dtos/StoreAuthDto.cs rename to BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Authorization/Dtos/StoreAuthDto.cs diff --git a/BPA.SAAS.KitChenManage.Application/AExternalPlatform/Service/Authorization/Services/AuthService.cs b/BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Authorization/Services/AuthService.cs similarity index 100% rename from BPA.SAAS.KitChenManage.Application/AExternalPlatform/Service/Authorization/Services/AuthService.cs rename to BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Authorization/Services/AuthService.cs diff --git a/BPA.SAAS.KitChenManage.Application/AExternalPlatform/Service/Authorization/Services/IAuthService.cs b/BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Authorization/Services/IAuthService.cs similarity index 100% rename from BPA.SAAS.KitChenManage.Application/AExternalPlatform/Service/Authorization/Services/IAuthService.cs rename to BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Authorization/Services/IAuthService.cs diff --git a/BPA.SAAS.KitChenManage.Application/AExternalPlatform/Service/CheckService/CheckServices.cs b/BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/CheckService/CheckServices.cs similarity index 100% rename from BPA.SAAS.KitChenManage.Application/AExternalPlatform/Service/CheckService/CheckServices.cs rename to BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/CheckService/CheckServices.cs diff --git a/BPA.SAAS.KitChenManage.Application/AExternalPlatform/Service/CheckService/Services/CheckServices.cs b/BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/CheckService/Services/CheckServices.cs similarity index 100% rename from BPA.SAAS.KitChenManage.Application/AExternalPlatform/Service/CheckService/Services/CheckServices.cs rename to BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/CheckService/Services/CheckServices.cs diff --git a/BPA.SAAS.KitChenManage.Application/AExternalPlatform/Service/CheckService/Services/ICheckServices.cs b/BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/CheckService/Services/ICheckServices.cs similarity index 100% rename from BPA.SAAS.KitChenManage.Application/AExternalPlatform/Service/CheckService/Services/ICheckServices.cs rename to BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/CheckService/Services/ICheckServices.cs diff --git a/BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Goods/Dtos/ResultGoodsResultDto.cs b/BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Goods/Dtos/ResultGoodsResultDto.cs new file mode 100644 index 0000000..e17e556 --- /dev/null +++ b/BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Goods/Dtos/ResultGoodsResultDto.cs @@ -0,0 +1,99 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BPA.SAAS.KitChenManage.Application.AExternalPlatform1.Service.Goods.Dtos +{ + public class ResultGoodsResultDto + { + public int statusCode { get; set; } + + public List data { get; set; } + + public string succeeded { get; set; } + + public string errors { get; set; } + + public string extras { get; set; } + + public int timestamp { get; set; } + } + + public class GoodsTypeResultDto + { + public string GoodsTypeId { get; set; } + + public string GoodsTypeName { get; set; } + + public List GoodsAttributeList { get; set; } + + public List GoodsInfoList { get; set; } + } + + + public class GoodsAttributeResultDto + { + public string GoodsAttributeId { get; set; } + + public string GoodsAttributeName { get; set; } + + public List GoodsAttributeValueList { get; set; } + } + + public class GoodsAttributeValueResultDto + { + public string GoodsAttributeId { get; set; } + public string GoodsAttributeValueId { get; set; } + public string AttributeValue { get; set; } + } + + public class GoodsResultDto + { + public string TypeId { get; set; } + + public string TypeName { get; set; } + } + + public class GoodsInfoResultDto + { + public string GoodsId { get; set; } + + public string GoodsName { get; set; } + + public List GoodsTechnologyActionList { get; set; } + } + + public class GoodsTechnologyActionResultDto + { + /// + /// 步骤名称 + /// + public string StepName { get; set; } + /// + /// 动作json + /// + public string ActionJson { get; set; } + /// + /// 商品属性id集合 + /// + public string GoodsAttributeId { get; set; } + /// + /// 是否物料 + /// + public bool IsBatch { get; set; } + /// + /// 动作value + /// + public string ChnologyId { get; set; } + public string GroupId { get; set; } + public int Sort { get; set; } + public string GoodsId { get; set; } + public string DeviceId { get; set; } + /// + /// 仓位模板 + /// + public string WarehousrTemplateId { get; set; } + } +} diff --git a/BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Goods/Services/GoodsServices.cs b/BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Goods/Services/GoodsServices.cs new file mode 100644 index 0000000..ff22b70 --- /dev/null +++ b/BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Goods/Services/GoodsServices.cs @@ -0,0 +1,71 @@ +using BPA.SAAS.KitChenManage.Application.AExternalPlatform.BaseDto; +using BPA.SAAS.KitChenManage.Application.AExternalPlatform1.Service.Goods.Dtos; +using BPA.SAAS.KitChenManage.Comm.Tool; +using BPA.SAAS.KitChenManage.Core.Model; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BPA.SAAS.KitChenManage.Application.AExternalPlatform1.Service.Goods.Services +{ + + [ApiDescriptionSettings("开放平台", Tag = "商品信息"), AllowAnonymous, NonUnify] + public class Goods: IGoodsServices, ITransient,IDynamicApiController + { + + private readonly ISqlSugarClient _db; + public Goods(ISqlSugarClient db) + { + _db = db; + } + /// + /// 获取设备物料信息 + /// + /// + [HttpPost("/api/goods/Getdevicegoods")] + public async Task GetDeviceGoods(string deviceId) + { + + + var goodsId = await _db.Queryable() + .Where(x => x.DeviceId == deviceId) + .Select(x => x.GoodsId) + .ToListAsync(); + + var data = await GetDeviceGoodspost(goodsId); + + return data; + } + + + /// + /// 获取商品信息 + /// + /// + /// + public async Task GetDeviceGoodspost(List goodsList) + { + try + { + + + Dictionary dic = new Dictionary(); + var url = App.Configuration["baseurl"] + "api/goods/GetGoodsListByIds"; + var inputData = JsonConvert.SerializeObject(goodsList); + var jsonData = HttpHelper.PostData(url, inputData, Encoding.UTF8, "application/json", dic); + var data = JsonConvert.DeserializeObject(jsonData); + return data; + } + catch (Exception ex) + { + + throw Oops.Oh("获取商品失败"); + } + + + } + } +} diff --git a/BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Goods/Services/IGoodsServices.cs b/BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Goods/Services/IGoodsServices.cs new file mode 100644 index 0000000..883d133 --- /dev/null +++ b/BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Goods/Services/IGoodsServices.cs @@ -0,0 +1,18 @@ +using BPA.SAAS.KitChenManage.Application.AExternalPlatform1.Service.Goods.Dtos; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BPA.SAAS.KitChenManage.Application.AExternalPlatform1.Service.Goods.Services +{ + public interface IGoodsServices + { + /// + /// 获取设备物料信息 + /// + /// + Task GetDeviceGoods(string deviceId); + } +} diff --git a/BPA.SAAS.KitChenManage.Application/AExternalPlatform/Service/Platform/Material/MaterialServices.cs b/BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Platform/Material/MaterialServices.cs similarity index 100% rename from BPA.SAAS.KitChenManage.Application/AExternalPlatform/Service/Platform/Material/MaterialServices.cs rename to BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Platform/Material/MaterialServices.cs diff --git a/BPA.SAAS.KitChenManage.Application/AExternalPlatform/Service/Platform/Material/Services/IMaterialServices.cs b/BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Platform/Material/Services/IMaterialServices.cs similarity index 100% rename from BPA.SAAS.KitChenManage.Application/AExternalPlatform/Service/Platform/Material/Services/IMaterialServices.cs rename to BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Platform/Material/Services/IMaterialServices.cs diff --git a/BPA.SAAS.KitChenManage.Application/AExternalPlatform/Service/Platform/Material/Services/MaterialService.cs b/BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Platform/Material/Services/MaterialService.cs similarity index 100% rename from BPA.SAAS.KitChenManage.Application/AExternalPlatform/Service/Platform/Material/Services/MaterialService.cs rename to BPA.SAAS.KitChenManage.Application/AExternalPlatform1/Service/Platform/Material/Services/MaterialService.cs diff --git a/BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.csproj b/BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.csproj index b8d288e..ecbd2d9 100644 --- a/BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.csproj +++ b/BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.csproj @@ -10,8 +10,11 @@ + + + diff --git a/BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.xml b/BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.xml index 7593f6c..c9c828a 100644 --- a/BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.xml +++ b/BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.xml @@ -4,6 +4,221 @@ BPA.SAAS.KitChenManage.Application + + + Dto参数验证 + + + + + 获取签名 + + + + 0-不排序 1-按名称ASCII排序 + + + + + 系统错误码 + + + + + 用户没有注册 + + + + + 操作错误 + + + + + 重复添加 + + + + + 操作数据不存在 + + + + + key不正确 + + + + + 签名错误 + + + + + 签名错误 + + + + + 获取店铺授权码列表 + + + + + + + 获取店铺授权码 + + + + + + + 添加店铺授权码 + + + + + + 修改店铺授权码 + + + + + + + 获取店铺授权码列表 + + + + + + + 获取店铺授权码 + + + + + + + 添加店铺授权码 + + + + + + 修改店铺授权码 + + + + + + + 获取店铺授权码列表 + + + + + + + 获取店铺授权码 + + + + + + + 添加店铺授权码 + + + + + + 修改店铺授权码 + + + + + + + 检查Sign + + + + + 获取模型值 + + + + + + + + 检查店铺key验证 + + + + + + 检查租户 + + + + + + + 检查Sign + + + + + 步骤名称 + + + + + 动作json + + + + + 商品属性id集合 + + + + + 是否物料 + + + + + 动作value + + + + + 仓位模板 + + + + + 获取设备物料信息 + + + + + + 获取商品信息 + + + + + + + 获取设备物料信息 + + + 分页店铺授权码 @@ -171,6 +386,20 @@ + + + 获取设备商品 + + + + + + + 编辑设备商品 + + + + Topics类 @@ -339,6 +568,20 @@ + + + 获取设备商品 + + + + + + + 编辑设备商品 + + + + 分页 @@ -367,6 +610,20 @@ + + + 获取设备商品 + + + + + + + 编辑设备商品 + + + + 商品菜品id @@ -377,6 +634,36 @@ 菜谱信息表 + + + 步骤名称 + + + + + 动作json + + + + + 商品属性id集合 + + + + + 是否物料 + + + + + 动作value + + + + + 仓位模板 + + 分页查询 @@ -419,6 +706,12 @@ + + + 获取设备物料信息 + + + 分页 @@ -461,6 +754,19 @@ + + + 获取设备物料信息 + + + + + + 获取商品信息 + + + + 分页 @@ -503,6 +809,12 @@ + + + 获取设备物料信息 + + + 映射数据 @@ -803,5 +1115,10 @@ + + + 检查Sign + + diff --git a/BPA.SAAS.KitChenManage.Application/Device/DevicePushRecodeServices.cs b/BPA.SAAS.KitChenManage.Application/Device/DevicePushRecodeServices.cs index d855a6f..b510cee 100644 --- a/BPA.SAAS.KitChenManage.Application/Device/DevicePushRecodeServices.cs +++ b/BPA.SAAS.KitChenManage.Application/Device/DevicePushRecodeServices.cs @@ -72,5 +72,33 @@ namespace BPA.SAAS.KitChenManage.Application.Device { return await _devicePushRecodeService.Delete(input); } + + + + #region 设备商品 + + /// + /// 获取设备商品 + /// + /// + /// + [HttpPost("/api/devicepushrecode/getdevicegoods")] + public async Task> GetDeviceGoods(string deviceId) + { + return await _devicePushRecodeService.GetDeviceGoods(deviceId); + } + + /// + /// 编辑设备商品 + /// + /// + /// + [HttpPost("/api/devicepushrecode/editdevicegoods")] + public async Task EditDeviceGoods(DeviceGoodsInputDto inputDto) + { + return await _devicePushRecodeService.EditDeviceGoods(inputDto); + } + + #endregion } } diff --git a/BPA.SAAS.KitChenManage.Application/Device/Services/DevicePushRecodeService.cs b/BPA.SAAS.KitChenManage.Application/Device/Services/DevicePushRecodeService.cs index 2b87789..2da2456 100644 --- a/BPA.SAAS.KitChenManage.Application/Device/Services/DevicePushRecodeService.cs +++ b/BPA.SAAS.KitChenManage.Application/Device/Services/DevicePushRecodeService.cs @@ -343,7 +343,7 @@ namespace BPA.SAAS.KitChenManage.Application.Device.Services { var result = new List(); - result = await _db.Queryable().Where(x => x.DeviceId == deviceId) + result = await _db.Queryable() .Select(x => new Goods() { GoodsId = x.GoodsId, @@ -372,6 +372,7 @@ namespace BPA.SAAS.KitChenManage.Application.Device.Services { list.Add(new BPA_DeviceGoods() { + Id=Guid.NewGuid().ToString(), DeviceId = inputDto.DeviceId, GoodsId = item.GoodsId, GoodsName = item.GoodsName, @@ -379,9 +380,10 @@ namespace BPA.SAAS.KitChenManage.Application.Device.Services } var res = await _db.Insertable(list).ExecuteCommandAsync(); - return res > 0; _db.Ado.CommitTran(); + + return res > 0; } catch (Exception e) { diff --git a/BPA.SAAS.KitChenManage.Application/Device/Services/IDevicePushRecodeService.cs b/BPA.SAAS.KitChenManage.Application/Device/Services/IDevicePushRecodeService.cs index 6c6d85d..ebd8b56 100644 --- a/BPA.SAAS.KitChenManage.Application/Device/Services/IDevicePushRecodeService.cs +++ b/BPA.SAAS.KitChenManage.Application/Device/Services/IDevicePushRecodeService.cs @@ -36,5 +36,23 @@ namespace BPA.SAAS.KitChenManage.Application.Device.Services /// /// Task Delete(List input); + + #region 设备商品 + + /// + /// 获取设备商品 + /// + /// + /// + Task> GetDeviceGoods(string deviceId); + + /// + /// 编辑设备商品 + /// + /// + /// + Task EditDeviceGoods(DeviceGoodsInputDto inputDto); + + #endregion } } diff --git a/BPA.SAAS.KitChenManage.Application/Food/Dtos/ResultSAASManageDto.cs b/BPA.SAAS.KitChenManage.Application/Food/Dtos/ResultSAASManageDto.cs new file mode 100644 index 0000000..faf6857 --- /dev/null +++ b/BPA.SAAS.KitChenManage.Application/Food/Dtos/ResultSAASManageDto.cs @@ -0,0 +1,99 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BPA.SAAS.KitChenManage.Application.Food.Dtos +{ + public class ResultSAASManageDto + { + public int statusCode { get; set; } + + public List data { get; set; } + + public string succeeded { get; set; } + + public string errors { get; set; } + + public string extras { get; set; } + + public int timestamp { get; set; } + } + + public class GoodsTypeResultDto + { + public string GoodsTypeId { get; set; } + + public string GoodsTypeName { get; set; } + + public List GoodsAttributeList { get; set; } + + public List GoodsInfoList { get; set; } + } + + + public class GoodsAttributeResultDto + { + public string GoodsAttributeId { get; set; } + + public string GoodsAttributeName { get; set; } + + public List GoodsAttributeValueList { get; set; } + } + + public class GoodsAttributeValueResultDto + { + public string GoodsAttributeId { get; set; } + public string GoodsAttributeValueId { get; set; } + public string AttributeValue { get; set; } + } + + public class GoodsResultDto + { + public string TypeId { get; set; } + + public string TypeName { get; set; } + } + + public class GoodsInfoResultDto + { + public string GoodsId { get; set; } + + public string GoodsName { get; set; } + + public List GoodsTechnologyActionList { get; set; } + } + + public class GoodsTechnologyActionResultDto + { + /// + /// 步骤名称 + /// + public string StepName { get; set; } + /// + /// 动作json + /// + public string ActionJson { get; set; } + /// + /// 商品属性id集合 + /// + public string GoodsAttributeId { get; set; } + /// + /// 是否物料 + /// + public bool IsBatch { get; set; } + /// + /// 动作value + /// + public string ChnologyId { get; set; } + public string GroupId { get; set; } + public int Sort { get; set; } + public string GoodsId { get; set; } + public string DeviceId { get; set; } + /// + /// 仓位模板 + /// + public string WarehousrTemplateId { get; set; } + } +} diff --git a/BPA.SAAS.KitChenManage.Application/Food/FoodMenuServices.cs b/BPA.SAAS.KitChenManage.Application/Food/FoodMenuServices.cs index 24ee7ed..fa1a9ae 100644 --- a/BPA.SAAS.KitChenManage.Application/Food/FoodMenuServices.cs +++ b/BPA.SAAS.KitChenManage.Application/Food/FoodMenuServices.cs @@ -81,5 +81,16 @@ namespace BPA.SAAS.KitChenManage.Application.Food { return await _foodmenuService.GetFoodMenuGoods(foodMenuId); } + + /// + /// 获取设备物料信息 + /// + /// + [HttpGet("/api/foodmenu/getdevicegoods")] + public async Task GetDeviceGoods(string deviceId) + { + return await _foodmenuService.GetDeviceGoods(deviceId); + + } } } diff --git a/BPA.SAAS.KitChenManage.Application/Food/Services/FoodMenuService.cs b/BPA.SAAS.KitChenManage.Application/Food/Services/FoodMenuService.cs index 085ed3a..530031b 100644 --- a/BPA.SAAS.KitChenManage.Application/Food/Services/FoodMenuService.cs +++ b/BPA.SAAS.KitChenManage.Application/Food/Services/FoodMenuService.cs @@ -1,9 +1,11 @@ using BPA.SAAS.KitChenManage.Application.Food.Dtos; using BPA.SAAS.KitChenManage.Application.Store.Dtos; using BPA.SAAS.KitChenManage.Application.Store.Services; +using BPA.SAAS.KitChenManage.Comm.Tool; using BPA.SAAS.KitChenManage.Core.Base; using BPA.SAAS.KitChenManage.Core.Model; using Furion.LinqBuilder; +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Linq; @@ -127,5 +129,52 @@ namespace BPA.SAAS.KitChenManage.Application.Food.Services { return await _db.Queryable().Where(x => x.FoodMenuId == foodMenuId).ToListAsync(); } + + + /// + /// 获取设备物料信息 + /// + /// + public async Task GetDeviceGoods(string deviceId) + { + + + var goodsId =await _db.Queryable() + .Where(x => x.DeviceId == deviceId) + .Select(x => x.GoodsId) + .ToListAsync(); + + var data = await GetDeviceGoodspost(goodsId); + + return data; + } + + + /// + /// 获取商品信息 + /// + /// + /// + public async Task GetDeviceGoodspost(List goodsList) + { + try + { + + + Dictionary dic = new Dictionary(); + var url = App.Configuration["baseurl"] + "api/goods/GetGoodsListByIds"; + var inputData = JsonConvert.SerializeObject(goodsList); + var jsonData = HttpHelper.PostData(url, inputData, Encoding.UTF8, "application/json", dic); + var data = JsonConvert.DeserializeObject(jsonData); + return data; + } + catch (Exception ex) + { + + throw Oops.Oh("获取商品失败"); + } + + + } } } diff --git a/BPA.SAAS.KitChenManage.Application/Food/Services/IFoodMenuService.cs b/BPA.SAAS.KitChenManage.Application/Food/Services/IFoodMenuService.cs index b04c7b7..9b5a5b8 100644 --- a/BPA.SAAS.KitChenManage.Application/Food/Services/IFoodMenuService.cs +++ b/BPA.SAAS.KitChenManage.Application/Food/Services/IFoodMenuService.cs @@ -48,5 +48,11 @@ namespace BPA.SAAS.KitChenManage.Application.Food.Services /// /// Task> GetFoodMenuGoods(string foodMenuId); + + /// + /// 获取设备物料信息 + /// + /// + Task GetDeviceGoods(string deviceId); } }