下发数据修改

BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.xml

@@ -62,106 +62,6 @@
             设备AutoKey
             </summary>
         </member>
-        <member name="P:BPA.SAAS.KitChenManage.Application.Device.PushDto.Batching.BatchingDto.Code">
-            <summary>
-            原料编码
-            </summary>           
-        </member>
-        <member name="P:BPA.SAAS.KitChenManage.Application.Device.PushDto.Batching.BatchingDto.Aittribute">
-            <summary>
-            商品属性  (0成品,1半成品,2,易耗品)
-            </summary>           
-        </member>
-        <member name="P:BPA.SAAS.KitChenManage.Application.Device.PushDto.Batching.BatchingDto.Name">
-            <summary>
-            原料名称
-            </summary>           
-        </member>
-        <member name="P:BPA.SAAS.KitChenManage.Application.Device.PushDto.Batching.BatchingDto.TypeName">
-            <summary>
-            配料类型
-            </summary>           
-        </member>
-        <member name="P:BPA.SAAS.KitChenManage.Application.Device.PushDto.Batching.BatchingDto.TypeID">
-            <summary>
-            原料类型
-            </summary>           
-        </member>
-        <member name="P:BPA.SAAS.KitChenManage.Application.Device.PushDto.Batching.BatchingDto.StockUintName">
-            <summary>
-            库存单位
-            </summary>           
-        </member>
-        <member name="P:BPA.SAAS.KitChenManage.Application.Device.PushDto.Batching.BatchingDto.Specs">
-            <summary>
-            规格属性
-            </summary>           
-        </member>
-        <member name="P:BPA.SAAS.KitChenManage.Application.Device.PushDto.Batching.BatchingDto.Price">
-            <summary>
-            成本价
-            </summary>           
-        </member>
-        <member name="P:BPA.SAAS.KitChenManage.Application.Device.PushDto.Batching.BatchingDto.netrecovery">
-            <summary>
-            净料率
-            </summary>           
-        </member>
-        <member name="P:BPA.SAAS.KitChenManage.Application.Device.PushDto.Batching.BatchingDto.outstockUint">
-            <summary>
-            出库单位
-            </summary>           
-        </member>
-        <member name="P:BPA.SAAS.KitChenManage.Application.Device.PushDto.Batching.BatchingDto.proportion">
-            <summary>
-            换算比例
-            </summary>           
-        </member>
-        <member name="P:BPA.SAAS.KitChenManage.Application.Device.PushDto.Batching.BatchingTypeDto.Name">
-            <summary>
-            单位名称
-            </summary>           
-        </member>
-        <member name="P:BPA.SAAS.KitChenManage.Application.Device.PushDto.Batching.BatchingTypeDto.Remark">
-            <summary>
-            备注
-            </summary>
-        </member>
-        <member name="P:BPA.SAAS.KitChenManage.Application.Device.PushDto.Batching.BatchingUintDto.Name">
-            <summary>
-            单位名称
-            </summary>           
-        </member>
-        <member name="P:BPA.SAAS.KitChenManage.Application.Device.PushDto.Batching.BatchingUintDto.Remark">
-            <summary>
-            备注
-            </summary>
-        </member>
-        <member name="P:BPA.SAAS.KitChenManage.Application.Device.PushDto.GoodsTechnology.TechnologyAction.TechnologyType">
-            <summary>
-            工艺模型类型（标识是否物料 1标识物料 0标识其他）
-            </summary>
-        </member>
-        <member name="P:BPA.SAAS.KitChenManage.Application.Device.PushDto.Goods.GoodsAttributeDto.AttributeName">
-            <summary>
-            属性名称
-            </summary>
-        </member>
-        <member name="P:BPA.SAAS.KitChenManage.Application.Device.PushDto.Goods.GoodsAttributeDto.GoodsTypeId">
-            <summary>
-            商品小类id
-            </summary>
-        </member>
-        <member name="P:BPA.SAAS.KitChenManage.Application.Device.PushDto.Goods.GoodsAttributeValue.GoodsAttributeId">
-             <summary>
-            商品属性id
-             </summary>
-        </member>
-        <member name="P:BPA.SAAS.KitChenManage.Application.Device.PushDto.Goods.GoodsAttributeValue.AttributeValue">
-            <summary>
-            属性值
-            </summary>
-        </member>
         <member name="P:BPA.SAAS.KitChenManage.Application.Device.PushDto.ProductFunction.ProductFunctionDto.Name">
             <summary>
             功能名称
