多物料增删改查

codegit/CallCenterApi/CallCenterApi.BLL/CallCenterApi.BLL.csproj

@@ -115,6 +115,7 @@
     <Compile Include="T_Sys_WorkOFFDays.cs" />
     <Compile Include="T_Sys_WorkTimes.cs" />
     <Compile Include="T_Wo_BusinessManage.cs" />
+    <Compile Include="T_Wo_MaterialItems.cs" />
     <Compile Include="T_Wo_MaterialManage.cs" />
     <Compile Include="T_Wo_QuestionManage.cs" />
     <Compile Include="T_Wo_WorkCopy.cs" />

codegit/CallCenterApi/CallCenterApi.BLL/T_Wo_MaterialItems.cs

@@ -0,0 +1,140 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CallCenterApi.BLL
+{
+    /// <summary>
+    /// T_Wo_MaterialItems
+    /// </summary>
+    public partial class T_Wo_MaterialItems
+    {
+        private readonly CallCenterApi.DAL.T_Wo_MaterialItems dal = new CallCenterApi.DAL.T_Wo_MaterialItems();
+        public T_Wo_MaterialItems()
+        { }
+        #region  BasicMethod
+        /// <summary>
+        /// 是否存在该记录
+        /// </summary>
+        public bool Exists(int F_Id)
+        {
+            return dal.Exists(F_Id);
+        }
+
+        /// <summary>
+        /// 增加一条数据
+        /// </summary>
+        public int Add(CallCenterApi.Model.T_Wo_MaterialItems model)
+        {
+            return dal.Add(model);
+        }
+
+        /// <summary>
+        /// 更新一条数据
+        /// </summary>
+        public bool Update(CallCenterApi.Model.T_Wo_MaterialItems model)
+        {
+            return dal.Update(model);
+        }
+
+        /// <summary>
+        /// 删除一条数据
+        /// </summary>
+        public bool Delete(int F_Id)
+        {
+
+            return dal.Delete(F_Id);
+        }
+        /// <summary>
+        /// 删除一条数据
+        /// </summary>
+        public bool DeleteList(string F_Idlist)
+        {
+            return dal.DeleteList(F_Idlist);
+        }
+
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public CallCenterApi.Model.T_Wo_MaterialItems GetModel(int F_Id)
+        {
+
+            return dal.GetModel(F_Id);
+        }
+
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public DataSet GetList(string strWhere)
+        {
+            return dal.GetList(strWhere);
+        }
+        /// <summary>
+        /// 获得前几行数据
+        /// </summary>
+        public DataSet GetList(int Top, string strWhere, string filedOrder)
+        {
+            return dal.GetList(Top, strWhere, filedOrder);
+        }
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public List<CallCenterApi.Model.T_Wo_MaterialItems> GetModelList(string strWhere)
+        {
+            DataSet ds = dal.GetList(strWhere);
+            return DataTableToList(ds.Tables[0]);
+        }
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public List<CallCenterApi.Model.T_Wo_MaterialItems> DataTableToList(DataTable dt)
+        {
+            List<CallCenterApi.Model.T_Wo_MaterialItems> modelList = new List<CallCenterApi.Model.T_Wo_MaterialItems>();
+            int rowsCount = dt.Rows.Count;
+            if (rowsCount > 0)
+            {
+                CallCenterApi.Model.T_Wo_MaterialItems model;
+                for (int n = 0; n < rowsCount; n++)
+                {
+                    model = dal.DataRowToModel(dt.Rows[n]);
+                    if (model != null)
+                    {
+                        modelList.Add(model);
+                    }
+                }
+            }
+            return modelList;
+        }
+
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public DataSet GetAllList()
+        {
+            return GetList("");
+        }
+
+        /// <summary>
+        /// 分页获取数据列表
+        /// </summary>
+        public int GetRecordCount(string strWhere)
+        {
+            return dal.GetRecordCount(strWhere);
+        }
+        /// <summary>
+        /// 分页获取数据列表
+        /// </summary>
+        public DataSet GetListByPage(string strWhere, string orderby, int startIndex, int endIndex)
+        {
+            return dal.GetListByPage(strWhere, orderby, startIndex, endIndex);
+        }
+
+        #endregion  BasicMethod
+        #region  ExtensionMethod
+
+        #endregion  ExtensionMethod
+    }
+}

codegit/CallCenterApi/CallCenterApi.DAL/CallCenterApi.DAL.csproj

@@ -115,6 +115,7 @@
     <Compile Include="T_Sys_WorkOFFDays.cs" />
     <Compile Include="T_Sys_WorkTimes.cs" />
     <Compile Include="T_Wo_BusinessManage.cs" />
