修复bug

src_0nline/ShwasherSys/ShwasherSys.Application/Common/QueryAppService.cs

@@ -166,7 +166,7 @@ namespace ShwasherSys.Common
 
         Task<List<CustomerDefaultProduct>> GetCustomerDefaultProductByCustomerId(string customerId);  
 
-        Task<List<ProductProperty>> GetProductProperty(string productPropertyType);
+        Task<List<ProductProperty>> GetProductPropertyEntity(string productPropertyType);
         #endregion
 
     }
@@ -1534,7 +1534,7 @@ namespace ShwasherSys.Common
         /// </summary>
         /// <param name="productPropertyType"></param>
         /// <returns></returns>
-        public async Task<List<ProductProperty>> GetProductProperty(string productPropertyType)
+        public async Task<List<ProductProperty>> GetProductPropertyEntity(string productPropertyType)
         {
             var types = new string[]{"1","2","3","4","5"};
             if (productPropertyType == "" || !types.Contains(productPropertyType))

src_0nline/ShwasherSys/ShwasherSys.Application/Invoice/OrderStickBillsApplicationService.cs

@@ -425,7 +425,7 @@ namespace ShwasherSys.Invoice
             var customerInfo = await CustomerRepository.FirstOrDefaultAsync(bill.CustomerId);
 
             var customerDefaultProducts = await QueryAppService.GetCustomerDefaultProductByCustomerId(customerInfo.Id);
-            var productProperties = await QueryAppService.GetProductProperty(ProductProperty.ProductMaterial + "");
+            var productProperties = await QueryAppService.GetProductPropertyEntity(ProductProperty.ProductMaterial + "");
 
             string path = AppDomain.CurrentDomain.BaseDirectory + "Resources/InvoiceTemplate/对账单导出模板.xlsx";
             var savePath = "Download/Excel/InvoiceBill";

src_0nline/ShwasherSys/ShwasherSys.Application/OrderSendInfo/OrderSendBillsApplicationService.cs

@@ -539,7 +539,7 @@ namespace ShwasherSys.OrderSendInfo
 		        ContactMan = bill.ContactMan
 	        };
             var customerDefaultProducts = await QueryAppService.GetCustomerDefaultProductByCustomerId(customerInfo.Id);
-            var productProperties =await QueryAppService.GetProductProperty(ProductProperty.ProductMaterial+"");
+            var productProperties =await QueryAppService.GetProductPropertyEntity(ProductProperty.ProductMaterial+"");
 
             miniValue.SendDate = bill.SendDate;
 	        int index = 0;

src_0nline/ShwasherSys/ShwasherSys.Web/Controllers/InvoiceInfoController.cs

@@ -122,7 +122,7 @@ namespace ShwasherSys.Controllers
                 var customerDefaultProducts = await QueryAppService.GetCustomerDefaultProductByCustomerId(customer.Id);
                 ViewBag.CustomerDefaultProducts = customerDefaultProducts;
 
-                var materialProductProperties = await QueryAppService.GetProductProperty(ProductProperty.ProductMaterial + "");
+                var materialProductProperties = await QueryAppService.GetProductPropertyEntity(ProductProperty.ProductMaterial + "");
                 ViewBag.MaterialProductProperties = materialProductProperties;
             }
           

src_0nline/ShwasherSys/ShwasherSys.Web/Controllers/SendGoodsController.cs

@@ -76,7 +76,7 @@ namespace ShwasherSys.Controllers
             var customerDefaultProducts = await QueryAppService.GetCustomerDefaultProductByCustomerId(bill.CustomerId);
             ViewBag.CustomerDefaultProducts = customerDefaultProducts;
 
-            var materialProductProperties = await QueryAppService.GetProductProperty(ProductProperty.ProductMaterial+"");
+            var materialProductProperties = await QueryAppService.GetProductPropertyEntity(ProductProperty.ProductMaterial+"");
             ViewBag.MaterialProductProperties = materialProductProperties;
             return View();
         }

src_0nline/ShwasherSys/ShwasherSys.Web/ShwasherSys.Web.csproj

@@ -2304,6 +2304,8 @@
     <Content Include="Views\ProductInfo\Standards - 复制%282%29.cshtml" />
     <Content Include="Views\OrderInfo\_searchInfoByProductNo.cshtml" />
     <Content Include="Views\Home\Index - 复制.cshtml" />
+    <Content Include="Resources\OrderSendTemplate\外销送货单模板.xlsx" />
+    <Content Include="Resources\OrderSendTemplate\上海巧耐森科技专用送货单.xlsx" />
     <!--<Content Include="Scripts\bootstrap.min.js.map" />
     <Content Include="Scripts\bootstrap.js.map" />
     <Content Include="Scripts\bootstrap.bundle.min.js.map" />