提货单，客服库管操作

代码/System.Common/Helpers/Billoflading.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace System.Common.Helpers
+{
+   public  class Billoflading
+    {
+        /// <summary>
+        /// 快递
+        /// </summary>
+        public string express { get; set; }
+        /// <summary>
+        /// 提货单编号
+        /// </summary>
+        public string code { get; set ;  }
+        /// <summary>
+        /// 制作人
+        /// </summary>
+        public string user { get; set; }
+        /// <summary>
+        /// 制作时间
+        /// </summary>
+        public DateTime  maketime { get; set; }
+        public int count;
+        /// <summary>
+        /// 提货人
+        /// </summary>
+        public string checkuser { get; set; }
+        public List<Commodity> commodities;
+
+    }
+    public class Commodity
+    {
+        /// <summary>
+        /// 序号
+        /// </summary>
+        public int serialnumber { get; set; }
+        /// <summary>
+        /// 商品名称
+        /// </summary>
+        public string F_ProductName { get; set; }
+        /// <summary>
+        /// 商品简码
+        /// </summary>
+        public string F_ProductShortName { get; set; }
+        /// <summary>
+        /// 商品规格
+        /// </summary>
+        public string F_Specifications { get; set; }
+        /// <summary>
+        /// 商品数量
+        /// </summary>
+        public int  F_Count { get; set; }
+    }
+}

代码/System.Common/Helpers/NPOIHelper.cs

@@ -1,4 +1,5 @@
-using NPOI.HSSF.UserModel;
+using Microsoft.AspNetCore.Http;
+using NPOI.HSSF.UserModel;
 using NPOI.SS.UserModel;
 using NPOI.SS.Util;
 using NPOI.XSSF.UserModel;
@@ -788,7 +789,178 @@ namespace System.Common.Helpers
                 return bs;
             }
         }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="ds"></param>
