修改

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerNewController.cs

@@ -403,7 +403,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                     }
                     Input1.F_Salesman = model[i].F_Salesman;//业务员
                     Input1.F_SalesPhone = model[i].F_SalesPhone;//业务员电话
-                    Input1.F_CustomerNature = model[i].F_CustomerNature;//客户性质
+                
                     Input1.F_Channel = model[i].F_Channel;// 渠道类型:总经销、二级商、种田大户、农户、化工客户、公司员工
                     Input1.F_Credit = model[i].F_Credit;//信用等级:一星、二星、三星、四星、五星、空
                     Input1.F_Legal = model[i].F_Legal;//法人 
@@ -415,14 +415,6 @@ namespace CallCenterApi.Interface.Controllers.customer
                     Input1.F_AddressFull = model[i].F_AddressFull;//详细地址
                     Input1.F_Brands = model[i].F_Brands;// 经营品牌:心连心、手拉手、沃利沃、双心、空
                     Input1.F_Product = model[i].F_Product;//产品:复合肥心连心、复合肥手拉手、复合肥沃利沃、复合肥双心、尿素心连心、尿素手拉手、尿素沃利沃、尿素双心
-                    Input1.F_FrozenFlag = model[i].F_FrozenFlag;//冻结标志
-                    Input1.F_IsOpenAccount = model[i].F_IsOpenAccount;//是否开户:已开户、未开户
-                    Input1.F_LevelCode = model[i].F_LevelCode;//上级客户编码
-                    Input1.F_LevelName = model[i].F_LevelName;//上级客户名称
-                    Input1.F_MnemonicCode = model[i].F_MnemonicCode;//助记码
-                    Input1.F_InvoiceBank = model[i].F_InvoiceBank;//开票银行名称
-                    Input1.F_InvoiceBankAccount = model[i].F_InvoiceBankAccount;//开票银行账号
-                    Input1.F_TaxRegCode = model[i].F_TaxRegCode;//纳税人登记号
                     Input1.F_IsRunXLX = model[i].F_IsRunXLX;// 是否经营心连心:是、否
                     Input1.F_AnnualSales = model[i].F_AnnualSales;//年销量
                     Input1.F_Formula = model[i].F_Formula;//配方
@@ -461,7 +453,6 @@ namespace CallCenterApi.Interface.Controllers.customer
             model.F_Gender = input.F_Gender ;//分公司ID
             model.F_Salesman = input.F_Salesman;//业务员
             model.F_SalesPhone = input.F_SalesPhone;//业务员电话
-            model.F_CustomerNature = input.F_CustomerNature;//客户性质
             model.F_Channel = input.F_Channel;// 渠道类型:总经销、二级商、种田大户、农户、化工客户、公司员工
             model.F_Credit = input.F_Credit;//信用等级:一星、二星、三星、四星、五星、空
             model.F_Legal = input.F_Legal;//法人 
@@ -473,14 +464,6 @@ namespace CallCenterApi.Interface.Controllers.customer
             model.F_AddressFull = input.F_AddressFull;//详细地址
             model.F_Brands = input.F_Brands;// 经营品牌:心连心、手拉手、沃利沃、双心、空
             model.F_Product = input.F_Product;//产品:复合肥心连心、复合肥手拉手、复合肥沃利沃、复合肥双心、尿素心连心、尿素手拉手、尿素沃利沃、尿素双心
-            model.F_FrozenFlag = input.F_FrozenFlag;//冻结标志
-            model.F_IsOpenAccount = input.F_IsOpenAccount;//是否开户:已开户、未开户
-            model.F_LevelCode = input.F_LevelCode;//上级客户编码
-            model.F_LevelName = input.F_LevelName;//上级客户名称
-            model.F_MnemonicCode = input.F_MnemonicCode;//助记码
-            model.F_InvoiceBank = input.F_InvoiceBank;//开票银行名称
-            model.F_InvoiceBankAccount = input.F_InvoiceBankAccount;//开票银行账号
-            model.F_TaxRegCode = input.F_TaxRegCode;//纳税人登记号
             model.F_IsRunXLX = input.F_IsRunXLX;// 是否经营心连心:是、否
             model.F_AnnualSales = input.F_AnnualSales;//年销量
             model.F_Formula = input.F_Formula;//配方
@@ -653,80 +636,79 @@ namespace CallCenterApi.Interface.Controllers.customer
                             
                             if (dr["客户编号"].ToString() != "" && valcode(dr["客户编号"].ToString()))
                             {
-                                if (!getunique(0, dr["客户编号"].ToString()))
-                                {
-                                    dModel.F_CustomerCode = dr["客户编号"].ToString();
-                                    dModel.F_CompanyName = dr["公司名称"].ToString();
-                                #region
-                                Model.T_Sys_Department pdModel = departmentBLL.GetModel(dr["大区名称"].ToString());
-                                if (pdModel!=null )
-                                {
-                                    dModel.F_AreaID = pdModel.F_DeptId.ToString();
-                                }
-                                    Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(dr["分公司名称"].ToString());
-                                if (pdModel1!=null )
-                                {
-                                    dModel.F_BranchID = pdModel1.F_DeptId.ToString();
-                                }
-                             
-                                dModel.F_Salesman = dr["业务员"].ToString();
-                                dModel.F_SalesPhone = dr["业务员电话"].ToString();
-                                dModel.F_CustomerNature = dr["客户性质"].ToString();
-                                dModel.F_Channel = dr["渠道类型"].ToString();
-                                dModel.F_Credit = dr["信用等级"].ToString();
-                                dModel.F_Legal = dr["客户"].ToString();
-                                    if (!string.IsNullOrEmpty(dr["性别"].ToString()))
+                               if (getunphone(0, dr["客户电话"].ToString()))
+                               {
+                                    if (!getunique(0, dr["客户编号"].ToString()))
                                     {
-                                        if (dr["性别"].ToString() == "女")
+                                        dModel.F_CustomerCode = dr["客户编号"].ToString();
+                                        dModel.F_CompanyName = dr["公司名称"].ToString();
+                                        #region
+                                        Model.T_Sys_Department pdModel = departmentBLL.GetModel(dr["大区名称"].ToString());
+                                        if (pdModel != null)
+                                        {
+                                            dModel.F_AreaID = pdModel.F_DeptId.ToString();
+                                        }
+                                        Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(dr["分公司名称"].ToString());
+                                        if (pdModel1 != null)
+                                        {
+                                            dModel.F_BranchID = pdModel1.F_DeptId.ToString();
+                                        }
+
+                                        dModel.F_Salesman = dr["业务员"].ToString();
+                                        dModel.F_SalesPhone = dr["业务员电话"].ToString();
+                                        dModel.F_Channel = dr["渠道类型"].ToString();
+                                        dModel.F_Credit = dr["信用等级"].ToString();
+                                        dModel.F_Legal = dr["客户"].ToString();
+                                        if (!string.IsNullOrEmpty(dr["性别"].ToString()))
+                                        {
+                                            if (dr["性别"].ToString() == "女")
+                                            {
+                                                dModel.F_Gender = "2";
+                                            }
+                                            else
+                                            {
+                                                dModel.F_Gender = "1";
+                                            }
+                                        }
+
+                                        dModel.F_LegalPhone = dr["客户电话"].ToString();
+                                        dModel.F_AddressProvince = dr["省"].ToString();
+                                        dModel.F_AddressCity = dr["市"].ToString();
+                                        dModel.F_AddressCountry = dr["县"].ToString();
+                                        dModel.F_AddressTownship = dr["乡"].ToString();
+                                        dModel.F_AddressFull = dr["详细地址"].ToString();
+                                        dModel.F_Brands = dr["经营品牌"].ToString();
+                                        dModel.F_Product = dr["产品"].ToString();
+                                        dModel.F_IsRunXLX = dr["是否经营心连心"].ToString();
+                                        dModel.F_AnnualSales = dr["年销量"].ToString();
+                                        dModel.F_Formula = dr["配方"].ToString();
+                                        dModel.F_RaiseCrops = dr["种植作物"].ToString();
+                                        dModel.F_PlantingArea = dr["种植面积"].ToString();
+                                        dModel.F_FertilizerBrand = dr["用肥品牌"].ToString();
+                                        dModel.F_Remark = dr["备注"].ToString();
+                                        #endregion
+                                        dModel.F_CreateOn = DateTime.Now;
+                                        var res = cusbll.Add(dModel);
+                                        if (res > 0)
                                         {
-                                            dModel.F_Gender = "2";
+                                            addoptlog(usercode, ip, EnumOpt.import.ToString(), res.ToString(), "导入成功,导入的文件为：" + newpath + ",当前为第" + headrow + "行");
                                         }
                                         else
                                         {
-                                            dModel.F_Gender = "1";
+
+                                            msg = msg + "第" + headrow + "行，导入失败<br>";
                                         }
                                     }
-                                   
-                                    dModel.F_LegalPhone = dr["客户电话"].ToString();
-                                dModel.F_AddressProvince = dr["省"].ToString();
-                                dModel.F_AddressCity = dr["市"].ToString();
-                                dModel.F_AddressCountry = dr["县"].ToString();
-                                dModel.F_AddressTownship = dr["乡"].ToString();
-                                dModel.F_AddressFull = dr["详细地址"].ToString();
-                                dModel.F_Brands = dr["经营品牌"].ToString();
-                                dModel.F_Product = dr["产品"].ToString();
-                                dModel.F_FrozenFlag = dr["冻结标志"].ToString();
-                                dModel.F_IsOpenAccount = dr["是否开户"].ToString();
-                                dModel.F_LevelCode = dr["上级客户编码"].ToString();
-                                dModel.F_LevelName = dr["上级客户名称"].ToString();
-                                dModel.F_MnemonicCode = dr["助记码"].ToString();
-                                dModel.F_InvoiceBank = dr["开票银行名称"].ToString();
-                                dModel.F_InvoiceBankAccount = dr["开票银行账号"].ToString();
-                                dModel.F_TaxRegCode = dr["纳税人登记号"].ToString();
-                                dModel.F_IsRunXLX = dr["是否经营心连心"].ToString();
-                                dModel.F_AnnualSales = dr["年销量"].ToString();
-                                dModel.F_Formula = dr["配方"].ToString();
-                                dModel.F_RaiseCrops = dr["种植作物"].ToString();
-                                dModel.F_PlantingArea = dr["种植面积"].ToString();
-                                dModel.F_FertilizerBrand = dr["用肥品牌"].ToString();
-                                dModel.F_Remark = dr["备注"].ToString();
-                                #endregion
-                                dModel.F_CreateOn = DateTime.Now;
-                                var res = cusbll.Add(dModel);
-                                if (res > 0)
-                                {
-                                    addoptlog(usercode, ip, EnumOpt.import.ToString(), res.ToString(), "导入成功,导入的文件为：" + newpath + ",当前为第" + headrow + "行");
-                                }
-                                else
-                                {
-
-                                    msg = msg + "第" + headrow + "行，导入失败<br>";
-                                }
+                                    else
+                                    {
+                                        msg = msg + "第" + headrow + "行，客户编号重复，未导入<br>";
+                                    }
                                 }
                                 else
                                 {
-                                    msg = msg + "第" + headrow + "行，客户编号重复，未导入<br>";
+                                    msg = msg + "第" + headrow + "行，客户电话重复，未导入<br>";
                                 }
+                                
                             }
                             else
                                 msg = msg + "第" + headrow + "行，客户编号为空或格式不正确，未导入<br>";

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/RegionCategoryController.cs

@@ -352,7 +352,10 @@ namespace CallCenterApi.Interface.Controllers.customer
                     string currentID = tab[i].F_RegionId.ToString();//当前功能ID
                     model.id = currentID;
                     model.IconCls = "";//图标
-                    model.headerid = int.Parse(tab[i].F_Layer.ToString());
+                    if (tab[i].F_Layer!=null )
+                    {
+                        model.headerid = int.Parse(tab[i].F_Layer.ToString());
+                    }
                     model.text = tab[i].F_RegionName;
                     var tab2 = list.Where(x => x.F_ParentId == F_RegionId).OrderByDescending(x=>x.F_Sort).ToList();
                     if (tab2.Count > 0)

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WOReportController.cs

@@ -73,6 +73,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 sql += $"  and T_Wo_WorkOrder.F_CustomerID in ( " + GetCustomerID(channel) + ") "; ;
             }
             sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