@@ -432,7 +332,7 @@
             <param name="foodMenuId"></param>
             <returns></returns>
         </member>
-        <member name="M:BPA.SAAS.KitChenManage.Application.RequestParmsHeadlen.GetDynamic(System.Object,System.Object)">
+        <member name="M:BPA.SAAS.KitChenManage.Application.Push.Comm.CommDefaultHandle.GetDynamic(System.Object,System.Object)">
             <summary>
             映射数据
             </summary>
@@ -440,7 +340,7 @@
             <param name="data2"></param>
             <returns></returns>
         </member>
-        <member name="M:BPA.SAAS.KitChenManage.Application.RequestParmsHeadlen.IsPropertyExist(System.Object,System.String)">
+        <member name="M:BPA.SAAS.KitChenManage.Application.Push.Comm.CommDefaultHandle.IsPropertyExist(System.Object,System.String)">
             <summary>
             验证属性是否存在
             </summary>
@@ -448,6 +348,120 @@
             <param name="propertyname"></param>
             <returns></returns>
         </member>
+        <member name="M:BPA.SAAS.KitChenManage.Application.Push.Comm.CommDefaultHandle.GetProduct_VersionData(System.String,System.String,System.String)">
+            <summary>
+            获取产品版本物模型定义的下发数据格式
+            </summary>
+            <param name="productName"></param>
+            <param name="productVersion"></param>
+            <param name="attrubiteName"></param>
+            <returns></returns>
+        </member>
+        <member name="P:BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Batching.BatchingDto.Code">
+            <summary>
+            原料编码
+            </summary>           
+        </member>
+        <member name="P:BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Batching.BatchingDto.Aittribute">
+            <summary>
+            商品属性  (0成品,1半成品,2,易耗品)
+            </summary>           
+        </member>
+        <member name="P:BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Batching.BatchingDto.Name">
+            <summary>
+            原料名称
+            </summary>           
+        </member>
+        <member name="P:BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Batching.BatchingDto.TypeName">
+            <summary>
+            配料类型
+            </summary>           
+        </member>
+        <member name="P:BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Batching.BatchingDto.TypeID">
+            <summary>
+            原料类型
+            </summary>           
+        </member>
+        <member name="P:BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Batching.BatchingDto.StockUintName">
+            <summary>
+            库存单位
+            </summary>           
+        </member>
+        <member name="P:BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Batching.BatchingDto.Specs">
+            <summary>
+            规格属性
+            </summary>           
+        </member>
+        <member name="P:BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Batching.BatchingDto.Price">
+            <summary>
+            成本价
+            </summary>           
+        </member>
+        <member name="P:BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Batching.BatchingDto.netrecovery">
+            <summary>
+            净料率
+            </summary>           
+        </member>
+        <member name="P:BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Batching.BatchingDto.outstockUint">
+            <summary>
+            出库单位
+            </summary>           
+        </member>
+        <member name="P:BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Batching.BatchingDto.proportion">
+            <summary>
+            换算比例
+            </summary>           
+        </member>
+        <member name="P:BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Batching.BatchingTypeDto.Name">
+            <summary>
+            单位名称
+            </summary>           
+        </member>
+        <member name="P:BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Batching.BatchingTypeDto.Remark">
+            <summary>
+            备注
+            </summary>
+        </member>
+        <member name="P:BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Batching.BatchingUintDto.Name">
+            <summary>
+            单位名称
+            </summary>           
+        </member>
+        <member name="P:BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Batching.BatchingUintDto.Remark">
+            <summary>
+            备注
+            </summary>
+        </member>
+        <member name="P:BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.GoodsTechnology.TechnologyAction.TechnologyType">
+            <summary>
+            工艺模型类型（标识是否物料 1标识物料 0标识其他）
+            </summary>
+        </member>
+        <member name="P:BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Goods.GoodsAttributeDto.AttributeName">
+            <summary>
+            属性名称
+            </summary>
+        </member>
+        <member name="P:BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Goods.GoodsAttributeDto.GoodsTypeId">
+            <summary>
+            商品小类id
+            </summary>
+        </member>
+        <member name="P:BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Goods.GoodsAttributeValue.GoodsAttributeId">
+             <summary>
+            商品属性id
+             </summary>
+        </member>
+        <member name="P:BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Goods.GoodsAttributeValue.AttributeValue">
+            <summary>
+            属性值
+            </summary>
+        </member>
+        <member name="T:BPA.SAAS.KitChenManage.Application.Push.奶茶机_v1.ProductFunctionData">
+             <summary>
+            产品下发数据格式定义
+             </summary>
+        </member>
         <member name="M:BPA.SAAS.KitChenManage.Application.Store.Services.IStoreService.Page(BPA.SAAS.KitChenManage.Application.Store.Dtos.StoreDtoPageInput)">
             <summary>
             分页

