提交数据展示形式

代码/TVShoppingCallCenter_ZLJ/Controllers/Product/ProductController.cs

@@ -1,8 +1,8 @@
-//————————————
-//des：产品管理类
-//author:zhangkun
-//addtime:2020-06-10
-//————————————
+/* =============================================
+-- Author:		<Author,,zhangkun>
+-- Create date: <Create Date,,20200609>
+-- Description:	<Description,,产品 库存 产品类别相关操作）>
+-- ============================================*/
 using System;
 using System.Collections.Generic;
 using System.Common;
@@ -16,6 +16,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
+using TVShoppingCallCenter_ZLJ.Models.Dtos;
 using TVShoppingCallCenter_ZLJ.Models.Inputs;
 
 namespace TVShoppingCallCenter_ZLJ.Controllers.Product
@@ -314,7 +315,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
             if (input.SpecialPrice <= 0)
                 return Error("请输入正确特惠价");
             if (input.ProductId <= 0)
-                return Error("产品ID不能修改");
+                return Error("产品ID必须大于0");
             if (string.IsNullOrEmpty(input.PinyinShort))
                 return Error("请输入正确拼音简码");
             #endregion
@@ -324,6 +325,22 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
             if (T_Bus_ProductModel == null)
                 return Error("如需新添加，请点击新增按钮，此记录不存在");
 
+            //此处如果id可修改，则输入新ID 修改重复条件
+            Expression<Func<T_Bus_Product, bool>> eq = a => a.F_ProductName == input.ProductName;
+            eq = eq.Or(b => b.F_PinyinShort == input.PinyinShort);
+            eq = eq.Or(b => b.F_ProductId == input.ProductId);
+            eq = eq.Or(b => b.F_ProductShortName == input.ProductShortName);
+            List<T_Bus_Product> T_Bus_ProductModelSearch = await _productRepository.GetListALL(eq);
+            if (T_Bus_ProductModelSearch.Count > 1)
+            {
+                return Error("名称/条形码/简称 有重复");
+            }
+            if (T_Bus_ProductModelSearch.Count == 1)
+            { 
+                if(T_Bus_ProductModelSearch[0].F_ProductId!= input.ProductId)
+                    return Error("名称/条形码/简称 有重复");
+            }
+
             T_Bus_ProductModel.F_ProductName = input.ProductName;
             T_Bus_ProductModel.F_ProductShortName = input.ProductShortName;
             T_Bus_ProductModel.F_ProductNumber = input.ProductNumber;
@@ -487,6 +504,47 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
             RefAsync<int> count = 0;
             var list = await _productRepository.GetListByPage(eq, new MyPageModel() { PageIndex = 1, PageSize = input.Limit, PageCount = count });
 
+            //如果需要转换内容，则启用
+            //List<ProductDto> pageDtoList = new List<ProductDto>();
+            //if (list != null)
+            //{
+            //    foreach (T_Bus_Product a in list.Rows)
+            //    {
+            //        ProductDto modelDto = new ProductDto();
+            //        modelDto.F_Address = a.F_Address;
+            //        modelDto.F_ProductId = a.F_ProductId;
+            //        modelDto.F_ProductName = a.F_ProductName;
+            //        modelDto.F_ProductShortName = a.F_ProductShortName;
+            //        modelDto.F_ProductNumber = a.F_ProductNumber;
+            //        modelDto.F_PinyinShort = a.F_PinyinShort;
+
+            //        modelDto.F_ClassId = a.F_ClassId;
+            //        modelDto.F_ClassName = a.F_ClassName;
+
+
+            //        modelDto.F_MarketPrice = a.F_MarketPrice;
+            //        modelDto.F_MemberPrice = a.F_MemberPrice;
+            //        modelDto.F_SpecialPrice = a.F_SpecialPrice;
+            //        modelDto.F_Integral = a.F_Integral;
+
+            //        modelDto.F_Address = a.F_Address;
+            //        modelDto.F_Des = a.F_Des;
+            //        modelDto.F_Factory = a.F_Factory;
+            //        modelDto.F_Supplier = a.F_Supplier;
+            //        modelDto.F_IsDelete = a.F_IsDelete;
+            //        modelDto.F_Tag = a.F_Tag;
+            //        modelDto.F_Sort = a.F_Sort;
+            //        modelDto.F_Weight = a.F_Weight;
+            //        if (input.OnSaleBegin != null)
+            //        { modelDto.F_OnSaleBegin = a.F_OnSaleBegin; }
+            //        if (input.OnSaleEnd != null)
+            //        { modelDto.F_OnSaleEnd = a.F_OnSaleEnd; }
+            //        pageDtoList.Add(modelDto);
+            //    }
+            //}
+            //PageData<ProductDto> pageData = new PageData<ProductDto>();
+            //pageData.Totals = list.Totals;
+            //pageData.Rows = pageDtoList;
             return Success("成功", list);
 
         }