+        /// <returns></returns>
+      
+        public byte[] BillofladingExportToExcel( List <Billoflading> express)
+        {
+            try
+            {
+                HSSFWorkbook workbook = new HSSFWorkbook();
+                for (int i=0;i< express.Count;i++)
+                {
+                    ISheet sheet = workbook.CreateSheet(express[i ].express );
+                    ICellStyle cellStyle = workbook.CreateCellStyle();
+                    NPOI.SS.UserModel.IFont cellfont = workbook.CreateFont();
+                    cellfont.Boldweight = (short)FontBoldWeight.Normal;
+                    cellStyle.SetFont(cellfont);
+
+                    ICellStyle cellStylebt = workbook.CreateCellStyle();
+                    NPOI.SS.UserModel.IFont cellfontbt = workbook.CreateFont();
+                   // cellfontbt.Boldweight = (short)FontBoldWeight.Bold;
+                    cellStylebt.SetFont(cellfontbt);
+                    cellStylebt.VerticalAlignment = VerticalAlignment.Center;
+                    cellStylebt.Alignment = HorizontalAlignment.Center;
+
+                    IRow irow1 = sheet.CreateRow(0);
+                    ICell cell1 = irow1.CreateCell(0);
+                    cell1.SetCellValue("提货单信息");
+                    cell1.CellStyle = cellStylebt;
+                    sheet.AddMergedRegion(new CellRangeAddress(0, 0, 0, 2));
+                    IRow irow2 = sheet.CreateRow(2);
+                    ICell cell2 = irow2.CreateCell(0);
+                    cell2.SetCellValue("提货单编号"+ express[i].code );
+                    cell2.CellStyle = cellStylebt;
+                    sheet.AddMergedRegion(new CellRangeAddress(2, 4, 0, 0));
+                    ICell cell3 = irow2.CreateCell(1);
+                    cell3.SetCellValue("提货状态:" + "已完成");
+                    cell3.CellStyle = cellStylebt;
+                   sheet.AddMergedRegion(new CellRangeAddress(2, 4, 1, 1));
+                    ICell cell4 = irow2.CreateCell(2);
+                    cell4.SetCellValue("快递公司:" + express[i].express);
+                    cell4.CellStyle = cellStylebt;
+                   sheet.AddMergedRegion(new CellRangeAddress(2, 4, 2, 2));
+
+                    IRow irow3 = sheet.CreateRow(5);
+                    ICell cell5 = irow3.CreateCell(0);
+                    cell5.SetCellValue("制作人"+ express[i].user );
+                    cell5.CellStyle = cellStylebt;
+                    sheet.AddMergedRegion(new CellRangeAddress(5, 7, 0, 0));
+                    ICell cell6 = irow3.CreateCell(1);
+                    cell6.SetCellValue("制作时间:" + express[i].maketime.ToString ("yyyy-MM-dd HH:mm:ss"));
+                    cell6.CellStyle = cellStylebt;
+                   sheet.AddMergedRegion(new CellRangeAddress(5, 7, 1, 1));
+                    ICell cell7 = irow3.CreateCell(2);
+                    cell7.SetCellValue("提货人:"  + express[i].checkuser);
+                    cell7.CellStyle = cellStylebt;
+                    sheet.AddMergedRegion(new CellRangeAddress(5, 7, 2, 2));
+                    ICell cell8 = irow3.CreateCell(3);
+                    cell8.SetCellValue("提货时间:" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+                    cell8.CellStyle = cellStylebt;
+                  sheet.AddMergedRegion(new CellRangeAddress(5, 7, 3, 3));
+
+                    IRow irow4= sheet.CreateRow(8);
+                    ICell cell9 = irow4.CreateCell(0);
+                    cell9.SetCellValue("序号");
+                    cell9.CellStyle = cellStylebt;
+                  //  sheet.AddMergedRegion(new CellRangeAddress(3, 3, 0, 0));
+                    ICell cell10 = irow4.CreateCell(1);
+                    cell10.SetCellValue("产品名称");
+                    cell10.CellStyle = cellStylebt;
+                  //  sheet.AddMergedRegion(new CellRangeAddress(3, 3, 1, 1));
+                    ICell cell11 = irow4.CreateCell(2);
+                    cell11.SetCellValue("产品简码" );
+                    cell11.CellStyle = cellStylebt;
+                 //   sheet.AddMergedRegion(new CellRangeAddress(3, 3, 2, 2));
+                    ICell cell12 = irow4.CreateCell(3);
+                    cell12.SetCellValue("产品规格" );
+                    cell12.CellStyle = cellStylebt;
+                 //   sheet.AddMergedRegion(new CellRangeAddress(3, 3, 3, 3));
+                    ICell cell13 = irow4.CreateCell(4);
+                    cell13.SetCellValue("产品数量");
+                    cell13.CellStyle = cellStylebt;
+                  //  sheet.AddMergedRegion(new CellRangeAddress(3, 3, 4, 4));
+                    for (int j = 0; j <= express[i ].commodities. Count; j++)
+                    {
+                        IRow irow5 = sheet.CreateRow(9 + j);
+                        if (j == express[i].commodities.Count)
+                        {
+                            ICell cell19 = irow5.CreateCell(3);
+                            cell19.SetCellValue("合计");
+                            cell19.CellStyle = cellStylebt;
+                            ICell cell20 = irow5.CreateCell(4);
+                            cell20.SetCellValue(express[i].count );
+                            cell20.CellStyle = cellStylebt;
+                        }
+                        else
+                        {
+                            for (int z = 0; z < 5; z++)
+                            {
+                                switch (z)
+                                {
+                                    case 0:
+                                        ICell cell14 = irow5.CreateCell(z);
+                                        cell14.SetCellValue(express[i].commodities[j].serialnumber);
+                                        cell14.CellStyle = cellStylebt;
+                                        break;
+                                    case 1:
+                                        ICell cell15 = irow5.CreateCell(z);
+                                        cell15.SetCellValue(express[i].commodities[j].F_ProductName);
+                                        cell15.CellStyle = cellStylebt;
+                                        break;
+                                    case 2:
+                                        ICell cell16 = irow5.CreateCell(z);
+                                        cell16.SetCellValue(express[i].commodities[j].F_ProductShortName);
+                                        cell16.CellStyle = cellStylebt;
+                                        break;
+                                    case 3:
+                                        ICell cell17 = irow5.CreateCell(z);
+                                        cell17.SetCellValue(express[i].commodities[j].F_Specifications);
+                                        cell17.CellStyle = cellStylebt;
+                                        break;
+                                    case 4:
+                                        ICell cell18 = irow5.CreateCell(z);
+                                        cell18.SetCellValue(express[i].commodities[j].F_Count);
+                                        cell18.CellStyle = cellStylebt;
+                                        break;
+                                }
+                            }
+                        }
+                       
+                    }
+
 
+                    //自适应列宽度
+                    for (int z = 0; z < 5; z++)
+                    {
+                        // sheet.AutoSizeColumn(z);
+                         sheet.SetColumnWidth(z, 35 * 256);
+                        //   sheet.SetColumnHidden (z, 50 * 20);
+
+                        //  sheet.SetColumnWidth(i, 12 * 256);
+                    }
+
+                }
+                using (MemoryStream ms = new MemoryStream())
+                {
+                    workbook.Write(ms);
+                    byte[] bs = ms.ToArray();
+
+                    workbook = null;
+                    ms.Close();
+                    ms.Dispose();
+
+                    return bs;
+                }
+                return null;
+
+            }
+            catch
+            {
+                return null ;
+            }
+
+
+
+
+
+
+
+        }
+   
 
 
     }