BPA.SAAS.KitChenManage.Application/Device/Dtos/DevicePushRecodeDtoInput.cs

@@ -11,6 +11,7 @@ namespace BPA.SAAS.KitChenManage.Application.Device.Dtos
         public string DeviceId { get; set; }
         public string ProductVersion { get; set; }
         public string ProductKey { get; set; }
+        public string ProductName { get; set; }
         public string DeviceName { get; set; }
         public int DeviceAutoKey { get; set; }
         public object Data { get; set; }

BPA.SAAS.KitChenManage.Application/Device/Services/DevicePushRecodeService.cs

@@ -1,6 +1,7 @@
 using BPA.Message;
 using BPA.Message.IOT;
 using BPA.SAAS.KitChenManage.Application.Device.Dtos;
+using BPA.SAAS.KitChenManage.Application.Push.Comm;
 using BPA.SAAS.KitChenManage.Application.Store.Dtos;
 using BPA.SAAS.KitChenManage.Comm.Const;
 using BPA.SAAS.KitChenManage.Core.Base;
@@ -25,7 +26,7 @@ namespace BPA.SAAS.KitChenManage.Application.Device.Services
     {
         private readonly ISqlSugarClient _db;
         private readonly IMqttClient _mqttClient;
-        RequestParmsHeadlen requestParmsHeadlen = new();
+        CommDefaultHandle requestParmsHeadlen = new();
         public DevicePushRecodeService(ISqlSugarClient db, IMqttClient mqttClient)
         {
             _db = db;
@@ -70,7 +71,7 @@ namespace BPA.SAAS.KitChenManage.Application.Device.Services
         /// <returns></returns>
         public async Task<bool> Add(DevicePushRecodeDtoInput input)
         {
-            var DataResore =await requestParmsHeadlen.GetParm(input.Type, input.Data.ToString(), input.DeviceId);
+            var DataResore =await requestParmsHeadlen.GetParm(input.Type, input.Data.ToString(), input.DeviceId, input.ProductName, input.ProductVersion);
             var data = input.Adapt<BPA_DevicePushRecode>();
             string topstr = "";
             string Topic = GetTopic(input.Type, input.DeviceAutoKey.ToString(), input.ProductVersion, input.ProductKey, out topstr);

BPA.SAAS.KitChenManage.Application/RequestParmsHeadlen.cs → BPA.SAAS.KitChenManage.Application/Push/Comm/CommDefaultHandle.cs

@@ -1,8 +1,9 @@
 using BPA.Message;
-using BPA.SAAS.KitChenManage.Application.Device.PushDto.Batching;
-using BPA.SAAS.KitChenManage.Application.Device.PushDto.Goods;
-using BPA.SAAS.KitChenManage.Application.Device.PushDto.GoodsTechnology;
 using BPA.SAAS.KitChenManage.Application.Device.PushDto.ProductFunction;
+using BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Batching;
+using BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Goods;
+using BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.GoodsTechnology;
+using BPA.SAAS.KitChenManage.Application.Push.奶茶机_v1;
 using BPA.SAAS.KitChenManage.Comm.Const;
 using BPA.SAAS.KitChenManage.Core.Base;
 using Furion.JsonSerialization;
@@ -10,6 +11,7 @@ using Furion.RemoteRequest.Extensions;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Dynamic;
 using System.Linq;
 using System.Reflection;
@@ -18,42 +20,30 @@ using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 
-namespace BPA.SAAS.KitChenManage.Application
+namespace BPA.SAAS.KitChenManage.Application.Push.Comm
 {
-    public class RequestParmsHeadlen
+    public class CommDefaultHandle
     {
         private string BaseServerUrl = App.GetConfig<string>("baseurl");
-        public async Task<dynamic> GetParm(int type,string data,string deviceId)
+        public async Task<dynamic> GetParm(int type, string data, string deviceId,string productName, string productVersion)
         {
-            var getProductFunctionurl = BaseServerUrl + "api/productfunction/getproductfunction_alm?deviceId="+ deviceId;//获取商品属性
-            var responseProductFunction = await getProductFunctionurl.SetHttpMethod(HttpMethod.Get).GetAsStringAsync();
-            var resProductFunction = JsonConvert.DeserializeObject<ResponDataBase>(responseProductFunction);
-            if (resProductFunction.statusCode != "200") throw Oops.Oh("获取该设备的物模型数据失败");
-            if(resProductFunction.data==null) throw Oops.Oh("找不到设备的物模型配置，请配置相关参数后再试");
-            var dataProductFunction = JsonConvert.DeserializeObject<List<ProductFunctionDto>>(resProductFunction.data.ToString());
             dynamic obj = null;
             switch (type)
             {
                 case 1: //商品下发
-                    var GoodsFunction=dataProductFunction.Where(x => x.Name == "商品数据下发" && x.Type == "1").First();
-                    if(GoodsFunction == null) throw Oops.Oh("该设备的物模型还没配置对应功能，请配置相关参数后再试");
-                    var GoodsFunctionValue = GoodsFunction.ProductFunctionValue.Where(x => x.IsDefault == true && x.ActionName == "DataSoure").First();
-                    if(string.IsNullOrEmpty(GoodsFunctionValue.ActionValue)) throw Oops.Oh("该设备的物模型配置对应功能参数没有配置，请配置相关参数后再试");
-                    obj = await GetGoods(data, GoodsFunctionValue.ActionValue);
+                    var GoodsData = GetProduct_VersionData(productName, productVersion, "GoodsData");
+                    if (string.IsNullOrWhiteSpace(GoodsData)) throw Oops.Oh("系统还未开发【产品名称：" + productName + "-版本号：" + productVersion + "】的商品数据下发功能");
+                    obj = await GetGoods(data, GoodsData);
                     break;
                 case 2://物料下发
-                    var BatchingFunction = dataProductFunction.Where(x => x.Name == "物料数据下发" && x.Type == "1").First();
-                    if (BatchingFunction == null) throw Oops.Oh("该设备的物模型还没配置对应功能，请配置相关参数后再试");
-                    var BatchingFunctionValue = BatchingFunction.ProductFunctionValue.Where(x => x.IsDefault==true && x.ActionName == "DataSoure").First();
-                    if (string.IsNullOrEmpty(BatchingFunctionValue.ActionValue)) throw Oops.Oh("该设备的物模型配置对应功能参数没有配置，请配置相关参数后再试");
-                    obj =await GetBatching(data, BatchingFunctionValue.ActionValue);
+                    var BatchingData = GetProduct_VersionData(productName, productVersion, "BatchingData");
+                    if (string.IsNullOrWhiteSpace(BatchingData)) throw Oops.Oh("系统还未开发【产品名称："+ productName + "-版本号："+ productVersion + "】的物料数据下发功能");
+                    obj = await GetBatching(data, BatchingData);
                     break;
                 case 4:
-                    var TechnologyFunction = dataProductFunction.Where(x => x.Name == "工艺数据下发" && x.Type == "1").First();
-                    if (TechnologyFunction == null) throw Oops.Oh("该设备的物模型还没配置对应功能，请配置相关参数后再试");
-                    var TechnologyFunctionValue = TechnologyFunction.ProductFunctionValue.Where(x => x.IsDefault == true && x.ActionName == "DataSoure").First();
-                    if (string.IsNullOrEmpty(TechnologyFunctionValue.ActionValue)) throw Oops.Oh("该设备的物模型配置对应功能参数没有配置，请配置相关参数后再试");
-                    obj = await GetGoodsTechnology(data, deviceId,TechnologyFunctionValue.ActionValue);
+                    var TechnologyData = GetProduct_VersionData(productName, productVersion, "TechnologyData");
+                    if (string.IsNullOrWhiteSpace(TechnologyData)) throw Oops.Oh("系统还未开发【产品名称：" + productName + "-版本号：" + productVersion + "】的工艺数据下发功能");
+                    obj = await GetGoodsTechnology(data, deviceId, TechnologyData);
                     break;
             }
             return obj;
@@ -124,9 +114,9 @@ namespace BPA.SAAS.KitChenManage.Application
             {
                 throw Oops.Oh("解析数据失败");
             }
-            
+
         }
-        private async Task<dynamic> GetBatching(string data,string productFunctionData)
+        private async Task<dynamic> GetBatching(string data, string productFunctionData)
         {
             try
             {
@@ -175,7 +165,7 @@ namespace BPA.SAAS.KitChenManage.Application
             }
 
         }
-        private async Task<dynamic> GetGoodsTechnology(string data,string deviceId, string productFunctionData)
+        private async Task<dynamic> GetGoodsTechnology(string data, string deviceId, string productFunctionData)
         {
             try
             {
@@ -227,11 +217,11 @@ namespace BPA.SAAS.KitChenManage.Application
                 foreach (var property in properties)
                 {
                     object value = property.GetValue(item);
-                    
-                    
+
+
                     foreach (var property1 in data2)
                     {
-                     
+
                         if (property.Name.ToLower() == property1?.Name?.ToLower())
                         {
                             Type dataType = property.PropertyType;
@@ -257,15 +247,41 @@ namespace BPA.SAAS.KitChenManage.Application
         /// <param name="data"></param>
         /// <param name="propertyname"></param>
         /// <returns></returns>
-        private bool IsPropertyExist(dynamic data, string propertyname) 
+        private bool IsPropertyExist(dynamic data, string propertyname)
         {
             var check = false;
             var sd = data.GetType().GetProperty(propertyname);
             foreach (var property1 in data)
             {
-                if (property1.Name == propertyname) check= true;
+                if (property1.Name == propertyname) check = true;
             }
             return check;
         }
+        /// <summary>
+        /// 获取产品版本物模型定义的下发数据格式
+        /// </summary>
+        /// <param name="productName"></param>
+        /// <param name="productVersion"></param>
+        /// <param name="attrubiteName"></param>
+        /// <returns></returns>
+        private string GetProduct_VersionData(string productName, string productVersion,string attrubiteName)
+        {
+            string namespaceName = "BPA.SAAS.KitChenManage.Application.Push."+ productName + "_"+ productVersion; // 要查询的命名空间名称
+            Assembly assembly = typeof(CommDefaultHandle).Assembly; // 当前程序集（或者其他需要查询的程序集）
+            Type[] typesInNamespace = assembly.GetTypes().Where(t => t.Namespace == namespaceName).ToArray();
+            var value = "";
+            foreach (Type type in typesInNamespace)
+            {
+                foreach (var field in type.GetFields())
+                {
+                    if(attrubiteName== field.Name)
+                    {
+                        value=field.GetValue(type.Name).ToString();
+                        break;
+                    }
+                }
+            }
+            return value;
+        }
     }
 }

BPA.SAAS.KitChenManage.Application/Device/PushDto/Batching/BatchingDto.cs → BPA.SAAS.KitChenManage.Application/Push/Comm/Dto/Batching/BatchingDto.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPA.SAAS.KitChenManage.Application.Device.PushDto.Batching
+namespace BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Batching
 {
     public class BatchingDto
     {
@@ -46,7 +46,7 @@ namespace BPA.SAAS.KitChenManage.Application.Device.PushDto.Batching
         /// </summary>           
         public decimal Price { get; set; }
 
-       
+
         /// <summary>
         /// 净料率
         /// </summary>           

BPA.SAAS.KitChenManage.Application/Device/PushDto/Batching/BatchingInfoDto.cs → BPA.SAAS.KitChenManage.Application/Push/Comm/Dto/Batching/BatchingInfoDto.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPA.SAAS.KitChenManage.Application.Device.PushDto.Batching
+namespace BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Batching
 {
     public class BatchingInfoDto
     {

BPA.SAAS.KitChenManage.Application/Device/PushDto/Batching/BatchingTypeDto.cs → BPA.SAAS.KitChenManage.Application/Push/Comm/Dto/Batching/BatchingTypeDto.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPA.SAAS.KitChenManage.Application.Device.PushDto.Batching
+namespace BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Batching
 {
     public class BatchingTypeDto
     {

BPA.SAAS.KitChenManage.Application/Device/PushDto/Batching/BatchingUintDto.cs → BPA.SAAS.KitChenManage.Application/Push/Comm/Dto/Batching/BatchingUintDto.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPA.SAAS.KitChenManage.Application.Device.PushDto.Batching
+namespace BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Batching
 {
     public class BatchingUintDto
     {

BPA.SAAS.KitChenManage.Application/Device/PushDto/Goods/GoodsAttributeDto.cs → BPA.SAAS.KitChenManage.Application/Push/Comm/Dto/Goods/GoodsAttributeDto.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPA.SAAS.KitChenManage.Application.Device.PushDto.Goods
+namespace BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Goods
 {
     public class GoodsAttributeDto
     {

BPA.SAAS.KitChenManage.Application/Device/PushDto/Goods/GoodsInfoDto.cs → BPA.SAAS.KitChenManage.Application/Push/Comm/Dto/Goods/GoodsInfoDto.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPA.SAAS.KitChenManage.Application.Device.PushDto.Goods
+namespace BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Goods
 {
     public class GoodsInfoDto
     {

BPA.SAAS.KitChenManage.Application/Device/PushDto/Goods/GoodsTypeDto.cs → BPA.SAAS.KitChenManage.Application/Push/Comm/Dto/Goods/GoodsTypeDto.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPA.SAAS.KitChenManage.Application.Device.PushDto.Goods
+namespace BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Goods
 {
     public class GoodsTypeDto
     {

BPA.SAAS.KitChenManage.Application/Device/PushDto/Goods/GoodsUintDto.cs → BPA.SAAS.KitChenManage.Application/Push/Comm/Dto/Goods/GoodsUintDto.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPA.SAAS.KitChenManage.Application.Device.PushDto.Goods
+namespace BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.Goods
 {
     public class GoodsUintDto
     {

BPA.SAAS.KitChenManage.Application/Device/PushDto/GoodsTechnology/GoodsTechnologysDto.cs → BPA.SAAS.KitChenManage.Application/Push/Comm/Dto/GoodsTechnology/GoodsTechnologysDto.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPA.SAAS.KitChenManage.Application.Device.PushDto.GoodsTechnology
+namespace BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.GoodsTechnology
 {
     public class GoodsTechnologysDto
     {

BPA.SAAS.KitChenManage.Application/Device/PushDto/GoodsTechnology/TechnologyDto.cs → BPA.SAAS.KitChenManage.Application/Push/Comm/Dto/GoodsTechnology/TechnologyDto.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPA.SAAS.KitChenManage.Application.Device.PushDto.GoodsTechnology
+namespace BPA.SAAS.KitChenManage.Application.Push.Comm.Dto.GoodsTechnology
 {
     public class TechnologyDto
     {

BPA.SAAS.KitChenManage.Application/Push/奶茶机_V1/ProductFunctionData.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.SAAS.KitChenManage.Application.Push.奶茶机_v1
+{
+    /// <summary>
+    ///产品下发数据格式定义
+    /// </summary>
+    public class ProductFunctionData
+    {
+        public const string BatchingData = "{\r\n\t\"batchinginfo\": [{\r\n\t\t\"id\": \"物料ID\",\r\n\t\t\"name\": \"物料名称\",\r\n\t\t\"typeid\": \"物料类型ID\",\r\n\t\t\"typename\": \"物料类型名称\",\r\n\t\t\"unit\": \"单位\",\r\n\t\t\"createAt\": \"创建时间\"\r\n\t}],\r\n\t\"batchingTypeinfo\": [{\r\n\t\t\"id\": \"ID\",\r\n\t\t\"name\": \"物料类型名称\"\r\n\t}],\r\n\t\"batchingUnitinfo\": [{\r\n\t\t\"id\": \"ID\",\r\n\t\t\"name\": \"物料单位名称\"\r\n\t}]\r\n}";
+        public const string GoodsData = "{\r\n\t\"goodsinfo\": [{\r\n\t\t\"id\": \"商品ID\",\r\n\t\t\"name\": \"商品名称\",\r\n\t\t\"goodsTypeId\": \"商品类型ID\",\r\n\t\t\"goodsTypeName\": \"商品类型名称\",\r\n\t\t\"goodsUintId\": \"单位Id\",\r\n\t\t\"goodsUintName\": \"单位名称\",\r\n\t\t\"createAt\": \"创建时间\",\r\n\t\t\"imgUrl\": \"商品图片路径\",\r\n\t\t\"price\": \"价格\",\r\n\t\t\"design\": \"描述\"\r\n\t}],\r\n\t\"goodsTypeInfo\": [{\r\n\t\t\"id\": \"id\",\r\n\t\t\"name\": \"分类名称\",\r\n\t\t\"PId\": \"父级id\"\r\n\t}],\r\n\t\"goodsUnitInfo\": [{\r\n\t\t\"id\": \"id\",\r\n\t\t\"name\": \"单位名称\"\r\n\t}],\r\n\t\"goodsAttribute\": [{\r\n\t\t\"id\": \"id\",\r\n\t\t\"attributeName\": \"属性名称\",\r\n\t\t\"goodsTypeId\": \"商品分类id\",\r\n\t\t\"attributeValueList\": [{\r\n\t\t\t\"id\": \"id\",\r\n\t\t\t\"goodsAttributeId\": \"商品属性id\",\r\n\t\t\t\"attributeValue\": \"商品属性值\"\r\n\t\t}]\r\n\t}]\r\n}";
+        public const string TechnologyData = "{\r\n\t\"technologysInfo\": [{\r\n\t\t\"id\": \"id\",\r\n\t\t\"name\": \"工艺步骤名称\",\r\n\t\t\"DeviceVersionId\": \"设备版本id\",\r\n\t\t\"technologyActionInfo\": [{\r\n\t\t\t\"id\": \"id\",\r\n\t\t\t\"technologyId\": \"工艺步骤id\",\r\n\t\t\t\"actionName\": \"模型名称\",\r\n\t\t\t\"actionValue\": \"模型数据\",\r\n\t\t\t\"actionType\": \"数据类型\",\r\n\t\t\t\"technologyType\": \"工艺模型类型（标识是否物料 1标识物料 0标识其他）\"\r\n\t\t}],\r\n\t}],\r\n\t\r\n\t\"goodsTechnologysInfo\": [{\r\n\t\t\"id\": \"id\",\r\n\t\t\"stepName\": \"工艺步骤名称\",\r\n\t\t\"actionJson\": \"工艺模型json\",\r\n\t\t\"goodsAttributeId\": \"商品属性值id组合\",\r\n\t\t\"chnologyId\": \"工艺id\",\r\n\t\t\"goodsId\": \"商品id\",\r\n\t\t\"deviceId\": \"设备id\",\r\n\t\t\"createAt\": \"创建时间\"\r\n\t}]\r\n}";
+    }
+}

BPA.SAAS.KitChenManage.Application/Push/小炒机_v1/ProductFunctionData.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.SAAS.KitChenManage.Application.Push.小炒机_v1
+{
+    public class ProductFunctionData
+    {
+    }
+}