@@ -494,12 +552,12 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
         /// 分页获取产品列表
         /// </summary>
         /// <param name="input">筛选字段</param>
-        /// <param name="pagesize"></param>
-        /// <param name="pageindex"></param>
         /// <returns></returns>
         [HttpPost("getlistbypage")]
-        public async Task<IActionResult> GetListByPage([FromBody]ProductInput input, int pagesize, int pageindex)
+        public async Task<IActionResult> GetListByPage([FromBody]ProductInput input)
         {
+            int pageindex = input.pageindex;
+            int pagesize = input.pagesize;
             List<IConditionalModel> conModels = new List<IConditionalModel>();
             #region 条件筛选
 
@@ -516,11 +574,6 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
                 conModels.Add(new ConditionalModel() { FieldName = "F_ClassId", ConditionalType = ConditionalType.Equal, FieldValue = input.ClassId.ToString() });
             }
 
-            if (!string.IsNullOrEmpty(input.ClassName))
-            {
-                conModels.Add(new ConditionalModel() { FieldName = "F_ClassName", ConditionalType = ConditionalType.Like, FieldValue = input.ClassName });
-
-            }
             //产品名/标题
             if (!string.IsNullOrEmpty(input.ProductName))
             {
@@ -556,8 +609,49 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
 
             #endregion
             int recordCount =0;
-            var list = await _productRepository.GetListByPage(conModels, new MyPageModel() { PageIndex = pageindex, PageSize = pagesize, PageCount = recordCount });
-
+            var list = await _productRepository.GetListByPage(conModels, new MyPageModel() { PageIndex = pageindex, PageSize = pagesize, PageCount = recordCount }, " F_Sort ASC");
+
+            //如果需要转换内容，则启用
+            //List<ProductDto> pageDtoList = new List<ProductDto>();
+            //if (list != null)
+            //{
+            //    foreach (T_Bus_Product a in list.Rows)
+            //    {
+            //        ProductDto modelDto = new ProductDto();
+            //        modelDto.F_Address = a.F_Address;
+            //        modelDto.F_ProductId = a.F_ProductId;
+            //        modelDto.F_ProductName = a.F_ProductName;
+            //        modelDto.F_ProductShortName = a.F_ProductShortName;
+            //        modelDto.F_ProductNumber = a.F_ProductNumber;
+            //        modelDto.F_PinyinShort = a.F_PinyinShort;
+
+            //        modelDto.F_ClassId = a.F_ClassId;
+            //        modelDto.F_ClassName = a.F_ClassName;
+
+
+            //        modelDto.F_MarketPrice = a.F_MarketPrice;
+            //        modelDto.F_MemberPrice = a.F_MemberPrice;
+            //        modelDto.F_SpecialPrice = a.F_SpecialPrice;
+            //        modelDto.F_Integral = a.F_Integral;
+
+            //        modelDto.F_Address = a.F_Address;
+            //        modelDto.F_Des = a.F_Des;
+            //        modelDto.F_Factory = a.F_Factory;
+            //        modelDto.F_Supplier = a.F_Supplier;
+            //        modelDto.F_IsDelete = a.F_IsDelete;
+            //        modelDto.F_Tag = a.F_Tag;
+            //        modelDto.F_Sort = a.F_Sort;
+            //        modelDto.F_Weight = a.F_Weight;
+            //        if (input.OnSaleBegin != null)
+            //        { modelDto.F_OnSaleBegin = a.F_OnSaleBegin; }
+            //        if (input.OnSaleEnd != null)
+            //        { modelDto.F_OnSaleEnd = a.F_OnSaleEnd; }
+            //        pageDtoList.Add(modelDto);
+            //    }
+            //}
+            //PageData<ProductDto> pageData = new PageData<ProductDto>();
+            //pageData.Totals = list.Totals;
+            //pageData.Rows = pageDtoList;
              return Success("成功", list);
         }
 