代码/System.Model/Bus/T_Bus_Order.cs

@@ -297,8 +297,8 @@ namespace System.Model
 			get { return _f_usescore; }
 		}
 		/// <summary>
-		///  订单状态 -1无效 0暂存 1提交  2KF退回  3分仓 4无货 5客服提交 6已发货 7付款待审核 8分物流 
-		/// </summary>
+		///  订单状态 -1无效 0暂存 1提交  2KF退回  3分仓 4无货 5客服提交 6已发货 7付款待审核 8待分物流 9 物流未通过
+		// / </summary>
 		public int F_State
 		{
 			set { _f_state = value; }

代码/System.Model/Bus/T_Bus_OrderDetail.cs

@@ -25,11 +25,12 @@ namespace System.Model
 		private string _f_remark = "";
 		private int _f_activity;
 		private int _f_state=0;
-
-		/// <summary>
-		/// 0正常1售后中 2售后完成
-		/// </summary>
-		public int F_State
+        private string _f_productshortname;
+        private string _f_specifications;
+        /// <summary>
+        /// 0正常1售后中 2售后完成
+        /// </summary>
+        public int F_State
 		{
 			set { _f_state = value; }
 			get { return _f_state; }
@@ -75,10 +76,26 @@ namespace System.Model
 			set { _f_productname = value; }
 			get { return _f_productname; }
 		}
-		/// <summary>
-		/// 单价，优先显示可用最低价会员价
+        /// <summary>
+		/// 产品简称/编码
 		/// </summary>
-		public decimal F_Price
+		public string F_ProductShortName
+        {
+            set { _f_productshortname = value; }
+            get { return _f_productshortname; }
+        }
+        /// <summary>
+        /// 规格
+        /// </summary>
+        public string F_Specifications
+        {
+            set { _f_specifications = value; }
+            get { return _f_specifications; }
+        }
+        /// <summary>
+        /// 单价，优先显示可用最低价会员价
+        /// </summary>
+        public decimal F_Price
 		{
 			set { _f_price = value; }
 			get { return _f_price; }

代码/System.Model/Bus/T_Bus_Product.cs

@@ -49,7 +49,7 @@ namespace System.Model
         private int _f_usenumber = 0;
         private int _f_match = 0;
         private int _f_match1 = 0;
-
+        private string _f_specifications;
 
         /// <summary>
         /// 产品编号ID
@@ -67,10 +67,11 @@ namespace System.Model
 			set { _f_productnumber = value; }
 			get { return _f_productnumber; }
 		}
-		/// <summary>
-		/// 款号名称/品名
-		/// </summary>
-		public string F_ProductNumberName
+    
+        /// <summary>
+        /// 款号名称/品名
+        /// </summary>
+        public string F_ProductNumberName
 		{
 			set { _f_productnumbername = value; }
 			get { return _f_productnumbername; }
@@ -91,10 +92,18 @@ namespace System.Model
 			set { _f_productshortname = value; }
 			get { return _f_productshortname; }
 		}
-		/// <summary>
-		/// 分类名称
-		/// </summary>
-		public string F_ClassName
+        /// <summary>
+        /// 规格
+        /// </summary>
+        public string F_Specifications
+        {
+            set { _f_specifications = value; }
+            get { return _f_specifications; }
+        }
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        public string F_ClassName
 		{
 			set { _f_classname = value; }
 			get { return _f_classname; }

代码/TVShoppingCallCenter_ZLJ/Controllers/Customer/VIPInfoController.cs

@@ -984,7 +984,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
                     }
                     else
                     {
-                        return Error("导出失败3");
+                        return Error("导出失败");
                     }
                 }
                 return Error("导出失败2");

代码/TVShoppingCallCenter_ZLJ/Controllers/Order/AfterSaleController.cs

@@ -1331,6 +1331,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 T_Bus_OrderDetail modelDetail = new T_Bus_OrderDetail();
                 modelDetail.F_ProductName = modelProduct.F_ProductName;
                 modelDetail.F_ProductId = modelProduct.F_ProductId;
+                modelDetail.F_Specifications = modelProduct.F_Specifications;
+                modelDetail.F_ProductShortName = modelProduct.F_ProductShortName;
                 modelDetail.F_Id = Guid.NewGuid().ToString().Replace("-", "");
                 modelDetail.F_OrderId = modelOrder.F_Id;
                 modelDetail.F_Count = Count;