+            sql += " order by F_CreateOn desc";
             var depts = new BLL.T_Wo_WorkOrder().GetModelList(sql);
             #endregion
             dt.Columns.Add("创建时间");
@@ -91,27 +92,31 @@ namespace CallCenterApi.Interface.Controllers.report
             foreach (var it in depts)
             {
                 DataRow drNew = dt.NewRow();
-                if (!valcode(it.F_CustomerID.ToString(), 10))//验证客户编码为10位纯数字
-                {
-                    Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(it.F_CustomerID.ToString());//通过客户编号获取客户资料
-                    if (cuModel != null)
+                if (!string .IsNullOrEmpty (it.F_CustomerID))
+               {
+                    if (valcode(it.F_CustomerID, 10))//验证客户编码为10位纯数字
                     {
-                        Model.T_Sys_Department pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
-                        if (pdModel != null)
-                        {
-                            drNew["大区名称"] = pdModel.F_DeptName;
-                        }
-                        Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(cuModel.F_BranchID);
-                        if (pdModel1 != null)
+                        Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(it.F_CustomerID.ToString());//通过客户编号获取客户资料
+                        if (cuModel != null)
                         {
-                            drNew["分公司名称"] = pdModel1.F_DeptName;
-                        }
-                        drNew["业务员"] = cuModel.F_Salesman;
-                        drNew["品牌"] = cuModel.F_Brands;
-                        drNew["渠道类型"] = cuModel.F_Channel;
+                            Model.T_Sys_Department pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
+                            if (pdModel != null)
+                            {
+                                drNew["大区名称"] = pdModel.F_DeptName;
+                            }
+                            Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(cuModel.F_BranchID);
+                            if (pdModel1 != null)
+                            {
+                                drNew["分公司名称"] = pdModel1.F_DeptName;
+                            }
+                            drNew["业务员"] = cuModel.F_Salesman;
+                            drNew["品牌"] = cuModel.F_Brands;
+                            drNew["渠道类型"] = cuModel.F_Channel;
 
+                        }
                     }
                 }
+               
                 drNew["产品"] = it.F_TS_Category;
                 if (it.F_Type == "1")
                 {
@@ -161,7 +166,7 @@ namespace CallCenterApi.Interface.Controllers.report
         /// 集团市场问题反馈汇总表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetQuestionList(string stime, string endtime, string salesBase, string channel, int type = 0, int pageindex = 1, int pagesize = 10)
+        public ActionResult GetQuestionList(string stime, string endtime, string salesBase, string channel, int type = 0, int page = 1, int limit = 10)
         {
             string sql = $" and F_IsDelete=0";
             DataTable dt = new DataTable();
@@ -194,8 +199,8 @@ namespace CallCenterApi.Interface.Controllers.report
                     "*",
                     sql,
                     "ORDER BY T_Wo_WorkOrder.F_ID desc",
-                    pagesize,
-                    pageindex,
+                    limit,
+                    page,
                     true,
                     out recordCount);
             }
@@ -247,8 +252,9 @@ namespace CallCenterApi.Interface.Controllers.report
             {
                 sql += $"  and T_Wo_WorkOrder.F_CustomerID in ( " + GetCustomerID(channel) + ") "; ;
             }
-            sql += $"  and T_Wo_WorkOrder.F_QuestionType in ( " + GetComplaint("'化肥产品质量问题反馈','化肥服务质量问题反馈','化肥农作物长势问题反馈'") + ") "; ;
+            sql += $"  and T_Wo_WorkOrder.F_QuestionType in ( '" + GetComplaint("'化肥产品质量问题反馈','化肥服务质量问题反馈','化肥农作物长势问题反馈'") + "') "; ;
             sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
+            sql += " order by F_CreateOn desc";
             #endregion
             var depts = new BLL.T_Wo_WorkOrder().GetModelList(sql);
 
@@ -305,46 +311,65 @@ namespace CallCenterApi.Interface.Controllers.report
             foreach (var it in depts)
             {
                 DataRow drNew = dt.NewRow();
-                if (!valcode(it.F_CustomerID.ToString(), 10))//验证客户编码为10位纯数字
+                if (!string .IsNullOrEmpty (it.F_CustomerID))
                 {
-                    drNew["客户编号"] = it.F_CustomerID;//
-                    Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(it.F_CustomerID.ToString());//通过客户编号获取客户资料
-                    if (cuModel != null)
+                    if (valcode(it.F_CustomerID, 10))//验证客户编码为10位纯数字
                     {
-                        Model.T_Sys_Department pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
-                        if (pdModel != null)
-                        {
-                            drNew["大区名称"] = pdModel.F_DeptName;//
-                        }
-                        Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(cuModel.F_BranchID);
-                        if (pdModel1 != null)
+                        drNew["客户编号"] = it.F_CustomerID;//
+                        Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(it.F_CustomerID.ToString());//通过客户编号获取客户资料
+                        if (cuModel != null)
                         {
-                            drNew["分公司名称"] = pdModel1.F_DeptName;//分公司名称
+                            Model.T_Sys_Department pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
+                            if (pdModel != null)
+                            {
+                                drNew["大区名称"] = pdModel.F_DeptName;//
+                            }
+                            Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(cuModel.F_BranchID);
+                            if (pdModel1 != null)
+                            {
+                                drNew["分公司名称"] = pdModel1.F_DeptName;//分公司名称
+                            }
+                            drNew["业务员"] = cuModel.F_Salesman;//业务员
                         }
-                        drNew["业务员"] = cuModel.F_Salesman;//业务员
                     }
+
                 }
-                if (!valcode(it.F_MaterialID.ToString(), 11))
+                if (!string .IsNullOrEmpty (it.F_MaterialID))
                 {
-                    drNew["物料编码"] = int.Parse(it.F_MaterialID);//验证物料编码为11位纯数字
-                    Model.T_Wo_MaterialManage maModel = mmBLL.GetModel(it.F_MaterialID.ToString());//通过物料编码获取物料信息
-                    if (maModel != null)
+                    if (valcode(it.F_MaterialID.ToString(), 11))
                     {
-                        drNew["物料名称"] = maModel.F_MaterialName;//物料名称
-                        drNew["型号"] = maModel.F_Model;//型号
-                        drNew["规格"] = maModel.F_Specs;//规格
-                        drNew["一级分类"] = maModel.F_Level1;//一级分类
-                        drNew["二级分类"] = maModel.F_Level2;//二级分类
-                        drNew["三级分类"] = maModel.F_Level3;//三级分类
-                        drNew["品牌"] = maModel.F_Brand;//品牌
-                        drNew["复合肥肥效"] = maModel.F_MaterialEffect;//F_MaterialEffect
-                        drNew["产品线"] = maModel.F_Pipeline;//F_Pipeline
-                        drNew["工艺"] = maModel.F_Craft;//F_Craft
+                        drNew["物料编码"] = int.Parse(it.F_MaterialID);//验证物料编码为11位纯数字
+                        Model.T_Wo_MaterialManage maModel = mmBLL.GetModel(it.F_MaterialID.ToString());//通过物料编码获取物料信息
+                        if (maModel != null)
+                        {
+                            drNew["物料名称"] = maModel.F_MaterialName;//物料名称
+                            drNew["型号"] = maModel.F_Model;//型号
+                            drNew["规格"] = maModel.F_Specs;//规格
+                            drNew["一级分类"] = maModel.F_Level1;//一级分类
+                            drNew["二级分类"] = maModel.F_Level2;//二级分类
+                            drNew["三级分类"] = maModel.F_Level3;//三级分类
+                            drNew["品牌"] = maModel.F_Brand;//品牌
+                            drNew["复合肥肥效"] = maModel.F_MaterialEffect;//F_MaterialEffect
+                            drNew["产品线"] = maModel.F_Pipeline;//F_Pipeline
+                            drNew["工艺"] = maModel.F_Craft;//F_Craft
+                        }
                     }
                 }
+               
                 if (!string.IsNullOrEmpty(it.F_QuestionType))
                 {
-                    Model.T_Wo_QuestionManage Manage = quesBLL.GetModel(it.F_QuestionType);//获取问题类别
+                    Model.T_Wo_QuestionManage Manage = null;
+                    try
+                    {
+                        int b = int.Parse(it.F_QuestionType.Trim());
+                        Manage = quesBLL.GetModel(b);
+
+
+                    }
+                    catch (Exception)
+                    {
+                        Manage = quesBLL.GetModel(it.F_QuestionType); //问题类别（投诉抽捡和咨询类别不一样）
+                    }
                     if (Manage != null)
                     {
                         if (Manage.F_Label == "1")
@@ -426,14 +451,27 @@ namespace CallCenterApi.Interface.Controllers.report
             string str = "";
             string str1 = " select F_Id from T_Wo_QuestionManage where F_QuestionName in(" + msg + ")";
             string str3 = " select F_Id from T_Wo_QuestionManage where F_ParentId in(" + str1 + ")";
-            string str4 = " select F_QuestionName from T_Wo_QuestionManage where F_ParentId in(" + str3 + ")";
-            return str4;
+            var dept = quesBLL .GetModelList("F_ParentId in(" + str3+")");
+            if (dept != null)
+            {
+                foreach (var it in dept)
+                {
+                    
+                        if (str != "")
+                        str += "','" + it.F_Id ;
+                        else
+                        str += it.F_Id;
+                   
+                }
+            }
+          //  string str4 = " select F_Id from T_Wo_QuestionManage where F_ParentId in(" + str3 + ")";
+            return str;
         }
         /// <summary>
         /// 化肥产品投诉明细表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetComplaintList(string stime, string endtime, string salesBase, string channel, int pageindex = 1, int pagesize = 10)
+        public ActionResult GetComplaintList(string stime, string endtime, string salesBase, string channel, int page = 1, int limit = 10)
         {
             string sql = $" and F_IsDelete=0";
             DataTable dt = new DataTable();
@@ -453,7 +491,7 @@ namespace CallCenterApi.Interface.Controllers.report
             {
                 sql += $"  and T_Wo_WorkOrder.F_CustomerID in ( " + GetCustomerID(channel) + ") "; ;
             }
-            sql += $"  and T_Wo_WorkOrder.F_QuestionType in ( " + GetComplaint("'化肥产品质量问题反馈','化肥服务质量问题反馈','化肥农作物长势问题反馈'") + ") "; ;
+            sql += $"  and T_Wo_WorkOrder.F_QuestionType in ( '" + GetComplaint("'化肥产品质量问题反馈','化肥服务质量问题反馈','化肥农作物长势问题反馈'") + "') "; ;
             sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
             #endregion
             int recordCount = 0;
@@ -466,8 +504,8 @@ namespace CallCenterApi.Interface.Controllers.report
                     "*",
                     sql,
                     "ORDER BY T_Wo_WorkOrder.F_ID desc",
-                    pagesize,
-                    pageindex,
+                     limit,
+                    page,
                     true,
                     out recordCount);
             }
@@ -521,6 +559,7 @@ namespace CallCenterApi.Interface.Controllers.report
             }
 
             sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
+            sql += " order by F_CreateOn desc";
             var depts = new BLL.T_Wo_WorkOrder().GetModelList(sql);
             #endregion
             dt.Columns.Add("创建时间");
@@ -538,27 +577,41 @@ namespace CallCenterApi.Interface.Controllers.report
             foreach (var it in depts)
             {
                 DataRow drNew = dt.NewRow();
-                if (!valcode(it.F_CustomerID.ToString(), 10))//验证客户编码为10位纯数字
+                if (!string .IsNullOrEmpty (it.F_CustomerID))
                 {
-                    Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(it.F_CustomerID.ToString());//通过客户编号获取客户资料
-                    if (cuModel != null)
+                    if (valcode(it.F_CustomerID, 10))//验证客户编码为10位纯数字
                     {
-                        Model.T_Sys_Department pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
-                        if (pdModel != null)
-                        {
-                            drNew["大区名称"] = pdModel.F_DeptName;//大区名称
-                        }
-                        Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(cuModel.F_BranchID);
-                        if (pdModel1 != null)
+                        Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(it.F_CustomerID.ToString());//通过客户编号获取客户资料
+                        if (cuModel != null)
                         {
-                            drNew["分公司名称"] = pdModel1.F_DeptName;//大区名称
+                            Model.T_Sys_Department pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
+                            if (pdModel != null)
+                            {
+                                drNew["大区名称"] = pdModel.F_DeptName;//大区名称
+                            }
+                            Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(cuModel.F_BranchID);
+                            if (pdModel1 != null)
+                            {
+                                drNew["分公司名称"] = pdModel1.F_DeptName;//大区名称
+                            }
+                            drNew["品牌"] = cuModel.F_Brands;//品牌
                         }
-                        drNew["品牌"] = cuModel.F_Brands;//品牌
                     }
                 }
                 if (!string.IsNullOrEmpty(it.F_QuestionType))
                 {
-                    Model.T_Wo_QuestionManage Manage = quesBLL.GetModel(it.F_QuestionType);//获取问题类别
+                    Model.T_Wo_QuestionManage Manage = null ;
+                    try
+                    {
+                        int b = int.Parse(it.F_QuestionType.Trim());
+                        Manage = quesBLL.GetModel(b);
+                      
+
+                    }
+                    catch (Exception)
+                    {
+                        Manage = quesBLL.GetModel(it.F_QuestionType); //问题类别（投诉抽捡和咨询类别不一样）
+                    }
                     if (Manage != null)
                     {
                         if (Manage.F_Label == "1")
@@ -608,7 +661,7 @@ namespace CallCenterApi.Interface.Controllers.report
         /// 市场投诉处理时效明细表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetPrescriptionList(string stime, string endtime, string salesBase, string channel, int pageindex = 1, int pagesize = 10)
+        public ActionResult GetPrescriptionList(string stime, string endtime, string salesBase, string channel, int page = 1, int limit = 10)
         {
             string sql = $" and F_IsDelete=0";
             DataTable dt = new DataTable();
@@ -640,8 +693,8 @@ namespace CallCenterApi.Interface.Controllers.report
                     "*",
                     sql,
                     "ORDER BY T_Wo_WorkOrder.F_ID desc",
-                    pagesize,
-                    pageindex,
+                    limit,
+                    page,
                     true,
                     out recordCount);
             }
@@ -693,8 +746,9 @@ namespace CallCenterApi.Interface.Controllers.report
             {
                 sql += $"  and T_Wo_WorkOrder.F_CustomerID in ( " + GetCustomerID(channel) + ") "; ;
             }
-            sql += $"  and T_Wo_WorkOrder.F_QuestionType in ( " + GetComplaint("'化工产品质量问题反馈','化工服务质量问题反馈'") + ") "; ;
+            sql += $"  and T_Wo_WorkOrder.F_QuestionType in ( '" + GetComplaint("'化工产品质量问题反馈','化工服务质量问题反馈'") + "') "; ;
             sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
+            sql += " order by F_CreateOn desc";
             var depts = new BLL.T_Wo_WorkOrder().GetModelList(sql);
             #endregion
             dt.Columns.Add("化工产品名称");
@@ -711,17 +765,21 @@ namespace CallCenterApi.Interface.Controllers.report
             foreach (var it in depts)
             {
                 DataRow drNew = dt.NewRow();
-                if (!valcode(it.F_CustomerID.ToString(), 10))//验证客户编码为10位纯数字
+                if (!string .IsNullOrEmpty (it.F_CustomerID))
                 {
-
-                    Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(it.F_CustomerID.ToString());//通过客户编号获取客户资料
-                    if (cuModel != null)
+                    if (valcode(it.F_CustomerID, 10))//验证客户编码为10位纯数字
                     {
-                        Model.T_Sys_Department pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
 
-                        drNew["业务员"] = cuModel.F_Salesman;//业务员
+                        Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(it.F_CustomerID.ToString());//通过客户编号获取客户资料
+                        if (cuModel != null)
+                        {
+                            Model.T_Sys_Department pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
+
+                            drNew["业务员"] = cuModel.F_Salesman;//业务员
+                        }
                     }
                 }
+                
                 drNew["化工产品名称"] = it.F_TS_Category;//产品
                 drNew["客户单位"] = it.F_CompanyName;//客户单位
                 if (!string.IsNullOrEmpty(it.F_BatchNumber))
@@ -741,7 +799,24 @@ namespace CallCenterApi.Interface.Controllers.report
                 }
                 drNew["反馈日期"] = it.F_CreateOn.ToString(); ;
                 drNew["喷码"] = it.F_BatchNumber;
-                drNew["问题分类"] = it.F_QuestionType;
+                Model.T_Wo_QuestionManage Manage = null;
+                try
+                {
+                    int b = int.Parse(it.F_QuestionType.Trim());
+                    Manage = quesBLL.GetModel(b);
+                    if (Manage!=null )
+                    {
+                        drNew["问题分类"] = Manage.F_QuestionName ;
+                    }
+                   
+
+
+                }
+                catch (Exception)
+                {
+                    drNew["问题分类"] = it.F_QuestionType;
+                }
+              
                 drNew["问题描述"] = it.F_Description;
                 drNew["处理方法"] = it.F_DealType;
                 drNew["责任部门"] = it.F_ZL_CResponsibleUnits;
@@ -764,7 +839,7 @@ namespace CallCenterApi.Interface.Controllers.report
         /// 化工产品市场投诉汇总表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetChemicalList(string stime, string endtime, string salesBase, string channel, int pageindex = 1, int pagesize = 10)
+        public ActionResult GetChemicalList(string stime, string endtime, string salesBase, string channel, int page = 1, int limit = 10)
         {
             string sql = $" and F_IsDelete=0";
             DataTable dt = new DataTable();
@@ -784,7 +859,7 @@ namespace CallCenterApi.Interface.Controllers.report
             {
                 sql += $"  and T_Wo_WorkOrder.F_CustomerID in ( " + GetCustomerID(channel) + ") "; ;
             }
-            sql += $"  and T_Wo_WorkOrder.F_QuestionType in ( " + GetComplaint("'化工产品质量问题反馈','化工服务质量问题反馈'") + ") "; ;
+            sql += $"  and T_Wo_WorkOrder.F_QuestionType in ( '" + GetComplaint("'化工产品质量问题反馈','化工服务质量问题反馈'") + "') "; ;
             sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
             #endregion
             int recordCount = 0;
@@ -797,8 +872,8 @@ namespace CallCenterApi.Interface.Controllers.report
                     "*",
                     sql,
                     "ORDER BY T_Wo_WorkOrder.F_ID desc",
-                    pagesize,
-                    pageindex,
+                    limit,
+                    page,
                     true,
                     out recordCount);
             }
@@ -1013,7 +1088,7 @@ namespace CallCenterApi.Interface.Controllers.report
             {
                 Complainthandling model = new Complainthandling();
                 model.name = categorylist[i].F_QuestionName;
-                string strnumber = " select  F_QuestionType,count(F_QuestionType) number from T_Wo_WorkOrder where" + sql+"and F_QuestionType= '" + categorylist[i].F_QuestionName +"'" +
+                string strnumber = " select  F_QuestionType,count(F_QuestionType) number from T_Wo_WorkOrder where" + sql+"and F_QuestionType= '" + categorylist[i].F_Id  +"'" +
                     "group by F_QuestionType order by count(F_QuestionType) desc";
                 DataTable QuestionType = DbHelperSQL.Query(strnumber).Tables[0];
                 List<QuestionType> QuestionTypelists = DataTableToList(QuestionType);
@@ -1025,7 +1100,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 {
                     model.number = 0;
                 }
-                string msg = "select F_QuestionType,datediff(HH ,F_CreateOn,F_DealTime) number from T_Wo_WorkOrder where " + sql + time + "and F_QuestionType  =" + "'" + categorylist[i].F_QuestionName + "'" + "ORDER BY number ";
+                string msg = "select F_QuestionType,datediff(HH ,F_CreateOn,F_DealTime) number from T_Wo_WorkOrder where " + sql + time + "and F_QuestionType  =" + "'" + categorylist[i].F_Id  + "'" + "ORDER BY number ";
                 DataTable dtxy = DbHelperSQL.Query(msg).Tables[0];
                 List<QuestionType> QuestionTypes = DataTableToList(dtxy);
                 float average = 0;
@@ -1063,7 +1138,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 }
                 model.averageTime = string.Format("{0:f2}", ave);
                 string Over = "select  F_QuestionType,count(F_IsOver) number from T_Wo_WorkOrder where  " + sql +
-                    "and F_QuestionType  ='" + categorylist[i].F_QuestionName + "'" + time + "group by F_QuestionType order by count(F_IsOver) desc";
+                    "and F_QuestionType  ='" + categorylist[i].F_Id  + "'" + time + "group by F_QuestionType order by count(F_IsOver) desc";
                 DataTable Overdtxy = DbHelperSQL.Query(Over).Tables[0];
                 List<QuestionType> Overdue = DataTableToList(Overdtxy);
                 if (Overdue.Count >0)
@@ -1100,7 +1175,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 string times = "";
                 times += " and CONVERT(varchar , F_CreateOn, 120)>=CONVERT(varchar , '" + time1.Trim() + " 00:00:01', 120) ";
                 times += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + time2.Trim() + " 23:59:59', 120) ";
-                string msgs = "select F_QuestionType,datediff(HH ,F_CreateOn,F_DealTime) number from T_Wo_WorkOrder where " + sql + times + "and F_QuestionType  =" + "'" + categorylist[i].F_QuestionName + "'" + "ORDER BY number ";
+                string msgs = "select F_QuestionType,datediff(HH ,F_CreateOn,F_DealTime) number from T_Wo_WorkOrder where " + sql + times + "and F_QuestionType  =" + "'" + categorylist[i].F_Id  + "'" + "ORDER BY number ";
                 DataTable dtxys = DbHelperSQL.Query(msgs).Tables[0];
                 List<QuestionType> Questionmonth = DataTableToList(dtxys);
                 float efficien = 0;
@@ -1258,7 +1333,7 @@ namespace CallCenterApi.Interface.Controllers.report
                     Prescription model = new Prescription();
                     if (!string .IsNullOrEmpty (model1[i].F_CustomerID))
                     {
-                        if (!valcode(model1[i].F_CustomerID, 10))//验证客户编码为10位纯数字
+                        if (valcode(model1[i].F_CustomerID, 10))//验证客户编码为10位纯数字
                         {
                             Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(model1[i].F_CustomerID);//通过客户编号获取客户资料
                             if (cuModel != null)
@@ -1280,7 +1355,18 @@ namespace CallCenterApi.Interface.Controllers.report
                    
                     if (!string.IsNullOrEmpty(model1[i].F_QuestionType))
                     {
-                        Model.T_Wo_QuestionManage Manage = quesBLL.GetModel(model1[i].F_QuestionType);//获取问题类别
+                        Model.T_Wo_QuestionManage Manage = null;
+                        try
+                        {
+                            int b = int.Parse(model1[i].F_QuestionType.Trim());
+                            Manage = quesBLL.GetModel(b);
+
+
+                        }
+                        catch (Exception)
+                        {
+                            Manage = quesBLL.GetModel(model1[i].F_QuestionType); //问题类别（投诉抽捡和咨询类别不一样）
+                        }
                         if (Manage != null)
                         {
                             if (Manage.F_Label == "1")
@@ -1338,7 +1424,7 @@ namespace CallCenterApi.Interface.Controllers.report
                     Questions model = new Questions();
                     if (!string .IsNullOrEmpty (model1[i].F_CustomerID))
                     {
-                        if (!valcode(model1[i].F_CustomerID, 10))//验证客户编码为10位纯数字
+                        if (valcode(model1[i].F_CustomerID, 10))//验证客户编码为10位纯数字
                         {
                             Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(model1[i].F_CustomerID);//通过客户编号获取客户资料
                             if (cuModel != null)
@@ -1413,7 +1499,7 @@ namespace CallCenterApi.Interface.Controllers.report
                     WorkOrderComplaint model = new WorkOrderComplaint();
                     if (!string .IsNullOrEmpty (model1[i].F_CustomerID))
                     {
-                        if (!valcode(model1[i].F_CustomerID, 10))//验证客户编码为10位纯数字
+                        if (valcode(model1[i].F_CustomerID, 10))//验证客户编码为10位纯数字
                         {
                             model.F_CustomerID = model1[i].F_CustomerID;//客户编码
                             Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(model1[i].F_CustomerID);//通过客户编号获取客户资料
@@ -1435,7 +1521,7 @@ namespace CallCenterApi.Interface.Controllers.report
                     }
                     if (!string .IsNullOrEmpty (model1[i].F_MaterialID))
                     {
-                        if (!valcode(model1[i].F_MaterialID, 11))
+                        if (valcode(model1[i].F_MaterialID, 11))
                         {
                             model.F_MaterialID = int.Parse(model1[i].F_MaterialID);//验证物料编码为11位纯数字
                             Model.T_Wo_MaterialManage maModel = mmBLL.GetModel(model1[i].F_MaterialID);//通过物料编码获取物料信息
@@ -1456,7 +1542,18 @@ namespace CallCenterApi.Interface.Controllers.report
                     }
                     if (!string .IsNullOrEmpty(model1[i].F_QuestionType))
                     {
-                        Model.T_Wo_QuestionManage Manage = quesBLL.GetModel(model1[i].F_QuestionType);//获取问题类别
+                        Model.T_Wo_QuestionManage Manage = null;
+                        try
+                        {
+                            int b = int.Parse(model1[i].F_QuestionType.Trim());
+                            Manage = quesBLL.GetModel(b);
+
+
+                        }
+                        catch (Exception)
+                        {
+                            Manage = quesBLL.GetModel(model1[i].F_QuestionType); //问题类别（投诉抽捡和咨询类别不一样）
+                        }
                         if (Manage !=null )
                         {
                             if (Manage .F_Label =="1")
@@ -1537,7 +1634,7 @@ namespace CallCenterApi.Interface.Controllers.report
                     Product model = new Product();
                     if (!string .IsNullOrEmpty (model1[i].F_CustomerID))
                     {
-                        if (!valcode(model1[i].F_CustomerID, 10))//验证客户编码为10位纯数字
+                        if (valcode(model1[i].F_CustomerID, 10))//验证客户编码为10位纯数字
                         {
 
                             Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(model1[i].F_CustomerID);//通过客户编号获取客户资料
@@ -1569,7 +1666,22 @@ namespace CallCenterApi.Interface.Controllers.report
                     }
                     model.CreatOn = model1[i].F_CreateOn .ToString (); ;
                     model.Spurtcode = model1[i].F_BatchNumber;
-                    model.QuestionType = model1[i].F_QuestionType;
+                    Model.T_Wo_QuestionManage Manage = null;
+                    try
+                    {
+                        int b = int.Parse(model1[i].F_QuestionType.Trim());
+                        Manage = quesBLL.GetModel(b);
+                        if (Manage !=null )
+                        {
+                            model.QuestionType = Manage.F_QuestionName;
+                        }
+
+                    }
+                    catch (Exception)
+                    {
+                        model.QuestionType = model1[i].F_QuestionType;
+                    }
+                 
                     model.Description = model1[i].F_Description;
                     model.DealType = model1[i].F_DealType;
                     model.CResponsibleUnits = model1[i].F_ZL_CResponsibleUnits;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -31,7 +31,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
         private readonly BLL.T_Sys_RoleInfo rolebll = new BLL.T_Sys_RoleInfo();
         private readonly BLL.T_Sys_DictionaryValue dicvalueBll = new BLL.T_Sys_DictionaryValue();
         private readonly BLL.T_Wo_MaterialManage mmBLL = new BLL.T_Wo_MaterialManage();
-      
+        BLL.T_Wo_QuestionManage quesBLL = new BLL.T_Wo_QuestionManage();
+
         ///// <summary>
         ///// 绑定微信号
         ///// </summary>
@@ -72,8 +73,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 customerBaseBLL.Update(modelcustomer);
             }
             #endregion
-            if (login.UserType == 1)
-            {
+          
                 Dictionary<string, string> paras = new Dictionary<string, string>();
                 string sql = " select * from T_Sys_UserAccount (NOLOCK) where F_UserCode=@F_UserCode and F_PassWord=@F_PassWord and F_DeleteFlag = 0 ";
                 paras.Add("@F_UserCode", login.UserCode);
@@ -100,9 +100,9 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         //部门角色（-1管理员，1接待部，2案场经理、项目负责人,3销售部总经理、物业部总经理、工程总经理、设计总经理,4区域客服，5业主（客户档案））
                     if (user.F_RoleId == 17 )
                     {
-                        //-1管理员
-                        UserType = -1;
-                    }
+                    //-1管理员
+                    return Error("无操作权限");
+                }
                     else
                     {
                         if ( user.F_RoleId == 60 || user.F_RoleId == 62)
@@ -123,8 +123,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         }
                         else
                         {
-                            UserType = 1;
-                        }
+                        return Error("无操作权限");
+                    }
                        
                         #region
                         ////部门操作权限：1接待部，2办理人员，3区域客服，4监管
@@ -169,7 +169,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         return Error("绑定失败");
                 }
                 return Error("账号或密码错误，请重新登录");
-            }
+            
             //else if (login.UserType == 5)
             //{
             //    //客户档案登录 - 用戶信息不存在时，登录客户档案业主账号
@@ -515,7 +515,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
 
             str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType in(" + (int)EnumItemType.deal+"," + (int)EnumItemType.audit + ")"
                 + " and "
-                    + "F_OptType in(" + (int)EnumItemOpt.create + "," + (int)EnumItemOpt.abreback + "," + (int)EnumItemOpt.reback + ") and F_NextUser='" + ua.F_UserCode  + "'"
+                    + "F_OptType in("  + (int)EnumItemOpt.abreback + "," + (int)EnumItemOpt.reback + ") and F_NextUser='" + ua.F_UserCode  + "'"
                 + ""
                 + " and isnull(F_IsUsed,'0')='0' ";
 
@@ -1193,7 +1193,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     else if (AuditState == 1)
                     {
                         opt = "驳回修订";
-                        var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "工单审批：驳回修订" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.create, toussers, 0, nowUser, overtime, sms);
+                        var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "工单审批：驳回修订" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reback, toussers, 0, nowUser, overtime, sms);
                         if (userid <= 0)
                             res = false;
                     }
@@ -1224,7 +1224,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         else if (AuditState == 1)
                         {
                             opt = "驳回修订";
-                            var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "工单审批：驳回修订" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.create, toussers, 0, nowUser, overtime, sms);
+                            var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "工单审批：驳回修订" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reback, toussers, 0, nowUser, overtime, sms);
                             if (userid <= 0)
                                 res = false;
                             wostate = 16;
@@ -1568,46 +1568,51 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 for (int i = 0; i < model1.Count; i++)
                 {
                     WorkOrderNewInput model = new WorkOrderNewInput();
-                    if (!string .IsNullOrEmpty (model1[i].F_CustomerID))
+                    if (!string.IsNullOrEmpty(model1[i].F_CustomerID))
                     {
-                        if (!valcode(model1[i].F_CustomerID.ToString(), 10))//验证客户编码为10位纯数字
+                       // var sql = "and  F_LegalPhone ='" + model1[i].F_CusPhone.Trim() + "'";
+                        //var userModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 " + sql);
+                        Model.T_Cus_CustomerBaseNew cuModel = customerBaseBLL .GetModel(model1[i].F_CustomerID.ToString());//通过客户编号获取客户资料
+                        if (cuModel != null)
                         {
-                            model.F_CustomerID = model1[i].F_CustomerID;//客户编码
-                            Model.T_Cus_CustomerBaseNew cuModel = customerBaseBLL.GetModel(model1[i].F_CustomerID.ToString());//通过客户编号获取客户资料
-                            if (cuModel != null)
+                            if (!string.IsNullOrEmpty(cuModel.F_AreaID))
                             {
-                                Model.T_Sys_Department pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
+                                Model.T_Sys_Department pdModel = departmentBLL.GetModel(int.Parse(cuModel.F_AreaID));//通过公司id获取部门
                                 if (pdModel != null)
                                 {
                                     model.F_AreaName = pdModel.F_DeptName;
                                 }
-                                Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(cuModel.F_BranchID);
+                            }
+                            if (!string.IsNullOrEmpty(cuModel.F_BranchID))
+                            {
+                                Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(int.Parse(cuModel.F_BranchID));
                                 if (pdModel1 != null)
                                 {
                                     model.F_BranchName = pdModel1.F_DeptName;
                                 }
-                                model.F_Salesman = cuModel.F_Salesman;
-                                model.F_SalesPhone = cuModel.F_SalesPhone;
-                                model.F_Legal = cuModel.F_Legal;
-                                model.F_LegalPhone = cuModel.F_LegalPhone;
-                                model.F_AddressProvince = cuModel.F_AddressProvince;
-                                model.F_AddressCity = cuModel.F_AddressCity;
-                                model.F_AddressCountry = cuModel.F_AddressCountry;
-                                model.F_AddressTownship = cuModel.F_AddressTownship;
-                                model.F_AddressFull = cuModel.F_AddressFull;
-                                model.F_Brands = cuModel.F_Brands;
-                                model.F_Channel = cuModel.F_Channel;
-                                model.F_IsRunXLX = cuModel.F_IsRunXLX;
-                                model.F_AnnualSales = cuModel.F_AnnualSales;
-                                model.F_Formula = cuModel.F_Formula;
-                                model.F_RaiseCrops = cuModel.F_RaiseCrops;
-                                model.F_PlantingArea = cuModel.F_PlantingArea;
-                                model.F_FertilizerBrand = cuModel.F_FertilizerBrand;
                             }
+                            model.F_CustomerID = cuModel.F_CustomerCode;//客户编码
+                            model.F_Salesman = cuModel.F_Salesman;
+                            model.F_SalesPhone = cuModel.F_SalesPhone;
+                            model.F_Legal = cuModel.F_Legal;
+                            model.F_LegalPhone = cuModel.F_LegalPhone;
+                            model.F_AddressProvince = cuModel.F_AddressProvince;
+                            model.F_AddressCity = cuModel.F_AddressCity;
+                            model.F_AddressCountry = cuModel.F_AddressCountry;
+                            model.F_AddressTownship = cuModel.F_AddressTownship;
+                            model.F_AddressFull = cuModel.F_AddressFull;
+                            model.F_Brands = cuModel.F_Brands;
+                            model.F_Channel = cuModel.F_Channel;
+                            model.F_IsRunXLX = cuModel.F_IsRunXLX;
+                            model.F_AnnualSales = cuModel.F_AnnualSales;
+                            model.F_Formula = cuModel.F_Formula;
+                            model.F_RaiseCrops = cuModel.F_RaiseCrops;
+                            model.F_PlantingArea = cuModel.F_PlantingArea;
+                            model.F_FertilizerBrand = cuModel.F_FertilizerBrand;
                         }
                     }
-                   
-                    if (!valcode(model1[i].F_MaterialID.ToString(), 11))
+
+                    if (valcode(model1[i].F_MaterialID.ToString(), 11))
                     {
                         model.F_MaterialID =model1[i].F_MaterialID;//验证物料编码为11位纯数字
                         Model.T_Wo_MaterialManage maModel = mmBLL.GetModel(model1[i].F_MaterialID.ToString());//通过物料编码获取物料信息
@@ -1735,7 +1740,23 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     model.F_Files = "0";//附件上传ids
                     model.F_DealType = model1[i].F_DealType;//处理方式:当即办理、电话转接、网络转办（点选）
                     #endregion
-                    model.F_QuestionType = model1[i].F_QuestionType;//问题类别（投诉抽捡和咨询类别不一样）
+                    if (!string.IsNullOrEmpty(model1[i].F_QuestionType))
+                    {
+                        try
+                        {
+                            int b = int.Parse(model1[i].F_QuestionType.Trim());
+                            Model.T_Wo_QuestionManage manage = quesBLL.GetModel(b);
+                            if (manage != null)
+                            {
+                                model.F_QuestionType = manage.F_QuestionName;
+                            }
+
+                        }
+                        catch (Exception)
+                        {
+                            model.F_QuestionType = model1[i].F_QuestionType; //问题类别（投诉抽捡和咨询类别不一样）
+                        }
+                    }
                     #region 投诉类
                     model.F_BatchNumber = model1[i].F_BatchNumber;//生产批次号
                     model.F_TS_Formula = model1[i].F_TS_Formula;// 投诉-配方
@@ -2226,6 +2247,20 @@ namespace CallCenterApi.Interface.Controllers.weixin
             string timecode = 3 + "" + RandKey + "" + time;
             return timecode;
         }
+        private bool IsMaterial(WorkOrderNewInput input)
+        {
+            bool n = false;
+            if (!string.IsNullOrEmpty(input.F_MaterialID) && !string.IsNullOrEmpty(input.F_MaterialName)
+               && !string.IsNullOrEmpty(input.F_Model) && !string.IsNullOrEmpty(input.F_Specs)
+                && !string.IsNullOrEmpty(input.F_Level1) && !string.IsNullOrEmpty(input.F_Level2)
+              && !string.IsNullOrEmpty(input.F_Level3) && !string.IsNullOrEmpty(input.F_Brand)
+              && !string.IsNullOrEmpty(input.F_MaterialEffect) && !string.IsNullOrEmpty(input.F_Craft)
+              && !string.IsNullOrEmpty(input.F_Pipeline))
+            {
+                n = true;
+            }
+            return n;
+        }
         /// <summary>
         /// 根据传入的对象和input的内容返回对象（添加修改使用）
         /// </summary>
@@ -2273,7 +2308,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     //    #endregion
                     //    int b = customerBaseBLL.Add(Customer);
                     //}
-                    if (string.IsNullOrEmpty(input.F_MaterialID))
+                    if (string.IsNullOrEmpty(input.F_MaterialID) && IsMaterial(input))
                     {
                         while (true)
                         {
@@ -2476,6 +2511,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         return Error("客户编号为10为纯数字！");
                     if (!string .IsNullOrEmpty (input.F_MaterialID ) && !valcode(input.F_MaterialID.ToString(), 11))
                         return Error("物料编码为11为纯数字！");
+                if (string.IsNullOrEmpty(input.F_CusName))
+                    return Error("请输入客户姓名！");
+                if (string.IsNullOrEmpty(input.F_CusPhone))
+                    return Error("请输入客户电话！");
                 //if (input.F_Type == 2 || input.F_Type == 3)
                 //{
                 //    if (string.IsNullOrEmpty(input.F_CustomerID))
@@ -2501,11 +2540,9 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     long n = woBLL.Add(model);
                     if (n > 0)
                     {
-                        #region 流转上一级领导审批
-                        DataTable dt = new DataTable();
-                        dt = new BLL.T_Wo_WorkOrder().GetList(1, "", "F_ID desc").Tables[0];
-                        List<Model.T_Wo_WorkOrder> modlelist = new BLL.T_Wo_WorkOrder().DataTableToList(dt);
-                        if (modlelist!=null && modlelist.Count >0)
+                    #region 流转上一级领导审批
+                    Model.T_Wo_WorkOrder modlelist = new BLL.T_Wo_WorkOrder().GetModel(n);
+                    if (modlelist!=null)
                         {
                         if (ua !=null )
                         {
@@ -2523,8 +2560,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 {
                                     deptname1 = deptmodel1.F_DeptName + "-";
                                 }
-                                AddLog(modlelist[0].F_ID,0, deptname1 + ua.F_UserName + "(" + ua.F_UserCode + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, user.F_UserCode, user.F_DeptId, ua , 0, 0);
-                                AddLog(modlelist[0].F_ID, modlelist[0].F_State.Value, deptname + user.F_UserName + "(" + user.F_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, 0, 0);
+                                AddLog(modlelist.F_ID,0, deptname1 + ua.F_UserName + "(" + ua.F_UserCode + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, user.F_UserCode, user.F_DeptId, ua , 0, 0);
+                                AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + user.F_UserName + "(" + user.F_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, 0, 0);
                             }
                             else
                             {
@@ -2534,8 +2571,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 {
                                     deptname1 = deptmodel1.F_DeptName + "-";
                                 }
-                                AddLog(modlelist[0].F_ID, 0, deptname1 + ua.F_UserName + "(" + ua.F_UserCode + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create,"",0, ua, 0, 0);
-                                var res = AssignWO(ua, modlelist[0], input, "流转市场管理科", 37, 0, overtime, sms);
+                                AddLog(modlelist.F_ID, 0, deptname1 + ua.F_UserName + "(" + ua.F_UserCode + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create,"",0, ua, 0, 0);
+                                var res = AssignWO(ua, modlelist, input, "流转市场管理科", 37, 0, overtime, sms);
                                 if (res)
                                 return Success("添加成功");
                                 else
@@ -2544,7 +2581,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         }
                         else
                         {
-                            AddLog(modlelist[0].F_ID, 0, "客户" + "创建工单", (int)EnumItemType.deal, (int)EnumItemOpt.create, "", 0, null, 0, 0);
+                            AddLog(modlelist.F_ID, 0, "客户" + "创建工单", (int)EnumItemType.deal, (int)EnumItemOpt.create, "", 0, null, 0, 0);
                             return Success("添加成功");
                         }
                             
@@ -2638,7 +2675,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 {
                     if (clbm == 0 && clid == 0)
                     {
-                        return Error("请选择接收人");
+                        return Error("请选择接收部门");
                     }
                     else
                     {
@@ -3697,10 +3734,15 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     return Error("参数错误！");
                 if (!(input.F_Type > 0 && input.F_Type < 5))
                     return Error("工单类型错误！");
+                if (string.IsNullOrEmpty(input.F_CusName))
+                    return Error("请输入客户姓名！");
+                if (string.IsNullOrEmpty(input.F_CusPhone))
+                    return Error("请输入客户电话！");
                 if (!string.IsNullOrEmpty(input.F_BatchNumber) && !vaBatchNumber(input.F_BatchNumber))
                 {
                     return Error("请输入正确的生产批次号！");
                 }
+
                 else
                 {
                     if (!string.IsNullOrEmpty(input.F_BatchNumber))

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

@@ -24,6 +24,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         BLL.T_Cus_CustomerBaseNew cusbll = new BLL.T_Cus_CustomerBaseNew();
         BLL.T_Sys_Department departmentBLL = new BLL.T_Sys_Department();
         BLL.T_Wo_MaterialManage mmBLL = new BLL.T_Wo_MaterialManage();
+        BLL.T_Wo_QuestionManage quesBLL = new BLL.T_Wo_QuestionManage();
         BLL.T_Wo_WorkOrderItem_New itembll = new BLL.T_Wo_WorkOrderItem_New();
         BLL.T_Wo_WorkOrder_Logs blllogs = new BLL.T_Wo_WorkOrder_Logs();
         BLL.T_Sys_UserAccount sysUserAccountBll = new BLL.T_Sys_UserAccount();
@@ -294,7 +295,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     case 12://微信未通过工单
                         if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
                         {
-                            sql += $" and F_ID in(" + GetDelay() + ")";
+                           
                         }
                         else
                         {
@@ -856,7 +857,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
             str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType in(" + (int)EnumItemType.deal + "," + (int)EnumItemType.audit + ")"
                 + " and "
-                    + "F_OptType in(" + (int)EnumItemOpt.create + "," + (int)EnumItemOpt.abreback + "," + (int)EnumItemOpt.reback + ") and F_NextUser='" + ua.F_UserCode + "'"
+                    + "F_OptType in(" + (int)EnumItemOpt.abreback + "," + (int)EnumItemOpt.reback + ") and F_NextUser='" + ua.F_UserCode + "'"
                 + ""
                 + " and isnull(F_IsUsed,'0')='0' ";
 
@@ -945,7 +946,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     else if (AuditState == 1)
                     {
                         opt = "驳回修订";
-                        var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "工单审批：驳回修订" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.create, toussers, 0, nowUser, overtime, sms);
+                        var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "工单审批：驳回修订" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reback, toussers, 0, nowUser, overtime, sms);
                         if (userid <= 0)
                             res = false;
                     }
@@ -976,7 +977,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         else if (AuditState == 1)
                         {
                             opt = "驳回修订";
-                            var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "工单审批：驳回修订" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.create, toussers, 0, nowUser, overtime, sms);
+                            var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "工单审批：驳回修订" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reback, toussers, 0, nowUser, overtime, sms);
                             if (userid <= 0)
                                 res = false;
                             wostate = 16;
@@ -1231,7 +1232,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         private string GetDelay()
         {
             string str = "";
-            str = "select F_WoID from T_Wo_WorkOrderItem_New where F_OptType=" + (int)EnumItemOpt.Delay;
+            str = "select F_WoID from T_Wo_WorkOrderItem_New where F_OptType=" + (int)EnumItemOpt.Delay + "and F_ItemType = " + (int)EnumItemType.Delay;
             return str;
         }
         /// <summary>
@@ -1344,13 +1345,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
             #region 工单处理
             int sms = 0; int wostate = 0; int limit = 0;
-            var itemlasts = itembll.GetModelList("  F_OptType=" + (int)EnumItemOpt.Delay + " and  F_WoID=" + model.F_ID + " ");
+            var itemlasts = itembll.GetModelList("  F_OptType=" + (int)EnumItemOpt.Delay + "and F_ItemType = " + (int)EnumItemType.Delay + " and  F_WoID=" + model.F_ID + " ");
             if (itemlasts.Count > 0)
             {
                 foreach (var it in itemlasts)
                 {
                         sms = int.Parse(it.F_IsSMS.ToString());
                         limit = int.Parse(it.F_LimitTime);
+                    it.F_ItemType = (int)EnumItemType.deal;
+                    it.F_OptType = (int)EnumItemOpt.deal;
+                    itembll.Update(it);
                 }
             }
             string opt = "";
@@ -1358,7 +1362,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (isadopt == 0)
             {
                 opt = "未通过";
-                optbut = (int)EnumItemOpt.Delay;
+                optbut = (int)EnumItemOpt.deal;
                 limit = model.F_limit;
             }
             else
@@ -1381,7 +1385,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
             if (itemlast != null)
                 touser = itemlast.F_CreateUser;
-            var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, limit, sms);
+            var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, limit, sms,"",1);
             if (itemid > 0)
             {
                 
@@ -1526,7 +1530,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     DataRow drNew = dt.NewRow();
                     #region 客户
-                    if (!valcode(it.F_CustomerID.ToString(), 10))//验证客户编码为10位纯数字
+                    if (valcode(it.F_CustomerID.ToString(), 10))//验证客户编码为10位纯数字
                     {
                         drNew["客户编号"] = it.F_CustomerID;//客户编码
                         Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(it.F_CustomerID.ToString());//通过客户编号获取客户资料
@@ -1563,7 +1567,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     #endregion
                     #region 物料
-                    if (!valcode(it.F_MaterialID.ToString(), 11))
+                    if (valcode(it.F_MaterialID.ToString(), 11))
                     {
                         drNew["物料编码"] = int.Parse(it.F_MaterialID);//验证物料编码为11位纯数字
                         Model.T_Wo_MaterialManage maModel = mmBLL.GetModel(it.F_MaterialID.ToString());//通过物料编码获取物料信息
@@ -2866,7 +2870,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
             {
-                string sql = " and F_IsDelete=0 and F_State != " + (int)EnumWorkOrderState.finish;
+                string sql = "";
               
                 DataTable dt = new DataTable();
                 #region 筛选条件
@@ -3057,6 +3061,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 #region 添加验证判断
                 if (!(input.F_Type> 0 && input.F_Type < 5))
                     return Error("工单类型错误！");
+                if(string .IsNullOrEmpty (input.F_CusName))
+                    return Error("请输入客户姓名！");
+                if (string.IsNullOrEmpty(input.F_CusPhone))
+                    return Error("请输入客户电话！");
                 if (!string.IsNullOrEmpty(input.F_BatchNumber) && !vaBatchNumber(input.F_BatchNumber))
                 {
                     return Error("请输入正确的生产批次号！");
@@ -3100,8 +3108,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                         var model = new Model.T_Wo_WorkOrder();
                 #region 保存客户基本信息
+                Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                 model = inputtoobj(model, input, 2);
-
+                if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "YWY")
+                {
+                    model.F_State = (int)EnumWorkOrderState.audit;
+                }
                 #endregion
                 long n = workOrder.Add(model);
                 if (n > 0)
@@ -3112,13 +3124,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         deptname = deptmodel.F_DeptName + "-";
                     }
-                    DataTable dt = new DataTable();
-                    dt = new BLL.T_Wo_WorkOrder().GetList(1, "", "F_ID desc").Tables[0];
-                    List<Model.T_Wo_WorkOrder> modlelist = new BLL.T_Wo_WorkOrder().DataTableToList(dt);
-                 
-                    if (ua != null)
-                    {
-                        Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
+                    Model.T_Wo_WorkOrder  modlelist = new BLL.T_Wo_WorkOrder().GetModel(n);
+                      
                         if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "YWY")
                         {
 
@@ -3132,13 +3139,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     deptname1 = deptmodel1.F_DeptName + "-";
                                 }
 
-                                AddLog(modlelist[0].F_ID, 0, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, user.F_UserCode, user.F_DeptId, ua, 0, 0);
-                                AddLog(modlelist[0].F_ID, modlelist[0].F_State.Value, deptname1 + user.F_UserName + "(" + user.F_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, 0, 0);
+                                AddLog(modlelist.F_ID, 0, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, user.F_UserCode, user.F_DeptId, ua, 0, 0);
+                                AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname1 + user.F_UserName + "(" + user.F_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, 0, 0);
                             }
                             else
                             {
-                                AddLog(modlelist[0].F_ID, 0, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
-                                var res = AssignWO(ua, modlelist[0], input, "流转市场管理科", 37, 0, 0, 0);
+                                AddLog(modlelist.F_ID, 0, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
+                                var res = AssignWO(ua, modlelist, input, "流转市场管理科", 37, 0, 0, 0);
                                 if (res)
                                     return Success("添加成功");
                                 else
@@ -3147,10 +3154,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         }
                         else
                         {
-                            AddLog(modlelist[0].F_ID, modlelist[0].F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
+                            AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
                         }
-                        
-                    }
                     return Success("添加成功！");
 
                 }
@@ -3278,6 +3283,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     return Error("参数错误！");
                 if (!(input.F_Type> 0 && input.F_Type < 5))
                     return Error("工单类型错误！");
+                if (string.IsNullOrEmpty(input.F_CusName))
+                    return Error("请输入客户姓名！");
+                if (string.IsNullOrEmpty(input.F_CusPhone))
+                    return Error("请输入客户电话！");
                 if (!string.IsNullOrEmpty(input.F_BatchNumber) && !vaBatchNumber(input.F_BatchNumber))
                 {
                     return Error("请输入正确的生产批次号！");
@@ -3387,22 +3396,28 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     WorkOrderNewInput model = new WorkOrderNewInput();
                     if (!string .IsNullOrEmpty(model1[i].F_CustomerID))
                     {
-                        if (!valcode(model1[i].F_CustomerID, 10))//验证客户编码为10位纯数字
-                        {
-                            model.F_CustomerID = model1[i].F_CustomerID;//客户编码
+                          //  var sql = "and  F_LegalPhone ='" + model1[i ].F_CusPhone.Trim() + "'";
+                          //  var userModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 " + sql);
                             Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(model1[i].F_CustomerID.ToString());//通过客户编号获取客户资料
                             if (cuModel != null)
                             {
-                                Model.T_Sys_Department pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
+                            if (!string .IsNullOrEmpty (cuModel.F_AreaID))
+                            {
+                                Model.T_Sys_Department pdModel = departmentBLL.GetModel(int.Parse(cuModel.F_AreaID));//通过公司id获取部门
                                 if (pdModel != null)
                                 {
                                     model.F_AreaName = pdModel.F_DeptName;
                                 }
-                                Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(cuModel.F_BranchID);
+                            }
+                               if (!string .IsNullOrEmpty (cuModel.F_BranchID))
+                            {
+                                Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(int.Parse(cuModel.F_BranchID));
                                 if (pdModel1 != null)
                                 {
                                     model.F_BranchName = pdModel1.F_DeptName;
                                 }
+                            }
+                               model.F_CustomerID = cuModel.F_CustomerCode;//客户编码
                                 model.F_Salesman = cuModel.F_Salesman;
                                 model.F_SalesPhone = cuModel.F_SalesPhone;
                                 model.F_Legal = cuModel.F_Legal;
@@ -3421,10 +3436,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 model.F_PlantingArea = cuModel.F_PlantingArea;
                                 model.F_FertilizerBrand = cuModel.F_FertilizerBrand;
                             }
-                        }
                     }
                    
-                    if (!valcode(model1[i].F_MaterialID.ToString(), 11))
+                    if (valcode(model1[i].F_MaterialID.ToString(), 11))
                     {
                         model.F_MaterialID = model1[i].F_MaterialID;//验证物料编码为11位纯数字
                         Model.T_Wo_MaterialManage maModel = mmBLL .GetModel(model1[i].F_MaterialID.ToString());//通过物料编码获取物料信息
@@ -3556,7 +3570,33 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     model.F_Files = "0";//附件上传ids
                     model.F_DealType = model1[i].F_DealType;//处理方式:当即办理、电话转接、网络转办（点选）
                     #endregion
-                    model.F_QuestionType = model1[i].F_QuestionType;//问题类别（投诉抽捡和咨询类别不一样）
+                  
+                    
+                    if (!string .IsNullOrEmpty (model1[i].F_QuestionType) )
+                    {
+                        try
+                        {
+                            int b = int.Parse(model1[i].F_QuestionType.Trim());
+                            Model.T_Wo_QuestionManage manage = quesBLL.GetModel(b);
+                            if (manage!=null )
+                            {
+                                model.F_QuestionType = manage.F_QuestionName;
+                                   if (manage.F_Label == "3")
+                                   {
+                                    Model.T_Wo_QuestionManage Manage1 = quesBLL.GetModel(int.Parse(manage.F_ParentId.ToString()));//获取问题类别
+                                    Model.T_Wo_QuestionManage Manage2 = quesBLL.GetModel(int.Parse(Manage1.F_ParentId.ToString()));//获取问题类别
+                                    model.F_QuestionTypeone = Manage2.F_QuestionName;//问题类别1
+                                    model.F_QuestionTypetwo = Manage1.F_QuestionName;//问题类别2
+                                  
+                                }
+                            }
+
+                        }
+                        catch (Exception)
+                        {
+                            model.F_QuestionType = model1[i].F_QuestionType; //问题类别（投诉抽捡和咨询类别不一样）
+                        }
+                    }
                     #region 投诉类
                     model.F_BatchNumber = model1[i].F_BatchNumber;//生产批次号
                     model.F_TS_Formula = model1[i].F_TS_Formula;// 投诉-配方
@@ -3650,7 +3690,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         model.F_AuditState = "";
                     }
-                  
+                  model .F_limit = model1[i].F_limit ;
                     model.F_AuditBy = model1[i].F_AuditBy;//审核人
                     model.F_AuditOn = model1[i].F_AuditOn;//审核时间
                     model.F_AuditCont = model1[i].F_AuditCont;//审核内容
@@ -3705,7 +3745,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         private int DelayTimelimit(int id,int limit)
         {
             int time = 0;
-            var itemlist = itembll.GetModelList("F_WoID="+ id + "and F_OptType="+ (int)EnumItemOpt.Delay);
+            var itemlist = itembll.GetModelList("F_WoID="+ id + "and F_OptType="+ (int)EnumItemOpt.Delay+ "and F_ItemType = " + (int)EnumItemType.Delay);
             foreach (var it in itemlist )
             {
                 time = int.Parse(it.F_LimitTime) - limit;
@@ -3853,6 +3893,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             return true;
         }
+        private bool IsMaterial(WorkOrderNewInput input)
+        {
+            bool n= false;
+            if (!string .IsNullOrEmpty (input.F_MaterialID)&& !string.IsNullOrEmpty(input.F_MaterialName)
+               && !string.IsNullOrEmpty(input.F_Model) && !string.IsNullOrEmpty(input.F_Specs)
+                && !string.IsNullOrEmpty(input.F_Level1) && !string.IsNullOrEmpty(input.F_Level2)
+              && !string.IsNullOrEmpty(input.F_Level3) && !string.IsNullOrEmpty(input.F_Brand)
+              && !string.IsNullOrEmpty(input.F_MaterialEffect) && !string.IsNullOrEmpty(input.F_Craft)
+              && !string.IsNullOrEmpty(input.F_Pipeline))
+            {
+                n = true;
+            }
+            return n;
+        }
         /// <summary>
         /// 根据传入的对象和input的内容返回对象（添加修改使用）
         /// </summary>
@@ -3861,13 +3915,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string usercode = CurrentUser.UserData.F_UserCode;
             var newmodel = model;
             if (input.F_ID!=0)
+            {
                 model.F_ID = input.F_ID;
+                model.F_WorkOrderCode = model.F_WorkOrderCode;//工单编号
+            }
             else
+            {
                 model.F_ID = model.F_ID;//工单ID
-            if (!string.IsNullOrWhiteSpace(input.F_WorkOrderCode))
-                model.F_WorkOrderCode = input.F_WorkOrderCode;//工单编号
-            else
                 model.F_WorkOrderCode = DateTime.Now.ToString("yyyyMMddHHmmssfff");  //工单编号  
+            }
             #region 基本字段
             if (type == 2)
             {
@@ -3899,7 +3955,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     //    #endregion
                     //    int b = cusbll.Add(Customer);
                     //  }
-                    if (string.IsNullOrEmpty(input.F_MaterialID))
+                    if (string.IsNullOrEmpty(input.F_MaterialID)&& IsMaterial(input))
                     {
                         while (true)
                         {
@@ -4090,6 +4146,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     return Error("工单类型错误！");
                 if (input.F_State == 2 && !vaBatchNumber(input.F_BatchNumber))
                     return Error("请输入正确的工单批次号！");
+                if (string.IsNullOrEmpty(input.F_CusName))
+                    return Error("请输入客户姓名！");
+                if (string.IsNullOrEmpty(input.F_CusPhone))
+                    return Error("请输入客户电话！");
                 if (!string.IsNullOrEmpty(input.F_CustomerID) && !valcode(input.F_CustomerID.ToString(), 10))
                     return Error("客户编号为10为纯数字！");
 
@@ -4114,22 +4174,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 long n = workOrder.Add(model);
                 if (n > 0)
                 {
-                    DataTable dt = new DataTable();
-                    dt = new BLL.T_Wo_WorkOrder().GetList(1,"", "F_ID desc").Tables [0];
-                    List<Model.T_Wo_WorkOrder> modlelist = new BLL.T_Wo_WorkOrder().DataTableToList(dt);
+                    Model.T_Wo_WorkOrder modlelist = new BLL.T_Wo_WorkOrder().GetModel(n);
                     WorkOrderNewInput inputs = new WorkOrderNewInput();
                         if (clbm == 0 && clid == 0)
                         {
-                            return Error("请选择接收人");
+                            return Error("请选择接收部门");
                         }
                         else
                         {
                         var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
                         if (deptmodel != null)
                             {
-                                if (modlelist != null&& modlelist.Count >0)
+                                if (modlelist != null)
                                 {
-                                    if (modlelist[0].F_Type == "2")
+                                    if (modlelist.F_Type == "2")
                                     {
                                         if (deptmodel.F_DeptId == 37)
                                         {
@@ -4152,7 +4210,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                                         }
                                     }
-                                    else if (modlelist[0].F_Type == "3")
+                                    else if (modlelist.F_Type == "3")
                                     {
                                         if (deptmodel.F_DeptId == 37)
                                         {
@@ -4187,7 +4245,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                         }
 
-                        if (modlelist[0] != null&& modlelist.Count >0)
+                        if (modlelist != null)
                         {
                         string deptname = "";
                         var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
@@ -4195,8 +4253,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             deptname = deptmodel.F_DeptName + "-";
                         }
-                        AddLog(modlelist[0].F_ID, modlelist[0].F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "添加工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
-                        var res = AssignWO(ua, modlelist[0], inputs, cont, clbm, clid, overtime, sms);
+                        AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "添加工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
+                        var res = AssignWO(ua, modlelist, inputs, cont, clbm, clid, overtime, sms);
                             if (res)
                                 return Success("转派成功");
                             else
@@ -4204,9 +4262,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         }
                         else
                             return Error("工单不存在！");
-
-                  
-
                 }
                 else
                     return Error("添加失败！");
@@ -4229,6 +4284,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     return Error("工单类型错误！");
                 if (input.F_State == 2 && !vaBatchNumber(input.F_BatchNumber))
                     return Error("请输入正确的工单批次号！");
+                if (string.IsNullOrEmpty(input.F_CusName))
+                    return Error("请输入客户姓名！");
+                if (string.IsNullOrEmpty(input.F_CusPhone))
+                    return Error("请输入客户电话！");
                 #endregion
                 if (!string.IsNullOrEmpty(input.F_CustomerID) && !valcode(input.F_CustomerID.ToString(), 10))
                     return Error("客户编号为10为纯数字！");
@@ -4253,39 +4312,37 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 long n = workOrder.Add(model);
                 if (n > 0)
                 {
-                    DataTable dt = new DataTable();
-                    dt = new BLL.T_Wo_WorkOrder().GetList(1, "", "F_ID desc").Tables[0];
-                    List<Model.T_Wo_WorkOrder> modlelist = new BLL.T_Wo_WorkOrder().DataTableToList(dt);
+                    Model.T_Wo_WorkOrder modlelist = new BLL.T_Wo_WorkOrder().GetModel(n);
                     WorkOrderNewInput inputs = new WorkOrderNewInput();
 
-                    modlelist[0].F_SC_ProductBase = input.F_SC_ProductBase;//市场管理科-生产基地（新乡、新疆、九江、东北、贴牌、无法确定）
-                    modlelist[0].F_SC_PreliminaryOpinion = input.F_SC_PreliminaryOpinion;//市场管理科-初审意见:退货、换货、补偿、自行处理
-                    modlelist[0].F_SC_CJ_SpotResult = input.F_SC_CJ_SpotResult;//市场管理科-抽检-抽检结果（视同合格、合格、不合格、复检后合格、未送检）
-                    modlelist[0].F_SC_CJ_SelfResult = input.F_SC_CJ_SelfResult;// 市场管理科-抽检-自检结果
-                    modlelist[0].F_SC_CJ_ApprovalNo = input.F_SC_CJ_ApprovalNo;//市场管理科-抽检-对应审批工作流单号
-                    modlelist[0].F_SC_CJ_ReturnAccount = input.F_SC_CJ_ReturnAccount;//市场管理科-抽检-确认返账金额（元）
-                    modlelist[0].F_ZL_QualityEventLevel = input.F_ZL_QualityEventLevel;//质量管理科-质量事件等级（未遂、一般、较大、重大）
-                    modlelist[0].F_ZL_ClaimAmount = input.F_ZL_ClaimAmount;//质量管理科-索赔金额（单位元，对应责任单位）
-                    modlelist[0].F_ZL_ResponsibleUnit = input.F_ZL_ResponsibleUnit;// 质量管理科-责任单位（需列出，可选多个）
-                    modlelist[0].F_ZL_ApprovalOpinions = input.F_ZL_ApprovalOpinions;// 质量管理科-审批意见（同意、不同意，若选择不同意，增加输入框输入补充内容）
-                    modlelist[0].F_ZL_ApprovalDisagree = input.F_ZL_ApprovalDisagree;//质量管理科-审批不同意意见
-                    modlelist[0].F_ZL_CompensationMethod = input.F_ZL_CompensationMethod;//质量管理科-补偿方式（实物、钱款【单位元】，若选择钱款，增加输入框输入补充内容）
-                    modlelist[0].F_ZL_CompensationMoney = input.F_ZL_CompensationMoney;// 质量管理科-补偿钱款
-                    modlelist[0].F_ZL_CResponsibleUnits = input.F_ZL_CResponsibleUnits;//质量管理科-对应责任单位（生产、研发、农化、物流、质量管理科，销售内勤）
-                    modlelist[0].F_ZL_Fquantity = input.F_ZL_Fquantity;//质量管理科-确认实收数量（吨）
-                    modlelist[0].F_ZL_ImprovementRequirements = input.F_ZL_ImprovementRequirements;// 质量管理科-改进要求
-                    modlelist[0].F_ZL_CApprovalNo = input.F_ZL_CApprovalNo;// 质量管理科-对应审批工作流单号
-                    modlelist[0].F_ZL_CJ_IsRecord = input.F_ZL_CJ_IsRecord;// 质量管理科-抽检-未备案、已备案
-                    modlelist[0].F_DealBy = ua.F_UserCode;// 处理人
-                    modlelist[0].F_DealTime =DateTime .Now ;// 处理时间
-                    modlelist[0].F_DealContent = input.F_DealContent;//完结内容
-                    modlelist[0].F_DealType = input.F_DealType;//处理方式:当即办理、电话转接、网络转办
-                    bool f = workOrder  .Update(modlelist[0]);
+                    modlelist.F_SC_ProductBase = input.F_SC_ProductBase;//市场管理科-生产基地（新乡、新疆、九江、东北、贴牌、无法确定）
+                    modlelist.F_SC_PreliminaryOpinion = input.F_SC_PreliminaryOpinion;//市场管理科-初审意见:退货、换货、补偿、自行处理
+                    modlelist.F_SC_CJ_SpotResult = input.F_SC_CJ_SpotResult;//市场管理科-抽检-抽检结果（视同合格、合格、不合格、复检后合格、未送检）
+                    modlelist.F_SC_CJ_SelfResult = input.F_SC_CJ_SelfResult;// 市场管理科-抽检-自检结果
+                    modlelist.F_SC_CJ_ApprovalNo = input.F_SC_CJ_ApprovalNo;//市场管理科-抽检-对应审批工作流单号
+                    modlelist.F_SC_CJ_ReturnAccount = input.F_SC_CJ_ReturnAccount;//市场管理科-抽检-确认返账金额（元）
+                    modlelist.F_ZL_QualityEventLevel = input.F_ZL_QualityEventLevel;//质量管理科-质量事件等级（未遂、一般、较大、重大）
+                    modlelist.F_ZL_ClaimAmount = input.F_ZL_ClaimAmount;//质量管理科-索赔金额（单位元，对应责任单位）
+                    modlelist.F_ZL_ResponsibleUnit = input.F_ZL_ResponsibleUnit;// 质量管理科-责任单位（需列出，可选多个）
+                    modlelist.F_ZL_ApprovalOpinions = input.F_ZL_ApprovalOpinions;// 质量管理科-审批意见（同意、不同意，若选择不同意，增加输入框输入补充内容）
+                    modlelist.F_ZL_ApprovalDisagree = input.F_ZL_ApprovalDisagree;//质量管理科-审批不同意意见
+                    modlelist.F_ZL_CompensationMethod = input.F_ZL_CompensationMethod;//质量管理科-补偿方式（实物、钱款【单位元】，若选择钱款，增加输入框输入补充内容）
+                    modlelist.F_ZL_CompensationMoney = input.F_ZL_CompensationMoney;// 质量管理科-补偿钱款
+                    modlelist.F_ZL_CResponsibleUnits = input.F_ZL_CResponsibleUnits;//质量管理科-对应责任单位（生产、研发、农化、物流、质量管理科，销售内勤）
+                    modlelist.F_ZL_Fquantity = input.F_ZL_Fquantity;//质量管理科-确认实收数量（吨）
+                    modlelist.F_ZL_ImprovementRequirements = input.F_ZL_ImprovementRequirements;// 质量管理科-改进要求
+                    modlelist.F_ZL_CApprovalNo = input.F_ZL_CApprovalNo;// 质量管理科-对应审批工作流单号
+                    modlelist.F_ZL_CJ_IsRecord = input.F_ZL_CJ_IsRecord;// 质量管理科-抽检-未备案、已备案
+                    modlelist.F_DealBy = ua.F_UserCode;// 处理人
+                    modlelist.F_DealTime =DateTime .Now ;// 处理时间
+                    modlelist.F_DealContent = input.F_DealContent;//完结内容
+                    modlelist.F_DealType = input.F_DealType;//处理方式:当即办理、电话转接、网络转办
+                    bool f = workOrder  .Update(modlelist);
                     if (!f )
                     {
                          return Error("完结失败！");
                     }
-                    if (modlelist[0] != null && modlelist.Count > 0)
+                    if (modlelist != null )
                     {
                         string deptname = "";
                         var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
@@ -4293,16 +4350,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             deptname = deptmodel.F_DeptName + "-";
                         }
-                        AddLog(modlelist[0].F_ID, modlelist[0].F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "添加工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
-                        var res = Overorder(ua, modlelist[0], 1);
+                        AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "添加工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.end, "", 0, ua, 0, 0);
+                        var res = Overorder(ua, modlelist, 1);
                         if (res)
                             return Success("完结成功");
-                        else
-                            return Error("完结失败！");
                     }
                 }
-                else
-                    return Error("完结失败！");
             }
             else
             {
@@ -4334,7 +4387,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     if (clbm == 0 && clid == 0)
                     {
-                        return Error("请选择接收人");
+                        return Error("请选择接收部门");
                     }
                     else
                     {
@@ -4888,7 +4941,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
             if (itemlast != null)
                 touser = itemlast.F_CreateUser;
-            var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, limit + model .F_limit , sms);
+            
+               
+            var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.Delay, optbut, touser, 0, nowUser, limit + model .F_limit , sms,"",1);
 
             #endregion
 

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Enum/EnumWorkOrderState.cs

@@ -61,6 +61,8 @@ namespace CallCenterApi.Interface.Models.Enum
         visit = 6,
         [Description("审批")]
         audit = 7,
+        [Description("延期")]
+         Delay = 8,
     }
     /// <summary>
     /// 工单记录操作

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/CustomerBaseNewInput.cs

@@ -48,10 +48,6 @@ namespace CallCenterApi.Interface.Models.Input
         /// </summary>
         public string F_SalesPhone { set; get; }
         /// <summary>
-        /// 客户性质
-        /// </summary>
-        public string F_CustomerNature { set; get; }
-        /// <summary>
         /// 渠道类型:总经销、二级商、种田大户、农户、化工客户、公司员工
         /// </summary>
         public string F_Channel { set; get; }
@@ -96,38 +92,6 @@ namespace CallCenterApi.Interface.Models.Input
         /// </summary>
         public string F_Product { set; get; }
         /// <summary>
-        /// 冻结标志
-        /// </summary>
-        public string F_FrozenFlag { set; get; }
-        /// <summary>
-        /// 是否开户:已开户、未开户
-        /// </summary>
-        public string F_IsOpenAccount { set; get; }
-        /// <summary>
-        /// 上级客户编码
-        /// </summary>
-        public string F_LevelCode { set; get; }
-        /// <summary>
-        /// 上级客户名称
-        /// </summary>
-        public string F_LevelName { set; get; }
-        /// <summary>
-        /// 助记码
-        /// </summary>
-        public string F_MnemonicCode { set; get; }
-        /// <summary>
-        /// 开票银行名称
-        /// </summary>
-        public string F_InvoiceBank { set; get; }
-        /// <summary>
-        /// 开票银行账号
-        /// </summary>
-        public string F_InvoiceBankAccount { set; get; }
-        /// <summary>
-        /// 纳税人登记号
-        /// </summary>
-        public string F_TaxRegCode { set; get; }
-        /// <summary>
         /// 是否经营心连心:是、否
         /// </summary>
         public string F_IsRunXLX { set; get; }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/WorkOrderNewInput.cs

@@ -284,12 +284,27 @@ namespace CallCenterApi.Interface.Models.Input
         /// </summary>
         public string F_Craft { get; set; }
         /// <summary>
+        /// 问题类别1
+        /// </summary>
+        public string F_QuestionTypeone
+        {
+            get; set;
+        }
+        /// <summary>
+        /// 问题类别2
+        /// </summary>
+        public string F_QuestionTypetwo
+        {
+            get; set;
+        }
+        /// <summary>
         /// 问题类别
         /// </summary>
         public string F_QuestionType
         {
             get; set;
         }
+  
         /// <summary>
         /// 生产批次号
         /// </summary>
@@ -563,6 +578,10 @@ namespace CallCenterApi.Interface.Models.Input
         {
             get; set;
         }
+        public float  F_limit
+        {
+            get; set;
+        }
         /// <summary>
         /// 审核人
         /// </summary>

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_MaterialManage.cs

@@ -53,7 +53,7 @@ namespace CallCenterApi.Model
             get { return _f_materialcode; }
         }
         /// <summary>
-        /// 物料编码
+        /// 物料名称
         /// </summary>
         public string F_MaterialName
         {