+    <Compile Include="T_Wo_MaterialItems.cs" />
     <Compile Include="T_Wo_MaterialManage.cs" />
     <Compile Include="T_Wo_QuestionManage.cs" />
     <Compile Include="T_Wo_WorkCopy.cs" />

codegit/CallCenterApi/CallCenterApi.DAL/T_Wo_MaterialItems.cs

@@ -0,0 +1,357 @@
+using CallCenterApi.DB;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CallCenterApi.DAL
+{
+    /// <summary>
+	/// 数据访问类:T_Wo_MaterialItems
+	/// </summary>
+	public partial class T_Wo_MaterialItems
+    {
+        public T_Wo_MaterialItems()
+        { }
+        #region  BasicMethod
+        /// <summary>
+        /// 是否存在该记录
+        /// </summary>
+        public bool Exists(int F_Id)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select count(1) from T_Wo_MaterialItems");
+            strSql.Append(" where F_Id=@F_Id");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_Id", SqlDbType.Int,4)
+            };
+            parameters[0].Value = F_Id;
+
+            return DbHelperSQL.Exists(strSql.ToString(), parameters);
+        }
+
+
+        /// <summary>
+        /// 增加一条数据
+        /// </summary>
+        public int Add(CallCenterApi.Model.T_Wo_MaterialItems model)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("insert into T_Wo_MaterialItems(");
+            strSql.Append("F_MaterialCode,F_MaterialName,F_Formula,F_LoadingFee,F_UnLoadingFee,F_MaterialFee,F_ReturnQuantity,F_WoID,F_Remark,F_CreateBy,F_CreateOn)");
+            strSql.Append(" values (");
+            strSql.Append("@F_MaterialCode,@F_MaterialName,@F_Formula,@F_LoadingFee,@F_UnLoadingFee,@F_MaterialFee,@F_ReturnQuantity,@F_WoID,@F_Remark,@F_CreateBy,@F_CreateOn)");
+            strSql.Append(";select @@IDENTITY");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_MaterialCode", SqlDbType.NVarChar,11),
+                    new SqlParameter("@F_MaterialName", SqlDbType.NVarChar,2000),
+                    new SqlParameter("@F_Formula", SqlDbType.NVarChar,200),
+                    new SqlParameter("@F_LoadingFee", SqlDbType.Decimal,9),
+                    new SqlParameter("@F_UnLoadingFee", SqlDbType.Decimal,9),
+                    new SqlParameter("@F_MaterialFee", SqlDbType.Decimal,9),
+                    new SqlParameter("@F_ReturnQuantity", SqlDbType.Int,4),
+                    new SqlParameter("@F_WoID", SqlDbType.BigInt,8),
+                    new SqlParameter("@F_Remark", SqlDbType.NText),
+                    new SqlParameter("@F_CreateBy", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_CreateOn", SqlDbType.DateTime)};
+            parameters[0].Value = model.F_MaterialCode;
+            parameters[1].Value = model.F_MaterialName;
+            parameters[2].Value = model.F_Formula;
+            parameters[3].Value = model.F_LoadingFee;
+            parameters[4].Value = model.F_UnLoadingFee;
+            parameters[5].Value = model.F_MaterialFee;
+            parameters[6].Value = model.F_ReturnQuantity;
+            parameters[7].Value = model.F_WoID;
+            parameters[8].Value = model.F_Remark;
+            parameters[9].Value = model.F_CreateBy;
+            parameters[10].Value = model.F_CreateOn;
+
+            object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
+            if (obj == null)
+            {
+                return 0;
+            }
+            else
+            {
+                return Convert.ToInt32(obj);
+            }
+        }
+        /// <summary>
+        /// 更新一条数据
+        /// </summary>
+        public bool Update(CallCenterApi.Model.T_Wo_MaterialItems model)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("update T_Wo_MaterialItems set ");
+            strSql.Append("F_MaterialCode=@F_MaterialCode,");
+            strSql.Append("F_MaterialName=@F_MaterialName,");
+            strSql.Append("F_Formula=@F_Formula,");
+            strSql.Append("F_LoadingFee=@F_LoadingFee,");
+            strSql.Append("F_UnLoadingFee=@F_UnLoadingFee,");
+            strSql.Append("F_MaterialFee=@F_MaterialFee,");
+            strSql.Append("F_ReturnQuantity=@F_ReturnQuantity,");
+            strSql.Append("F_WoID=@F_WoID,");
+            strSql.Append("F_Remark=@F_Remark,");
+            strSql.Append("F_CreateBy=@F_CreateBy,");
+            strSql.Append("F_CreateOn=@F_CreateOn");
+            strSql.Append(" where F_Id=@F_Id");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_MaterialCode", SqlDbType.NVarChar,11),
+                    new SqlParameter("@F_MaterialName", SqlDbType.NVarChar,2000),
+                    new SqlParameter("@F_Formula", SqlDbType.NVarChar,200),
+                    new SqlParameter("@F_LoadingFee", SqlDbType.Decimal,9),
+                    new SqlParameter("@F_UnLoadingFee", SqlDbType.Decimal,9),
+                    new SqlParameter("@F_MaterialFee", SqlDbType.Decimal,9),
+                    new SqlParameter("@F_ReturnQuantity", SqlDbType.Int,4),
+                    new SqlParameter("@F_WoID", SqlDbType.BigInt,8),
+                    new SqlParameter("@F_Remark", SqlDbType.NText),
+                    new SqlParameter("@F_CreateBy", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_CreateOn", SqlDbType.DateTime),
+                    new SqlParameter("@F_Id", SqlDbType.Int,4)};
+            parameters[0].Value = model.F_MaterialCode;
+            parameters[1].Value = model.F_MaterialName;
+            parameters[2].Value = model.F_Formula;
+            parameters[3].Value = model.F_LoadingFee;
+            parameters[4].Value = model.F_UnLoadingFee;
+            parameters[5].Value = model.F_MaterialFee;
+            parameters[6].Value = model.F_ReturnQuantity;
+            parameters[7].Value = model.F_WoID;
+            parameters[8].Value = model.F_Remark;
+            parameters[9].Value = model.F_CreateBy;
+            parameters[10].Value = model.F_CreateOn;
+            parameters[11].Value = model.F_Id;
+
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
+            if (rows > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 删除一条数据
+        /// </summary>
+        public bool Delete(int F_Id)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("delete from T_Wo_MaterialItems ");
+            strSql.Append(" where F_Id=@F_Id");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_Id", SqlDbType.Int,4)
+            };
+            parameters[0].Value = F_Id;
+
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
+            if (rows > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        /// <summary>
+        /// 批量删除数据
+        /// </summary>
+        public bool DeleteList(string F_Idlist)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("delete from T_Wo_MaterialItems ");
+            strSql.Append(" where F_Id in (" + F_Idlist + ")  ");
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString());
+            if (rows > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public CallCenterApi.Model.T_Wo_MaterialItems GetModel(int F_Id)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select  top 1 F_Id,F_MaterialCode,F_MaterialName,F_Formula,F_LoadingFee,F_UnLoadingFee,F_MaterialFee,F_ReturnQuantity,F_WoID,F_Remark,F_CreateBy,F_CreateOn from T_Wo_MaterialItems ");
+            strSql.Append(" where F_Id=@F_Id");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_Id", SqlDbType.Int,4)
+            };
+            parameters[0].Value = F_Id;
+
+            CallCenterApi.Model.T_Wo_MaterialItems model = new CallCenterApi.Model.T_Wo_MaterialItems();
+            DataSet ds = DbHelperSQL.Query(strSql.ToString(), parameters);
+            if (ds.Tables[0].Rows.Count > 0)
+            {
+                return DataRowToModel(ds.Tables[0].Rows[0]);
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public CallCenterApi.Model.T_Wo_MaterialItems DataRowToModel(DataRow row)
+        {
+            CallCenterApi.Model.T_Wo_MaterialItems model = new CallCenterApi.Model.T_Wo_MaterialItems();
+            if (row != null)
+            {
+                if (row["F_Id"] != null && row["F_Id"].ToString() != "")
+                {
+                    model.F_Id = int.Parse(row["F_Id"].ToString());
+                }
+                if (row["F_MaterialCode"] != null)
+                {
+                    model.F_MaterialCode = row["F_MaterialCode"].ToString();
+                }
+                if (row["F_MaterialName"] != null)
+                {
+                    model.F_MaterialName = row["F_MaterialName"].ToString();
+                }
+                if (row["F_Formula"] != null)
+                {
+                    model.F_Formula = row["F_Formula"].ToString();
+                }
+                if (row["F_LoadingFee"] != null && row["F_LoadingFee"].ToString() != "")
+                {
+                    model.F_LoadingFee = decimal.Parse(row["F_LoadingFee"].ToString());
+                }
+                if (row["F_UnLoadingFee"] != null && row["F_UnLoadingFee"].ToString() != "")
+                {
+                    model.F_UnLoadingFee = decimal.Parse(row["F_UnLoadingFee"].ToString());
+                }
+                if (row["F_MaterialFee"] != null && row["F_MaterialFee"].ToString() != "")
+                {
+                    model.F_MaterialFee = decimal.Parse(row["F_MaterialFee"].ToString());
+                }
+                if (row["F_ReturnQuantity"] != null && row["F_ReturnQuantity"].ToString() != "")
+                {
+                    model.F_ReturnQuantity = int.Parse(row["F_ReturnQuantity"].ToString());
+                }
+                if (row["F_WoID"] != null && row["F_WoID"].ToString() != "")
+                {
+                    model.F_WoID = long.Parse(row["F_WoID"].ToString());
+                }
+                if (row["F_Remark"] != null)
+                {
+                    model.F_Remark = row["F_Remark"].ToString();
+                }
+                if (row["F_CreateBy"] != null)
+                {
+                    model.F_CreateBy = row["F_CreateBy"].ToString();
+                }
+                if (row["F_CreateOn"] != null && row["F_CreateOn"].ToString() != "")
+                {
+                    model.F_CreateOn = DateTime.Parse(row["F_CreateOn"].ToString());
+                }
+            }
+            return model;
+        }
+
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public DataSet GetList(string strWhere)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select F_Id,F_MaterialCode,F_MaterialName,F_Formula,F_LoadingFee,F_UnLoadingFee,F_MaterialFee,F_ReturnQuantity,F_WoID,F_Remark,F_CreateBy,F_CreateOn ");
+            strSql.Append(" FROM T_Wo_MaterialItems ");
+            if (strWhere.Trim() != "")
+            {
+                strSql.Append(" where " + strWhere);
+            }
+            return DbHelperSQL.Query(strSql.ToString());
+        }
+
+        /// <summary>
+        /// 获得前几行数据
+        /// </summary>
+        public DataSet GetList(int Top, string strWhere, string filedOrder)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select ");
+            if (Top > 0)
+            {
+                strSql.Append(" top " + Top.ToString());
+            }
+            strSql.Append(" F_Id,F_MaterialCode,F_MaterialName,F_Formula,F_LoadingFee,F_UnLoadingFee,F_MaterialFee,F_ReturnQuantity,F_WoID,F_Remark,F_CreateBy,F_CreateOn ");
+            strSql.Append(" FROM T_Wo_MaterialItems ");
+            if (strWhere.Trim() != "")
+            {
+                strSql.Append(" where " + strWhere);
+            }
+            strSql.Append(" order by " + filedOrder);
+            return DbHelperSQL.Query(strSql.ToString());
+        }
+
+        /// <summary>
+        /// 获取记录总数
+        /// </summary>
+        public int GetRecordCount(string strWhere)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select count(1) FROM T_Wo_MaterialItems ");
+            if (strWhere.Trim() != "")
+            {
+                strSql.Append(" where " + strWhere);
+            }
+            object obj = DbHelperSQL.GetSingle(strSql.ToString());
+            if (obj == null)
+            {
+                return 0;
+            }
+            else
+            {
+                return Convert.ToInt32(obj);
+            }
+        }
+        /// <summary>
+        /// 分页获取数据列表
+        /// </summary>
+        public DataSet GetListByPage(string strWhere, string orderby, int startIndex, int endIndex)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("SELECT * FROM ( ");
+            strSql.Append(" SELECT ROW_NUMBER() OVER (");
+            if (!string.IsNullOrEmpty(orderby.Trim()))
+            {
+                strSql.Append("order by T." + orderby);
+            }
+            else
+            {
+                strSql.Append("order by T.F_Id desc");
+            }
+            strSql.Append(")AS Row, T.*  from T_Wo_MaterialItems T ");
+            if (!string.IsNullOrEmpty(strWhere.Trim()))
+            {
+                strSql.Append(" WHERE " + strWhere);
+            }
+            strSql.Append(" ) TT");
+            strSql.AppendFormat(" WHERE TT.Row between {0} and {1}", startIndex, endIndex);
+            return DbHelperSQL.Query(strSql.ToString());
+        }
+
+        #endregion  BasicMethod
+        #region  ExtensionMethod
+
+        #endregion  ExtensionMethod
+    }
+}

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/App_Start/AuthorizeAttribute.cs