@@ -1606,6 +1608,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                         T_Bus_OrderDetail modelDetail = new T_Bus_OrderDetail();
                         modelDetail.F_ProductName = modelProduct.F_ProductName;
                         modelDetail.F_ProductId = modelProduct.F_ProductId;
+                        modelDetail.F_Specifications = modelProduct.F_Specifications;
+                        modelDetail.F_ProductShortName = modelProduct.F_ProductShortName;
                         modelDetail.F_Id = Guid.NewGuid().ToString().Replace("-", "");
                         modelDetail.F_OrderId = modelOrder.F_Id;
                         modelDetail.F_Count = Count;

代码/TVShoppingCallCenter_ZLJ/Controllers/Order/KFOrderController.cs

@@ -125,10 +125,11 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             var dtExcel = npoi.ExcelToTable1(_upfile, headrow);
             int num = dtExcel.Rows.Count;
             var cols = dtExcel.Columns;
-            int colnum = cols.Count;
+            int colnu5m = cols.Count;
             string errmsg = string.Empty;
             string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
             List<T_Bus_Order> orderLIst = new List<T_Bus_Order>();
+            List<T_Bus_Orderlogs> logs = new List<T_Bus_Orderlogs>();
             if (num > 0)
             {
                 int index = 1;
@@ -136,6 +137,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 {
 
                     T_Bus_Order modelOrder = new T_Bus_Order();
+                    T_Bus_Orderlogs t_Bus_Orderlogs = new T_Bus_Orderlogs();
                     if (dr.Table.Columns.Contains("订单号"))
                     {
                         if (!string.IsNullOrEmpty(dr["订单号"].ToString()))
@@ -169,21 +171,39 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                             return Error("模板错误，请选择正确的模板");
                         }
                     }
-                   else
+                    else if (state == 1)
                     {
                         modelOrder.F_State = 1;
                     }
+                   else
+                    {
+                        if (dr.Table.Columns.Contains("退回说明"))
+                        {
+                            modelOrder.F_CheckRemark = dr["退回说明"].ToString();
+                        }
+                        else
+                        {
+                            return Error("模板错误，请选择正确的模板");
+                        }
+                        modelOrder.F_State = 9;
+                    }
                     modelOrder.F_CheckUser = UserLogin.UserId.ObjToInt();
                     modelOrder.F_CheckUserName = UserLogin.UserName;
                     modelOrder.F_CheckTime = DateTime.Now;
                     orderLIst.Add(modelOrder);
-                   
+                    t_Bus_Orderlogs.F_WoID = modelOrder.F_Id;
+                    t_Bus_Orderlogs.F_OptContent = UserLogin.UserName + "退回订单";
+                    t_Bus_Orderlogs.F_CreateUser = UserLogin.UserCode;
+                    t_Bus_Orderlogs.F_CreateTime = DateTime.Now;
+                    t_Bus_Orderlogs.F_WoState = modelOrder.F_State;
+                    logs.Add(t_Bus_Orderlogs);
                     index++;
 
                 }
                 
                 if (!await bus_OrderRepository.UpdateList (orderLIst))
                 {
+                    await busOrderlogsRepository.AddAndUpdateList(logs);
                     if (!string.IsNullOrEmpty(errmsg))
                     {
                         errmsg = errmsg + "导入失败！";
@@ -221,11 +241,12 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             string msg = "";
             string[] ids = orderids.Split(',');
             List<T_Bus_Order> orderLIst = new List<T_Bus_Order>();
+            List<T_Bus_Orderlogs> logs = new List<T_Bus_Orderlogs>();
             foreach (var it in ids)
             {
 
                 T_Bus_Order modelOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == it);
-               
+                T_Bus_Orderlogs t_Bus_Orderlogs = new T_Bus_Orderlogs();
                 modelOrder.F_CheckUser = UserLogin.UserId.ObjToInt();
                 modelOrder.F_CheckUserName = UserLogin.UserName;
                 modelOrder.F_CheckTime = DateTime.Now;
@@ -234,14 +255,26 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                     modelOrder.F_CheckRemark = remark;
                    modelOrder.F_State = 2;
                 }
-                else
+                else if (state == 1)
                 {
                     modelOrder.F_State = 1;
                 }
+               else
+               {
+                    modelOrder.F_CheckRemark = remark;
+                    modelOrder.F_State = 9;
+                }
+                t_Bus_Orderlogs.F_WoID = modelOrder.F_Id;
+                t_Bus_Orderlogs.F_OptContent = UserLogin.UserName + "退回订单";
+                t_Bus_Orderlogs.F_CreateUser = UserLogin.UserCode;
+                t_Bus_Orderlogs.F_CreateTime = DateTime.Now;
+                t_Bus_Orderlogs.F_WoState = modelOrder.F_State;
+                logs.Add(t_Bus_Orderlogs);
                 orderLIst.Add(modelOrder);
             }
             if (await bus_OrderRepository.UpdateList(orderLIst))
             {
+                await busOrderlogsRepository.AddAndUpdateList(logs);
                 return Success("退回成功");
             }
             else