代码/TVShoppingCallCenter_ZLJ/Models/Dtos/ProductDto.cs

@@ -18,7 +18,6 @@ namespace TVShoppingCallCenter_ZLJ.Models.Dtos
 		private string _f_pinyinshort;
 		private DateTime? _f_onsalebegin;
 		private DateTime? _f_onsaleend;
-		private bool _f_issale;
 		private string _f_factory;
 		private string _f_address;
 		private string _f_supplier;
@@ -114,14 +113,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Dtos
 			set { _f_onsaleend = value; }
 			get { return _f_onsaleend; }
 		}
-		/// <summary>
-		/// 是否正在上架（可暂不启用）
-		/// </summary>
-		public bool F_IsSale
-		{
-			set { _f_issale = value; }
-			get { return _f_issale; }
-		}
+
 		/// <summary>
 		/// 生产厂家
 		/// </summary>

代码/TVShoppingCallCenter_ZLJ/Models/Inputs/BaseInput.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace TVShoppingCallCenter_ZLJ.Models.Inputs
+{
+    public class BaseInput
+    {
+        public int pageindex { get; set; } = 1;
+        public int pagesize { get; set; } = 20;
+    }
+}

代码/TVShoppingCallCenter_ZLJ/Models/Inputs/ProductInput.cs

@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 
 namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 {
-    public class ProductInput
+    public class ProductInput: BaseInput
     {
 
         #region Model
@@ -19,19 +19,19 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
         private DateTime? _f_onsalebegin;
         private DateTime? _f_onsaleend;
         private bool _f_issale;
-        private string _f_factory;
-        private string _f_address;
-        private string _f_supplier;
-        private int? _f_integral;
+        private string _f_factory="";
+        private string _f_address="";
+        private string _f_supplier="";
+        private int? _f_integral=0;
         private decimal? _f_marketprice;
         private decimal? _f_memberprice;
         private decimal? _f_specialprice;
         private int? _f_isdelete;
-        private string _f_des;
-        private string _f_attribute;
-        private decimal? _f_weight;
-        private string _f_tag;
-        private string _f_picture;
+        private string _f_des="";
+        private string _f_attribute="";
+        private decimal? _f_weight=0.00M;
+        private string _f_tag="";
+        private string _f_picture="";
         private string _f_video;
         private string _f_content;
         private int? _f_userid;

文档/开发文档/库存接口对接说明.html

@@ -0,0 +1,74 @@
+<html>
+<head>
+    <title>接口对接说明</title>
+    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/showdown/1.9.0/showdown.min.js"></script>
+	<link rel="stylesheet" href="https://cdn.sspai.com/MWeb.css" type="text/css" data-for="result">
+</head>
+<body onload="compile()">
+<div>
+    <textarea id="content" style="height:400px;width:600px;display:none;" >    
+**首先系统中的库存不由系统进行更改：所有库存操作，均有仓管平台进行接口调用更新
+仓管平台需要登录，分配角色只可调用更新库存接口** 
+
+- 库存更新接口
+
+**请求URL：** 
+- ` /api/product/updatestock `
+  
+**请求方式：**
+- POST 
+
+**参数：以对象数组方式传递** 
+
+|参数名|必选|类型|说明|
+|:----    |:---|:----- |-----   |
+|ProductId |是  |string |产品Id   |
+|Stock |是  |int | 当前库存    |
+ **请求示例**
+
+``` 
+ [
+        {
+            "ProductId": 9900,
+            "Stock": 5
+        },
+        {
+            "ProductId": 9899,
+            "Stock": 4
+        }
+ ]
+```
+
+ **返回示例**
+
+
+``` 
+ {
+  "state": "success",
+  "message": "更新库存成功",
+  "data": null
+} 
+
+```
+
+
+
+ **返回参数说明** 
+
+|参数名|类型|说明|
+|:-----  |:-----|-----                           |
+|state |string   |更新状态 如果此状态没有成功，请过几分钟重新更新库存（最新库存），连续三次不成功，最好有地方反馈和查询，通知到相关人员做一个排查。例如有可能是一个网络原因   |</textarea>
+    <div id="result"></div>
+
+</div>
+<script type="text/javascript">
+function compile(){
+    var text = document.getElementById("content").value;
+    var converter = new showdown.Converter({tables: true});
+    var html = converter.makeHtml(text);
+    document.getElementById("result").innerHTML = html;
+}
+</script>
+</body>
+</html>
+