@@ -7,19 +7,21 @@ using System.Linq;
 using System.Web;
 using System.Web.Mvc;
 using System.Web.Routing;
+using System.Web.Script.Serialization;
+using System.Web.Security;
 
 namespace CallCenterApi.Interface
 {
     public class AuthorityAttribute : AuthorizeAttribute
     {
-        private BLL.T_Sys_RoleFunction roleFunctionBLL = new BLL.T_Sys_RoleFunction();
+        //private BLL.T_Sys_RoleFunction roleFunctionBLL = new BLL.T_Sys_RoleFunction();
         /// <summary>
         /// 权限验证
         /// </summary>
         /// <param name="filterContext"></param>
         public override void OnAuthorization(AuthorizationContext filterContext)
         {
-            bool isAuth = false;
+            //bool isAuth = false;
 
             if (filterContext.RequestContext.HttpContext.Request.IsAuthenticated)
             {
@@ -28,25 +30,25 @@ namespace CallCenterApi.Interface
                 var controller = controllerDescriptor.ControllerName;
                 var action = actionDescriptor.ActionName;
                 var token = filterContext.HttpContext.Request["token"];
-                if (token != null)
+                if (!string.IsNullOrEmpty(token))
                 {
-                    var userData = CacheHelper.Get<Cache.Models.CurrentUserInfo>(token);
-                    var roleId = userData.F_RoleId;
-                    var role = new BLL.T_Sys_RoleInfo().GetModel(roleId);
-                    if (role != null)
-                    {
-                        var roleFunctionList = roleFunctionBLL.DataTableToList(roleFunctionBLL.GetList(" F_RoleId=" + role.F_RoleId).Tables[0]);
-                        //var str = string.Join(",", roleFunctionList.Select(x => x.F_FunctionId).ToArray());
-                        var moduleFunction = new BLL.T_Sys_ModuleFunctions().GetModel(controller, action);
-                        if (moduleFunction != null)
-                        {
-                            var single = roleFunctionList.SingleOrDefault(x => x.F_FunctionId == moduleFunction.F_FunctionId);
-                            if (single != null)
-                            {
-                                isAuth = true;
-                            }
-                        }
-                    }
+                    //var userData = CacheHelper.Get<Cache.Models.CurrentUserInfo>(token);
+                    //var roleId = userData.F_RoleId;
+                    //var role = new BLL.T_Sys_RoleInfo().GetModel(roleId);
+                    //if (role != null)
+                    //{
+                    //    var roleFunctionList = roleFunctionBLL.DataTableToList(roleFunctionBLL.GetList(" F_RoleId=" + role.F_RoleId).Tables[0]);
+                    //    //var str = string.Join(",", roleFunctionList.Select(x => x.F_FunctionId).ToArray());
+                    //    var moduleFunction = new BLL.T_Sys_ModuleFunctions().GetModel(controller, action);
+                    //    if (moduleFunction != null)
+                    //    {
+                    //        var single = roleFunctionList.SingleOrDefault(x => x.F_FunctionId == moduleFunction.F_FunctionId);
+                    //        if (single != null)
+                    //        {
+                    //            isAuth = true;
+                    //        }
+                    //    }
+                    //}
                 }
                 else
                 {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj

@@ -236,6 +236,7 @@
     <Compile Include="Controllers\weixin\WxCustomController.cs" />
     <Compile Include="Controllers\weixin\WxLoginController.cs" />
     <Compile Include="Controllers\weixin\WxReceiveController.cs" />
+    <Compile Include="Controllers\workorder\MaterialItemsController.cs" />
     <Compile Include="Controllers\workorder\MaterialManageController.cs" />
     <Compile Include="Controllers\workorder\MaterialManageXLXController.cs" />
     <Compile Include="Controllers\workorder\WorkOrderController.cs" />
@@ -330,6 +331,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
+    <Folder Include="Views\MaterialItems\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\CallCenterCommon\CallCenter.Utility\CallCenter.Utility.csproj">

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Login/LoginController.cs

@@ -77,7 +77,7 @@ namespace CallCenterApi.Interface.Controllers
                     var token = FormsPrincipal<Cache.Models.CurrentUserInfo>.GetCookieValue(currentUserInfo.F_UserCode, currentUserInfo);
 
                     //放入缓存
-                    CacheHelper.Insert(token, currentUserInfo, 1440);
+                    //CacheHelper.Insert(token, currentUserInfo, 1440);
                     return Success("登录成功", new
                     {
                         token = token
@@ -124,7 +124,7 @@ namespace CallCenterApi.Interface.Controllers
                     F_Remark = "",
                     F_State = 0
                 });
-                CacheHelper.Remove(token);
+                //CacheHelper.Remove(token);
             }
             return Success("退出成功");
         }

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

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+
+namespace CallCenterApi.Interface.Controllers.workorder
+{
+    public class MaterialItemsController : Controller
+    {
+        // GET: MaterialItems
+        public ActionResult Index()
+        {
+            return View();
+        }
+    }
+}

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

@@ -2369,13 +2369,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <param name="id"></param>
         /// <param name="type"></param>
         /// <returns></returns>
-        public ActionResult GetItemList(int id, int type = 1, int pageindex = 1, int pagesize = 10)
+        public ActionResult GetItemList(int id, int type = 1, int pageindex = 1, int pagesize = 10,int flag=1)
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
             {
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
+                Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                 string msg = "";
+                string strsql = "";
                 if (id <= 0)
                     return Error("请输入正确的id");
                 if (type == 1)
@@ -2385,9 +2387,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 else
                 {
                     msg = "" + type;
-                }
-                int flag = ua.F_Flag;
-                string sql = "and  F_ItemType in(" + msg + ") and  F_WoID=" + id + " and F_Type in(3," + flag + ") ";
+                }              
+                strsql = " and F_Type in(3, " + flag + ")";
+                string sql = "and  F_ItemType in(" + msg + ") and  F_WoID=" + id + strsql+" ";
                 DataTable dt = new DataTable();
                 int recordCount;
                 dt = BLL.PagerBLL.GetListPager(
@@ -6576,7 +6578,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             #region 
             string strsql = "";
             Model.T_Sys_RoleInfo ro = rolebll.GetModel(nowUser.F_RoleId);
-            if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY" && flag!=4)
+            if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY" && flag!=3)
             {
                 strsql = $" F_OptType !=1 and isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " and  F_CreateUser=" + nowUser.F_UserCode + " ";
             }
@@ -6879,6 +6881,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (userId != 0)
             {
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
+                Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                 if (ua != null)
                 {
                     Model.T_Wo_WorkOrder model = workOrder.GetModel(orderid);
@@ -6887,11 +6890,21 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         if (flag == 1)
                         {
-                            if (ua.F_RoleId == 17)
+                            if (ro.F_RoleCode == "XTGLY")
                             {
                                 model.F_Annotation = cont + "-" + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                             }
-                            else return Error("无操作权限");
+                            else
+                            {
+                                if (string.IsNullOrEmpty(model.F_Annotation))
+                                {
+                                    model.F_Annotation = cont + "-" + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); 
+                                }
+                                else
+                                {
+                                    model.F_Annotation = model.F_Annotation + "\n" + cont + "-" + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); ; ;
+                                }
+                            }
 
                         }
                         else
@@ -6920,9 +6933,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 if (userlist.Count > 0)
                                 {
                                     if (flag == 1)
-                                        contens = " 修改注解";
+                                        contens = " 修改注解,工单编号 "+model.F_WorkOrderCode;
                                     else
-                                        contens = " 附加注解";
+                                        contens = " 附加注解,工单编号 "+ model.F_WorkOrderCode;
                                     foreach (var item in userlist)
                                     {
                                         touser = item.F_UserCode; ;
@@ -7245,7 +7258,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                 if (model.F_State != 0)
                 {
-                    var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + " and F_IsUsed=0 order by   F_ID desc ").FirstOrDefault();
+                    string strsql = " and F_Type in(3,"+ua.F_Flag+")";
+                    var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + strsql+" and F_IsUsed=0 order by   F_ID desc ").FirstOrDefault();
                     if (modellist != null)
                     {
                         if (modellist.F_NextUser != ua.F_UserCode)
@@ -7425,19 +7439,21 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
 
                         }
-                        if (model.F_State == 2)
+                        if (ua.F_Flag == 1)
                         {
-                            return Error("工单已接单无需重新接单");
+                            if (model.F_State == 2)
+                                return Error("工单已接单无需重新接单");
                         }
-                        else
+                        else if (ua.F_Flag == 2)
                         {
-                            var res = SureWO(ua, model, ua.F_Flag);
-                            if (res)
-                                return Success("接单成功");
-                            else
-                                return Error("接单失败");
+                            if (model.F_State2 == 2)
+                                return Error("工单已接单无需重新接单");
                         }
-
+                        var res = SureWO(ua, model, ua.F_Flag);
+                        if (res)
+                            return Success("接单成功");
+                        else
+                            return Error("接单失败");
                     }
                     else
                         return Error("工单不存在");
@@ -7741,6 +7757,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         public ActionResult RevokeWo(long orderid, string cont)
         {
             int userId = CurrentUser.UserData.F_UserId; ;
+            int flag = 0;
             if (userId != 0)
             {
                 //增加撤回功能
@@ -7748,6 +7765,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (ua != null)
                 {
                     Model.T_Wo_WorkOrder model = workOrder.GetModel(orderid);
+                    Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                     //验证信息 
                     if (model != null)
                     {
@@ -7763,10 +7781,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             if (modellist.F_WoState == (int)EnumWorkOrderState.assign)
                             {
-                                var res = RevWO(ua, model, cont);
+                                if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
+                                {
+                                    flag = 3;
+                                }
+                                else
+                                {
+                                    flag = ua.F_Flag;
+                                }
+                                var res = RevWO(ua, model, cont, flag);
                                 if (res)
-                                    return Success("撤回成功");
-                                else return Error("撤回失败！");
+                                return Success("撤回成功");
                             }
                             else
                                 return Error("撤回失败！");
@@ -8207,48 +8232,61 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, nowUser.F_UserCode, nowUser.F_DeptId, nowUser, model.F_limit, sms,"",0,flag);
             if (itemid > 0)
             {
-                string smscont = "";
-                if (model.F_Type == "1")
-                {
-                    smscont = "咨询";
-                }
-                else if (model.F_Type == "2")
+                #region 发短信
+                //string smscont = "";
+                //if (model.F_Type == "1")
+                //{
+                //    smscont = "咨询";
+                //}
+                //else if (model.F_Type == "2")
+                //{
+                //    smscont = "投诉";
+                //}
+                //else if (model.F_Type == "3")
+                //{
+                //    smscont = "抽检";
+                //}
+                //else
+                //{
+                //    smscont = "建议";
+                //}
+                //string[] mag = { smscont };
+                //string smsmsg = "您好，您有一条待处理的工单已被撤回,请留意！";
+                //var tousermodel = new BLL.T_Sys_UserAccount().GetModel(touser);
+                //if (tousermodel != null)
+                //{
+                //    if (!string.IsNullOrEmpty(tousermodel.F_Mobile))
+                //    {
+                //        SmsSingleSenderResult result = new SMSController().SMSSingleshot(445305, mag, tousermodel.F_Mobile.Trim());
+                //        bool n = new SMSController().AddSmS(tousermodel.F_Mobile.Trim(), smsmsg, nowUser.F_UserId);
+                //    }
+                //}
+                #endregion
+                #region 处理工单
+                if (flag == 1)
                 {
-                    smscont = "投诉";
+                    model.F_State = wostate;
                 }
-                else if (model.F_Type == "3")
+                else if (flag == 2)
                 {
-                    smscont = "抽检";
+                    model.F_State2 = wostate;
                 }
                 else
                 {
-                    smscont = "建议";
-                }
-                string[] mag = { smscont };
-                string smsmsg = "您好，您有一条待处理的工单已被撤回,请留意！";
-                var tousermodel = new BLL.T_Sys_UserAccount().GetModel(touser);
-                if (tousermodel != null)
-                {
-                    if (!string.IsNullOrEmpty(tousermodel.F_Mobile))
-                    {
-                        SmsSingleSenderResult result = new SMSController().SMSSingleshot(445305, mag, tousermodel.F_Mobile.Trim());
-                        //SmsSingleSenderResult result = new SMSController().SMSSingleshot(445305, mag, "15225066843");
-                        bool n = new SMSController().AddSmS(tousermodel.F_Mobile.Trim(), smsmsg, nowUser.F_UserId);
-                    }
+                    model.F_State = wostate;
+                    model.F_State2 = wostate;
                 }
-                #region 处理工单
-                model.F_State = wostate;
                 workOrder.Update(model);
                 #endregion
                 #region 推送消息
                 #region 向上一级操作人员推送消息
-                if (!string.IsNullOrWhiteSpace(touser) && touser != nowUser.F_UserCode)
-                {//排除上一级指派人是自己
-                    sendsysmsg(model, nowUser, touser, (int)itemid, opt);
-                    var lastUser = sysUserAccountBll.GetModel(touser);
-                    //if (lastUser != null && !string.IsNullOrEmpty(lastUser.F_WxOpenId))
-                    //   sendwxmsg(model, lastUser.F_WxOpenId, nowUser, opt);
-                }
+                //if (!string.IsNullOrWhiteSpace(touser) && touser != nowUser.F_UserCode)
+                //{//排除上一级指派人是自己
+                //    sendsysmsg(model, nowUser, touser, (int)itemid, opt);
+                //    var lastUser = sysUserAccountBll.GetModel(touser);
+                //    //if (lastUser != null && !string.IsNullOrEmpty(lastUser.F_WxOpenId))
+                //    //   sendwxmsg(model, lastUser.F_WxOpenId, nowUser, opt);
+                //}
                 #endregion
                 #endregion
                 return true;
@@ -8374,21 +8412,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "完结工单";
 
             var touser = "";
-            string strsql = "";
-            if (flag == 1)
-            {
-                strsql = " and F_Type in(3,1)";
-
-            }
-            else if (flag == 2)
-            {
-                strsql = " and F_Type in(3,2)";
-            }
-            else if (flag == 3)
-            {
-                strsql = "";
-            }
-            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "'" + strsql + " order by F_ID desc").FirstOrDefault();
+           
+            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_ID 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, model.F_limit, sms, "", 0, flag);
@@ -8396,19 +8421,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 #region 处理工单
                 model.F_VisitOn = DateTime.Now;
-                if (flag == 3)
-                {
-                    model.F_State = wostate;
-                    model.F_State2 = wostate;
-                }
-                else if (flag == 2)
-                {
-                    model.F_State2 = wostate;
-                }
-                else if (flag == 1)
-                {
-                    model.F_State = wostate;
-                }
+                model.F_State = wostate;
+                model.F_State2 = wostate;
                 workOrder.Update(model);
                 #endregion
                 #region 推送消息

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Global.asax.cs

@@ -29,8 +29,8 @@ namespace CallCenterApi.Interface
           
 
         }
-     
-      
+
+
         protected void Application_AuthenticateRequest(object sender, EventArgs e)
         {
             HttpApplication app = (HttpApplication)sender;
@@ -55,7 +55,7 @@ namespace CallCenterApi.Interface
                 if (ticket != null && string.IsNullOrEmpty(ticket.UserData) == false)
                     userData = (new JavaScriptSerializer()).Deserialize<Cache.Models.CurrentUserInfo>(ticket.UserData); //还原用户数据
                 if (ticket != null && userData != null)
-                    context.User = new FormsPrincipal<Cache.Models.CurrentUserInfo> (ticket, userData);//重新给context.User赋值。
+                    context.User = new FormsPrincipal<Cache.Models.CurrentUserInfo>(ticket, userData);//重新给context.User赋值。
             }
             catch { /* 有异常也不要抛出，防止攻击者试探。 */ }
         }

codegit/CallCenterApi/CallCenterApi.Model/CallCenterApi.Model.csproj

@@ -121,6 +121,7 @@
     <Compile Include="T_Sys_WorkOFFDays.cs" />
     <Compile Include="T_Sys_WorkTimes.cs" />
     <Compile Include="T_Wo_BusinessManage.cs" />
+    <Compile Include="T_Wo_MaterialItems.cs" />
     <Compile Include="T_Wo_MaterialManage.cs" />
     <Compile Include="T_Wo_QuestionManage.cs" />
     <Compile Include="T_Wo_WorkCopy.cs" />

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_MaterialItems.cs

@@ -0,0 +1,126 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CallCenterApi.Model
+{
+    [Serializable]
+    public partial class T_Wo_MaterialItems
+    {
+        public T_Wo_MaterialItems()
+        { }
+        #region Model
+        private int _f_id;
+        private string _f_materialcode;
+        private string _f_materialname;
+        private string _f_formula;
+        private decimal? _f_loadingfee;
+        private decimal? _f_unloadingfee;
+        private decimal? _f_materialfee;
+        private int? _f_returnquantity = 0;
+        private long _f_woid;
+        private string _f_remark;
+        private string _f_createby;
+        private DateTime? _f_createon;
+        /// <summary>
+        /// 
+        /// </summary>
+        public int F_Id
+        {
+            set { _f_id = value; }
+            get { return _f_id; }
+        }
+        /// <summary>
+        /// 物料编码
+        /// </summary>
+        public string F_MaterialCode
+        {
+            set { _f_materialcode = value; }
+            get { return _f_materialcode; }
+        }
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string F_MaterialName
+        {
+            set { _f_materialname = value; }
+            get { return _f_materialname; }
+        }
+        /// <summary>
+        /// 配方
+        /// </summary>
+        public string F_Formula
+        {
+            set { _f_formula = value; }
+            get { return _f_formula; }
+        }
+        /// <summary>
+        /// 装车费
+        /// </summary>
+        public decimal? F_LoadingFee
+        {
+            set { _f_loadingfee = value; }
+            get { return _f_loadingfee; }
+        }
+        /// <summary>
+        /// 卸车费
+        /// </summary>
+        public decimal? F_UnLoadingFee
+        {
+            set { _f_unloadingfee = value; }
+            get { return _f_unloadingfee; }
+        }
+        /// <summary>
+        /// 返料费
+        /// </summary>
+        public decimal? F_MaterialFee
+        {
+            set { _f_materialfee = value; }
+            get { return _f_materialfee; }
+        }
+        /// <summary>
+        /// 实收返厂数量
+        /// </summary>
+        public int? F_ReturnQuantity
+        {
+            set { _f_returnquantity = value; }
+            get { return _f_returnquantity; }
+        }
+        /// <summary>
+        /// 工单id
+        /// </summary>
+        public long F_WoID
+        {
+            set { _f_woid = value; }
+            get { return _f_woid; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_Remark
+        {
+            set { _f_remark = value; }
+            get { return _f_remark; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_CreateBy
+        {
+            set { _f_createby = value; }
+            get { return _f_createby; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? F_CreateOn
+        {
+            set { _f_createon = value; }
+            get { return _f_createon; }
+        }
+        #endregion Model
+
+    }
+}