@@ -517,7 +550,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             }
 
            
-
+            
 
             #endregion
             RefAsync<int> recordCount = 0;
@@ -854,8 +887,20 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             #endregion
             //更新所选订单的快递，并标记为客服已分配快递
             string[] ids = orderids.Split(',');
+            List<T_Bus_Orderlogs> logs = new List<T_Bus_Orderlogs>();
+            foreach (var it in ids)
+            {
+                T_Bus_Orderlogs t_Bus_Orderlogs = new T_Bus_Orderlogs();
+                t_Bus_Orderlogs.F_WoID = it;
+                t_Bus_Orderlogs.F_OptContent = UserLogin.UserName + "分快递,"+ express;
+                t_Bus_Orderlogs.F_CreateUser = UserLogin.UserCode;
+                t_Bus_Orderlogs.F_CreateTime = DateTime.Now;
+                t_Bus_Orderlogs.F_WoState = 3;
+                logs.Add(t_Bus_Orderlogs);
+            }
             if (await bus_OrderRepository.Update(s => new T_Bus_Order() { F_Express = express, F_IsExpress = 1 }, q => ids.Contains(q.F_Id)))
             {
+                await busOrderlogsRepository.AddAndUpdateList(logs);
                 return Success("成功");
             }
 
@@ -884,26 +929,35 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 modelscore.F_StartDebit = 1;
                 modelscore.F_DebitPercent = 1000;
             }
-          string msg="";
+            List<T_Bus_Orderlogs> logs = new List<T_Bus_Orderlogs>();
+          
+            string msg="";
             string[] ids = orderids.Split(',');
             List<T_Bus_Order> orderLIst = new List<T_Bus_Order>();
             if (stock =="无货")
             {
                 foreach (var it in ids)
                 {
+                    T_Bus_Orderlogs t_Bus_Orderlogs = new T_Bus_Orderlogs();
                     T_Bus_Order modelOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == it);
                     modelOrder.F_CheckUserName = UserLogin.UserName;
                     modelOrder.F_CheckTime = DateTime.Now;
                     modelOrder.F_Stock = stock;
                     modelOrder.F_State = 4;
                     orderLIst.Add(modelOrder);
+                    t_Bus_Orderlogs.F_WoID = it;
+                    t_Bus_Orderlogs.F_OptContent = UserLogin.UserName + "分仓，无货";
+                    t_Bus_Orderlogs.F_CreateUser = UserLogin.UserCode;
+                    t_Bus_Orderlogs.F_CreateTime = DateTime.Now;
+                    t_Bus_Orderlogs.F_WoState = 4;
+                    logs.Add(t_Bus_Orderlogs);
                 }
             }
             else
             {
                 foreach (var it in ids)
                 {
-
+                    T_Bus_Orderlogs t_Bus_Orderlogs = new T_Bus_Orderlogs();
                     T_Bus_Order modelOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == it);
                     if (modelscore.F_Start == 1)
                     {
@@ -929,12 +983,22 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                     {
                         msg += "订单" + modelOrder.F_Id + strStock;
                         modelOrder.F_State = 4;
+                        t_Bus_Orderlogs.F_WoState = 4;
+                        t_Bus_Orderlogs.F_OptContent = UserLogin.UserName + "分仓，无货";
                         //   { return Error(strStock); }
                     }
                     else
                     {
                         modelOrder.F_State = 8;
+                        t_Bus_Orderlogs.F_WoState = 8;
+                        t_Bus_Orderlogs.F_OptContent = UserLogin.UserName + "分仓，"+ stock;
                     }
+                    t_Bus_Orderlogs.F_WoID = it;
+                  
+                    t_Bus_Orderlogs.F_CreateUser = UserLogin.UserCode;
+                    t_Bus_Orderlogs.F_CreateTime = DateTime.Now;
+                   
+                    logs.Add(t_Bus_Orderlogs);
                     orderLIst.Add(modelOrder);
                 }
             }
@@ -949,9 +1013,6 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             else
                 return Error("分仓失败"+ msg);
 
-           
-
-
         }
 
         [HttpPost("checkordermoney")]
@@ -1078,6 +1139,155 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
 
 
         /// <summary>
+        /// 客服提交订单
+        /// </summary>
+        /// <param name="orderids"></param>
+        /// <param name="stock"></param>
+        /// <returns></returns>
+        [HttpPost("Submit")]
+        public async Task<IActionResult> Submit(string orderids)
+        {
+
+            if (string.IsNullOrEmpty(orderids))
+                return Error("请选择订单号");
+          
+            string msg = "";int res = 0;
+            string[] ids = orderids.Split(',');
+            List<T_Bus_Order> orderLIst = new List<T_Bus_Order>();
+            List<T_Bus_Orderlogs> logs = new List<T_Bus_Orderlogs>();
+            foreach (var it in ids)
+                {
+                    T_Bus_Order modelOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == it);
+                T_Bus_Orderlogs t_Bus_Orderlogs = new T_Bus_Orderlogs();
+                if (modelOrder.F_IsExpress<=0|| modelOrder.F_State !=3)
+                  {
+                    msg += "订单" + modelOrder.F_Id + "未分物流";
+                    continue;
+                   }
+                modelOrder.F_CheckUser = UserLogin.UserId.ObjToInt();
+                modelOrder.F_CheckUserName = UserLogin.UserName;
+                modelOrder.F_CheckTime = DateTime.Now;
+                modelOrder.F_State = 5;
+                   orderLIst.Add(modelOrder);
+                t_Bus_Orderlogs.F_WoID = modelOrder.F_Id;
+                t_Bus_Orderlogs.F_OptContent = UserLogin.UserName + "提交订单";
+                t_Bus_Orderlogs.F_CreateUser = UserLogin.UserCode;
+                t_Bus_Orderlogs.F_CreateTime = DateTime.Now;
+                t_Bus_Orderlogs.F_WoState = 5;
+                logs.Add(t_Bus_Orderlogs);
+            }
+           
+
+            if (await bus_OrderRepository.UpdateList(orderLIst))
+            {
+                await busOrderlogsRepository.AddAndUpdateList(logs);
+                if (msg == "")
+                    return Success("分仓成功");
+                else
+                    return Success(msg);
+            }
+            else
+                return Error("订单分仓失败" + msg);
+
+
+
+
+        }
+
+
+        /// <summary>
+        /// 上传文件并导入数据库批量导入快递信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("importordersubmitexcel")]
+        public async Task<IActionResult> importordersubmitexcel(int headrow = 0)
+        {
+            Microsoft.AspNetCore.Http.IFormFile _upfile = Request.Form.Files[0];
+            if (!_upfile.ContentType.Equals("application/vnd.ms-excel") && !_upfile.ContentType.Equals("application/x-xls") && !_upfile.ContentType.Equals("application/x-xlsx") && !_upfile.ContentType.Equals("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") && !_upfile.ContentType.Equals("application/octet-stream"))
+                return Error($"请正确上传Excel文件：file.ContentType={_upfile.ContentType}");
+            NPOIHelper npoi = new NPOIHelper();
+            var dtExcel = npoi.ExcelToTable1(_upfile, headrow);
+            int num = dtExcel.Rows.Count;
+            var cols = dtExcel.Columns;
+            int colnum = cols.Count;
+            string errmsg = string.Empty;
+            string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
+            List<T_Bus_Order> orderLIst = new List<T_Bus_Order>();
+            List<T_Bus_Orderlogs> logs = new List<T_Bus_Orderlogs>();
+            if (num > 0)
+            {
+                int index = 1;
+                foreach (DataRow dr in dtExcel.Rows)
+                {
+
+                    T_Bus_Order modelOrder = new T_Bus_Order();
+                    T_Bus_Orderlogs t_Bus_Orderlogs = new T_Bus_Orderlogs();
+                    if (dr.Table.Columns.Contains("订单号"))
+                    {
+                        if (!string.IsNullOrEmpty(dr["订单号"].ToString()))
+                        {
+                            modelOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == dr["订单号"].ToString());
+                            if (modelOrder == null)
+                            {
+                                errmsg = errmsg + "\r\n第" + index + "行导入失败！订单不存在";
+                                continue;
+                            }
+                        }
+                        else
+                        {
+                            errmsg = errmsg + "\r\n第" + index + "行导入失败！订单不存在";
+                            continue;
+                        }
+                    }
+                    else
+                    {
+                        return Error("模板错误，请选择正确的模板");
+                    }
+                    if (modelOrder.F_IsExpress <= 0 || modelOrder.F_State != 3)
+                    {
+                        errmsg = errmsg + "\r\n第" + index + "行导入失败！该订单未分物流";
+                        continue;
+                    }
+                    modelOrder.F_CheckUser = UserLogin.UserId.ObjToInt();
+                    modelOrder.F_CheckUserName = UserLogin.UserName;
+                    modelOrder.F_CheckTime = DateTime.Now;
+                    modelOrder.F_State = 5;
+                    orderLIst.Add(modelOrder);
+                    t_Bus_Orderlogs.F_WoID = modelOrder.F_Id;
+                    t_Bus_Orderlogs.F_OptContent = UserLogin.UserName + "提交订单";
+                    t_Bus_Orderlogs.F_CreateUser = UserLogin.UserCode;
+                    t_Bus_Orderlogs.F_CreateTime = DateTime.Now;
+                    t_Bus_Orderlogs.F_WoState = 5;
+                    logs.Add(t_Bus_Orderlogs);
+                    index++;
+                }
+               
+                if (!await bus_OrderRepository.UpdateList(orderLIst))
+                {
+                    await busOrderlogsRepository.AddAndUpdateList(logs);
+                    if (!string.IsNullOrEmpty(errmsg))
+                    {
+                        errmsg = errmsg + "导入失败！";
+                    }
+                    else
+                    {
+                        errmsg = "导入失败！";
+                    }
+                }
+            }
+            else
+            {
+                return Error("文件中无数据");
+            }
+
+            if (!string.IsNullOrEmpty(errmsg))
+            {
+                return Error(errmsg);
+            }
+
+            return Success("导入成功");
+        }
+        /// <summary>
         /// 根据分页获取售后列表 待退款   退货 仓库确认收到货    补差额 不需要仓库确认
         /// </summary>
         /// <param name="input"></param>

代码/TVShoppingCallCenter_ZLJ/Controllers/Order/OrderController.cs

@@ -596,6 +596,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                                         T_Bus_OrderDetail modelDetail = new T_Bus_OrderDetail();
                                         modelDetail.F_ProductName = m.F_ProductName;
                                         modelDetail.F_ProductId = m.F_ProductId;
+                                        modelDetail.F_Specifications = m.F_Specifications;
+                                        modelDetail.F_ProductShortName = m.F_ProductShortName;
                                         modelDetail.F_Id = Guid.NewGuid().ToString().Replace("-", "");
                                         modelDetail.F_OrderId = input.F_Id;
                                         modelDetail.F_Count = 1;
@@ -646,6 +648,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                         T_Bus_OrderDetail modelDetail = new T_Bus_OrderDetail();
                         modelDetail.F_ProductName = modelProduct.F_ProductName;
                         modelDetail.F_ProductId = modelProduct.F_ProductId;
+                        modelDetail.F_Specifications = modelProduct.F_Specifications;
+                        modelDetail.F_ProductShortName = modelProduct.F_ProductShortName;
                         modelDetail.F_Id = Guid.NewGuid().ToString().Replace("-", "");
                         modelDetail.F_OrderId = input.F_Id;
                         modelDetail.F_Count = m.F_Count;
@@ -1711,6 +1715,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                                     T_Bus_OrderDetail modelDetail = new T_Bus_OrderDetail();
                                     modelDetail.F_ProductName = m.F_ProductName;
                                     modelDetail.F_ProductId = m.F_ProductId;
+                                    modelDetail.F_Specifications = m.F_Specifications;
+                                    modelDetail.F_ProductShortName = m.F_ProductShortName;
                                     modelDetail.F_Id = Guid.NewGuid().ToString().Replace("-", "");
                                     modelDetail.F_OrderId = input.F_Id;
                                     modelDetail.F_Count = 1;
@@ -1759,6 +1765,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                     T_Bus_OrderDetail modelDetail = new T_Bus_OrderDetail();
                     modelDetail.F_ProductName = modelProduct.F_ProductName;
                     modelDetail.F_ProductId = modelProduct.F_ProductId;
+                    modelDetail.F_Specifications = modelProduct.F_Specifications;
+                    modelDetail.F_ProductShortName = modelProduct.F_ProductShortName;
                     modelDetail.F_Id = Guid.NewGuid().ToString().Replace("-", "");
                     modelDetail.F_OrderId = input.F_Id;
                     modelDetail.F_Count = m.F_Count;
@@ -2118,6 +2126,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                         OrderDetailInput model = new OrderDetailInput();
                         model.F_ProductName = m.F_ProductName;
                         model.F_ProductId = m.F_ProductId;
+                        model.F_Specifications = m.F_Specifications;
+                        model.F_ProductShortName = m.F_ProductShortName;
                         model.F_Id = m.F_Id;
                         model.F_OrderId = m.F_OrderId;
                         model.F_Count = m.F_Count;

代码/TVShoppingCallCenter_ZLJ/Controllers/Order/OrderFunctionController.cs

@@ -399,6 +399,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                             T_Bus_OrderDetail modelDetail = new T_Bus_OrderDetail();
                             modelDetail.F_ProductName = modelProduct.F_ProductName;
                             modelDetail.F_ProductId = modelProduct.F_ProductId;
+                            modelDetail.F_Specifications = modelProduct.F_Specifications;
+                            modelDetail.F_ProductShortName = modelProduct.F_ProductShortName;
                             modelDetail.F_Id = Guid.NewGuid().ToString().Replace("-", "");
                             modelDetail.F_OrderId = modelOrder.F_Id;
                             modelDetail.F_Count = 1;

代码/TVShoppingCallCenter_ZLJ/Controllers/Order/OrderMergeController.cs

@@ -436,6 +436,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                                 modelDetail = new T_Bus_OrderDetail();
                                 modelDetail.F_ProductName = productModel.F_ProductName;
                                 modelDetail.F_ProductId = productModel.F_ProductId;
+                                modelDetail.F_Specifications = productModel.F_Specifications;
+                                modelDetail.F_ProductShortName = productModel.F_ProductShortName;
                                 modelDetail.F_Id = Guid.NewGuid().ToString().Replace("-", "");
                                 modelDetail.F_OrderId = input.F_Id;
                                 modelDetail.F_Count = 1;

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

@@ -345,10 +345,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
             T_Bus_ProductModel.F_ProductNumber = input.ProductNumber;
             T_Bus_ProductModel.F_ProductNumberName = input.ProductNumberName;
             T_Bus_ProductModel.F_PinyinShort = input.PinyinShort;
-
+            T_Bus_ProductModel. F_Specifications= input.F_Specifications;
             T_Bus_ProductModel.F_ClassId = input.ClassId;
             T_Bus_ProductModel.F_ClassName = input.ClassName;
-
+            
 
             T_Bus_ProductModel.F_MarketPrice = input.MarketPrice;
             T_Bus_ProductModel.F_MemberPrice = input.MemberPrice;

代码/TVShoppingCallCenter_ZLJ/Models/Inputs/Order/OrderDetailInput.cs

@@ -25,11 +25,12 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 		private string _f_remark = "";
 		private int _f_activity;
 		private int _f_state = 0;
-
-		/// <summary>
-		/// 0正常1售后
-		/// </summary>
-		public int F_State
+        private string _f_productshortname;
+        private string _f_specifications;
+        /// <summary>
+        /// 0正常1售后
+        /// </summary>
+        public int F_State
 		{
 			set { _f_state = value; }
 			get { return _f_state; }
@@ -80,10 +81,26 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 			set { _f_productname = value; }
 			get { return _f_productname; }
 		}
-		/// <summary>
-		/// 单价，优先显示可用最低价会员价
-		/// </summary>
-		public decimal F_Price
+        /// <summary>
+        /// 产品简称/编码
+        /// </summary>
+        public string F_ProductShortName
+        {
+            set { _f_productshortname = value; }
+            get { return _f_productshortname; }
+        }
+        /// <summary>
+        /// 规格
+        /// </summary>
+        public string F_Specifications
+        {
+            set { _f_specifications = value; }
+            get { return _f_specifications; }
+        }
+        /// <summary>
+        /// 单价，优先显示可用最低价会员价
+        /// </summary>
+        public decimal F_Price
 		{
 			set { _f_price = value; }
 			get { return _f_price; }

代码/TVShoppingCallCenter_ZLJ/Models/Inputs/Order/OrderInput.cs

@@ -569,7 +569,17 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
             get { return _f_recommendertel; }
 
         }
-        
+        public string F_Ress { get; set; }
+        /// <summary>
+		/// 产品名称
+		/// </summary>
+		public string F_ProductName
+        { get; set; }
+        public int Count { get; set; }
+        /// <summary>
+        /// 优惠活动
+        /// </summary>
+        public string Preferential { get; set; }
         public OrderMoneyInput OrderMoney { get; set; }
         #endregion Model
 

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

@@ -47,7 +47,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
         private int _f_freezestock = 0;
         private int _f_stock1 = 0;
         private int _f_freezestock1 = 0;
-
+        private string _f_specifications;
 
 
         /// <summary>
@@ -117,6 +117,14 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
             get { return _f_pinyinshort; }
         }
         /// <summary>
+        /// 规格
+        /// </summary>
+        public string F_Specifications
+        {
+            set { _f_specifications = value; }
+            get { return _f_specifications; }
+        }
+        /// <summary>
         /// 上架时间
         /// </summary>
         public DateTime? OnSaleBegin