代码加组织过滤

yl

2023-06-17 5b4fb9c56426b5096555560a44dd365b02853ad4

代码加组织过滤

 .vs/VueWebApi/v16/.suo

Binary files differ

 VueWebApi/Controllers/AppProductionManagementController.cs

@@ -57,12 +57,13 @@
        /// <summary>
        /// ç”Ÿäº§å¼€æŠ¥å·¥ï¼šæŠ¥å·¥æ—¶èŽ·å–生产班组下拉框
        /// </summary>
        /// <param name="wkshopcode">车间编码</param>
        /// <returns></returns>
        [Route(template: "MesOrderStepReportSelectUserGroup")]
        [HttpGet]
        public HttpResponseMessage MesOrderStepReportSelectUserGroup()
        public HttpResponseMessage MesOrderStepReportSelectUserGroup(string wkshopcode)
        {
            mes = ProductionManagementBLL.MesOrderStepReportSelectUserGroup();
            mes = ProductionManagementBLL.MesOrderStepReportSelectUserGroup(wkshopcode);
            return TJson.toJson(mes);
        }
        #endregion

 VueWebApi/Controllers/BaseDateController.cs

@@ -132,6 +132,38 @@
        }
        #endregion

        #region[通过选择的所属组织查询所属班组]
        /// <summary>
        /// é€šè¿‡é€‰æ‹©çš„所属组织查询所属班组
        /// </summary>
        /// <param name="stu_torgcode">组织编码</param>
        /// <param name="description">组织类型</param>
        /// <returns></returns>
        [Route(template: "StorgGroupSelect")]
        [HttpGet]
        public HttpResponseMessage StorgGroupSelect(string stu_torgcode, string description)
        {
            mes = BaseDateBLL.StorgGroupSelect(stu_torgcode, description);
            return TJson.toJson(mes);
        }
        #endregion

        #region[通过选择的所属组织查询所属角色类型]
        /// <summary>
        /// é€šè¿‡é€‰æ‹©çš„所属组织查询所属角色类型
        /// </summary>
        /// <param name="stu_torgcode">组织编码</param>
        /// <param name="description">组织类型</param>
        /// <returns></returns>
        [Route(template: "StorgRoleSelect")]
        [HttpGet]
        public HttpResponseMessage StorgRoleSelect(string stu_torgcode, string description)
        {
            mes = BaseDateBLL.StorgRoleSelect(stu_torgcode, description);
            return TJson.toJson(mes);
        }
        #endregion



        #region[ERP生产车间/部门信息查询]

 VueWebApi/Controllers/BasicSettingController.cs

@@ -42,9 +42,11 @@
        [HttpGet]
        public HttpResponseMessage OrganizationSearch(string OrgCode=null, string OrgName=null, string OrgType=null, string UserName=null,int page=0,int rows=0,string prop=null,string order=null)
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = BasicSettingBLL.OrganizationSearch(OrgCode, OrgName, OrgType, UserName,startNum,endNum,prop,order);
            mes = BasicSettingBLL.OrganizationSearch(stu_torgcode, description, OrgCode, OrgName, OrgType, UserName,startNum,endNum,prop,order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -111,6 +113,7 @@
        /// <param name="UserCode">用户编码</param>
        /// <param name="UserName">用户名称</param>
        /// <param name="StuOrg">所属组织</param>
        /// <param name="description">所属组织类型</param>
        /// <param name="wagetype">工资类型</param>
        /// <param name="Enable">在职状态</param>
        /// <param name="page">页码</param>
@@ -120,11 +123,11 @@
        /// <returns></returns>
        [Route(template: "UserSearch")]
        [HttpGet]
        public HttpResponseMessage UserSearch(string UserCode = null, string UserName = null, string StuOrg = null,string wagetype=null, string Enable = null, int page = 0, int rows = 0, string prop = null, string order = null)
        public HttpResponseMessage UserSearch(string UserCode = null, string UserName = null, string StuOrg = null,string description=null, string wagetype=null, string Enable = null, int page = 0, int rows = 0, string prop = null, string order = null)
        {
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = BasicSettingBLL.UserSearch(UserCode, UserName, StuOrg, wagetype, Enable, startNum, endNum, prop, order);
            mes = BasicSettingBLL.UserSearch(UserCode, UserName, StuOrg, description, wagetype, Enable, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -138,7 +141,9 @@
        [HttpGet]
        public HttpResponseMessage UserOrganization()
        {
            mes = BasicSettingBLL.UserOrganization();
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            mes = BasicSettingBLL.UserOrganization(stu_torgcode, description);
            return TJson.toJson(mes);
        }
        #endregion
@@ -152,7 +157,9 @@
        [HttpGet]
        public HttpResponseMessage UserGroup()
        {
            mes = BasicSettingBLL.UserGroup();
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            mes = BasicSettingBLL.UserGroup(stu_torgcode, description);
            return TJson.toJson(mes);
        }
        #endregion
@@ -204,12 +211,14 @@
        /// ç”¨æˆ·æ¸…单关联角色查询
        /// </summary>
        /// <param name="usercode">用户编码</param>
        /// <param name="stu_torgcode">所属组织编码</param>
        /// <param name="description">所属组织类型</param>
        /// <returns></returns>
        [Route(template: "UserAssociationRole")]
        [HttpGet]
        public HttpResponseMessage UserAssociationRole(string usercode)
        public HttpResponseMessage UserAssociationRole(string usercode,string stu_torgcode,string description)
        {
            mes = BasicSettingBLL.UserAssociationRole(usercode);
            mes = BasicSettingBLL.UserAssociationRole(usercode, stu_torgcode, description);
            return TJson.toJson(mes);
        }
        #endregion
@@ -219,16 +228,18 @@
        /// ç”¨æˆ·æ¸…单关联角色保存
        /// </summary>
        /// <param name="usercode">用户编码</param>
        /// <param name="stu_torgcode">所属组织编码</param>
        /// <param name="description">所属组织类型</param>
        /// <param name="json">提交数据对象</param>
        /// <returns></returns>
        [Route(template: "SaveUserAssoctRole")]
        [HttpPost]
        public HttpResponseMessage SaveUserAssoctRole(string usercode, List<RoleUserSubmit> json)
        public HttpResponseMessage SaveUserAssoctRole(string usercode,string stu_torgcode,string description, List<RoleUserSubmit> json)
        {
            //JavaScriptSerializer Serializer = new JavaScriptSerializer();
            //List<RoleUserSubmit> objs = new List<RoleUserSubmit>(); 
            //objs = Serializer.Deserialize<List<RoleUserSubmit>>(json);
            mes= BasicSettingBLL.SaveUserAssoctRole(usercode, json);
            mes= BasicSettingBLL.SaveUserAssoctRole(usercode, stu_torgcode, description, json);
            return TJson.toJson(mes);
        }
        #endregion
@@ -311,9 +322,11 @@
        [HttpGet]
        public HttpResponseMessage UserGroupSearch(int page = 0, int rows = 0, string prop = null, string order = null)
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = BasicSettingBLL.UserGroupSearch(startNum, endNum, prop, order);
            mes = BasicSettingBLL.UserGroupSearch(stu_torgcode, description, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -364,9 +377,11 @@
        [HttpGet]
        public HttpResponseMessage RoleTypeSearch(int page = 0, int rows = 0, string prop = null, string order = null)
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = BasicSettingBLL.RoleTypeSearch(startNum, endNum, prop, order);
            mes = BasicSettingBLL.RoleTypeSearch(stu_torgcode, description,startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -410,9 +425,11 @@
        [HttpGet]
        public HttpResponseMessage RoleTypeSelect()
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            try
            {
                mes = BasicSettingBLL.RoleTypeSelect();
                mes = BasicSettingBLL.RoleTypeSelect(stu_torgcode, description);
            }
            catch (Exception e)
            {
@@ -440,9 +457,11 @@
        [HttpGet]
        public HttpResponseMessage RoleSearch(string RoleCode = null, string RoleName = null, string RoleTypeCode = null, string CreateUser = null, int page = 0, int rows = 0, string prop = null, string order = null)
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = BasicSettingBLL.RoleSearch(RoleCode, RoleName, RoleTypeCode, CreateUser, startNum, endNum, prop, order);
            mes = BasicSettingBLL.RoleSearch(stu_torgcode,description, RoleCode, RoleName, RoleTypeCode, CreateUser, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -460,11 +479,12 @@
            string RoleId = obj["RoleId"].ToString();    //角色id(主键)
            string RoleCode = obj["RoleCode"].ToString(); //角色编码
            string RoleName = obj["RoleName"].ToString(); //角色名称
            string stu_torgcode = obj["stu_torgcode"].ToString(); //所属组织编码
            string RoleTypeCode = obj["RoleTypeCode"].ToString(); //角色类型编码
            string description = obj["description"].ToString(); //角色描述
            var usercode = HttpContext.Current.Request.Cookies["navTabId"].Value.ToString();
            string OperType = obj["OperType"].ToString();  //操作类型
            mes = BasicSettingBLL.AddUpdateRole(RoleId, RoleCode, RoleName, RoleTypeCode, description, usercode, OperType);
            mes = BasicSettingBLL.AddUpdateRole(RoleId, RoleCode, RoleName, stu_torgcode,RoleTypeCode, description, usercode, OperType);
            return TJson.toJson(mes);
        }
        #endregion
@@ -643,6 +663,18 @@
        #endregion


        #region[安灯系统/车间查询]
        [Route(template: "AnDengShopSearch")]
        [HttpGet]
        public HttpResponseMessage AnDengShopSearch()
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            mes = BasicSettingBLL.AnDengShopSearch(stu_torgcode, description);
            return TJson.toJson(mes);
        }
        #endregion

        #region[安灯系统/自定义安灯呼叫类型查询]
        /// <summary>
        /// å®‰ç¯ç³»ç»Ÿ/自定义安灯呼叫类型查询

 VueWebApi/Controllers/DeviceManagerController.cs

@@ -180,7 +180,9 @@
        [HttpGet]
        public HttpResponseMessage WorkShopSelect()
        {
            mes = DeviceManagerBLL.WorkShopSelect();
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            mes = DeviceManagerBLL.WorkShopSelect(stu_torgcode, description);
            return TJson.toJson(mes);
        }
        #endregion
@@ -219,9 +221,11 @@
        [HttpGet]
        public HttpResponseMessage DeviceMangerSearch(string DeviceCode = null, string DeviceName = null, string Status = null, string WorkShop = null,string DeviceType=null,string DeviceGroup=null,int page = 0, int rows = 0, string prop = null, string order = null)
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = DeviceManagerBLL.DeviceMangerSearch(DeviceCode, DeviceName, Status, WorkShop, DeviceType, DeviceGroup, startNum, endNum, prop, order);
            mes = DeviceManagerBLL.DeviceMangerSearch(stu_torgcode, description,DeviceCode, DeviceName, Status, WorkShop, DeviceType, DeviceGroup, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -491,7 +495,9 @@
        [HttpGet]
        public HttpResponseMessage DeviceCheckStanedAssociationEqp(string checkstand_code)
        {
            mes = DeviceManagerBLL.DeviceCheckStanedAssociationEqp(checkstand_code);
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            mes = DeviceManagerBLL.DeviceCheckStanedAssociationEqp(stu_torgcode, description,checkstand_code);
            return TJson.toJson(mes);
        }
        #endregion
@@ -609,7 +615,9 @@
        [HttpGet]
        public HttpResponseMessage DeviceRepairStanedAssociationEqp(string repairstand_code)
        {
            mes = DeviceManagerBLL.DeviceRepairStanedAssociationEqp(repairstand_code);
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            mes = DeviceManagerBLL.DeviceRepairStanedAssociationEqp(stu_torgcode, description,repairstand_code);
            return TJson.toJson(mes);
        }
        #endregion
@@ -651,6 +659,8 @@
        [HttpGet]
        public HttpResponseMessage DeviceCheckTakeSearch(int page, int rows, string prop, string order, string wkshopcode = null, string eqpcode = null, string eqpname = null,string stanedname=null,string checkuser=null,string checkdate=null)
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            string checkopendate = "";  //点检开始时间
            string checkclosedate = "";    //点检结束时间
            if (checkdate != "" && checkdate != null)
@@ -660,7 +670,7 @@
            }
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = DeviceManagerBLL.DeviceCheckTakeSearch(wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate, startNum, endNum, prop, order);
            mes = DeviceManagerBLL.DeviceCheckTakeSearch(stu_torgcode, description,wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -695,6 +705,8 @@
        [HttpGet]
        public HttpResponseMessage DeviceCheckTakeOutExcel(string wkshopcode = null, string eqpcode = null, string eqpname = null, string stanedname = null, string checkuser = null, string checkdate = null)
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            string checkopendate = "";  //点检开始时间
            string checkclosedate = "";    //点检结束时间
            if (checkdate != "" && checkdate != null)
@@ -702,7 +714,7 @@
                checkopendate = checkdate.Split('~')[0].ToString();
                checkclosedate = checkdate.Split('~')[1].ToString();
            }
            mes = DeviceManagerBLL.DeviceCheckTakeOutExcel(wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate);
            mes = DeviceManagerBLL.DeviceCheckTakeOutExcel(stu_torgcode, description,wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate);
            return TJson.toJson(mes);
        }
        #endregion
@@ -728,6 +740,8 @@
        [HttpGet]
        public HttpResponseMessage DeviceRepairTakeSearch(int page, int rows, string prop, string order, string wkshopcode = null, string eqpcode = null, string eqpname = null, string stanedname = null, string repairuser = null, string repairdate = null,string repairresult=null)
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            string repairopendate = "";  //点检开始时间
            string repairclosedate = "";    //点检结束时间
            if (repairdate != "" && repairdate != null)
@@ -737,7 +751,7 @@
            }
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = DeviceManagerBLL.DeviceRepairTakeSearch(wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult, startNum, endNum, prop, order);
            mes = DeviceManagerBLL.DeviceRepairTakeSearch(stu_torgcode, description, wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -773,6 +787,8 @@
        [HttpGet]
        public HttpResponseMessage DeviceRepairTakeOutExcel(string wkshopcode = null, string eqpcode = null, string eqpname = null, string stanedname = null, string repairuser = null, string repairdate = null, string repairresult = null)
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            string repairopendate = "";  //点检开始时间
            string repairclosedate = "";    //点检结束时间
            if (repairdate != "" && repairdate != null)
@@ -780,7 +796,7 @@
                repairopendate = repairdate.Split('~')[0].ToString();
                repairclosedate = repairdate.Split('~')[1].ToString();
            }
            mes = DeviceManagerBLL.DeviceRepairTakeOutExcel(wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult);
            mes = DeviceManagerBLL.DeviceRepairTakeOutExcel(stu_torgcode, description,wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult);
            return TJson.toJson(mes);
        }
        #endregion
@@ -808,6 +824,8 @@
        [HttpGet]
        public HttpResponseMessage DeviceUpdateSearch(int page, int rows, string prop, string order, string wkshopcode = null, string eqpcode = null, string eqpname = null, string reportuser = null, string repairuser = null,string vrifcatuser=null, string reportdate = null, string repairdate = null,string vrifcatdate=null)
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            string reportopendate = "";  //报修开始时间
            string reportclosedate = "";  //报修结束时间
            string repairopendate = "";  //维修开始时间
@@ -831,7 +849,7 @@
            }
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = DeviceManagerBLL.DeviceUpdateSearch(wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate, startNum, endNum, prop, order);
            mes = DeviceManagerBLL.DeviceUpdateSearch(stu_torgcode, description,wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -869,6 +887,8 @@
        [HttpGet]
        public HttpResponseMessage DeviceUpdateOutExcel(string wkshopcode = null, string eqpcode = null, string eqpname = null, string reportuser = null, string repairuser = null, string vrifcatuser = null, string reportdate = null, string repairdate = null, string vrifcatdate = null)
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            string reportopendate = "";  //报修开始时间
            string reportclosedate = "";  //报修结束时间
            string repairopendate = "";  //维修开始时间
@@ -890,7 +910,7 @@
                vrifcatopendate = vrifcatdate.Split('~')[0].ToString();
                vrifcatclosedate = vrifcatdate.Split('~')[1].ToString();
            }
            mes = DeviceManagerBLL.DeviceUpdateOutExcel(wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate);
            mes = DeviceManagerBLL.DeviceUpdateOutExcel(stu_torgcode, description,wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate);
            return TJson.toJson(mes);
        }
        #endregion

 VueWebApi/Controllers/LoginController.cs

@@ -50,23 +50,24 @@
                    ms.usercode = dt.Rows[0]["USERCODE"].ToString();
                    ms.username = dt.Rows[0]["USERNAME"].ToString();
                    ms.password = dt.Rows[0]["PASSWORD"].ToString();
                    ms.stu_torgcode= dt.Rows[0]["org_code"].ToString();
                    ms.description = dt.Rows[0]["description"].ToString()==null?"": dt.Rows[0]["description"].ToString();
                    ms.stu_torgname= dt.Rows[0]["org_name"].ToString();
                    ms.usertype = usertype;
                    ms.rediskey = Enterprise+"LoginUserID" + ms.usertype + ms.userid;
                    ms.rediskey = Enterprise+ms.stu_torgcode+"LoginUserID" + ms.usertype + ms.userid;
                    mss.Add(ms);
                    HttpContext.Current.Session.Clear(); //从会话状态集合中删除所有的键值
                    //HttpContext.Current.Session["User"] = JsonConvert.SerializeObject(ms);
                    //User loginUser = JsonConvert.DeserializeObject<User>(HttpContext.Current.Session["User"].ToString());
                    User loginUser = JsonConvert.DeserializeObject<User>(JsonConvert.SerializeObject(ms));
                    //如果redis登录用户中不存在当前用户
                    if (redis.Get<User>(Enterprise+"LoginUserID" + ms.usertype + ms.userid, 0) == null)
                    if (redis.Get<User>(Enterprise+ms.stu_torgcode+"LoginUserID" + ms.usertype + ms.userid, 0) == null)
                    {
                        //redis.Remove("LoginUserID" + ms.userid, 0);
                        //写入redis(注意：redis类里面的失效时间必须在key创建完成之后才生效)
                        redis.Set<User>(Enterprise+"LoginUserID" + ms.usertype + ms.userid, ms, redis.secondsTimeOut, 0);
                        redis.Set<User>(Enterprise+ms.stu_torgcode+"LoginUserID" + ms.usertype + ms.userid, ms, redis.secondsTimeOut, 0);
                        //登录信息写入session
                        HttpContext.Current.Session["User"] = JsonConvert.SerializeObject(ms);
                        //写入登录操作记录
                        mes = LoginBLL.LoginBas(ms.usercode, ms.usertype);
                        mes = LoginBLL.LoginBas(ms.usercode, ms.usertype, ms.stu_torgcode);
                        mes.code = "200";
                        mes.Message = "登录成功!";
                        mes.data = ms;
@@ -74,9 +75,9 @@
                    else //如果存在
                    {
                        //获取redis中当前用户信息
                        User r_loginUser = redis.Get<User>(Enterprise+"LoginUserID" + ms.usertype + ms.userid, 0);
                        User r_loginUser = redis.Get<User>(Enterprise+ ms.stu_torgcode + "LoginUserID" + ms.usertype + ms.userid, 0);
                        //如果session中的用户usercode和redis中的用户usercode匹配
                        if ((r_loginUser.usercode + r_loginUser.usertype).Equals(loginUser.usercode + loginUser.usertype))
                        if ((r_loginUser.stu_torgcode+r_loginUser.usercode + r_loginUser.usertype).Equals(loginUser.stu_torgcode+loginUser.usercode + loginUser.usertype))
                        {
                            mes.data = ms;
                            mes.code = "302";
@@ -85,11 +86,11 @@
                        else
                        {
                            //重置过期时间(注意：redis类里面的失效时间必须在key创建完成之后才生效)
                            redis.Set<User>(Enterprise+"LoginUserID" + ms.usertype + loginUser.userid, loginUser, redis.secondsTimeOut, 0);
                            redis.Set<User>(Enterprise+ ms.stu_torgcode + "LoginUserID" + ms.usertype + loginUser.userid, loginUser, redis.secondsTimeOut, 0);
                            //登录信息写入session
                            HttpContext.Current.Session["User"] = JsonConvert.SerializeObject(ms);
                            //写入登录操作记录
                            mes = LoginBLL.LoginBas(ms.usercode, ms.usertype);
                            mes = LoginBLL.LoginBas(ms.usercode, ms.usertype, ms.stu_torgcode);
                            mes.data = ms;
                            mes.code = "200";
                            mes.Message = "登录成功!";
@@ -128,10 +129,11 @@
        /// <param name="username">用户名</param>
        /// <param name="usertype">操作端PC/APP</param>
        /// <param name="rid">rid极光推送获取设备id</param>
        /// <param name="stu_torgcode">所属组织编码</param>
        /// <returns></returns>
        [Route(template: "ForcedOffline")]
        [HttpPost]
        public HttpResponseMessage ForcedOffline(int userid, string usercode, string username, string usertype,string rid)
        public HttpResponseMessage ForcedOffline(int userid, string usercode, string username, string usertype,string rid,string stu_torgcode)
        {
            string sql="";
            List<object> list = new List<object>();
@@ -140,14 +142,14 @@
                if (usertype == "APP")
                {
                    //更新rid
                    sql = @"update [dbo].[TUser] set rid=@rid where usercode=@usercode";
                    list.Add(new { str = sql, parm = new { rid = rid, usercode = username } });
                    sql = @"update [dbo].[TUser] set rid=@rid where usercode=@usercode and stu_torgcode=@stu_torgcode";
                    list.Add(new { str = sql, parm = new { rid = rid, usercode = username, stu_torgcode= stu_torgcode } });
                    bool aa = DapperHelper.DoTransaction(list);
                    redis.Remove(Enterprise+"LoginUserID" + usertype + userid, 1); //删除redis
                    redis.Remove(Enterprise+ stu_torgcode + "LoginUserID" + usertype + userid, 1); //删除redis
                }
                else 
                {
                    redis.Remove(Enterprise+"LoginUserID" + usertype + userid, 0); //删除redis
                    redis.Remove(Enterprise+ stu_torgcode + "LoginUserID" + usertype + userid, 0); //删除redis
                }
                mes.code = "200";
                mes.count = 0;
@@ -216,15 +218,16 @@
        /// <param name="usercode">用户编码</param>
        /// <param name="username">用户名</param>
        /// <param name="usertype">操作端PC/APP</param>
        /// <param name="stu_torgcode">所属组织编码</param>
        /// <returns></returns>
        [Route(template: "LoginOut")]
        [HttpPost]
        [ChannelActionFilter]
        public HttpResponseMessage LoginOut(int userid, string usercode, string username, string usertype)
        public HttpResponseMessage LoginOut(int userid, string usercode, string username, string usertype,string stu_torgcode)
        {
            var sql = "";
            List<object> list = new List<object>();
            mes = LoginBLL.LoginOut(userid, usercode, username, usertype);
            mes = LoginBLL.LoginOut(userid, usercode, username, usertype, stu_torgcode);
            return mes.ResponseMess(mes);
        }
        #endregion
@@ -257,24 +260,27 @@
                    ms.usercode = dt.Rows[0]["USERCODE"].ToString();
                    ms.username = dt.Rows[0]["USERNAME"].ToString();
                    ms.password = dt.Rows[0]["PASSWORD"].ToString();
                    ms.stu_torgcode = dt.Rows[0]["org_code"].ToString();
                    ms.description = dt.Rows[0]["description"].ToString() == null ? "" : dt.Rows[0]["description"].ToString();
                    ms.stu_torgname = dt.Rows[0]["org_name"].ToString();
                    ms.usertype = usertype;
                    ms.rediskey = Enterprise+"LoginUserID" + ms.usertype + ms.userid;
                    ms.rediskey = Enterprise+ ms.stu_torgcode + "LoginUserID" + ms.usertype + ms.userid;
                    mss.Add(ms);
                    HttpContext.Current.Session.Clear(); //从会话状态集合中删除所有的键值
                    User loginUser = JsonConvert.DeserializeObject<User>(JsonConvert.SerializeObject(ms));
                    //如果redis登录用户中不存在当前用户
                    if (redis.Get<User>(Enterprise+"LoginUserID" + ms.usertype + ms.userid, 1) == null)
                    if (redis.Get<User>(Enterprise+ ms.stu_torgcode + "LoginUserID" + ms.usertype + ms.userid, 1) == null)
                    {
                        //写入redis(注意：redis类里面的失效时间必须在key创建完成之后才生效)
                        redis.Set<User>(Enterprise+"LoginUserID" + ms.usertype + ms.userid, ms, redis.secondsTimeOut, 1);
                        redis.Set<User>(Enterprise+ ms.stu_torgcode + "LoginUserID" + ms.usertype + ms.userid, ms, redis.secondsTimeOut, 1);
                        //登录信息写入session
                        HttpContext.Current.Session["User"] = JsonConvert.SerializeObject(ms);
                        //更新rid
                        sql = @"update [dbo].[TUser] set rid=@rid where usercode=@usercode";
                        list.Add(new { str = sql, parm = new { rid = rid, usercode = username } });
                        sql = @"update [dbo].[TUser] set rid=@rid where usercode=@usercode and stu_torgcode=@stu_torgcode";
                        list.Add(new { str = sql, parm = new { rid = rid, usercode = username, stu_torgcode= ms.stu_torgcode } });
                        bool aa = DapperHelper.DoTransaction(list);
                        //写入登录操作记录
                        mes = LoginBLL.LoginBas(ms.usercode, ms.usertype);
                        mes = LoginBLL.LoginBas(ms.usercode, ms.usertype, ms.stu_torgcode);
                        mes.code = "200";
                        mes.Message = "登录成功!";
                        mes.data = ms;
@@ -282,9 +288,9 @@
                    else //如果存在
                    {
                        //获取redis中当前用户信息
                        User r_loginUser = redis.Get<User>(Enterprise+"LoginUserID" + ms.usertype + ms.userid, 1);
                        User r_loginUser = redis.Get<User>(Enterprise+ ms.stu_torgcode + "LoginUserID" + ms.usertype + ms.userid, 1);
                        //如果session中的用户usercode和redis中的用户usercode匹配
                        if ((r_loginUser.usercode + r_loginUser.usertype).Equals(loginUser.usercode + loginUser.usertype))
                        if ((r_loginUser.stu_torgcode+r_loginUser.usercode + r_loginUser.usertype).Equals(loginUser.stu_torgcode+loginUser.usercode + loginUser.usertype))
                        {
                            mes.data = ms;
                            mes.code = "302";
@@ -293,15 +299,15 @@
                        else
                        {
                            //重置过期时间(注意：redis类里面的失效时间必须在key创建完成之后才生效)
                            redis.Set<User>(Enterprise+"LoginUserID" + ms.usertype + loginUser.userid, loginUser, redis.secondsTimeOut, 1);
                            redis.Set<User>(Enterprise+ ms.stu_torgcode + "LoginUserID" + ms.usertype + loginUser.userid, loginUser, redis.secondsTimeOut, 1);
                            //登录信息写入session
                            HttpContext.Current.Session["User"] = JsonConvert.SerializeObject(ms);
                            //更新rid
                            sql = @"update [dbo].[TUser] set rid=@rid where usercode=@usercode";
                            list.Add(new { str = sql, parm = new { rid = rid, usercode = username } });
                            sql = @"update [dbo].[TUser] set rid=@rid where usercode=@usercode and stu_torgcode=@stu_torgcode";
                            list.Add(new { str = sql, parm = new { rid = rid, usercode = username, stu_torgcode= ms.stu_torgcode } });
                            bool aa = DapperHelper.DoTransaction(list);
                            //写入登录操作记录
                            mes = LoginBLL.LoginBas(ms.usercode, ms.usertype);
                            mes = LoginBLL.LoginBas(ms.usercode, ms.usertype, ms.stu_torgcode);
                            mes.data = ms;
                            mes.code = "200";
                            mes.Message = "登录成功!";

 VueWebApi/Controllers/ProductModelController.cs

@@ -279,7 +279,9 @@
        [HttpGet]
        public HttpResponseMessage InventoryFileAssociationRoute(string partcode)
        {
            mes = ProductModelBLL.InventoryFileAssociationRoute(partcode);
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            mes = ProductModelBLL.InventoryFileAssociationRoute(stu_torgcode, stu_torgtypecode,partcode);
            return TJson.toJson(mes);
        }
        #endregion
@@ -294,10 +296,12 @@
        /// <returns></returns>
        [Route(template: "SaveInventoryFile")]
        [HttpPost]
        public HttpResponseMessage SaveInventoryFile(string partcode, List<ObjectData> json, string defaultroute_code = null)
        public HttpResponseMessage SaveInventoryFile(string partcode, List<PartRout> json, string defaultroute_code = null)
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = ProductModelBLL.SaveInventoryFile(partcode, defaultroute_code, username, json);
            mes = ProductModelBLL.SaveInventoryFile(stu_torgcode, stu_torgtypecode, partcode, defaultroute_code, username, json);
            return TJson.toJson(mes);
        }
        #endregion
@@ -421,9 +425,9 @@
        /// <returns></returns>
        [Route(template: "StepSelect")]
        [HttpGet]
        public HttpResponseMessage StepSelect()
        public HttpResponseMessage StepSelect(string WorkShop)
        {
            mes = ProductModelBLL.StepSelect();
            mes = ProductModelBLL.StepSelect(WorkShop);
            return TJson.toJson(mes);
        }
        #endregion
@@ -432,6 +436,7 @@
        /// <summary>
        /// å·¥è‰ºè·¯çº¿æŸ¥è¯¢
        /// </summary>
        /// <param name="WorkShop">所属车间</param>
        /// <param name="routecode">工艺路线编码</param>
        /// <param name="routename">工艺路线名称</param>
        /// <param name="description">工艺路线描述</param>
@@ -443,11 +448,13 @@
        /// <returns></returns>
        [Route(template: "RouteSearch")]
        [HttpGet]
        public HttpResponseMessage RouteSearch(string routecode = null, string routename = null, string description = null, string createuser = null, int page = 0, int rows = 0, string prop = null, string order = null)
        public HttpResponseMessage RouteSearch(string WorkShop=null,string routecode = null, string routename = null, string description = null, string createuser = null, int page = 0, int rows = 0, string prop = null, string order = null)
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = ProductModelBLL.RouteSearch(routecode, routename, description, createuser, startNum, endNum, prop, order);
            mes = ProductModelBLL.RouteSearch(stu_torgcode, stu_torgtypecode, WorkShop, routecode, routename, description, createuser, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -506,6 +513,7 @@
        /// <summary>
        /// å·¥åºæŸ¥è¯¢
        /// </summary>
        /// <param name="WorkShop">所属车间</param>
        /// <param name="stepcode">工序编码</param>
        /// <param name="stepname">工序名称</param>
        /// <param name="enable">启用状态</param>
@@ -518,11 +526,13 @@
        /// <returns></returns>
        [Route(template: "StepSearch")]
        [HttpGet]
        public HttpResponseMessage StepSearch(string stepcode = null, string stepname = null, string enable = null, string steptypecode = null, string createuser = null, int page = 0, int rows = 0, string prop = null, string order = null)
        public HttpResponseMessage StepSearch(string WorkShop=null, string stepcode = null, string stepname = null, string enable = null, string steptypecode = null, string createuser = null, int page = 0, int rows = 0, string prop = null, string order = null)
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = ProductModelBLL.StepSearch(stepcode, stepname, enable, steptypecode, createuser, startNum, endNum, prop, order);
            mes = ProductModelBLL.StepSearch(stu_torgcode, stu_torgtypecode, WorkShop, stepcode, stepname, enable, steptypecode, createuser, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -538,6 +548,7 @@
        public HttpResponseMessage AddUpdateStep([FromBody] JObject obj)
        {
            string stepid = obj["id"].ToString();    //工序id(主键)
            string WorkShop = obj["WorkShop"].ToString(); //车间编码
            string stepcode = obj["stepcode"].ToString(); //工序编码
            string stepname = obj["stepname"].ToString(); //工序名称
            string steptypecode = obj["steptypecode"].ToString(); //工序类型编码
@@ -545,7 +556,7 @@
            string description = obj["description"].ToString(); //工序描述
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            string OperType = obj["OperType"].ToString();  //操作类型
            mes = ProductModelBLL.AddUpdateStep(stepid, stepcode, stepname, steptypecode, enable, description, username, OperType);
            mes = ProductModelBLL.AddUpdateStep(stepid, WorkShop,stepcode, stepname, steptypecode, enable, description, username, OperType);
            return TJson.toJson(mes);
        }
        #endregion
@@ -573,9 +584,9 @@
        /// <returns></returns>
        [Route(template: "StepAssociationEqp")]
        [HttpGet]
        public HttpResponseMessage StepAssociationEqp(string stepcode)
        public HttpResponseMessage StepAssociationEqp(string WorkShop, string stepcode)
        {
            mes = ProductModelBLL.StepAssociationEqp(stepcode);
            mes = ProductModelBLL.StepAssociationEqp(WorkShop,stepcode);
            return TJson.toJson(mes);
        }
        #endregion
@@ -584,15 +595,16 @@
        /// <summary>
        /// å·¥åºå®šä¹‰å…³è”工作站提交
        /// </summary>
        /// <param name="WorkShop">所属组织编码(车间)</param>
        /// <param name="stepcode">工序编码</param>
        /// <param name="json">提交数据</param>
        /// <returns></returns>
        [Route(template: "SaveStepAssociationEqp")]
        [HttpPost]
        public HttpResponseMessage SaveStepAssociationEqp(string stepcode, List<ObjectData> json)
        public HttpResponseMessage SaveStepAssociationEqp(string WorkShop, string stepcode, List<ObjectData> json)
        {
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = ProductModelBLL.SaveStepAssociationEqp(stepcode, username, json);
            mes = ProductModelBLL.SaveStepAssociationEqp(WorkShop,stepcode, username, json);
            return TJson.toJson(mes);
        }
        #endregion
@@ -605,9 +617,9 @@
        /// <returns></returns>
        [Route(template: "StepAssociationDefect")]
        [HttpGet]
        public HttpResponseMessage StepAssociationDefect(string stepcode)
        public HttpResponseMessage StepAssociationDefect(string WorkShop,  string stepcode)
        {
            mes = ProductModelBLL.StepAssociationDefect(stepcode);
            mes = ProductModelBLL.StepAssociationDefect(WorkShop,stepcode);
            return TJson.toJson(mes);
        }
        #endregion
@@ -621,10 +633,10 @@
        /// <returns></returns>
        [Route(template: "SaveStepAssociationDefect")]
        [HttpPost]
        public HttpResponseMessage SaveStepAssociationDefect(string stepcode, List<ObjectData> json)
        public HttpResponseMessage SaveStepAssociationDefect(string WorkShop, string stepcode, List<ObjectData> json)
        {
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = ProductModelBLL.SaveStepAssociationDefect(stepcode, username, json);
            mes = ProductModelBLL.SaveStepAssociationDefect(WorkShop,stepcode, username, json);
            return TJson.toJson(mes);
        }
        #endregion
@@ -665,7 +677,9 @@
        {
            try
            {
                mes = ProductModelBLL.PartSelectRpute(partcode);
                var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
                var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
                mes = ProductModelBLL.PartSelectRpute(stu_torgcode, stu_torgtypecode,partcode);
            }
            catch (Exception e)
            {
@@ -756,9 +770,11 @@
        [HttpGet]
        public HttpResponseMessage BeatRateSearch(string partcode = null, string routecode = null, string stepcode = null, string eqpcode = null,int page = 0, int rows = 0, string prop = null, string order = null)
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = ProductModelBLL.BeatRateSearch(partcode,routecode, stepcode, eqpcode, startNum, endNum, prop, order);
            mes = ProductModelBLL.BeatRateSearch(stu_torgcode, stu_torgtypecode,partcode, routecode, stepcode, eqpcode, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion

 VueWebApi/Controllers/ProductionManagementController.cs

@@ -47,6 +47,8 @@
        [HttpGet]
        public HttpResponseMessage ErpOrderSearch(string erporderstus = null, string erpordercode = null, string partcode = null, string partname = null, string partspec = null, string paystartdate = null, string payenddate = null, string creatuser = null, int page = 0, int rows = 0, string prop = null, string order = null)
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            string paydatestartdate = "";  //预计开工开始时间
            string paydateenddate = "";    //预计开工结束时间
            string paydatestartdate1 = "";  //预计完工开始时间
@@ -63,7 +65,7 @@
            }
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = ProductionManagementBLL.ErpOrderSearch(erporderstus, erpordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
            mes = ProductionManagementBLL.ErpOrderSearch(stu_torgcode, stu_torgtypecode,erporderstus, erpordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -136,9 +138,11 @@
        [HttpGet]
        public HttpResponseMessage MesOrderSearch(int page, int rows, string prop, string order, string mesorderstus = null, string mesordercode = null, string sourceorder = null, string ordertype = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null)
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = ProductionManagementBLL.MesOrderSearch(mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
            mes = ProductionManagementBLL.MesOrderSearch(stu_torgcode, stu_torgtypecode,mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -175,12 +179,13 @@
        /// äº§å“ç¼–码查找工艺路线下拉接口
        /// </summary>
        /// <param name="partcode">产品编码</param>
        /// <param name="wkshopcode">车间编码</param>
        /// <returns></returns>
        [Route(template: "PartSelectRoute")]
        [HttpGet]
        public HttpResponseMessage PartSelectRoute(string partcode)
        public HttpResponseMessage PartSelectRoute(string partcode,string wkshopcode)
        {
            mes = ProductionManagementBLL.PartSelectRoute(partcode);
            mes = ProductionManagementBLL.PartSelectRoute(partcode, wkshopcode);
            return TJson.toJson(mes);
        }
        #endregion
@@ -190,13 +195,14 @@
        /// äº§å“+工艺路线查找车间下拉接口
        /// </summary>
        /// <param name="partcode">产品编码</param>
        /// <param name="routecode">工艺路线编码</param>
        /// <returns></returns>
        [Route(template: "RouteSelectWkshop")]
        [HttpGet]
        public HttpResponseMessage RouteSelectWkshop(string partcode, string routecode)
        public HttpResponseMessage RouteSelectWkshop(string partcode)
        {
            mes = ProductionManagementBLL.RouteSelectWkshop(partcode, routecode);
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            mes = ProductionManagementBLL.RouteSelectWkshop(stu_torgcode, stu_torgtypecode,partcode);
            return TJson.toJson(mes);
        }
        #endregion
@@ -387,9 +393,11 @@
        [HttpGet]
        public HttpResponseMessage MesOrderStepSearch(string orderstepqrcode = null, int page = 0, int rows = 0, string prop = null, string order = null)
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = ProductionManagementBLL.MesOrderStepSearch(orderstepqrcode, startNum, endNum, prop, order);
            mes = ProductionManagementBLL.MesOrderStepSearch(stu_torgcode, stu_torgtypecode,orderstepqrcode, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -408,9 +416,11 @@
        [HttpGet]
        public HttpResponseMessage MesOrderWxStepSearch(string orderstepqrcode = null, int page = 0, int rows = 0, string prop = null, string order = null)
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = ProductionManagementBLL.MesOrderWxStepSearch(orderstepqrcode, startNum, endNum, prop, order);
            mes = ProductionManagementBLL.MesOrderWxStepSearch(stu_torgcode, stu_torgtypecode,orderstepqrcode, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -429,9 +439,11 @@
        [HttpGet]
        public HttpResponseMessage MesOrderNgStepSearch(string orderstepqrcode = null, int page = 0, int rows = 0, string prop = null, string order = null)
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = ProductionManagementBLL.MesOrderNgStepSearch(orderstepqrcode, startNum, endNum, prop, order);
            mes = ProductionManagementBLL.MesOrderNgStepSearch(stu_torgcode, stu_torgtypecode,orderstepqrcode, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -487,12 +499,15 @@
        /// <summary>
        /// ç”Ÿäº§å¼€æŠ¥å·¥ï¼šæŠ¥å·¥æ—¶èŽ·å–生产班组下拉框
        /// </summary>
        /// <param name="wkshopcode">车间编码</param>
        /// <returns></returns>
        [Route(template: "MesOrderStepReportSelectUserGroup")]
        [HttpGet]
        public HttpResponseMessage MesOrderStepReportSelectUserGroup()
        public HttpResponseMessage MesOrderStepReportSelectUserGroup(string wkshopcode)
        {
            mes = ProductionManagementBLL.MesOrderStepReportSelectUserGroup();
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            mes = ProductionManagementBLL.MesOrderStepReportSelectUserGroup(stu_torgcode, stu_torgtypecode,wkshopcode);
            return TJson.toJson(mes);
        }
        #endregion
@@ -761,9 +776,11 @@
        [HttpGet]
        public HttpResponseMessage MesOrderBitchClosedSearch(string mesorderstus = null, string mesordercode = null, string sourceorder = null, string ordertype = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = ProductionManagementBLL.MesOrderBitchClosedSearch(mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
            mes = ProductionManagementBLL.MesOrderBitchClosedSearch(stu_torgcode, stu_torgtypecode,mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion

 VueWebApi/Controllers/QualityManagementController.cs

@@ -124,12 +124,13 @@
        /// <summary>
        /// å·¥åºæ£€éªŒæ ‡å‡†æ–°å¢žã€ç¼–辑获取检验项目下拉列表
        /// </summary>
        /// <param name="WorkShop">车间编码</param>
        /// <returns></returns>
        [Route(template: "StepCheckItemSelect")]
        [HttpGet]
        public HttpResponseMessage StepCheckItemSelect()
        public HttpResponseMessage StepCheckItemSelect(string WorkShop)
        {
           mes = QualityManagementBLL.StepCheckItemSelect();
           mes = QualityManagementBLL.StepCheckItemSelect(WorkShop);
           return TJson.toJson(mes);
        }
        #endregion
@@ -184,9 +185,11 @@
        [HttpGet]
        public HttpResponseMessage StepCheckItemSearch(string itemcode = null, string itemname = null, string itemdescr = null, int page = 0, int rows = 0, string prop = null, string order = null)
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = QualityManagementBLL.StepCheckItemSearch(itemcode, itemname, itemdescr, startNum, endNum, prop, order);
            mes = QualityManagementBLL.StepCheckItemSearch(stu_torgcode, stu_torgtypecode,itemcode, itemname, itemdescr, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -201,12 +204,13 @@
        [HttpPost]
        public HttpResponseMessage AddUpdateStepCheckItem([FromBody] JObject obj)
        {
            string wkshopcode = obj["wkshopcode"].ToString();    //车间编码
            string checkitemcode = obj["checkitemcode"].ToString();    //工序检验项目代码
            string checkitemname = obj["checkitemname"].ToString(); //工序检验项目名称
            string checkitemdescr = obj["checkitemdescr"].ToString(); //工序检验项目描述
            string opertype = obj["OperType"].ToString();  //操作类型
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = QualityManagementBLL.AddUpdateStepCheckItem(checkitemcode, checkitemname, checkitemdescr, opertype, username);
            mes = QualityManagementBLL.AddUpdateStepCheckItem(wkshopcode,checkitemcode, checkitemname, checkitemdescr, opertype, username);
            return TJson.toJson(mes);
        }
        #endregion
@@ -314,9 +318,11 @@
        [HttpGet]
        public HttpResponseMessage QualityInspectionSearch(string qualityinsptcode = null, string qualityinsptname = null, string status=null, string checktype=null,string sampltype=null,string suitobject = null, int page = 0, int rows = 0, string prop = null, string order = null)
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = QualityManagementBLL.QualityInspectionSearch(qualityinsptcode, qualityinsptname, status, checktype, sampltype, suitobject, startNum, endNum, prop, order);
            mes = QualityManagementBLL.QualityInspectionSearch(stu_torgcode, stu_torgtypecode,qualityinsptcode, qualityinsptname, status, checktype, sampltype, suitobject, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -346,6 +352,7 @@
        [HttpPost]
        public HttpResponseMessage QualityInspectionAddEditSave([FromBody] JObject obj)
        {
            string wkshopcode= obj["wkshopcode"].ToString(); //车间编码
            string qualityinsptcode = obj["qualityinsptcode"].ToString(); //质检方案编码
            string qualityinsptname = obj["qualityinsptname"].ToString(); //质检方案名称
            string status = obj["status"].ToString(); //有效状态
@@ -359,7 +366,7 @@
            string checkitem = obj["checkitem"].ToString(); //质检列表
            string type = obj["type"].ToString(); //操作类型
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = QualityManagementBLL.QualityInspectionAddEditSave(qualityinsptcode, qualityinsptname, status,checktype,sampmethod,sampscare,suitobject,suitpart,descr, stepcode, checkitem,type,username);
            mes = QualityManagementBLL.QualityInspectionAddEditSave(wkshopcode,qualityinsptcode, qualityinsptname, status,checktype,sampmethod,sampscare,suitobject,suitpart,descr, stepcode, checkitem,type,username);
            return TJson.toJson(mes);
        }
        #endregion

 VueWebApi/Controllers/ReportManagerController.cs

@@ -23,6 +23,7 @@
        /// <summary>
        /// å§”外报表记录查询
        /// </summary>
        /// <param name="wkshopcode">车间编码</param>
        /// <param name="wocode">工单编号</param>
        /// <param name="partcode">产品编码</param>
        /// <param name="partname">产品名称</param>
@@ -38,7 +39,7 @@
        /// <returns></returns>
        [Route(template: "OutSourceReportSearch")]
        [HttpGet]
        public HttpResponseMessage OutSourceReportSearch(int page, int rows, string prop, string order, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string suppername = null, string type = null,string receivdate=null)
        public HttpResponseMessage OutSourceReportSearch(int page, int rows, string prop, string order,string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string suppername = null, string type = null,string receivdate=null)
        {
            string receivopendate = "";  //收料开始时间
            string receivclosedate = "";    //收料结束时间
@@ -49,7 +50,7 @@
            }
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = ReportManagerBLL.OutSourceReportSearch(wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate, startNum, endNum, prop, order);
            mes = ReportManagerBLL.OutSourceReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -58,6 +59,7 @@
        /// <summary>
        /// å§”外报表记录导出
        /// </summary>
        /// <param name="wkshopcode">车间编码</param>
        /// <param name="wocode">工单编号</param>
        /// <param name="partcode">产品编码</param>
        /// <param name="partname">产品名称</param>
@@ -69,7 +71,7 @@
        /// <returns></returns>
        [Route(template: "OutSourceReportExcelSearch")]
        [HttpGet]
        public HttpResponseMessage OutSourceReportExcelSearch(string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string suppername = null, string type = null, string receivdate = null)
        public HttpResponseMessage OutSourceReportExcelSearch(string wkshopcode = null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string suppername = null, string type = null, string receivdate = null)
        {
            string receivopendate = "";  //收料开始时间
            string receivclosedate = "";    //收料结束时间
@@ -78,7 +80,7 @@
                receivopendate = receivdate.Split('~')[0].ToString();
                receivclosedate = receivdate.Split('~')[1].ToString();
            }
            mes = ReportManagerBLL.OutSourceReportExcelSearch(wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate);
            mes = ReportManagerBLL.OutSourceReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate);
            return TJson.toJson(mes);
        }
        #endregion
@@ -89,6 +91,7 @@
        /// <summary>
        /// ç­ç»„工资报表记录查询
        /// </summary>
        /// <param name=" wkshopcode">车间编码</param>
        /// <param name="compute">计算方式(逐道/末道)</param>
        /// <param name="wocode">工单编号</param>
        /// <param name="partcode">产品编码</param>
@@ -106,7 +109,7 @@
        /// <returns></returns>
        [Route(template: "GroupSalaryReportSearch")]
        [HttpGet]
        public HttpResponseMessage GroupSalaryReportSearch(int page, int rows, string prop, string order,string compute, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null,string rejectstepcode=null)
        public HttpResponseMessage GroupSalaryReportSearch(int page, int rows, string prop, string order, string compute, string wkshopcode = null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null,string rejectstepcode=null)
        {
            string operopendate = "";  //报工开始时间
            string operclosedate = "";    //报工结束时间
@@ -117,7 +120,7 @@
            }
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = ReportManagerBLL.GroupSalaryReportSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode, startNum, endNum, prop, order);
            mes = ReportManagerBLL.GroupSalaryReportSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -141,6 +144,7 @@
        /// <summary>
        /// ç­ç»„工资报表记录查询
        /// </summary>
        /// <param name=" wkshopcode">车间编码</param>
        /// <param name="compute">计算方式(逐道/末道)</param>
        /// <param name="wocode">工单编号</param>
        /// <param name="partcode">产品编码</param>
@@ -154,7 +158,7 @@
        /// <returns></returns>
        [Route(template: "GroupSalaryReportExcelSearch")]
        [HttpGet]
        public HttpResponseMessage GroupSalaryReportExcelSearch(string compute, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null,string rejectstepcode=null)
        public HttpResponseMessage GroupSalaryReportExcelSearch(string compute, string wkshopcode = null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null,string rejectstepcode=null)
        {
            string operopendate = "";  //报工开始时间
            string operclosedate = "";    //报工结束时间
@@ -163,7 +167,7 @@
                operopendate = operdate.Split('~')[0].ToString();
                operclosedate = operdate.Split('~')[1].ToString();
            }
            mes = ReportManagerBLL.GroupSalaryReportExcelSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode);
            mes = ReportManagerBLL.GroupSalaryReportExcelSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode);
            return TJson.toJson(mes);
        }
        #endregion
@@ -173,6 +177,7 @@
        /// <summary>
        /// äººå‘˜å·¥èµ„明细报表
        /// </summary>
        /// <param name=" wkshopcode">车间编码</param>
        /// <param name="compute">计算方式(逐道/末道)</param>
        /// <param name="wocode">工单编号</param>
        /// <param name="partcode">产品编码</param>
@@ -190,7 +195,7 @@
        /// <returns></returns>
        [Route(template: "PeopleSalaryReportSearch")]
        [HttpGet]
        public HttpResponseMessage PeopleSalaryReportSearch(int page, int rows, string prop, string order,string compute, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string reportname = null, string reportdate = null,string rejectstepcode=null)
        public HttpResponseMessage PeopleSalaryReportSearch(int page, int rows, string prop, string order,string compute, string wkshopcode = null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string reportname = null, string reportdate = null,string rejectstepcode=null)
        {
            string reportopendate = "";  //报工开始时间
            string reportclosedate = "";    //报工结束时间
@@ -201,7 +206,7 @@
            }
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = ReportManagerBLL.PeopleSalaryReportSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode, startNum, endNum, prop, order);
            mes = ReportManagerBLL.PeopleSalaryReportSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -210,6 +215,7 @@
        /// <summary>
        /// äººå‘˜å·¥èµ„明细报表导出
        /// </summary>
        /// <param name=" wkshopcode">车间编码</param>
        /// <param name="compute">计算方式(逐道/末道)</param>
        /// <param name="wocode">工单编号</param>
        /// <param name="partcode">产品编码</param>
@@ -223,7 +229,7 @@
        /// <returns></returns>
        [Route(template: "PeopleSalaryReportExcelSearch")]
        [HttpGet]
        public HttpResponseMessage PeopleSalaryReportExcelSearch(string compute, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string reportname = null, string reportdate = null,string rejectstepcode=null)
        public HttpResponseMessage PeopleSalaryReportExcelSearch(string compute, string wkshopcode = null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string reportname = null, string reportdate = null,string rejectstepcode=null)
        {
            string reportopendate = "";  //报工开始时间
            string reportclosedate = "";    //报工结束时间
@@ -232,7 +238,7 @@
                reportopendate = reportdate.Split('~')[0].ToString();
                reportclosedate = reportdate.Split('~')[1].ToString();
            }
            mes = ReportManagerBLL.PeopleSalaryReportExcelSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode);
            mes = ReportManagerBLL.PeopleSalaryReportExcelSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode);
            return TJson.toJson(mes);
        }
        #endregion
@@ -242,6 +248,7 @@
        /// <summary>
        /// ä¸è‰¯æ˜Žç»†æŠ¥è¡¨ 
        /// </summary>
        /// <param name=" wkshopcode">车间编码</param>
        /// <param name="wocode">工单编号</param>
        /// <param name="partcode">产品编码</param>
        /// <param name="partname">产品名称</param>
@@ -258,7 +265,7 @@
        /// <returns></returns>
        [Route(template: "DefectDetailsReportSearch")]
        [HttpGet]
        public HttpResponseMessage DefectDetailsReportSearch(int page, int rows, string prop, string order, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null,string defectcode=null,string defectname=null, string reportname = null, string reportdate = null)
        public HttpResponseMessage DefectDetailsReportSearch(int page, int rows, string prop, string order,string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null,string defectcode=null,string defectname=null, string reportname = null, string reportdate = null)
        {
            string reportopendate = "";  //报工开始时间
            string reportclosedate = "";    //报工结束时间
@@ -269,7 +276,7 @@
            }
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = ReportManagerBLL.DefectDetailsReportSearch(wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
            mes = ReportManagerBLL.DefectDetailsReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -278,6 +285,7 @@
        /// <summary>
        /// ä¸è‰¯æ˜Žç»†æŠ¥è¡¨å¯¼å‡º 
        /// </summary>
        /// <param name=" wkshopcode">车间编码</param>
        /// <param name="wocode">工单编号</param>
        /// <param name="partcode">产品编码</param>
        /// <param name="partname">产品名称</param>
@@ -290,7 +298,7 @@
        /// <returns></returns>
        [Route(template: "DefectDetailsReportExcelSearch")]
        [HttpGet]
        public HttpResponseMessage DefectDetailsReportExcelSearch(string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string defectcode = null, string defectname = null, string reportname = null, string reportdate = null)
        public HttpResponseMessage DefectDetailsReportExcelSearch(string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string defectcode = null, string defectname = null, string reportname = null, string reportdate = null)
        {
            string reportopendate = "";  //报工开始时间
            string reportclosedate = "";    //报工结束时间
@@ -299,7 +307,7 @@
                reportopendate = reportdate.Split('~')[0].ToString();
                reportclosedate = reportdate.Split('~')[1].ToString();
            }
            mes = ReportManagerBLL.DefectDetailsReportExcelSearch(wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate);
            mes = ReportManagerBLL.DefectDetailsReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate);
            return TJson.toJson(mes);
        }
        #endregion
@@ -324,6 +332,7 @@
        /// <summary>
        /// ç»´ä¿®æ˜Žç»†æŠ¥è¡¨ 
        /// </summary>
        /// <param name="wkshopcode">车间编号</param>
        /// <param name="wocode">工单编号</param>
        /// <param name="partcode">产品编码</param>
        /// <param name="partname">产品名称</param>
@@ -340,7 +349,7 @@
        /// <returns></returns>
        [Route(template: "MaintenanceDetailsReportSearch")]
        [HttpGet]
        public HttpResponseMessage MaintenanceDetailsReportSearch(int page, int rows, string prop, string order, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string style = null, string defectname = null, string repairname = null, string repairdate = null)
        public HttpResponseMessage MaintenanceDetailsReportSearch(int page, int rows, string prop, string order,string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string style = null, string defectname = null, string repairname = null, string repairdate = null)
        {
            string repairopendate = "";  //维修开始时间
            string repairclosedate = "";    //维修结束时间
@@ -351,7 +360,7 @@
            }
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = ReportManagerBLL.MaintenanceDetailsReportSearch(wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate, startNum, endNum, prop, order);
            mes = ReportManagerBLL.MaintenanceDetailsReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -360,6 +369,7 @@
        /// <summary>
        /// ç»´ä¿®æ˜Žç»†æŠ¥è¡¨å¯¼å‡º 
        /// </summary>
        /// <param name="wkshopcode">车间编号</param>
        /// <param name="wocode">工单编号</param>
        /// <param name="partcode">产品编码</param>
        /// <param name="partname">产品名称</param>
@@ -372,7 +382,7 @@
        /// <returns></returns>
        [Route(template: "MaintenanceDetailsReportExcelSearch")]
        [HttpGet]
        public HttpResponseMessage MaintenanceDetailsReportExcelSearch(string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string style = null, string defectname = null, string repairname = null, string repairdate = null)
        public HttpResponseMessage MaintenanceDetailsReportExcelSearch(string wkshopcode = null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string style = null, string defectname = null, string repairname = null, string repairdate = null)
        {
            string repairopendate = "";  //维修开始时间
            string repairclosedate = "";    //维修结束时间
@@ -381,7 +391,7 @@
                repairopendate = repairdate.Split('~')[0].ToString();
                repairclosedate = repairdate.Split('~')[1].ToString();
            }
            mes = ReportManagerBLL.MaintenanceDetailsReportExcelSearch(wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate);
            mes = ReportManagerBLL.MaintenanceDetailsReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate);
            return TJson.toJson(mes);
        }
        #endregion
@@ -596,6 +606,7 @@
        /// <summary>
        /// ç”Ÿäº§è¿›åº¦æŠ¥è¡¨
        /// </summary>
        /// <param name="wkshopcode">车间编码</param>
        /// <param name="status">工单状态</param>
        /// <param name="wocode">工单编号</param>
        /// <param name="routecode">工艺路线编码</param>
@@ -611,7 +622,7 @@
        /// <returns></returns>
        [Route(template: "ProductionScheduleReportSearch")]
        [HttpGet]
        public HttpResponseMessage ProductionScheduleReportSearch(int page, int rows, string prop, string order,string status=null, string wocode = null, string routecode = null, string routename = null, string partcode = null, string partname = null, string partspec = null,string lm_date=null)
        public HttpResponseMessage ProductionScheduleReportSearch(int page, int rows, string prop, string order, string wkshopcode=null, string status=null, string wocode = null, string routecode = null, string routename = null, string partcode = null, string partname = null, string partspec = null,string lm_date=null)
        {
            string opendate = "";     //开始时间
            string closedate = "";    //结束时间
@@ -622,7 +633,7 @@
            }
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = ReportManagerBLL.ProductionScheduleReportSearch(status,wocode, routecode, routename, partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
            mes = ReportManagerBLL.ProductionScheduleReportSearch(wkshopcode,status, wocode, routecode, routename, partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -631,6 +642,7 @@
        /// <summary>
        /// ç”Ÿäº§è¿›åº¦æŠ¥è¡¨å¯¼å‡º
        /// </summary>
        /// <param name="wkshopcode">车间编码</param>
        /// <param name="status">工单状态</param>
        /// <param name="wocode">工单编号</param>
        /// <param name="routecode">工艺路线编码</param>
@@ -642,7 +654,7 @@
        /// <returns></returns>
        [Route(template: "ProductionScheduleReportExcelSearch")]
        [HttpGet]
        public HttpResponseMessage ProductionScheduleReportExcelSearch(string status = null, string wocode = null, string routecode = null, string routename = null, string partcode = null, string partname = null, string partspec = null, string lm_date = null)
        public HttpResponseMessage ProductionScheduleReportExcelSearch(string wkshopcode=null, string status = null, string wocode = null, string routecode = null, string routename = null, string partcode = null, string partname = null, string partspec = null, string lm_date = null)
        {
            string opendate = "";     //开始时间
            string closedate = "";    //结束时间
@@ -651,7 +663,7 @@
                opendate = lm_date.Split('~')[0].ToString();
                closedate = lm_date.Split('~')[1].ToString();
            }
            mes = ReportManagerBLL.ProductionScheduleReportExcelSearch(status,wocode, routecode, routename, partcode, partname, partspec, opendate, closedate);
            mes = ReportManagerBLL.ProductionScheduleReportExcelSearch(wkshopcode,status, wocode, routecode, routename, partcode, partname, partspec, opendate, closedate);
            return TJson.toJson(mes);
        }
        #endregion

 VueWebApi/DLL/BLL/BaseDateBLL.cs

@@ -65,6 +65,19 @@
        }
        #endregion

        #region[通过选择的所属组织查询所属班组]
        public static ToMessage StorgGroupSelect(string stu_torgcode, string description)
        {
            return BaseDateDAL.StorgGroupSelect(stu_torgcode, description);
        }
        #endregion

        #region[通过选择的所属组织查询所属角色类型]
        public static ToMessage StorgRoleSelect(string stu_torgcode, string description)
        {
            return BaseDateDAL.StorgRoleSelect(stu_torgcode, description);
        }
        #endregion


        #region[ERP生产车间/部门信息查询]

 VueWebApi/DLL/BLL/BasicSettingBLL.cs

@@ -12,9 +12,9 @@
    public class BasicSettingBLL
    {
        #region [组织架构数据查询]
        public static ToMessage OrganizationSearch(string orgCode, string orgName, string orgType, string userName, int startNum, int endNum, string prop, string order)
        public static ToMessage OrganizationSearch(string stu_torgcode,string description, string orgCode, string orgName, string orgType, string userName, int startNum, int endNum, string prop, string order)
        {
            return BasicSettingDAL.OrganizationSearch(orgCode, orgName, orgType, userName, startNum, endNum, prop, order);
            return BasicSettingDAL.OrganizationSearch(stu_torgcode, description, orgCode, orgName, orgType, userName, startNum, endNum, prop, order);
        }
        #endregion

@@ -43,23 +43,23 @@


        #region[用户清单数据查询]
        public static ToMessage UserSearch(string UserCode, string UserName, string StuOrg, string wagetype, string Enable, int startNum, int endNum, string prop, string order)
        public static ToMessage UserSearch(string UserCode, string UserName, string StuOrg,string description, string wagetype, string Enable, int startNum, int endNum, string prop, string order)
        {
            return BasicSettingDAL.UserSearch(UserCode, UserName, StuOrg, wagetype, Enable, startNum, endNum, prop, order);
            return BasicSettingDAL.UserSearch(UserCode, UserName, StuOrg, description, wagetype, Enable, startNum, endNum, prop, order);
        }
        #endregion

        #region [用户所属组织]
        public static ToMessage UserOrganization()
        public static ToMessage UserOrganization(string stu_torgcode,string description)
        {
            return BasicSettingDAL.UserOrganization();
            return BasicSettingDAL.UserOrganization(stu_torgcode, description);
        }
        #endregion

        #region[用户所属班组]
        public static ToMessage UserGroup()
        public static ToMessage UserGroup(string stu_torgcode,string description)
        {
            return BasicSettingDAL.UserGroup();
            return BasicSettingDAL.UserGroup(stu_torgcode, description);
        }
        #endregion

@@ -78,16 +78,16 @@
        #endregion

        #region[用户清单关联角色查询]
        public static ToMessage UserAssociationRole(string usercode)
        public static ToMessage UserAssociationRole(string usercode,string stu_torgcode,string description)
        {
            return BasicSettingDAL.UserAssociationRole(usercode);
            return BasicSettingDAL.UserAssociationRole(usercode, stu_torgcode, description);
        }
        #endregion

        #region[用户清单关联角色保存]
        public static ToMessage SaveUserAssoctRole(string usercode, List<RoleUserSubmit> json)
        public static ToMessage SaveUserAssoctRole(string usercode,string stu_torgcode,string description, List<RoleUserSubmit> json)
        {
            return BasicSettingDAL.SaveUserAssoctRole(usercode, json);
            return BasicSettingDAL.SaveUserAssoctRole(usercode, stu_torgcode, description, json);
        }
        #endregion

@@ -100,9 +100,9 @@


        #region[用户组列表查询]
        public static ToMessage UserGroupSearch(int startNum, int endNum, string prop, string order)
        public static ToMessage UserGroupSearch(string stu_torgcode,string description,int startNum, int endNum, string prop, string order)
        {
            return BasicSettingDAL.UserGroupSearch(startNum, endNum, prop, order);
            return BasicSettingDAL.UserGroupSearch(stu_torgcode, description,startNum, endNum, prop, order);
        }
        #endregion

@@ -122,9 +122,9 @@


        #region[角色类型查询]
        public static ToMessage RoleTypeSearch(int startNum, int endNum, string prop, string order)
        public static ToMessage RoleTypeSearch(string stu_torgcode, string description,int startNum, int endNum, string prop, string order)
        {
            return BasicSettingDAL.RoleTypeSearch(startNum, endNum, prop, order);
            return BasicSettingDAL.RoleTypeSearch(stu_torgcode, description, startNum, endNum, prop, order);
        }
        #endregion

@@ -143,16 +143,16 @@
        #endregion

        #region[角色类型下拉接口]
        public static ToMessage RoleTypeSelect()
        public static ToMessage RoleTypeSelect(string stu_torgcode,string description)
        {
            return BasicSettingDAL.RoleTypeSelect();
            return BasicSettingDAL.RoleTypeSelect(stu_torgcode, description);
        }
        #endregion

        #region[角色清单查询]
        public static ToMessage RoleSearch(string RoleCode, string RoleName, string RoleTypeCode, string CreateUser, int startNum, int endNum, string prop, string order)
        public static ToMessage RoleSearch(string stu_torgcode,string description,string RoleCode, string RoleName, string RoleTypeCode, string CreateUser, int startNum, int endNum, string prop, string order)
        {
            return BasicSettingDAL.RoleSearch(RoleCode, RoleName, RoleTypeCode, CreateUser, startNum, endNum, prop, order);
            return BasicSettingDAL.RoleSearch(stu_torgcode, description,RoleCode, RoleName, RoleTypeCode, CreateUser, startNum, endNum, prop, order);
        }
        #endregion

@@ -164,9 +164,9 @@
        #endregion

        #region[角色清单新增编辑]
        public static ToMessage AddUpdateRole(string RoleId, string RoleCode, string RoleName, string RoleTypeCode, string description, string Usercode, string OperType)
        public static ToMessage AddUpdateRole(string RoleId, string RoleCode, string RoleName,string stu_torgcode, string RoleTypeCode, string description, string Usercode, string OperType)
        {
            return BasicSettingDAL.AddUpdateRole(RoleId, RoleCode, RoleName, RoleTypeCode, description, Usercode, OperType);
            return BasicSettingDAL.AddUpdateRole(RoleId, RoleCode, RoleName, stu_torgcode, RoleTypeCode, description, Usercode, OperType);
        }
        #endregion

@@ -230,6 +230,13 @@



        #region[安灯系统/车间查询]
        public static ToMessage AnDengShopSearch(string stu_torgcode,string description)
        {
            return BasicSettingDAL.AnDengShopSearch(stu_torgcode, description);
        }
        #endregion

        #region[安灯系统/自定义安灯呼叫类型查询]
        public static ToMessage AnDengTypeSearch()
        {

 VueWebApi/DLL/BLL/DeviceManagerBLL.cs

@@ -69,9 +69,9 @@
        #endregion

        #region[所属车间下拉接口]
        public static ToMessage WorkShopSelect()
        public static ToMessage WorkShopSelect(string stu_torgcode,string description)
        {
            return DeviceManagerDAL.WorkShopSelect();
            return DeviceManagerDAL.WorkShopSelect(stu_torgcode, description);
        }
        #endregion

@@ -83,9 +83,9 @@
        #endregion

        #region [设备清单查询]
        public static ToMessage DeviceMangerSearch(string deviceCode, string deviceName, string status, string workShop, string deviceType, string deviceGroup, int startNum, int endNum, string prop, string order)
        public static ToMessage DeviceMangerSearch(string stu_torgcode,string description,string deviceCode, string deviceName, string status, string workShop, string deviceType, string deviceGroup, int startNum, int endNum, string prop, string order)
        {
            return DeviceManagerDAL.DeviceMangerSearch(deviceCode, deviceName, status, workShop, deviceType, deviceGroup, startNum, endNum, prop, order);
            return DeviceManagerDAL.DeviceMangerSearch(stu_torgcode, description,deviceCode, deviceName, status, workShop, deviceType, deviceGroup, startNum, endNum, prop, order);
        }
        #endregion

@@ -187,9 +187,9 @@
        #endregion

        #region[设备点检标准关联工作站查询]
        public static ToMessage DeviceCheckStanedAssociationEqp(string checkstand_code)
        public static ToMessage DeviceCheckStanedAssociationEqp(string stu_torgcode,string description,string checkstand_code)
        {
            return DeviceManagerDAL.DeviceCheckStanedAssociationEqp(checkstand_code);
            return DeviceManagerDAL.DeviceCheckStanedAssociationEqp(stu_torgcode, description,checkstand_code);
        }
        #endregion

@@ -238,9 +238,9 @@
        #endregion

        #region[设备保养标准关联工作站查询]
        public static ToMessage DeviceRepairStanedAssociationEqp(string repairstand_code)
        public static ToMessage DeviceRepairStanedAssociationEqp(string stu_torgcode,string description,string repairstand_code)
        {
            return DeviceManagerDAL.DeviceRepairStanedAssociationEqp(repairstand_code);
            return DeviceManagerDAL.DeviceRepairStanedAssociationEqp(stu_torgcode, description,repairstand_code);
        }
        #endregion

@@ -254,9 +254,9 @@


        #region[设备点检记录查询]
        public static ToMessage DeviceCheckTakeSearch(string wkshopcode, string eqpcode, string eqpname, string stanedname, string checkuser, string checkopendate, string checkclosedate, int startNum, int endNum, string prop, string order)
        public static ToMessage DeviceCheckTakeSearch(string stu_torgcode,string description,string wkshopcode, string eqpcode, string eqpname, string stanedname, string checkuser, string checkopendate, string checkclosedate, int startNum, int endNum, string prop, string order)
        {
            return DeviceManagerDAL.DeviceCheckTakeSearch(wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate, startNum, endNum, prop, order);
            return DeviceManagerDAL.DeviceCheckTakeSearch(stu_torgcode, description,wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate, startNum, endNum, prop, order);
        }
        #endregion

@@ -268,18 +268,18 @@
        #endregion

        #region[设备点检记录导出]
        public static ToMessage DeviceCheckTakeOutExcel(string wkshopcode, string eqpcode, string eqpname, string stanedname, string checkuser, string checkopendate, string checkclosedate)
        public static ToMessage DeviceCheckTakeOutExcel(string stu_torgcode,string description,string wkshopcode, string eqpcode, string eqpname, string stanedname, string checkuser, string checkopendate, string checkclosedate)
        {
            return DeviceManagerDAL.DeviceCheckTakeOutExcel(wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate);
            return DeviceManagerDAL.DeviceCheckTakeOutExcel(stu_torgcode, description,wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate);
        }
        #endregion



        #region[设备保养记录查询]
        public static ToMessage DeviceRepairTakeSearch(string wkshopcode, string eqpcode, string eqpname, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult, int startNum, int endNum, string prop, string order)
        public static ToMessage DeviceRepairTakeSearch(string stu_torgcode,string description,string wkshopcode, string eqpcode, string eqpname, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult, int startNum, int endNum, string prop, string order)
        {
            return DeviceManagerDAL.DeviceCheckTakeSearch(wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult, startNum, endNum, prop, order);
            return DeviceManagerDAL.DeviceCheckTakeSearch(stu_torgcode, description,wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult, startNum, endNum, prop, order);
        }
        #endregion

@@ -291,18 +291,18 @@
        #endregion

        #region[设备保养记录导出]
        public static ToMessage DeviceRepairTakeOutExcel(string wkshopcode, string eqpcode, string eqpname, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult)
        public static ToMessage DeviceRepairTakeOutExcel(string stu_torgcode,string description,string wkshopcode, string eqpcode, string eqpname, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult)
        {
            return DeviceManagerDAL.DeviceRepairTakeOutExcel(wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult);
            return DeviceManagerDAL.DeviceRepairTakeOutExcel(stu_torgcode, description,wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult);
        }
        #endregion



        #region[设备维修记录查询]
        public static ToMessage DeviceUpdateSearch(string wkshopcode, string eqpcode, string eqpname, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate, int startNum, int endNum, string prop, string order)
        public static ToMessage DeviceUpdateSearch(string stu_torgcode,string description,string wkshopcode, string eqpcode, string eqpname, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate, int startNum, int endNum, string prop, string order)
        {
            return DeviceManagerDAL.DeviceUpdateSearch(wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate, startNum, endNum, prop, order);
            return DeviceManagerDAL.DeviceUpdateSearch(stu_torgcode, description,wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate, startNum, endNum, prop, order);
        }
        #endregion

@@ -314,9 +314,9 @@
        #endregion

        #region[设备维修记录导出]
        public static ToMessage DeviceUpdateOutExcel(string wkshopcode, string eqpcode, string eqpname, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate)
        public static ToMessage DeviceUpdateOutExcel(string stu_torgcode,string description,string wkshopcode, string eqpcode, string eqpname, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate)
        {
            return DeviceManagerDAL.DeviceUpdateOutExcel(wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate);
            return DeviceManagerDAL.DeviceUpdateOutExcel(stu_torgcode, description,wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate);
        }
        #endregion
    }

 VueWebApi/DLL/BLL/LoginBLL.cs

@@ -18,9 +18,9 @@
        #endregion

        #region [写入登录记录表]
        public static ToMessage LoginBas(string usercode,string usertype)
        public static ToMessage LoginBas(string usercode,string usertype,string stu_torgcode)
        {
            return LoginDAL.LoginBas(usercode,usertype);
            return LoginDAL.LoginBas(usercode,usertype, stu_torgcode);
        }
        #endregion

@@ -54,9 +54,9 @@
        #endregion

        #region[PC登出]
        public static ToMessage LoginOut(int userid,string usercode, string username,string usertype)
        public static ToMessage LoginOut(int userid,string usercode, string username,string usertype,string stu_torgcode)
        {
            return LoginDAL.LoginOut(userid, usercode, username, usertype);
            return LoginDAL.LoginOut(userid, usercode, username, usertype, stu_torgcode);
        }
        #endregion


 VueWebApi/DLL/BLL/ProductModelBLL.cs

@@ -99,16 +99,16 @@
        #endregion

        #region[存货档案关联工艺路线查询]
        public static ToMessage InventoryFileAssociationRoute(string partcode)
        public static ToMessage InventoryFileAssociationRoute(string stu_torgcode,string stu_torgtypecode,string partcode)
        {
            return ProductModelDAL.InventoryFileAssociationRoute(partcode);
            return ProductModelDAL.InventoryFileAssociationRoute(stu_torgcode, stu_torgtypecode,partcode);
        }
        #endregion

        #region[存货档案关联工艺路线提交]
        public static ToMessage SaveInventoryFile(string partcode,string defaultroute_code, string username, List<ObjectData> json)
        public static ToMessage SaveInventoryFile(string stu_torgcode,string stu_torgtypecode,string partcode,string defaultroute_code, string username, List<PartRout> json)
        {
            return ProductModelDAL.SaveInventoryFile(partcode, defaultroute_code, username, json);
            return ProductModelDAL.SaveInventoryFile(stu_torgcode, stu_torgtypecode,partcode, defaultroute_code, username, json);
        }
        #endregion

@@ -153,16 +153,16 @@


        #region[工序下拉查询接口]
        public static ToMessage StepSelect()
        public static ToMessage StepSelect(string WorkShop)
        {
            return ProductModelDAL.StepSelect();
            return ProductModelDAL.StepSelect(WorkShop);
        }
        #endregion

        #region[工艺路线查询]
        public static ToMessage RouteSearch(string routecode, string routename, string description, string createuser, int startNum, int endNum, string prop, string order)
        public static ToMessage RouteSearch(string stu_torgcode,string stu_torgtypecode, string WorkShop,string routecode, string routename, string description, string createuser, int startNum, int endNum, string prop, string order)
        {
            return ProductModelDAL.RouteSearch(routecode, routename, description, createuser, startNum, endNum, prop, order);
            return ProductModelDAL.RouteSearch(stu_torgcode,stu_torgtypecode,WorkShop, routecode, routename, description, createuser, startNum, endNum, prop, order);
        }
        #endregion

@@ -190,16 +190,16 @@


        #region[工序查询]
        public static ToMessage StepSearch(string stepcode, string stepname, string enable,string steptypecode, string createuser, int startNum, int endNum, string prop, string order)
        public static ToMessage StepSearch(string stu_torgcode,string stu_torgtypecode,string WorkShop, string stepcode, string stepname, string enable,string steptypecode, string createuser, int startNum, int endNum, string prop, string order)
        {
            return ProductModelDAL.StepSearch(stepcode, stepname, enable, steptypecode, createuser, startNum, endNum, prop, order);
            return ProductModelDAL.StepSearch(stu_torgcode, stu_torgtypecode, WorkShop, stepcode, stepname, enable, steptypecode, createuser, startNum, endNum, prop, order);
        }
        #endregion

        #region[工序新增编辑]
        public static ToMessage AddUpdateStep(string stepid, string stepcode, string stepname, string steptypecode, string enable, string description, string username, string operType)
        public static ToMessage AddUpdateStep(string stepid,string WorkShop, string stepcode, string stepname, string steptypecode, string enable, string description, string username, string operType)
        {
            return ProductModelDAL.AddUpdateStep(stepid, stepcode, stepname, steptypecode, enable, description, username, operType);
            return ProductModelDAL.AddUpdateStep(stepid, WorkShop, stepcode, stepname, steptypecode, enable, description, username, operType);
        }
        #endregion

@@ -211,30 +211,30 @@
        #endregion

        #region[工序定义关联工作站查询]
        public static ToMessage StepAssociationEqp(string stepcode)
        public static ToMessage StepAssociationEqp(string WorkShop, string stepcode)
        {
            return ProductModelDAL.StepAssociationEqp(stepcode);
            return ProductModelDAL.StepAssociationEqp(WorkShop,stepcode);
        }
        #endregion

        #region [工序定义关联工作站提交]
        public static ToMessage SaveStepAssociationEqp(string stepcode, string username, List<ObjectData> json)
        public static ToMessage SaveStepAssociationEqp(string WorkShop,string stepcode, string username, List<ObjectData> json)
        {
            return ProductModelDAL.SaveStepAssociationEqp(stepcode,username,json);
            return ProductModelDAL.SaveStepAssociationEqp(WorkShop,stepcode, username,json);
        }
        #endregion

        #region[工序关联缺陷查询]
        public static ToMessage StepAssociationDefect(string stepcode)
        public static ToMessage StepAssociationDefect(string WorkShop, string stepcode)
        {
            return ProductModelDAL.StepAssociationDefect(stepcode);
            return ProductModelDAL.StepAssociationDefect(WorkShop,stepcode);
        }
        #endregion

        #region[工序关联缺陷提交]
        public static ToMessage SaveStepAssociationDefect(string stepcode, string username, List<ObjectData> json)
        public static ToMessage SaveStepAssociationDefect(string WorkShop, string stepcode, string username, List<ObjectData> json)
        {
            return ProductModelDAL.SaveStepAssociationDefect(stepcode,username,json);
            return ProductModelDAL.SaveStepAssociationDefect(WorkShop,stepcode, username,json);
        }
        #endregion

@@ -250,9 +250,9 @@
        #endregion

        #region[产品编码查找工艺路线下拉框]
        public static ToMessage PartSelectRpute(string partcode)
        public static ToMessage PartSelectRpute(string stu_torgcode,string stu_torgtypecode,string partcode)
        {
            return ProductModelDAL.PartSelectRpute(partcode);
            return ProductModelDAL.PartSelectRpute(stu_torgcode, stu_torgtypecode,partcode);
        }
        #endregion

@@ -278,9 +278,9 @@
        #endregion

        #region[节拍工价查询]
        public static ToMessage BeatRateSearch(string partcode,string routecode, string stepcode, string eqpcode,int startNum, int endNum, string prop, string order)
        public static ToMessage BeatRateSearch(string stu_torgcode,string stu_torgtypecode,string partcode,string routecode, string stepcode, string eqpcode,int startNum, int endNum, string prop, string order)
        {
            return ProductModelDAL.BeatRateSearch(partcode,routecode, stepcode, eqpcode, startNum, endNum, prop, order);
            return ProductModelDAL.BeatRateSearch(stu_torgcode, stu_torgtypecode,partcode, routecode, stepcode, eqpcode, startNum, endNum, prop, order);
        }
        #endregion


 VueWebApi/DLL/BLL/ProductionManagementBLL.cs

@@ -13,9 +13,9 @@
    public class ProductionManagementBLL
    {
        #region[ERP订单查询]
        public static ToMessage ErpOrderSearch(string erporderstus, string erpordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string paydatestartdate1, string paydateenddate2, string creatuser, int endNum, string prop, string order)
        public static ToMessage ErpOrderSearch(string stu_torgcode,string stu_torgtypecode, string erporderstus, string erpordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string paydatestartdate1, string paydateenddate2, string creatuser, int endNum, string prop, string order)
        {
            return ProductionManagementDAL.ErpOrderSearch(erporderstus, erpordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
            return ProductionManagementDAL.ErpOrderSearch(stu_torgcode, stu_torgtypecode,erporderstus, erpordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
        }
        #endregion

@@ -36,9 +36,9 @@


        #region[MES工单查询]
        public static ToMessage MesOrderSearch(string mesorderstus, string mesordercode,string sourceorder,string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
        public static ToMessage MesOrderSearch(string stu_torgcode,string stu_torgtypecode,string mesorderstus, string mesordercode,string sourceorder,string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
        {
            return ProductionManagementDAL.MesOrderSearch(mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
            return ProductionManagementDAL.MesOrderSearch(stu_torgcode, stu_torgtypecode,mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
        }
        #endregion

@@ -50,16 +50,16 @@
        #endregion

        #region[产品编码查找工艺路线下拉接口]
        public static ToMessage PartSelectRoute(string partcode)
        public static ToMessage PartSelectRoute(string partcode,string wkshopcode)
        {
            return ProductionManagementDAL.PartSelectRoute(partcode);
            return ProductionManagementDAL.PartSelectRoute(partcode, wkshopcode);
        }
        #endregion

        #region[工艺路线查找车间下拉接口]
        public static ToMessage RouteSelectWkshop(string partcode, string routecode)
        public static ToMessage RouteSelectWkshop(string stu_torgcode,string stu_torgtypecode,string partcode)
        {
            return ProductionManagementDAL.RouteSelectWkshop(partcode,routecode);
            return ProductionManagementDAL.RouteSelectWkshop(stu_torgcode, stu_torgtypecode, partcode);
        }
        #endregion

@@ -136,23 +136,23 @@
        #endregion

        #region[生产开报工扫码获取工单对应工序任务]
        public static ToMessage MesOrderStepSearch(string orderstepqrcode, int startNum, int endNum, string prop, string order)
        public static ToMessage MesOrderStepSearch(string stu_torgcode,string stu_torgtypecode, string orderstepqrcode, int startNum, int endNum, string prop, string order)
        {
            return ProductionManagementDAL.MesOrderStepSearch(orderstepqrcode, startNum, endNum, prop, order);
            return ProductionManagementDAL.MesOrderStepSearch(stu_torgcode, stu_torgtypecode, orderstepqrcode, startNum, endNum, prop, order);
        }
        #endregion

        #region[生产开报工扫码获取工单对应工序任务(外协)]
        public static ToMessage MesOrderWxStepSearch(string orderstepqrcode, int startNum, int endNum, string prop, string order)
        public static ToMessage MesOrderWxStepSearch(string stu_torgcode,string stu_torgtypecode,string orderstepqrcode, int startNum, int endNum, string prop, string order)
        {
            return ProductionManagementDAL.MesOrderWxStepSearch(orderstepqrcode, startNum, endNum, prop, order);
            return ProductionManagementDAL.MesOrderWxStepSearch(stu_torgcode, stu_torgtypecode,orderstepqrcode, startNum, endNum, prop, order);
        }
        #endregion

        #region[生产开报工扫码获取工单对应工序任务(不良)]
        public static ToMessage MesOrderNgStepSearch(string orderstepqrcode, int startNum, int endNum, string prop, string order)
        public static ToMessage MesOrderNgStepSearch(string stu_torgcode,string stu_torgtypecode,string orderstepqrcode, int startNum, int endNum, string prop, string order)
        {
            return ProductionManagementDAL.MesOrderNgStepSearch(orderstepqrcode, startNum, endNum, prop, order);
            return ProductionManagementDAL.MesOrderNgStepSearch(stu_torgcode, stu_torgtypecode,orderstepqrcode, startNum, endNum, prop, order);
        }
        #endregion

@@ -178,9 +178,9 @@
        #endregion

        #region[生产开报工：报工时获取生产班组下拉框]
        public static ToMessage MesOrderStepReportSelectUserGroup()
        public static ToMessage MesOrderStepReportSelectUserGroup(string stu_torgcode,string stu_torgtypecode,string wkshopcode)
        {
            return ProductionManagementDAL.MesOrderStepReportSelectUserGroup();
            return ProductionManagementDAL.MesOrderStepReportSelectUserGroup(stu_torgcode, stu_torgtypecode,wkshopcode);
        }
        #endregion

@@ -272,9 +272,9 @@


        #region[MES工单批量关闭查询]
        public static ToMessage MesOrderBitchClosedSearch(string mesorderstus, string mesordercode, string sourceorder, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
        public static ToMessage MesOrderBitchClosedSearch(string stu_torgcode,string stu_torgtypecode, string mesorderstus, string mesordercode, string sourceorder, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
        {
            return ProductionManagementDAL.MesOrderBitchClosedSearch(mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
            return ProductionManagementDAL.MesOrderBitchClosedSearch(stu_torgcode, stu_torgtypecode,mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
        }
        #endregion


 VueWebApi/DLL/BLL/QualityManagementBLL.cs

@@ -49,9 +49,9 @@
        #endregion

        #region[工序检验标准新增、编辑获取检验项目下拉列表]
        public static ToMessage StepCheckItemSelect()
        public static ToMessage StepCheckItemSelect(string WorkShop)
        {
            return QualityManagementDAL.StepCheckItemSelect();
            return QualityManagementDAL.StepCheckItemSelect(WorkShop);
        }
        #endregion

@@ -72,16 +72,16 @@


        #region[工序检验项目列表查询]
        public static ToMessage StepCheckItemSearch(string itemcode, string itemname, string itemdescr, int startNum, int endNum, string prop, string order)
        public static ToMessage StepCheckItemSearch(string stu_torgcode,string stu_torgtypecode, string itemcode, string itemname, string itemdescr, int startNum, int endNum, string prop, string order)
        {
            return QualityManagementDAL.StepCheckItemSearch(itemcode, itemname, itemdescr, startNum,endNum, prop, order);
            return QualityManagementDAL.StepCheckItemSearch(stu_torgcode, stu_torgtypecode, itemcode, itemname, itemdescr, startNum,endNum, prop, order);
        }
        #endregion

        #region[工序检验项目新增、编辑提交]
        public static ToMessage AddUpdateStepCheckItem(string checkitemcode, string checkitemname, string checkitemdescr, string opertype, string username)
        public static ToMessage AddUpdateStepCheckItem(string wkshopcode, string checkitemcode, string checkitemname, string checkitemdescr, string opertype, string username)
        {
            return QualityManagementDAL.AddUpdateStepCheckItem(checkitemcode, checkitemname, checkitemdescr, opertype, username);
            return QualityManagementDAL.AddUpdateStepCheckItem(wkshopcode,checkitemcode, checkitemname, checkitemdescr, opertype, username);
        }
        #endregion

@@ -117,9 +117,9 @@


        #region[质检方案列表查询]
        public static ToMessage QualityInspectionSearch(string qualityinsptcode, string qualityinsptname, string status, string checktype, string sampltype,string suitobject, int startNum, int endNum, string prop, string order)
        public static ToMessage QualityInspectionSearch(string stu_torgcode,string stu_torgtypecode, string qualityinsptcode, string qualityinsptname, string status, string checktype, string sampltype,string suitobject, int startNum, int endNum, string prop, string order)
        {
            return QualityManagementDAL.QualityInspectionSearch(qualityinsptcode, qualityinsptname, status, checktype, sampltype, suitobject, startNum, endNum, prop, order);
            return QualityManagementDAL.QualityInspectionSearch(stu_torgcode, stu_torgtypecode, qualityinsptcode, qualityinsptname, status, checktype, sampltype, suitobject, startNum, endNum, prop, order);
        }
        #endregion

@@ -131,9 +131,9 @@
        #endregion

        #region[质检方案新增/编辑提交]
        public static ToMessage QualityInspectionAddEditSave(string qualityinsptcode, string qualityinsptname, string status, string checktype, string sampmethod, string sampscare, string suitobject, string suitpart, string descr,string stepcode, string checkitem, string type, string username)
        public static ToMessage QualityInspectionAddEditSave(string wkshopcode, string qualityinsptcode, string qualityinsptname, string status, string checktype, string sampmethod, string sampscare, string suitobject, string suitpart, string descr,string stepcode, string checkitem, string type, string username)
        {
            return QualityManagementDAL.QualityInspectionAddEditSave(qualityinsptcode, qualityinsptname, status, checktype, sampmethod, sampscare, suitobject, suitpart, descr, stepcode, checkitem, type, username);
            return QualityManagementDAL.QualityInspectionAddEditSave(wkshopcode,qualityinsptcode, qualityinsptname, status, checktype, sampmethod, sampscare, suitobject, suitpart, descr, stepcode, checkitem, type, username);
        }
        #endregion


 VueWebApi/DLL/BLL/ReportManagerBLL.cs

@@ -10,24 +10,24 @@
    public class ReportManagerBLL
    {
        #region[委外报表记录查询]
        public static ToMessage OutSourceReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate, int startNum, int endNum, string prop, string order)
        public static ToMessage OutSourceReportSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate, int startNum, int endNum, string prop, string order)
        {
            return ReportManagerDAL.OutSourceReportSearch(wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate, startNum, endNum, prop, order);
            return ReportManagerDAL.OutSourceReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate, startNum, endNum, prop, order);
        }
        #endregion

        #region[委外报表记录导出]
        public static ToMessage OutSourceReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate)
        public static ToMessage OutSourceReportExcelSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate)
        {
            return ReportManagerDAL.OutSourceReportExcelSearch(wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate);
            return ReportManagerDAL.OutSourceReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate);
        }
        #endregion


        #region[班组工资报表记录查询]
        public static ToMessage GroupSalaryReportSearch(string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate,string rejectstepcode, int startNum, int endNum, string prop, string order)
        public static ToMessage GroupSalaryReportSearch(string wkshopcode, string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate,string rejectstepcode, int startNum, int endNum, string prop, string order)
        {
            return ReportManagerDAL.GroupSalaryReportSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode, startNum, endNum, prop, order);
            return ReportManagerDAL.GroupSalaryReportSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode, startNum, endNum, prop, order);
        }
        #endregion

@@ -39,39 +39,39 @@
        #endregion

        #region[班组工资报表记录导出]
        public static ToMessage GroupSalaryReportExcelSearch(string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate,string rejectstepcode)
        public static ToMessage GroupSalaryReportExcelSearch(string wkshopcode, string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate,string rejectstepcode)
        {
            return ReportManagerDAL.GroupSalaryReportExcelSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode);
            return ReportManagerDAL.GroupSalaryReportExcelSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode);
        }
        #endregion


        #region[人员工资明细报表]
        public static ToMessage PeopleSalaryReportSearch(string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string reportname, string reportopendate, string reportclosedate,string rejectstepcode, int startNum, int endNum, string prop, string order)
        public static ToMessage PeopleSalaryReportSearch(string wkshopcode, string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string reportname, string reportopendate, string reportclosedate,string rejectstepcode, int startNum, int endNum, string prop, string order)
        {
            return ReportManagerDAL.PeopleSalaryReportSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode, startNum, endNum, prop, order);
            return ReportManagerDAL.PeopleSalaryReportSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode, startNum, endNum, prop, order);
        }
        #endregion

        #region[人员工资明细报表导出]
        public static ToMessage PeopleSalaryReportExcelSearch(string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string reportname, string reportopendate, string reportclosedate,string rejectstepcode)
        public static ToMessage PeopleSalaryReportExcelSearch(string wkshopcode, string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string reportname, string reportopendate, string reportclosedate,string rejectstepcode)
        {
            return ReportManagerDAL.PeopleSalaryReportExcelSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode);
            return ReportManagerDAL.PeopleSalaryReportExcelSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode);
        }
        #endregion


        #region[不良明细报表]
        public static ToMessage DefectDetailsReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate, int startNum, int endNum, string prop, string order)
        public static ToMessage DefectDetailsReportSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate, int startNum, int endNum, string prop, string order)
        {
            return ReportManagerDAL.DefectDetailsReportSearch(wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
            return ReportManagerDAL.DefectDetailsReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
        }
        #endregion

        #region[不良明细报表导出]
        public static ToMessage DefectDetailsReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate)
        public static ToMessage DefectDetailsReportExcelSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate)
        {
            return ReportManagerDAL.DefectDetailsReportExcelSearch(wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate);
            return ReportManagerDAL.DefectDetailsReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate);
        }
        #endregion

@@ -85,16 +85,16 @@


        #region[维修明细报表]
        public static ToMessage MaintenanceDetailsReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate, int startNum, int endNum, string prop, string order)
        public static ToMessage MaintenanceDetailsReportSearch(string wkshopcode,string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate, int startNum, int endNum, string prop, string order)
        {
            return ReportManagerDAL.MaintenanceDetailsReportSearch(wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate, startNum, endNum, prop, order);
            return ReportManagerDAL.MaintenanceDetailsReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate, startNum, endNum, prop, order);
        }
        #endregion

        #region[维修明细报表导出]
        public static ToMessage MaintenanceDetailsReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate)
        public static ToMessage MaintenanceDetailsReportExcelSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate)
        {
            return ReportManagerDAL.MaintenanceDetailsReportExcelSearch(wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate);
            return ReportManagerDAL.MaintenanceDetailsReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate);
        }
        #endregion

@@ -145,16 +145,16 @@


        #region[生产进度报表]
        public static ToMessage ProductionScheduleReportSearch(string status, string wocode, string routecode, string routename, string partcode, string partname, string partspec,string opendate,string closedate, int startNum, int endNum, string prop, string order)
        public static ToMessage ProductionScheduleReportSearch(string wkshopcode, string status, string wocode, string routecode, string routename, string partcode, string partname, string partspec,string opendate,string closedate, int startNum, int endNum, string prop, string order)
        {
            return ReportManagerDAL.ProductionScheduleReportSearch(status,wocode, routecode, routename, partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
            return ReportManagerDAL.ProductionScheduleReportSearch(wkshopcode,status, wocode, routecode, routename, partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
        }
        #endregion

        #region[生产进度报表导出]
        public static ToMessage ProductionScheduleReportExcelSearch(string status, string wocode, string routecode, string routename, string partcode, string partname, string partspec,string opendate,string closedate)
        public static ToMessage ProductionScheduleReportExcelSearch(string wkshopcode, string status, string wocode, string routecode, string routename, string partcode, string partname, string partspec,string opendate,string closedate)
        {
            return ReportManagerDAL.ProductionScheduleReportExcelSearch(status,wocode, routecode, routename, partcode, partname, partspec,opendate, closedate);
            return ReportManagerDAL.ProductionScheduleReportExcelSearch(wkshopcode,status, wocode, routecode, routename, partcode, partname, partspec,opendate, closedate);
        }
        #endregion
    }

 VueWebApi/DLL/DAL/BaseDateDAL.cs

@@ -223,6 +223,94 @@
        }
        #endregion

        #region[通过选择的所属组织查询所属班组]
        public static ToMessage StorgGroupSelect(string stu_torgcode, string description)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                // --------------查询指定数据--------------
                switch (description)
                {
                    case "":
                        break;
                    case "D":
                        search += "and parent.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    case "W":
                        search += "and parent.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    default:
                        break;
                }
                var sql = @"select group_code,group_name
                            from TGroup G
                            left join TOrganization parent on G.torg_code=parent.org_code 
                            left join TOrganization as child on parent.parent_id=child.id 
                            where  G.is_delete<>'1' " + search;
                var data = DapperHelper.selectdata(sql, dynamicParams);
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.data = data;
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion

        #region[通过选择的所属组织查询所属角色类型]
        public static ToMessage StorgRoleSelect(string stu_torgcode, string description)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                //获取设备类型数据
                switch (description)
                {
                    case "":
                        break;
                    case "D":
                        search += "and parent.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    case "W":
                        search += "and parent.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    default:
                        break;
                }
                var sql = @"select roletype_code,roletype_name,torg_code,parent.org_name
                            from TRoleType R
                            left join TOrganization parent on R.torg_code=parent.org_code 
                            left join TOrganization as child on parent.parent_id=child.id 
                            where  R.is_delete<>'1' " + search;
                var data = DapperHelper.selectdata(sql, dynamicParams);
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.data = data;
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion



        #region[ERP生产车间/部门信息查询]

 VueWebApi/DLL/DAL/BasicSettingDAL.cs

@@ -21,12 +21,27 @@
        public static SqlParameter[] parameters; //定义全局SqlParameter参数数组

        #region [组织架构数据查询]
        public static ToMessage OrganizationSearch(string orgCode, string orgName, string orgType, string userName, int startNum, int endNum, string prop, string order)
        public static ToMessage OrganizationSearch(string stu_torgcode, string description, string orgCode, string orgName, string orgType, string userName, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                switch (description)
                {
                    case "":
                        break;
                    case "D":
                        search += "and child.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    case "W":
                        search += "and parent.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    default:
                        break;
                }
                if (orgCode != "" && orgCode != null)
                {
                    search += "and parent.org_code like '%'+@orgCode+'%' ";
@@ -67,7 +82,7 @@
                            from TOrganization as parent 
                            left join TOrganization as child on parent.parent_id=child.id 
                            left join TUser U on parent.lm_user=U.usercode
                            where parent.is_delete<>1 " + search;
                            where parent.is_delete<>1  " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
                mes.Message = "查询成功!";
@@ -277,49 +292,64 @@


        #region[用户清单数据查询]
        public static ToMessage UserSearch(string UserCode, string UserName, string StuOrg, string wagetype, string Enable, int startNum, int endNum, string prop, string order)
        public static ToMessage UserSearch(string UserCode, string UserName, string StuOrg,string description, string wagetype, string Enable, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                switch (description)
                {
                    case "":
                        break;
                    case "D":
                        search += "and t.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", StuOrg);
                        break;
                    case "W":
                        search += "and t.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", StuOrg);
                        break;
                    default:
                        break;
                }
                if (UserCode != "" && UserCode != null)
                {
                    search += "and u.usercode like '%'+@UserCode+'%' ";
                    search += " and u.usercode like '%'+@UserCode+'%' ";
                    dynamicParams.Add("@UserCode", UserCode);
                }
                if (UserName != "" && UserName != null)
                {
                    search += "and S.username like '%'+@UserName+'%' ";
                    search += " and S.username like '%'+@UserName+'%' ";
                    dynamicParams.Add("@UserName", UserName);
                }
                if (StuOrg != "" && StuOrg != null)
                {
                    search += "and u.stu_torgcode=@StuOrg ";
                    dynamicParams.Add("@StuOrg", StuOrg);
                }
                if (wagetype != "" && wagetype != null)
                {
                    search += "and u.wagetype=@wagetype ";
                    search += " and u.wagetype=@wagetype ";
                    dynamicParams.Add("@wagetype", wagetype);
                }
                if (Enable != "" && Enable != null)
                {
                    search += "and u.enable=@Enable ";
                    search += " and u.enable=@Enable ";
                    dynamicParams.Add("@Enable", Enable);
                }
                if (search == "")
                {
                    search = "and 1=1 ";
                    search = " and 1=1 ";
                }
                //search = search.Substring(3);//截取索引2后面的字符
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select u.id,u.usercode,u.username,g.group_code,g.group_name,u.stu_torgcode,t.org_name,u.password,u.mobile,u.email,u.wagetype,u.enable,S.username as lm_user,u.lm_date,u.is_role  
                var sql = @"select u.id,u.usercode,u.username,g.group_code,g.group_name,u.stu_torgcode,t.org_name,t.description,u.password,u.mobile,u.email,u.wagetype,u.enable,
                            S.username as lm_user,u.lm_date,(case when isnull(M.user_code,'')='' then 'N' else 'Y' end) as is_role  
                            from TUser u
                            left join TOrganization t on u.stu_torgcode=t.org_code 
                            left join TOrganization as child on t.parent_id=child.id 
                            left join TGroup g on u.usergroup_code=g.group_code
                            left join TUser S on u.lm_user=S.usercode
                            left join (
                              select distinct user_code from TUserRoleRelation 
                            )  M on u.usercode=M.user_code
                            where u.is_delete='0' and u.userclassid='0' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
@@ -339,28 +369,77 @@
        #endregion

        #region [用户所属组织]
        public static ToMessage UserOrganization()
        public static ToMessage UserOrganization(string stu_torgcode, string description)
        {
            var dynamicParams = new DynamicParameters();
            string sql = "";
            string search = "";
            try
            {
                List<TreeDG> list = new List<TreeDG>();
                sql = @"select id,parent_id,org_code,org_name,description  
                      FROM TOrganization where is_delete<>'1'";
                var dt = DapperHelper.selectdata(sql, dynamicParams);
                for (int i = 0; i < dt.Rows.Count; i++)   //这里是循环所有
                switch (description)
                {
                    if (string.IsNullOrEmpty(dt.Rows[i]["PARENT_ID"].ToString()) || dt.Rows[i]["PARENT_ID"].ToString() == "0")  //判断是否最外层根节点
                    {
                        TreeDG tbj = new TreeDG();
                        tbj.id = dt.Rows[i]["ID"].ToString();
                        tbj.code = dt.Rows[i]["ORG_CODE"].ToString();
                        tbj.name = dt.Rows[i]["ORG_NAME"].ToString();
                        list.Add(tbj);
                    }
                    case "":
                        sql = @"select parent.id,parent.parent_id,parent.org_code,parent.org_name,parent.description 
                        from TOrganization as parent 
                        left join TOrganization as child on parent.parent_id=child.id 
                        where parent.is_delete<>'1'  " + search;
                        var dt = DapperHelper.selectdata(sql, dynamicParams);
                        for (int i = 0; i < dt.Rows.Count; i++)   //这里是循环所有
                        {
                            if (string.IsNullOrEmpty(dt.Rows[i]["PARENT_ID"].ToString()) || dt.Rows[i]["PARENT_ID"].ToString() == "0")  //判断是否最外层根节点
                            {
                                TreeDG tbj = new TreeDG();
                                tbj.id = dt.Rows[i]["ID"].ToString();
                                tbj.code = dt.Rows[i]["ORG_CODE"].ToString();
                                tbj.name = dt.Rows[i]["ORG_NAME"].ToString();
                                tbj.flag = dt.Rows[i]["description"].ToString();
                                list.Add(tbj);
                            }
                        }
                        digui(dt, list);
                        break;
                    case "D":
                        search += "and parent.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        sql = @"select parent.id,parent.parent_id,parent.org_code,parent.org_name,parent.description 
                        from TOrganization as parent 
                        left join TOrganization as child on parent.parent_id=child.id 
                        where parent.is_delete<>'1'  " + search;
                        var dt0 = DapperHelper.selectdata(sql, dynamicParams);
                        for (int i = 0; i < dt0.Rows.Count; i++)   //这里是循环所有
                        {
                            if (string.IsNullOrEmpty(dt0.Rows[i]["PARENT_ID"].ToString()) || dt0.Rows[i]["PARENT_ID"].ToString() == "0")  //判断是否最外层根节点
                            {
                                TreeDG tbj = new TreeDG();
                                tbj.id = dt0.Rows[i]["ID"].ToString();
                                tbj.code = dt0.Rows[i]["ORG_CODE"].ToString();
                                tbj.name = dt0.Rows[i]["ORG_NAME"].ToString();
                                tbj.flag = dt0.Rows[i]["description"].ToString();
                                list.Add(tbj);
                            }
                        }
                        digui(dt0, list);
                        break;
                    case "W":
                        search += "and parent.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        sql = @"select parent.id,parent.parent_id,parent.org_code,parent.org_name,parent.description 
                        from TOrganization as parent 
                        left join TOrganization as child on parent.parent_id=child.id 
                        where parent.is_delete<>'1'  " + search;
                        var dt1 = DapperHelper.selectdata(sql, dynamicParams);
                        TreeDG tbj0 = new TreeDG();
                        tbj0.id = dt1.Rows[0]["ID"].ToString();
                        tbj0.code = dt1.Rows[0]["ORG_CODE"].ToString();
                        tbj0.name = dt1.Rows[0]["ORG_NAME"].ToString();
                        tbj0.flag = dt1.Rows[0]["description"].ToString();
                        list.Add(tbj0);
                        break;
                    default:
                        break;
                }
                digui(dt, list);

                mes.code = "200";
                mes.Message = "加载完成";
                mes.data = list;
@@ -377,20 +456,36 @@
        #endregion

        #region[用户所属班组]
        public static ToMessage UserGroup()
        public static ToMessage UserGroup(string stu_torgcode,string description)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select group_code,group_name 
                            from TGroup 
                            where  is_delete<>'1' ";
                var data = DapperHelper.selecttable(sql);
                switch (description)
                {
                    case "":
                        break;
                    case "D":
                        search += "and parent.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    case "W":
                        search += "and parent.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    default:
                        break;
                }
                var sql = @"select group_code,group_name,torg_code,parent.org_name
                            from TGroup G
                            left join TOrganization parent on G.torg_code=parent.org_code 
                            left join TOrganization as child on parent.parent_id=child.id 
                            where  G.is_delete<>'1' " + search;
                var data = DapperHelper.selectdata(sql, dynamicParams);
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.count = total;
                mes.data = data;
            }
            catch (Exception e)
@@ -418,6 +513,7 @@
                        tbjson.id = dt.Rows[i]["ID"].ToString();
                        tbjson.code = dt.Rows[i]["ORG_CODE"].ToString();
                        tbjson.name = dt.Rows[i]["ORG_NAME"].ToString();
                        tbjson.flag = dt.Rows[i]["description"].ToString();
                        tree[m].children.Add(tbjson);
                    }
                }
@@ -567,29 +663,48 @@
        #endregion

        #region[用户清单关联角色查询]
        public static ToMessage UserAssociationRole(string usercode)
        public static ToMessage UserAssociationRole(string usercode,string stu_torgcode,string description)
        {
            string sql = "";
            string search = "";
            var dynamicParams = new DynamicParameters();
            List<TreeObejct> list = new List<TreeObejct>();
            try
            {
                switch (description)
                {
                    case "":
                        break;
                    case "D":
                        search += "and parent.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    case "W":
                        search += "and parent.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    default:
                        break;
                }
                //获取角色类型集合(包含绑定标识)
                sql = @"select A.roletype_code as code,A.roletype_name as name,(case when B.roletype_code is null then 'N' else 'Y' end) flag  from TRoleType A 
                sql = @"select A.roletype_code as code,A.roletype_name as name,(case when B.roletype_code is null then 'N' else 'Y' end) flag
                        from TRoleType A 
                        left join TOrganization parent on A.torg_code=parent.org_code 
                        left join TOrganization as child on parent.parent_id=child.id 
                        left join (
                        select distinct B.roletype_code from TRole B 
                        inner join TUserRoleRelation C on B.role_code=C.role_code
                        where C.user_code=@usercode 
                        where C.user_code=@usercode
                        ) B
                        on A.roletype_code=B.roletype_code 
                        where  A.is_delete='0'";
                        where  A.is_delete='0' "+search;
                dynamicParams.Add("@usercode", usercode);
                var data = DapperHelper.select<TreeObejct>(sql, dynamicParams);
                for (int i = 0; i < data.Count; i++)
                {
                    sql = @"select B.role_code as code,B.role_name as name,(case when C.role_code is null then 'N' else 'Y' end) flag from TRole B 
                             left join(select role_code  from TUserRoleRelation where user_code=@usercode) C on B.role_code=C.role_code
                             where B.roletype_code=@roletype_code  and B.is_delete='0' and B.is_system='0'";
                             where B.roletype_code=@roletype_code  and B.is_delete='0' and B.is_system='0' and B.torg_code<>'F'";
                    dynamicParams.Add("@roletype_code", data[i].code);
                    dynamicParams.Add("@usercode", usercode);
                    var data0 = DapperHelper.select<TreeObejctCn>(sql, dynamicParams);
@@ -612,7 +727,7 @@
        #endregion

        #region[用户清单关联角色保存]
        public static ToMessage SaveUserAssoctRole(string usercode, List<RoleUserSubmit> json)
        public static ToMessage SaveUserAssoctRole(string usercode,string stu_torgcode,string description, List<RoleUserSubmit> json)
        {
            var sql = "";
            List<object> list = new List<object>();
@@ -621,32 +736,68 @@
                list.Clear();
                if (json == null || json.Count <= 0)
                {
                    //清除用户关联角色表数据
                    sql = @"delete TUserRoleRelation where user_code=@usercode";
                    list.Add(new { str = sql, parm = new { usercode = usercode } });
                    //清除用户表关联角色标识
                    sql = @"update TUser set is_role='N' where usercode=@usercode";
                    list.Add(new { str = sql, parm = new { usercode = usercode } });
                    switch (description)
                    {
                        case "":
                            //清除用户关联角色表数据
                            sql = @"delete TUserRoleRelation where user_code=@usercode";
                            list.Add(new { str = sql, parm = new { usercode = usercode } });
                            break;
                        case "D":
                            //清除用户关联角色表数据
                            sql = @"delete from TUserRoleRelation where id in (select A.id   from TUserRoleRelation A
                                    left join TOrganization T on A.torg_code=T.org_code 
                                    left join TOrganization as L on T.parent_id=L.id 
                                    where 1=1 and  A.user_code=@usercode and  T.org_code=@stu_torgcode)";
                            list.Add(new { str = sql, parm = new { usercode = usercode, stu_torgcode = stu_torgcode } });
                            break;
                        case "W":
                            //清除用户关联角色表数据
                            sql = @"delete from TUserRoleRelation where id in (select A.id   from TUserRoleRelation A
                                    left join TOrganization T on A.torg_code=T.org_code 
                                    left join TOrganization as L on T.parent_id=L.id 
                                    where 1=1 and  A.user_code=@usercode and  T.org_code=@stu_torgcode)";
                            list.Add(new { str = sql, parm = new { usercode = usercode, stu_torgcode = stu_torgcode } });
                            break;
                    }
                }
                else
                {
                    //清除用户关联角色表数据
                    sql = @"delete TUserRoleRelation where user_code=@usercode";
                    list.Add(new { str = sql, parm = new { usercode = usercode } });
                    switch (description)
                    {
                        case "":
                            //清除用户关联角色表数据
                            sql = @"delete TUserRoleRelation where user_code=@usercode";
                            list.Add(new { str = sql, parm = new { usercode = usercode } });
                            break;
                        case "D":
                            //清除用户关联角色表数据
                            sql = @"delete from TUserRoleRelation where id in (select A.id   from TUserRoleRelation A
                                    left join TOrganization T on A.torg_code=T.org_code 
                                    left join TOrganization as L on T.parent_id=L.id 
                                    where 1=1 and  A.user_code=@usercode and  T.org_code=@stu_torgcode)";
                            list.Add(new { str = sql, parm = new { usercode = usercode, stu_torgcode = stu_torgcode } });
                            break;
                        case "W":
                            //清除用户关联角色表数据
                            sql = @"delete from TUserRoleRelation where id in (select A.id   from TUserRoleRelation A
                                    left join TOrganization T on A.torg_code=T.org_code 
                                    left join TOrganization as L on T.parent_id=L.id 
                                    where 1=1 and  A.user_code=@usercode and  T.org_code=@stu_torgcode)";
                            list.Add(new { str = sql, parm = new { usercode = usercode, stu_torgcode = stu_torgcode } });
                            break;
                    }

                    //循环写入用户关联角色表
                    for (int i = 0; i < json.Count; i++)
                    {
                        for (int j = 0; j < json[i].Data.Count; j++)
                        {
                            sql = @"insert into TUserRoleRelation(user_code,role_code) values(@usercode,@role_code)";
                            list.Add(new { str = sql, parm = new { usercode = usercode, role_code = json[i].Data[j] } });
                            sql = @"insert into TUserRoleRelation(user_code,role_code,torg_code) values(@usercode,@role_code,@stu_torgcode)";
                            list.Add(new { str = sql, parm = new { usercode = usercode, stu_torgcode= stu_torgcode, role_code = json[i].Data[j] } });

                        }
                    }
                    //标记用户表关联角色标识
                    sql = @"update TUser set is_role='Y' where usercode=@usercode";
                    list.Add(new { str = sql, parm = new { usercode = usercode } });
                }
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
@@ -753,16 +904,34 @@


        #region[用户组列表查询]
        public static ToMessage UserGroupSearch(int startNum, int endNum, string prop, string order)
        public static ToMessage UserGroupSearch(string stu_torgcode, string description,int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select group_code,group_name,description
                            from TGroup 
                            where  is_delete<>'1' ";
                switch (description)
                {
                    case "":
                        break;
                    case "D":
                        search += "and parent.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    case "W":
                        search += "and parent.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    default:
                        break;
                }
                var sql = @"select torg_code,parent.org_name,group_code,group_name,G.description
                            from TGroup G
                            left join TOrganization parent on G.torg_code=parent.org_code 
                            left join TOrganization as child on parent.parent_id=child.id 
                            where  G.is_delete<>'1' "+search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
                mes.Message = "查询成功!";
@@ -792,8 +961,9 @@
                //循环写入用户组表
                for (int i = 0; i < json.Count; i++)
                {
                    var sql0 = @"select *  from TGroup where group_code=@group_code";
                    var sql0 = @"select *  from TGroup where group_code=@group_code and torg_code=@torg_code";
                    dynamicParams.Add("@group_code", json[i].code);
                    dynamicParams.Add("@torg_code", json[i].storg_code);
                    var data = DapperHelper.selectdata(sql0, dynamicParams);
                    if (data.Rows.Count > 0)
                    {
@@ -803,7 +973,7 @@
                        mes.data = null;
                        return mes;
                    }
                    sql = @"insert into TGroup(group_code,group_name,description,lm_user,lm_date) values(@groupcode,@groupename,@description,@lm_user,@lm_date)";
                    sql = @"insert into TGroup(group_code,group_name,description,lm_user,lm_date,torg_code) values(@groupcode,@groupename,@description,@lm_user,@lm_date,@torg_code)";
                    list.Add(new
                    {
                        str = sql,
@@ -813,7 +983,8 @@
                            groupename = json[i].name,
                            description = json[i].flag,
                            lm_user = username,
                            lm_date = DateTime.Now.ToString()
                            lm_date = DateTime.Now.ToString(),
                            torg_code = json[i].storg_code
                        }
                    });
                }
@@ -899,16 +1070,34 @@


        #region[角色类型查询]
        public static ToMessage RoleTypeSearch(int startNum, int endNum, string prop, string order)
        public static ToMessage RoleTypeSearch(string stu_torgcode, string description,int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select roletype_code,roletype_name 
                            from TRoleType 
                            where  is_delete<>'1' ";
                switch (description)
                {
                    case "":
                        break;
                    case "D":
                        search += "and parent.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    case "W":
                        search += "and parent.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    default:
                        break;
                }
                var sql = @"select torg_code,parent.org_name,roletype_code,roletype_name 
                            from TRoleType R
                            left join TOrganization parent on R.torg_code=parent.org_code 
                            left join TOrganization as child on parent.parent_id=child.id 
                            where  R.is_delete<>'1' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
                mes.Message = "查询成功!";
@@ -938,8 +1127,9 @@
                //循环写入角色类型表
                for (int i = 0; i < json.Count; i++)
                {
                    var sql0 = @"select *  from TRoleType where roletype_code=@roletype_code";
                    var sql0 = @"select *  from TRoleType where roletype_code=@roletype_code and torg_code=@torg_code";
                    dynamicParams.Add("@roletype_code", json[i].code);
                    dynamicParams.Add("@torg_code", json[i].flag);
                    var data = DapperHelper.selectdata(sql0, dynamicParams);
                    if (data.Rows.Count > 0)
                    {
@@ -949,14 +1139,15 @@
                        mes.data = null;
                        return mes;
                    }
                    sql = @"insert into TRoleType(roletype_code,roletype_name) values(@roletypecode,@roletypename)";
                    sql = @"insert into TRoleType(roletype_code,roletype_name,torg_code) values(@roletypecode,@roletypename,@torg_code)";
                    list.Add(new
                    {
                        str = sql,
                        parm = new
                        {
                            roletypecode = json[i].code,
                            roletypename = json[i].name
                            roletypename = json[i].name,
                            torg_code= json[i].flag
                        }
                    });
                }
@@ -1027,14 +1218,34 @@
        #endregion

        #region[角色类型下拉接口]
        public static ToMessage RoleTypeSelect()
        public static ToMessage RoleTypeSelect(string stu_torgcode,string description)
        {
            string sql = "";
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                //获取设备类型数据
                sql = @"select roletype_code,roletype_name from TRoleType where is_delete<>'1' ";
                var data = DapperHelper.selecttable(sql);
                switch (description)
                {
                    case "":
                        break;
                    case "D":
                        search += "and parent.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    case "W":
                        search += "and parent.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    default:
                        break;
                }
                var sql = @"select roletype_code,roletype_name,torg_code,parent.org_name
                            from TRoleType R
                            left join TOrganization parent on R.torg_code=parent.org_code 
                            left join TOrganization as child on parent.parent_id=child.id 
                            where  R.is_delete<>'1' " + search;
                var data = DapperHelper.selectdata(sql, dynamicParams);
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.data = data;
@@ -1051,12 +1262,27 @@
        #endregion

        #region[角色清单查询]
        public static ToMessage RoleSearch(string RoleCode, string RoleName, string RoleTypeCode, string CreateUser, int startNum, int endNum, string prop, string order)
        public static ToMessage RoleSearch(string stu_torgcode,string description,string RoleCode, string RoleName, string RoleTypeCode, string CreateUser, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                switch (description)
                {
                    case "":
                        break;
                    case "D":
                        search += "and part.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    case "W":
                        search += "and part.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    default:
                        break;
                }
                if (RoleCode != "" && RoleCode != null)
                {
                    search += "and A.role_code like '%'+@RoleCode+'%' ";
@@ -1084,8 +1310,10 @@
                //search = search.Substring(3);//截取索引2后面的字符
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select A.id,A.role_code,A.role_name,b.roletype_code,B.roletype_name,A.description,T.username as lm_user,A.lm_date,A.is_user,A.is_right  
                var sql = @"select A.id,A.role_code,A.role_name,b.roletype_code,B.roletype_name,A.torg_code,part.org_name,A.description,T.username as lm_user,A.lm_date,A.is_user,A.is_right  
                            from TRole A
                            left join TOrganization part on A.torg_code=part.org_code 
                            left join TOrganization as child on part.parent_id=child.id 
                            left join TRoleType  B on A.roletype_code=B.roletype_code
                            left join TUser T on A.lm_user=T.usercode
                            where  A.is_delete='0' and A.is_system='0' " + search;
@@ -1107,7 +1335,7 @@
        #endregion

        #region[角色清单新增编辑]
        public static ToMessage AddUpdateRole(string RoleId, string RoleCode, string RoleName, string RoleTypeCode, string description, string Usercode, string OperType)
        public static ToMessage AddUpdateRole(string RoleId, string RoleCode, string RoleName,string stu_torgcode, string RoleTypeCode, string description, string Usercode, string OperType)
        {
            var dynamicParams = new DynamicParameters();
            try
@@ -1125,14 +1353,15 @@
                        mes.data = null;
                        return mes;
                    }
                    var sql = @"insert into TRole(role_code,role_name,lm_user,lm_date,roletype_code,description) 
                            values(@RoleCode,@RoleName,@Usercode,@CreateDate,@RoleTypeCode,@description)";
                    var sql = @"insert into TRole(role_code,role_name,lm_user,lm_date,roletype_code,description,torg_code) 
                            values(@RoleCode,@RoleName,@Usercode,@CreateDate,@RoleTypeCode,@description,@torg_code)";
                    dynamicParams.Add("@RoleCode", RoleCode);
                    dynamicParams.Add("@RoleName", RoleName);
                    dynamicParams.Add("@Usercode", Usercode);
                    dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
                    dynamicParams.Add("@RoleTypeCode", RoleTypeCode);
                    dynamicParams.Add("@description", description);
                    dynamicParams.Add("@torg_code", stu_torgcode);
                    int cont = DapperHelper.SQL(sql, dynamicParams);
                    if (cont > 0)
                    {
@@ -1151,11 +1380,12 @@
                }
                if (OperType == "Update")
                {
                    var sql = @"update TRole set role_name=@RoleName,lm_user=@Usercode,lm_date=@CreateDate,roletype_code=@RoleTypeCode,description=@description where id=@RoleId";
                    var sql = @"update TRole set role_name=@RoleName,lm_user=@Usercode,lm_date=@CreateDate,torg_code=@torg_code,roletype_code=@RoleTypeCode,description=@description where id=@RoleId";
                    dynamicParams.Add("@RoleId", RoleId);
                    dynamicParams.Add("@RoleName", RoleName);
                    dynamicParams.Add("@Usercode", Usercode);
                    dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
                    dynamicParams.Add("@torg_code", stu_torgcode);
                    dynamicParams.Add("@RoleTypeCode", RoleTypeCode);
                    dynamicParams.Add("@description", description);
                    int cont = DapperHelper.SQL(sql, dynamicParams);
@@ -1681,6 +1911,50 @@
        #endregion


        #region[安灯系统/车间查询]
        public static ToMessage AnDengShopSearch(string stu_torgcode, string description)
        {
            string sql = "";
            string search = "";
            var dynamicParams = new DynamicParameters();
            try
            {
                //获取车间信息
                switch (description)
                {
                    case "":
                        break;
                    case "D":
                        search += "and  child.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    case "W":
                        search += "and parent.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    default:
                        break;
                }
                sql = @"select parent.org_code,parent.org_name
                            from  TOrganization parent 
                            left join TOrganization as child on parent.parent_id=child.id 
                            where  parent.is_delete<>'1' " + search;
                var data = DapperHelper.selectdata(sql, dynamicParams);
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.data = data;
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion

        #region[安灯系统/自定义安灯呼叫类型查询]
        public static ToMessage AnDengTypeSearch()
        {
@@ -1910,7 +2184,7 @@
                    sql = @"delete TAnDon_Roul_ConFigUser  where ando_cogfigid=@mid";
                    list.Add(new { str = sql, parm = new { mid = mid } });
                }
                else 
                else
                {
                    //获取主表最大ID
                    sql = @"select ISNULL(IDENT_CURRENT('TAnDon_Roul_ConFig')+1,1) as id";

 VueWebApi/DLL/DAL/DeviceManagerDAL.cs

@@ -359,14 +359,36 @@
        #endregion

        #region[所属车间下拉接口]
        public static ToMessage WorkShopSelect()
        public static ToMessage WorkShopSelect(string stu_torgcode,string description)
        {
            string sql = "";
            string search = "";
            var dynamicParams = new DynamicParameters();
            try
            {
                //获取设备类型数据
                sql = @"select org_code as code,org_name as name from TOrganization where description='W' and is_delete<>'1'";
                var data = DapperHelper.selecttable(sql);
                switch (description)
                {
                    case "":
                        search += "and parent.description=@description ";
                        dynamicParams.Add("@description", "W");
                        break;
                    case "D":
                        search += "and child.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    case "W":
                        search += "and parent.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    default:
                        break;
                }
                 sql = @"select parent.org_code as code,parent.org_name as name
                         from  TOrganization parent
                         left join TOrganization as child on parent.parent_id=child.id 
                         where  parent.is_delete<>'1'  " + search;
                var data = DapperHelper.selectdata(sql, dynamicParams);
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.data = data;
@@ -410,12 +432,31 @@
        #endregion

        #region [设备清单查询]
        public static ToMessage DeviceMangerSearch(string deviceCode, string deviceName, string status, string workShop, string deviceType, string deviceGroup, int startNum, int endNum, string prop, string order)
        public static ToMessage DeviceMangerSearch(string stu_torgcode,string description,string deviceCode, string deviceName, string status, string workShop, string deviceType, string deviceGroup, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                if (workShop != "" && workShop != null)
                {
                    search += "and A.wksp_code=@workShop ";
                    dynamicParams.Add("@workShop", workShop);
                }
                else 
                {
                    switch (description)
                    {
                        case "":
                            search += "and T.description=@description ";
                            dynamicParams.Add("@description", "W");
                            break;
                        case "D":
                            search += "and  L.org_code=@stu_torgcode ";
                            dynamicParams.Add("@stu_torgcode", stu_torgcode);
                            break;
                    }
                }
                if (deviceCode != "" && deviceCode != null)
                {
                    search += "and A.code like '%'+@deviceCode+'%' ";
@@ -430,11 +471,6 @@
                {
                    search += "and A.enable=@status ";
                    dynamicParams.Add("@status", status);
                }
                if (workShop != "" && workShop != null)
                {
                    search += "and A.wksp_code=@workShop ";
                    dynamicParams.Add("@workShop", workShop);
                }
                if (deviceType != "" && deviceType != null)
                {
@@ -458,8 +494,8 @@
                            from TEqpInfo A
                            left join TEqpType B on A.eqptype_code=B.code
                            left join TEqpGroup G on A.eqpgroup_code=G.code
                            left join TOrganization T on A.wksp_code=T.org_code
                            left join TOrganization L on A.Line_code=L.org_code
                            left join TOrganization T on A.wksp_code=T.org_code 
                            left join TOrganization as L on T.parent_id=L.id 
                            left join TUser U on A.lm_user=U.usercode
                            where A.is_delete<>'1' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
@@ -1317,21 +1353,38 @@
        #endregion

        #region[设备点检标准关联工作站查询]
        public static ToMessage DeviceCheckStanedAssociationEqp(string checkstand_code)
        public static ToMessage DeviceCheckStanedAssociationEqp(string stu_torgcode,string description,string checkstand_code)
        {
            string sql = "";
            string search = "";
            var dynamicParams = new DynamicParameters();
            List<StandEqp> list = new List<StandEqp>();
            try
            {
                switch (description)
                {
                    case "":
                        break;
                    case "D":
                        search += "and T.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    case "W":
                        search += "and T.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    default:
                        break;
                }
                //获取工作站集合(车间,包含已绑定工作站标识)
                sql = @"select distinct T.org_code as wksp_code,T.org_name as wksp_name,'E' as type,(case when B.eqp_code is null then 'N' else 'Y' end) flag 
                        from TOrganization T
                        left join TOrganization as child on T.parent_id=child.id 
                        left join(
                        select distinct A.eqp_code,B.wksp_code  from TEqpchk_Eqp A 
                        inner join TEqpInfo B on A.eqp_code=B.code 
                        where A.eqpchkmain_code=@checkstand_code and A.is_delete<>'1' and B.is_delete<>'1'
                        ) B on T.org_code=B.wksp_code where T.description='W' and is_delete<>'1'";
                        ) B on T.org_code=B.wksp_code where T.description='W' and T.is_delete<>'1' "+search;
                dynamicParams.Add("@checkstand_code", checkstand_code);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                for (int i = 0; i < data.Rows.Count; i++)
@@ -1756,21 +1809,38 @@
        #endregion

        #region[设备保养标准关联工作站查询]
        public static ToMessage DeviceRepairStanedAssociationEqp(string repairstand_code)
        public static ToMessage DeviceRepairStanedAssociationEqp(string stu_torgcode,string description,string repairstand_code)
        {
            string sql = "";
            string search = "";
            var dynamicParams = new DynamicParameters();
            List<StandEqp> list = new List<StandEqp>();
            try
            {
                switch (description)
                {
                    case "":
                        break;
                    case "D":
                        search += "and T.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    case "W":
                        search += "and T.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    default:
                        break;
                }
                //获取工作站集合(车间,包含已绑定工作站标识)
                sql = @"select distinct T.org_code as wksp_code,T.org_name as wksp_name,'E' as type,(case when B.eqp_code is null then 'N' else 'Y' end) flag 
                        from TOrganization T
                        left join TOrganization as child on T.parent_id=child.id 
                        left join(
                        select distinct A.eqp_code,B.wksp_code  from TEqpmai_Eqp A 
                        inner join TEqpInfo B on A.eqp_code=B.code 
                        where A.eapmai_code=@repairstand_code and A.is_delete<>'1' and B.is_delete<>'1'
                        ) B on T.org_code=B.wksp_code where T.description='W' and is_delete<>'1'";
                        ) B on T.org_code=B.wksp_code where T.description='W' and T.is_delete<>'1' "+search;

                dynamicParams.Add("@repairstand_code", repairstand_code);
                var data = DapperHelper.selectdata(sql, dynamicParams);
@@ -1905,7 +1975,7 @@


        #region[设备点检记录查询]
        public static ToMessage DeviceCheckTakeSearch(string wkshopcode, string eqpcode, string eqpname, string stanedname, string checkuser, string checkopendate, string checkclosedate, int startNum, int endNum, string prop, string order)
        public static ToMessage DeviceCheckTakeSearch(string stu_torgcode,string description, string wkshopcode, string eqpcode, string eqpname, string stanedname, string checkuser, string checkopendate, string checkclosedate, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
@@ -1915,6 +1985,20 @@
                {
                    search += "and T.org_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                else
                {
                    switch (description)
                    {
                        case "":
                            search += "and T.description=@description ";
                            dynamicParams.Add("@description", "W");
                            break;
                        case "D":
                            search += "and  L.org_code=@stu_torgcode ";
                            dynamicParams.Add("@stu_torgcode", stu_torgcode);
                            break;
                    }
                }
                if (eqpcode != "" && eqpcode != null)
                {
@@ -1955,6 +2039,7 @@
                            left join TEqpInfo E on A.eqp_code=E.code
                            left join TEqpchk_Main M on A.eqpchkmain_code=M.code
                            left join TOrganization T on E.wksp_code=T.org_code
                            left join TOrganization as L on T.parent_id=L.id 
                            where T.description='W' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
@@ -2003,7 +2088,7 @@
        #endregion

        #region[设备点检记录导出]
        public static ToMessage DeviceCheckTakeOutExcel(string wkshopcode, string eqpcode, string eqpname, string stanedname, string checkuser, string checkopendate, string checkclosedate)
        public static ToMessage DeviceCheckTakeOutExcel(string stu_torgcode, string description, string wkshopcode, string eqpcode, string eqpname, string stanedname, string checkuser, string checkopendate, string checkclosedate)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
@@ -2013,6 +2098,20 @@
                {
                    search += "and T.org_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                else
                {
                    switch (description)
                    {
                        case "":
                            search += "and T.description=@description ";
                            dynamicParams.Add("@description", "W");
                            break;
                        case "D":
                            search += "and  L.org_code=@stu_torgcode ";
                            dynamicParams.Add("@stu_torgcode", stu_torgcode);
                            break;
                    }
                }
                if (eqpcode != "" && eqpcode != null)
                {
@@ -2081,6 +2180,7 @@
                            left join TEqpInfo E on A.eqp_code=E.code
                            left join TEqpchk_Main M on A.eqpchkmain_code=M.code
                            left join TOrganization T on E.wksp_code=T.org_code
                            left join TOrganization as L on T.parent_id=L.id 
                            left join TEqpchk_Item H on B.eqpchkdeta_code=H.code
                            where T.description='W' " + search;
                DataTable data = DapperHelper.selectdata(sql, dynamicParams);
@@ -2105,7 +2205,7 @@


        #region[设备保养记录查询]
        public static ToMessage DeviceCheckTakeSearch(string wkshopcode, string eqpcode, string eqpname, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult, int startNum, int endNum, string prop, string order)
        public static ToMessage DeviceCheckTakeSearch(string stu_torgcode, string description, string wkshopcode, string eqpcode, string eqpname, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
@@ -2115,6 +2215,20 @@
                {
                    search += "and T.org_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                else
                {
                    switch (description)
                    {
                        case "":
                            search += "and T.description=@description ";
                            dynamicParams.Add("@description", "W");
                            break;
                        case "D":
                            search += "and  L.org_code=@stu_torgcode ";
                            dynamicParams.Add("@stu_torgcode", stu_torgcode);
                            break;
                    }
                }
                if (eqpcode != "" && eqpcode != null)
                {
@@ -2160,6 +2274,7 @@
                            left join TEqpInfo E on A.eqp_code=E.code
                            left join TEqpmai_Main M on A.eqpmaint_code=M.code
                            left join TOrganization T on E.wksp_code=T.org_code
                            left join TOrganization as L on T.parent_id=L.id 
                            where T.description='W' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
@@ -2208,7 +2323,7 @@
        #endregion

        #region[设备保养记录导出]
        public static ToMessage DeviceRepairTakeOutExcel(string wkshopcode, string eqpcode, string eqpname, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult)
        public static ToMessage DeviceRepairTakeOutExcel(string stu_torgcode, string description, string wkshopcode, string eqpcode, string eqpname, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
@@ -2218,6 +2333,20 @@
                {
                    search += "and T.org_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                else
                {
                    switch (description)
                    {
                        case "":
                            search += "and T.description=@description ";
                            dynamicParams.Add("@description", "W");
                            break;
                        case "D":
                            search += "and  L.org_code=@stu_torgcode ";
                            dynamicParams.Add("@stu_torgcode", stu_torgcode);
                            break;
                    }
                }
                if (eqpcode != "" && eqpcode != null)
                {
@@ -2294,6 +2423,7 @@
                            left join TEqpInfo E on A.eqp_code=E.code
                            left join TEqpmai_Main M on A.eqpmaint_code=M.code
                            left join TOrganization T on E.wksp_code=T.org_code
                            left join TOrganization as L on T.parent_id=L.id 
                            left join TEqpmai_Item H on B.eqpmaideta_code=H.code
                            where T.description='W' " + search;
                DataTable data = DapperHelper.selectdata(sql, dynamicParams);
@@ -2318,7 +2448,7 @@


        #region[设备维修记录查询]
        public static ToMessage DeviceUpdateSearch(string wkshopcode, string eqpcode, string eqpname, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate, int startNum, int endNum, string prop, string order)
        public static ToMessage DeviceUpdateSearch(string stu_torgcode, string description, string wkshopcode, string eqpcode, string eqpname, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
@@ -2328,6 +2458,20 @@
                {
                    search += "and A.wksp_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                else
                {
                    switch (description)
                    {
                        case "":
                            search += "and T.description=@description ";
                            dynamicParams.Add("@description", "W");
                            break;
                        case "D":
                            search += "and  L.org_code=@stu_torgcode ";
                            dynamicParams.Add("@stu_torgcode", stu_torgcode);
                            break;
                    }
                }
                if (eqpcode != "" && eqpcode != null)
                {
@@ -2387,6 +2531,7 @@
                            left join TEqp_RepairRequest B on A.source_wo=B.docu_code 
                            left join TEqpInfo E on A.eqp_code=E.code
                            left join TOrganization T on A.wksp_code=T.org_code
                            left join TOrganization as L on T.parent_id=L.id 
                            where T.description='W' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
@@ -2473,7 +2618,7 @@
        #endregion

        #region[设备维修记录导出]
        public static ToMessage DeviceUpdateOutExcel(string wkshopcode, string eqpcode, string eqpname, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate)
        public static ToMessage DeviceUpdateOutExcel(string stu_torgcode, string description, string wkshopcode, string eqpcode, string eqpname, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
@@ -2483,6 +2628,20 @@
                {
                    search += "and A.wksp_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                else
                {
                    switch (description)
                    {
                        case "":
                            search += "and T.description=@description ";
                            dynamicParams.Add("@description", "W");
                            break;
                        case "D":
                            search += "and  L.org_code=@stu_torgcode ";
                            dynamicParams.Add("@stu_torgcode", stu_torgcode);
                            break;
                    }
                }
                if (eqpcode != "" && eqpcode != null)
                {
@@ -2552,6 +2711,7 @@
                            left join TEqp_RepairRequest B on A.source_wo=B.docu_code 
                            left join TEqpInfo E on A.eqp_code=E.code
                            left join TOrganization T on A.wksp_code=T.org_code
                            left join TOrganization as L on T.parent_id=L.id 
                            where T.description='W'" + search;
                DataTable data = DapperHelper.selectdata(sql, dynamicParams);
                data.TableName = "Table"; //设置DataTable的名称

 VueWebApi/DLL/DAL/LoginDAL.cs

@@ -28,7 +28,9 @@
        {

            //执行sql
            strProcName = "select *  from [dbo].[TUser] where usercode=@username and password=@password and is_delete='0'";
            strProcName = @"select *  from TUser U
                            left join TOrganization T on U.stu_torgcode = T.org_code
                            where U.usercode =@username and U.password =@password and U.is_delete = '0'";
            //创建参数
            listStr.Add(new SqlParameter("@username", username));
            listStr.Add(new SqlParameter("@password", password));
@@ -40,18 +42,19 @@
        #endregion

        #region [写入登录记录表]
        public static ToMessage LoginBas(string usercode, string usertype)
        public static ToMessage LoginBas(string usercode, string usertype,string stu_torgcode)
        {
            var sql = "";
            var cont = 0;
            var dynamicParams = new DynamicParameters();
            try
            {
                sql = @"insert into T_Bas_Login(usercode,status,indate,origin) 
                            values(@usercode,'Y',@indate,@usertype)";
                sql = @"insert into T_Bas_Login(usercode,status,indate,origin,torg_code) 
                            values(@usercode,'Y',@indate,@usertype,@stu_torgcode)";
                dynamicParams.Add("@usercode", usercode);
                dynamicParams.Add("@usertype", usertype);
                dynamicParams.Add("@indate", DateTime.Now.ToString());
                dynamicParams.Add("@stu_torgcode", stu_torgcode);
                cont = DapperHelper.SQL(sql, dynamicParams);
                if (cont > 0)
                {
@@ -301,7 +304,7 @@
        #endregion

        #region[PC登出]
        public static ToMessage LoginOut(int userid, string usercode, string username, string usertype)
        public static ToMessage LoginOut(int userid, string usercode, string username, string usertype,string stu_torgcode)
        {
            var sql = "";
            var cont = 0;
@@ -309,15 +312,16 @@
            RedisHelper redis = new RedisHelper();
            try
            {
                sql = @"insert into T_Bas_Login(usercode,status,outdate,origin) 
                            values(@usercode,'N',@outdate,@usertype)";
                sql = @"insert into T_Bas_Login(usercode,status,outdate,origin,torg_code) 
                            values(@usercode,'N',@outdate,@usertype,@stu_torgcode)";
                dynamicParams.Add("@usercode", usercode);
                dynamicParams.Add("@usertype", usertype);
                dynamicParams.Add("@outdate", DateTime.Now.ToString());
                dynamicParams.Add("@stu_torgcode", stu_torgcode);
                cont = DapperHelper.SQL(sql, dynamicParams);
                if (cont > 0)
                {
                    redis.Remove(Enterprise + "LoginUserID" + usertype + userid, 0); //删除redis
                    redis.Remove(Enterprise + stu_torgcode + "LoginUserID" + usertype + userid, 0); //删除redis
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "登出成功!";
@@ -399,7 +403,7 @@
                        left  join TOrganization T on B.wkshp_code=T.org_code 
                        left  join TAnDonType D on A.type=d.code
                        left  join TUser U on A.resp_user=U.usercode
                        where A.resp_user=@usercode and B.status='START' and U.rid=@rid  and T.description='W'";
                        where A.resp_user=@usercode and B.status='START' and U.rid=@rid";
                dynamicParams.Add("@usercode", usercode);
                dynamicParams.Add("@rid", rid);
                var data = DapperHelper.selectdata(sql, dynamicParams);

 VueWebApi/DLL/DAL/ProductModelDAL.cs

@@ -464,14 +464,17 @@
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select A.id,A.partcode,A.partname,A.partspec,A.uom_code,B.name as uom_name,D.code as stocktypecode,D.name as stocktypename,
                            C.code as materialtypecode,C.name as materialtypename,A.stck_code,T.name as stck_name,A.maxqty,A.minqty,U.username as lm_user,A.default_route,
                            A.lm_date,A.proute_id,A.is_batchno,A.is_fifo,A.is_incheck,A.is_outcheck
                            C.code as materialtypecode,C.name as materialtypename,A.stck_code,T.name as stck_name,A.maxqty,A.minqty,U.username as lm_user,
                            A.lm_date,(case when isnull(M.materiel_code,'')='' then 'N' else 'Y' end) as proute_id,A.is_batchno,A.is_fifo,A.is_incheck,A.is_outcheck
                            from TMateriel_Info A
                            left join TUom B on A.uom_code=B.code
                            left join TMateriel_Type C on A.materieltype_code=C.code
                            left join T_Dict D on A.stocktype_code=D.code and D.dict_type='CHLX'
                            left join T_Sec_Stck T on A.stck_code=T.code 
                            left join TUser U on A.lm_user=U.usercode
                            left join (
                              select distinct materiel_code from TMateriel_Route 
                            )  M on A.partcode=M.materiel_code
                            where A.is_delete<>'1' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
@@ -686,20 +689,38 @@
        #endregion

        #region[存货档案关联工艺路线查询]
        public static ToMessage InventoryFileAssociationRoute(string partcode)
        public static ToMessage InventoryFileAssociationRoute(string stu_torgcode,string stu_torgtypecode,string partcode)
        {
            string sql = "";
            string search = "";
            var dynamicParams = new DynamicParameters();
            List<MaterialRout> list = new List<MaterialRout>();
            try
            {
                switch (stu_torgtypecode)
                {
                    case "":
                        break;
                    case "D":
                        search += "and parent.org_code=@stu_torgcode or child.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    case "W":
                        search += "and parent.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    default:
                        break;
                }
                //获取工艺路线集合(包含物料绑定工艺路线标识)
                sql = @"select distinct A.code as routecode,A.name as routename,(case when B.route_code is null then 'N' else 'Y' end) flag  from TFlw_Rout A 
                sql = @"select distinct parent.org_code,parent.org_name,A.code as routecode,A.name as routename,(case when B.route_code is null then 'N' else 'Y' end) flag  from TFlw_Rout A 
                        left join TOrganization parent on A.torg_code=parent.org_code 
                        left join TOrganization as child on parent.parent_id=child.id 
                        left join (
                          select distinct route_code  from TMateriel_Route where  materiel_code=@partcode and is_delete<>'1'
                        ) B
                        on A.code=B.route_code 
                        where  A.is_delete='0' and A.enable='Y'";
                        where  A.is_delete='0' and A.enable='Y' " + search;
                dynamicParams.Add("@partcode", partcode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                for (int i = 0; i < data.Rows.Count; i++)
@@ -708,7 +729,8 @@
                    rout.code = data.Rows[i]["ROUTECODE"].ToString();
                    rout.name = data.Rows[i]["ROUTENAME"].ToString();
                    rout.flag = data.Rows[i]["FLAG"].ToString();

                    rout.wkshopcode= data.Rows[i]["ORG_CODE"].ToString();
                    rout.wkshopname = data.Rows[i]["ORG_NAME"].ToString();
                    //根据工艺路线编码获取关联的工序信息
                    sql = @"select A.seq,B.stepcode,B.stepname,B.enable from TFlw_Rtdt A
                            inner join TStep B on A.step_code=B.stepcode
@@ -735,7 +757,7 @@
        #endregion

        #region[存货档案关联工艺路线提交]
        public static ToMessage SaveInventoryFile(string partcode, string defaultroute_code, string username, List<ObjectData> json)
        public static ToMessage SaveInventoryFile(string stu_torgcode,string stu_torgtypecode, string partcode, string defaultroute_code, string username, List<PartRout> json)
        {
            var sql = "";
            List<object> list = new List<object>();
@@ -744,22 +766,61 @@
                list.Clear();
                if (json == null || json.Count <= 0)
                {
                    //清除物料关联工艺路线表数据
                    sql = @"delete TMateriel_Route where materiel_code=@partcode";
                    list.Add(new { str = sql, parm = new { partcode = partcode } });
                    //标记物料表关联工艺路线标识
                    sql = @"update TMateriel_Info set proute_id='N',default_route='' where partcode=@partcode";
                    list.Add(new { str = sql, parm = new { partcode = partcode } });
                    switch (stu_torgtypecode)
                    {
                        case "":
                            //清除物料关联工艺路线表数据
                            sql = @"delete TMateriel_Route where materiel_code=@partcode";
                            list.Add(new { str = sql, parm = new { partcode = partcode } });
                            break;
                        case "D":
                            //清除物料关联工艺路线表数据
                            sql = @"delete from TMateriel_Route where id in (select A.id   from TMateriel_Route A
                                    left join TOrganization T on A.torg_code=T.org_code 
                                    left join TOrganization as L on T.parent_id=L.id 
                                    where 1=1 and  A.materiel_code=@partcode and  L.org_code=@stu_torgcode)";
                            list.Add(new { str = sql, parm = new { partcode = partcode, stu_torgcode = stu_torgcode } });
                            break;
                        case "W":
                            //清除物料关联工艺路线表数据
                            sql = @"delete from TMateriel_Route where id in (select A.id   from TMateriel_Route A
                                    left join TOrganization T on A.torg_code=T.org_code 
                                    left join TOrganization as L on T.parent_id=L.id 
                                    where 1=1 and  A.materiel_code=@partcode and  T.org_code=@stu_torgcode)";
                            list.Add(new { str = sql, parm = new { partcode = partcode, stu_torgcode = stu_torgcode } });
                            break;
                    }
                }
                else
                {
                    //清除用户关联角色表数据
                    sql = @"delete TMateriel_Route where materiel_code=@partcode";
                    list.Add(new { str = sql, parm = new { partcode = partcode } });
                    switch (stu_torgtypecode)
                    {
                        case "":
                            //清除物料关联工艺路线表数据
                            sql = @"delete TMateriel_Route where materiel_code=@partcode";
                            list.Add(new { str = sql, parm = new { partcode = partcode } });
                            break;
                        case "D":
                            //清除物料关联工艺路线表数据
                            sql = @"delete from TMateriel_Route where id in (select A.id   from TMateriel_Route A
                                    left join TOrganization T on A.torg_code=T.org_code 
                                    left join TOrganization as L on T.parent_id=L.id 
                                    where 1=1 and  A.materiel_code=@partcode and  L.org_code=@stu_torgcode)";
                            list.Add(new { str = sql, parm = new { partcode = partcode, stu_torgcode = stu_torgcode } });
                            break;
                        case "W":
                            //清除物料关联工艺路线表数据
                            sql = @"delete from TMateriel_Route where id in (select A.id   from TMateriel_Route A
                                    left join TOrganization T on A.torg_code=T.org_code 
                                    left join TOrganization as L on T.parent_id=L.id 
                                    where 1=1 and  A.materiel_code=@partcode and  T.org_code=@stu_torgcode)";
                            list.Add(new { str = sql, parm = new { partcode = partcode, stu_torgcode = stu_torgcode } });
                            break;
                    }
                    //循环写入用户关联角色表
                    for (int i = 0; i < json.Count; i++)
                    {
                        sql = @"insert into TMateriel_Route(materiel_code,route_code,lm_user,lm_date) values(@materiel_code,@route_code,@lm_user,@lm_date)";
                        sql = @"insert into TMateriel_Route(materiel_code,route_code,lm_user,lm_date,torg_code) values(@materiel_code,@route_code,@lm_user,@lm_date,@torg_code)";
                        list.Add(new
                        {
                            str = sql,
@@ -768,13 +829,11 @@
                                materiel_code = partcode,
                                route_code = json[i].code,
                                lm_user = username,
                                lm_date = DateTime.Now.ToString()
                                lm_date = DateTime.Now.ToString(),
                                torg_code = json[i].wkshopcode
                            }
                        });
                    }
                    //标记物料表关联工艺路线标识
                    sql = @"update TMateriel_Info set proute_id='Y',default_route=@defaultroute_code where partcode=@partcode";
                    list.Add(new { str = sql, parm = new { partcode = partcode, defaultroute_code = defaultroute_code } });
                }
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
@@ -1164,12 +1223,31 @@


        #region[工艺路线查询]
        public static ToMessage RouteSearch(string routecode, string routename, string description, string createuser, int startNum, int endNum, string prop, string order)
        public static ToMessage RouteSearch(string stu_torgcode, string stu_torgtypecode, string WorkShop,string routecode, string routename, string description, string createuser, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                if (WorkShop != "" && WorkShop != null)
                {
                    search += "and A.torg_code=@workShop ";
                    dynamicParams.Add("@workShop", WorkShop);
                }
                else
                {
                    switch (stu_torgtypecode)
                    {
                        case "":
                            search += "and T.description=@description ";
                            dynamicParams.Add("@description", "W");
                            break;
                        case "D":
                            search += "and  L.org_code=@stu_torgcode ";
                            dynamicParams.Add("@stu_torgcode", stu_torgcode);
                            break;
                    }
                }
                if (routecode != "" && routecode != null)
                {
                    search += "and A.code like '%'+@routecode+'%' ";
@@ -1196,8 +1274,10 @@
                }
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select A.id,A.code,A.name,A.description,A.enable,U.username as lm_user,A.lm_date  from TFlw_Rout A
                var sql = @"select A.id,T.org_code,T.org_name,A.code,A.name,A.description,A.enable,U.username as lm_user,A.lm_date  from TFlw_Rout A
                            left join TUser U on A.lm_user=U.usercode
                            left join TOrganization T on A.torg_code=T.org_code 
                            left join TOrganization as L on T.parent_id=L.id 
                            where A.is_delete<>'1' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
@@ -1225,7 +1305,7 @@
            try
            {
                //获取工艺路线信息
                sql = @"select code,name,description,enable 
                sql = @"select code,name,description,enable,torg_code 
                        from TFlw_Rout
                        where code=@routecode and is_delete<>'1'";
                dynamicParams.Add("@routecode", routecode);
@@ -1237,6 +1317,7 @@
                    rout.name = data.Rows[i]["NAME"].ToString();
                    rout.enable = data.Rows[i]["ENABLE"].ToString();
                    rout.description = data.Rows[i]["DESCRIPTION"].ToString();
                    rout.wkshopcode = data.Rows[i]["torg_code"].ToString();

                    //根据工艺路线编码获取关联的工序信息
                    sql = @"select A.seq,B.stepcode,B.stepname,B.enable from TFlw_Rtdt A
@@ -1285,8 +1366,8 @@
                        return mes;
                    }
                    //新增工艺路线表
                    sql = @"insert into TFlw_Rout(code,name,description,enable,lm_user,lm_date) values(@code,@name,@description,@enable,@lm_user,@lm_date)";
                    list.Add(new { str = sql, parm = new { code = json.code, name = json.name, description = json.description, enable = json.enable, lm_user = username, lm_date = DateTime.Now.ToString() } });
                    sql = @"insert into TFlw_Rout(code,name,description,enable,lm_user,lm_date,torg_code) values(@code,@name,@description,@enable,@lm_user,@lm_date,@torg_code)";
                    list.Add(new { str = sql, parm = new { code = json.code, name = json.name, description = json.description, enable = json.enable, lm_user = username, lm_date = DateTime.Now.ToString(), torg_code=json.wkshopcode } });
                    for (int i = 0; i < json.Data.Rows.Count; i++)
                    {
                        string is_firststep = "N"; //是否首道工序
@@ -1300,8 +1381,8 @@
                            is_laststep = "Y";
                        }
                        //新增工艺路线关联工序表
                        sql = @"insert TFlw_Rtdt (rout_code,seq,step_code,first_choke,last_choke,lm_user,lm_date) values(@rout_code,@seq,@step_code,@first_choke,@last_choke,@lm_user,@lm_date)";
                        list.Add(new { str = sql, parm = new { rout_code = json.code, seq = Convert.ToInt32(json.Data.Rows[i]["SEQ"].ToString()), step_code = json.Data.Rows[i]["STEPCODE"].ToString(), first_choke = is_firststep, last_choke = is_laststep, lm_user = username, lm_date = DateTime.Now.ToString() } });
                        sql = @"insert TFlw_Rtdt (rout_code,seq,step_code,first_choke,last_choke,lm_user,lm_date,torg_code) values(@rout_code,@seq,@step_code,@first_choke,@last_choke,@lm_user,@lm_date,@torg_code)";
                        list.Add(new { str = sql, parm = new { rout_code = json.code, seq = Convert.ToInt32(json.Data.Rows[i]["SEQ"].ToString()), step_code = json.Data.Rows[i]["STEPCODE"].ToString(), first_choke = is_firststep, last_choke = is_laststep, lm_user = username, lm_date = DateTime.Now.ToString(),torg_code=json.wkshopcode } });
                    }
                    bool aa = DapperHelper.DoTransaction(list);
                    if (aa)
@@ -1424,14 +1505,16 @@


        #region[工序下拉查询接口]
        public static ToMessage StepSelect()
        public static ToMessage StepSelect(string WorkShop)
        {
            string sql = "";
            var dynamicParams = new DynamicParameters();
            try
            {
                //获取工序数据
                sql = @"select stepcode,stepname from TStep where is_delete<>'1' and enable='Y'";
                var data = DapperHelper.selecttable(sql);
                sql = @"select stepcode,stepname from TStep where is_delete<>'1' and enable='Y' and torg_code=@torg_code";
                dynamicParams.Add("@torg_code", WorkShop);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                mes.code = "200";
                mes.count = data.Rows.Count;
                mes.Message = "查询成功!";
@@ -1449,12 +1532,31 @@
        #endregion

        #region[工序查询]
        public static ToMessage StepSearch(string stepcode, string stepname, string enable, string steptypecode, string createuser, int startNum, int endNum, string prop, string order)
        public static ToMessage StepSearch(string stu_torgcode,string stu_torgtypecode,string WorkShop, string stepcode, string stepname, string enable, string steptypecode, string createuser, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                if (WorkShop != "" && WorkShop != null)
                {
                    search += "and A.torg_code=@workShop ";
                    dynamicParams.Add("@workShop", WorkShop);
                }
                else
                {
                    switch (stu_torgtypecode)
                    {
                        case "":
                            search += "and T.description=@description ";
                            dynamicParams.Add("@description", "W");
                            break;
                        case "D":
                            search += "and  L.org_code=@stu_torgcode ";
                            dynamicParams.Add("@stu_torgcode", stu_torgcode);
                            break;
                    }
                }
                if (stepcode != "" && stepcode != null)
                {
                    search += "and A.stepcode like '%'+@stepcode+'%' ";
@@ -1486,8 +1588,10 @@
                }
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select A.id,A.stepcode,A.stepname,A.flwtype,A.enable,A.descr,U.username as lm_user,A.lm_date,A.is_eqp,A.is_defect  from TStep A
                var sql = @"select A.id,T.org_code,T.org_name,A.stepcode,A.stepname,A.flwtype,A.enable,A.descr,U.username as lm_user,A.lm_date,A.is_eqp,A.is_defect  from TStep A
                            left join TUser U on A.lm_user=U.usercode
                            left join TOrganization T on A.torg_code=T.org_code 
                            left join TOrganization as L on T.parent_id=L.id 
                            where A.is_delete<>'1' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
@@ -1507,7 +1611,7 @@
        #endregion

        #region[工序新增编辑]
        public static ToMessage AddUpdateStep(string stepid, string stepcode, string stepname, string steptypecode, string enable, string description, string username, string operType)
        public static ToMessage AddUpdateStep(string stepid,string WorkShop, string stepcode, string stepname, string steptypecode, string enable, string description, string username, string operType)
        {
            var dynamicParams = new DynamicParameters();
            List<object> list = new List<object>();
@@ -1527,8 +1631,8 @@
                        mes.data = null;
                        return mes;
                    }
                    var sql = @"insert into TStep(stepcode,stepname,flwtype,enable,descr,lm_user,lm_date) 
                            values(@stepcode,@stepname,@steptypecode,@enable,@description,@username,@CreateDate)";
                    var sql = @"insert into TStep(stepcode,stepname,flwtype,enable,descr,lm_user,lm_date,torg_code) 
                            values(@stepcode,@stepname,@steptypecode,@enable,@description,@username,@CreateDate,@torg_code)";
                    dynamicParams.Add("@stepcode", stepcode);
                    dynamicParams.Add("@stepname", stepname);
                    dynamicParams.Add("@steptypecode", steptypecode);
@@ -1536,6 +1640,7 @@
                    dynamicParams.Add("@description", description);
                    dynamicParams.Add("@username", username);
                    dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
                    dynamicParams.Add("@torg_code", WorkShop);
                    int cont = DapperHelper.SQL(sql, dynamicParams);
                    if (cont > 0)
                    {
@@ -1593,9 +1698,9 @@
                            list.Add(new { str = sql_1, parm = new { stepcode = stepcode } });
                        }
                    }
                    sql_1 = @"update TStep set stepname=@stepname,flwtype=@steptypecode,enable=@enable,descr=@description,
                    sql_1 = @"update TStep set torg_code=@torg_code, stepname=@stepname,flwtype=@steptypecode,enable=@enable,descr=@description,
                                lm_user=@username,lm_date=@CreateDate where id=@stepid";
                    list.Add(new { str = sql_1, parm = new { stepid = stepid, stepname = stepname, steptypecode = steptypecode, enable = enable, description = description, username = username, CreateDate = DateTime.Now.ToString() } });
                    list.Add(new { str = sql_1, parm = new { torg_code=WorkShop, stepid = stepid, stepname = stepname, steptypecode = steptypecode, enable = enable, description = description, username = username, CreateDate = DateTime.Now.ToString() } });
                    bool aa = DapperHelper.DoTransaction(list);
                    if (aa)
                    {
@@ -1657,7 +1762,7 @@
                sql = @"delete TDefect_Step  where step_code=@stepcode";
                list.Add(new { str = sql, parm = new { stepcode = stepcode } });
                //删除工序
                sql = @"update TStep set is_delete='1' where stepcode=@stepcode";
                sql = @"delete TStep  where stepcode=@stepcode";
                list.Add(new { str = sql, parm = new { stepcode = stepcode } });
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
@@ -1687,7 +1792,7 @@
        #endregion

        #region[工序定义关联工作站查询]
        public static ToMessage StepAssociationEqp(string stepcode)
        public static ToMessage StepAssociationEqp(string WorkShop, string stepcode)
        {
            string sql = "";
            var dynamicParams = new DynamicParameters();
@@ -1700,7 +1805,7 @@
                        select distinct A.eqp_code,B.wksp_code  from TFlw_Rteqp A 
                        inner join TEqpInfo B on A.eqp_code=B.code 
                        where A.step_code=@stepcode and A.is_delete<>'1' and B.is_delete<>'1' and B.enable='Y'
                        ) B on T.org_code=B.wksp_code where T.description='W' and is_delete<>'1'
                        ) B on T.org_code=B.wksp_code where T.description='W' and is_delete<>'1' and T.org_code=@WorkShop
                        UNION ALL
                        select distinct T.type as wksp_code,(case when T.type='211' then '供应商' when T.type='228' then '客户/供应商' end ) as wksp_name,'W' as type,(case when B.type is null then 'N' else 'Y' end) flag 
                        from TCustomer T
@@ -1709,6 +1814,7 @@
                        inner join TCustomer B on A.eqp_code=B.code 
                        where A.step_code=@stepcode  and A.is_delete<>'1' and B.is_delete<>'1'
                        ) B on T.type=B.type where T.type in('211','228') and T.is_delete<>'1'"; //226(客户)
                dynamicParams.Add("@WorkShop", WorkShop);
                dynamicParams.Add("@stepcode", stepcode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                for (int i = 0; i < data.Rows.Count; i++)
@@ -1784,7 +1890,7 @@
        #endregion

        #region [工序定义关联工作站提交]
        public static ToMessage SaveStepAssociationEqp(string stepcode, string username, List<ObjectData> json)
        public static ToMessage SaveStepAssociationEqp(string WorkShop,string stepcode, string username, List<ObjectData> json)
        {
            var sql = "";
            List<object> list = new List<object>();
@@ -1808,7 +1914,7 @@
                    //循环写入用户关联角色表
                    for (int i = 0; i < json.Count; i++)
                    {
                        sql = @"insert into TFlw_Rteqp(eqp_code,step_code,style,lm_user,lm_date) values(@eqp_code,@stepcode,@style,@lm_user,@lm_date)";
                        sql = @"insert into TFlw_Rteqp(eqp_code,step_code,style,lm_user,lm_date,torg_code) values(@eqp_code,@stepcode,@style,@lm_user,@lm_date,@torg_code)";
                        list.Add(new
                        {
                            str = sql,
@@ -1818,7 +1924,8 @@
                                stepcode = stepcode,
                                style = json[i].name,
                                lm_user = username,
                                lm_date = DateTime.Now.ToString()
                                lm_date = DateTime.Now.ToString(),
                                torg_code=WorkShop
                            }
                        });
                    }
@@ -1854,19 +1961,24 @@
        #endregion

        #region[工序关联缺陷查询]
        public static ToMessage StepAssociationDefect(string stepcode)
        public static ToMessage StepAssociationDefect(string WorkShop,string stepcode)
        {
            string sql = "";
            var dynamicParams = new DynamicParameters();
            List<StepDefect> list = new List<StepDefect>();
            try
            {

                //获取工序关联缺陷数据(包含关联标识)
                sql = @"select A.code,A.name,(case when B.defect_code is null then 'N' else 'Y' end) flag from TDefect A
                        left join(
                        select distinct defect_code  from TDefect_Step where step_code=@stepcode and is_delete<>'1'
                        select distinct defect_code  from TDefect_Step A
                        left join TOrganization T on A.torg_code=T.org_code 
                        left join TOrganization as L on T.parent_id=L.id 
                        where step_code=@stepcode and A.is_delete<>'1' and T.org_code=@WorkShop
                        ) B on A.code=B.defect_code";
                dynamicParams.Add("@stepcode", stepcode);
                dynamicParams.Add("@WorkShop", WorkShop);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                for (int i = 0; i < data.Rows.Count; i++)
                {
@@ -1892,7 +2004,7 @@
        #endregion

        #region[工序关联缺陷提交]
        public static ToMessage SaveStepAssociationDefect(string stepcode, string username, List<ObjectData> json)
        public static ToMessage SaveStepAssociationDefect(string WorkShop,string stepcode, string username, List<ObjectData> json)
        {
            var sql = "";
            List<object> list = new List<object>();
@@ -1916,7 +2028,7 @@
                    //循环写入用户关联角色表
                    for (int i = 0; i < json.Count; i++)
                    {
                        sql = @"insert into TDefect_Step(defect_code,step_code,lm_user,lm_date) values(@defect_code,@stepcode,@lm_user,@lm_date)";
                        sql = @"insert into TDefect_Step(defect_code,step_code,lm_user,lm_date,torg_code) values(@defect_code,@stepcode,@lm_user,@lm_date,@torg_code)";
                        list.Add(new
                        {
                            str = sql,
@@ -1925,7 +2037,8 @@
                                defect_code = json[i].code,
                                stepcode = stepcode,
                                lm_user = username,
                                lm_date = DateTime.Now.ToString()
                                lm_date = DateTime.Now.ToString(),
                                torg_code= WorkShop
                            }
                        });
                    }
@@ -1993,17 +2106,35 @@
        #endregion

        #region[产品编码查找工艺路线下拉框]
        public static ToMessage PartSelectRpute(string partcode)
        public static ToMessage PartSelectRpute(string stu_torgcode,string stu_torgtypecode,string partcode)
        {
            string sql = "";
            string search = "";
            var dynamicParams = new DynamicParameters();
            try
            {
                switch (stu_torgtypecode)
                {
                    case "":
                        break;
                    case "D":
                        search += "and L.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    case "W":
                        search += "and T.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    default:
                        break;
                }
                //通过产品编码查找关联的工艺路线信息
                sql = @"select A.route_code,B.name as route_name   
                        from TMateriel_Route A
                        inner join TFlw_Rout B on A.route_code=B.code 
                        where A.materiel_code=@partcode and B.is_delete<>'1' and A.is_delete<>'1'";
                        left join TOrganization T on A.torg_code=T.org_code 
                        left join TOrganization as L on T.parent_id=L.id
                        where A.materiel_code=@partcode and B.is_delete<>'1' and A.is_delete<>'1' "+search;
                dynamicParams.Add("@partcode", partcode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                mes.code = "200";
@@ -2172,12 +2303,27 @@
        #endregion

        #region[节拍工价查询]
        public static ToMessage BeatRateSearch(string partcode, string routecode, string stepcode, string eqpcode, int startNum, int endNum, string prop, string order)
        public static ToMessage BeatRateSearch(string stu_torgcode,string stu_torgtypecode,string partcode, string routecode, string stepcode, string eqpcode, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                switch (stu_torgtypecode)
                {
                    case "":
                        break;
                    case "D":
                        search += "and L.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    case "W":
                        search += "and F.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    default:
                        break;
                }
                if (partcode != "" && partcode != null)
                {
                    search += "and A.materiel_code=@partcode ";
@@ -2213,6 +2359,7 @@
                            left join TStep D on A.step_code=D.stepcode
                            left join TEqpInfo E on A.eqp_code=E.code
                            left join TOrganization F on E.wksp_code=F.org_code
                            left join TOrganization L on  F.parent_id=L.id
                            where B.is_delete<>'1' and C.is_delete<>'1' and D.is_delete<>'1' and E.is_delete<>'1' and F.is_delete<>'1' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";

 VueWebApi/DLL/DAL/ProductionManagementDAL.cs

@@ -22,12 +22,27 @@


        #region[ERP订单查询]
        public static ToMessage ErpOrderSearch(string erporderstus, string erpordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string paydatestartdate1, string paydateenddate2, string creatuser, int endNum, string prop, string order)
        public static ToMessage ErpOrderSearch(string stu_torgcode,string stu_torgtypecode,string erporderstus, string erpordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string paydatestartdate1, string paydateenddate2, string creatuser, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                switch (stu_torgtypecode)
                {
                    case "":
                        break;
                    case "D":
                        search += "and L.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    case "W":
                        search += "and C.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    default:
                        break;
                }
                if (erporderstus != "" && erporderstus != null)
                {
                    search += "and A.status=@erporderstus ";
@@ -84,6 +99,7 @@
                            left join TOrganization C on A.wkshp_code=C.org_code
                            left join T_Sec_Stck D on A.stck_code=D.code 
                            left join TUser U on A.createuser=U.usercode 
                            left join TOrganization L on  C.parent_id=L.id
                            where A.is_delete<>'1' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
@@ -307,12 +323,27 @@


        #region[MES工单查询]
        public static ToMessage MesOrderSearch(string mesorderstus, string mesordercode, string sourceorder, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
        public static ToMessage MesOrderSearch(string stu_torgcode,string stu_torgtypecode,string mesorderstus, string mesordercode, string sourceorder, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                switch (stu_torgtypecode)
                {
                    case "":
                        break;
                    case "D":
                        search += "and L.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    case "W":
                        search += "and C.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    default:
                        break;
                }
                if (mesorderstus != "" && mesorderstus != null)
                {
                    search += "and A.status=@mesorderstus ";
@@ -374,6 +405,7 @@
                            left join TFlw_Rout E on A.route_code=E.code
                            left join T_Sec_Stck F on A.stck_code=F.code 
                            left join TUser U on A.lm_user=U.usercode 
                            left join TOrganization L on  C.parent_id=L.id
                            where A.is_delete<>'1' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
@@ -470,7 +502,7 @@
        #endregion

        #region[产品编码查找工艺路线下拉接口]
        public static ToMessage PartSelectRoute(string partcode)
        public static ToMessage PartSelectRoute(string partcode,string wkshopcode)
        {
            string sql = "";
            var dynamicParams = new DynamicParameters();
@@ -480,8 +512,9 @@
                sql = @"select R.code,R.name,A.default_route  from TMateriel_Info A
                        inner join  TMateriel_Route M on A.partcode=M.materiel_code
                        inner join  TFlw_Rout R on M.route_code=R.code
                        where A.partcode=@partcode ";
                        where A.partcode=@partcode and M.torg_code=@torg_code";
                dynamicParams.Add("@partcode", partcode);
                dynamicParams.Add("@torg_code", wkshopcode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                mes.code = "200";
                mes.Message = "查询成功!";
@@ -499,23 +532,38 @@
        #endregion

        #region[工艺路线查找车间下拉接口]
        public static ToMessage RouteSelectWkshop(string partcode, string routecode)
        public static ToMessage RouteSelectWkshop(string stu_torgcode,string stu_torgtypecode,string partcode)
        {
            string sql = "";
            string search = "";
            var dynamicParams = new DynamicParameters();
            try
            {
                switch (stu_torgtypecode)
                {
                    case "":
                        break;
                    case "D":
                        search += "and L.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    case "W":
                        search += "and F.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    default:
                        break;
                }
                //获取车间下拉框数据
                sql = @"select distinct F.org_code,F.org_name  from TFlw_Rout A
                        inner join  TMateriel_Route M on A.code=M.route_code
                        inner join   TFlw_Rtdt B on A.code=B.rout_code
                sql = @"select distinct F.org_code,F.org_name   from TMateriel_Route M
                        inner join   TFlw_Rtdt B on M.route_code=B.rout_code
                        inner join TStep C on B.step_code=C.stepcode
                        inner join TFlw_Rteqp D on C.stepcode=D.step_code
                        inner join TEqpInfo  E on D.eqp_code=E.code
                        left join TOrganization F on E.wksp_code=F.org_code
                        where A.code=@routecode and M.materiel_code=@partcode and E.enable='Y'";
                        left join TOrganization L on  F.parent_id=L.id
                        where M.materiel_code=@partcode and E.enable='Y' "+search;
                dynamicParams.Add("@partcode", partcode);
                dynamicParams.Add("@routecode", routecode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                mes.code = "200";
                mes.Message = "查询成功!";
@@ -1296,7 +1344,7 @@
        #endregion

        #region[生产开报工扫码获取工单对应工序任务(自制)]
        public static ToMessage MesOrderStepSearch(string orderstepqrcode, int startNum, int endNum, string prop, string order)
        public static ToMessage MesOrderStepSearch(string stu_torgcode,string stu_torgtypecode, string orderstepqrcode, int startNum, int endNum, string prop, string order)
        {
            var sql = "";
            string search = "";
@@ -1324,7 +1372,7 @@
                        stepcode = arra[1]; //获取指定字符串前面的字符
                    }

                    if (ordercode != "" && ordercode != null) //工单号不为空,工序号为空
                    if (ordercode != "" && stepcode == null) //工单号不为空,工序号为空
                    {
                        search += "and A.wo_code=@ordercode ";
                        dynamicParams.Add("@ordercode", ordercode);
@@ -1363,14 +1411,31 @@
                        }
                    }
                }
                switch (stu_torgtypecode)
                {
                    case "":
                        break;
                    case "D":
                        search += "and L.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    case "W":
                        search += "and F.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    default:
                        break;
                }
                //根据条件查询工单工序任务(自制工序)
                sql = @"select A.status,A.wo_code,B.route_code,M.partcode,M.partname,M.partspec,A.seq,A.isbott,A.isend,
                            S.stepcode,S.stepname,S.descr,A.plan_qty,A.good_qty,A.ng_qty,A.bad_qty,A.plan_startdate,A.plan_enddate,B.lm_date
                            from TK_Wrk_Step A
                            left join TK_Wrk_Man B on A.wo_code=B.wo_code
                            left join TMateriel_Info M on B.materiel_code=M.partcode
                            left join TStep S on A.step_code=S.stepcode
                            where A.status in('ALLO','START') and S.flwtype='Z'  " + search;
                        S.stepcode,S.stepname,S.descr,A.plan_qty,A.good_qty,A.ng_qty,A.bad_qty,A.plan_startdate,A.plan_enddate,B.lm_date
                        from TK_Wrk_Step A
                        left join TK_Wrk_Man B on A.wo_code=B.wo_code
                        left join TMateriel_Info M on B.materiel_code=M.partcode
                        left join TStep S on A.step_code=S.stepcode
                        left join TOrganization F on B.wkshp_code=F.org_code
                        left join TOrganization L on  F.parent_id=L.id
                        where A.status in('ALLO','START') and S.flwtype='Z'  " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                if (data.ToList().Count > 0)
                {
@@ -1401,7 +1466,7 @@
        #endregion

        #region[生产开报工扫码获取工单对应工序任务(外协)]
        public static ToMessage MesOrderWxStepSearch(string orderstepqrcode, int startNum, int endNum, string prop, string order)
        public static ToMessage MesOrderWxStepSearch(string stu_torgcode,string stu_torgtypecode,string orderstepqrcode, int startNum, int endNum, string prop, string order)
        {
            var sql = "";
            string search = "";
@@ -1428,7 +1493,7 @@
                        ordercode = arra[0]; //获取指定字符串前面的字符
                        stepcode = arra[1]; //获取指定字符串前面的字符
                    }
                    if (ordercode != "" && ordercode != null) //工单号不为空,工序号为空
                    if (ordercode != "" && stepcode == null) //工单号不为空,工序号为空
                    {
                        search += "and A.wo_code=@ordercode ";
                        dynamicParams.Add("@ordercode", ordercode);
@@ -1467,13 +1532,30 @@
                        }
                    }
                }
                //根据条件查询工单工序任务(自制工序)
                switch (stu_torgtypecode)
                {
                    case "":
                        break;
                    case "D":
                        search += "and L.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    case "W":
                        search += "and F.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    default:
                        break;
                }
                //根据条件查询工单工序任务(外协工序)
                sql = @"select A.status,A.wo_code,B.route_code,M.partcode,M.partname,M.partspec,A.seq,A.isbott,A.isend,
                            S.stepcode,S.stepname,S.descr,A.plan_qty,A.good_qty,A.ng_qty,A.bad_qty,A.plan_startdate,A.plan_enddate,B.lm_date
                            from TK_Wrk_Step A
                            left join TK_Wrk_Man B on A.wo_code=B.wo_code
                            left join TMateriel_Info M on B.materiel_code=M.partcode
                            left join TStep S on A.step_code=S.stepcode
                            left join TOrganization F on B.wkshp_code=F.org_code
                            left join TOrganization L on  F.parent_id=L.id
                            where A.status in('ALLO','START') and S.flwtype='W'  " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                if (data.ToList().Count > 0)
@@ -1505,7 +1587,7 @@
        #endregion

        #region[生产开报工扫码获取工单对应工序任务(不良)]
        public static ToMessage MesOrderNgStepSearch(string orderstepqrcode, int startNum, int endNum, string prop, string order)
        public static ToMessage MesOrderNgStepSearch(string stu_torgcode,string stu_torgtypecode,string orderstepqrcode, int startNum, int endNum, string prop, string order)
        {
            var sql = "";
            string search = "";
@@ -1532,7 +1614,7 @@
                        ordercode = arra[0]; //获取指定字符串前面的字符
                        stepcode = arra[1]; //获取指定字符串前面的字符
                    }
                    if (ordercode != "" && ordercode != null) //工单号不为空,工序号为空
                    if (ordercode != "" && stepcode == null) //工单号不为空,工序号为空
                    {
                        search += "and A.wo_code=@ordercode ";
                        dynamicParams.Add("@ordercode", ordercode);
@@ -1561,14 +1643,31 @@
                        return mes;
                    }
                }
                switch (stu_torgtypecode)
                {
                    case "":
                        break;
                    case "D":
                        search += "and L.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    case "W":
                        search += "and F.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    default:
                        break;
                }
                //根据条件查询工单工序任务,且不良数量大于0
                sql = @"select A.wo_code,M.partcode,M.partname,M.partspec,A.seq,A.isend,
                            S.stepcode,S.stepname,S.descr,A.plan_qty,A.good_qty,A.ng_qty,A.bad_qty,B.lm_date
                            from TK_Wrk_Step A
                            left join TK_Wrk_Man B on A.wo_code=B.wo_code
                            left join TMateriel_Info M on B.materiel_code=M.partcode
                            left join TStep S on A.step_code=S.stepcode
                            where A.status in('ALLO','START') and A.ng_qty>0 " + search;
                        S.stepcode,S.stepname,S.descr,A.plan_qty,A.good_qty,A.ng_qty,A.bad_qty,B.lm_date
                        from TK_Wrk_Step A
                        left join TK_Wrk_Man B on A.wo_code=B.wo_code
                        left join TMateriel_Info M on B.materiel_code=M.partcode
                        left join TStep S on A.step_code=S.stepcode
                        left join TOrganization F on B.wkshp_code=F.org_code
                        left join TOrganization L on  F.parent_id=L.id
                        where A.status in('ALLO','START') and A.ng_qty>0 " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                if (data.ToList().Count > 0)
                {
@@ -1806,9 +1905,11 @@
                    return mes;
                }
                //获取工序关联的设备
                sql = @"select B.code,B.name from TFlw_Rteqp A
                sql = @"select B.code,B.name  from TK_Wrk_Man M
                        inner join TFlw_Rtdt R on M.route_code=R.rout_code
                        inner join TFlw_Rteqp A on R.step_code=A.step_code
                        left join TEqpInfo B on A.eqp_code=B.code
                        where A.style='E' and A.step_code=@stepcode and B.enable='Y'";
                        where A.style='E' and M.wo_code=@wo_code and A.step_code=@stepcode and B.enable='Y'";
                dynamicParams.Add("@wo_code", ordercode);
                dynamicParams.Add("@stepcode", stepcode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
@@ -1828,14 +1929,38 @@
        #endregion

        #region[生产开报工：报工时获取生产班组下拉框]
        public static ToMessage MesOrderStepReportSelectUserGroup()
        public static ToMessage MesOrderStepReportSelectUserGroup(string stu_torgcode,string stu_torgtypecode,string wkshopcode)
        {
            string sql = "";
            string search = "";
            var dynamicParams = new DynamicParameters();
            try
            {
                if (wkshopcode != "" && wkshopcode != null)
                {
                    search += "and A.torg_code=@workShop ";
                    dynamicParams.Add("@workShop", wkshopcode);
                }
                else
                {
                    switch (stu_torgtypecode)
                    {
                        case "":
                            search += "and T.description=@description ";
                            dynamicParams.Add("@description", "W");
                            break;
                        case "D":
                            search += "and  L.org_code=@stu_torgcode ";
                            dynamicParams.Add("@stu_torgcode", stu_torgcode);
                            break;
                    }
                }
                //获取用户组
                sql = @"select group_code,group_name from TGroup";
                var data = DapperHelper.selecttable(sql);
                sql = @"select group_code,group_name from TGroup  A
                        left join TOrganization T on A.torg_code=T.org_code 
                        left join TOrganization as L on T.parent_id=L.id 
                        where 1=1 "+search;
                var data = DapperHelper.selectdata(sql, dynamicParams);
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.data = data;
@@ -2972,12 +3097,27 @@


        #region[MES工单批量关闭查询]
        public static ToMessage MesOrderBitchClosedSearch(string mesorderstus, string mesordercode, string sourceorder, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
        public static ToMessage MesOrderBitchClosedSearch(string stu_torgcode,string stu_torgtypecode,string mesorderstus, string mesordercode, string sourceorder, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                switch (stu_torgtypecode)
                {
                    case "":
                        break;
                    case "D":
                        search += "and L.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    case "W":
                        search += "and C.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    default:
                        break;
                }
                if (mesorderstus != "" && mesorderstus != null)
                {
                    search += "and A.status=@mesorderstus ";
@@ -3042,6 +3182,7 @@
                            left join TFlw_Rout E on A.route_code=E.code
                            left join T_Sec_Stck F on A.stck_code=F.code 
                            left join TUser U on A.lm_user=U.usercode 
                            left join TOrganization L on  C.parent_id=L.id
                            where A.is_delete<>'1' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";

 VueWebApi/DLL/DAL/QualityManagementDAL.cs

@@ -300,14 +300,16 @@
        #endregion

        #region[工序检验标准新增、编辑获取检验项目下拉列表]
        public static ToMessage StepCheckItemSelect()
        public static ToMessage StepCheckItemSelect(string WorkShop)
        {
            string sql = "";
            var dynamicParams = new DynamicParameters();
            try
            {
                //获取工序点检项目数据
                sql = @"select code,name,descr from TStepCheckItem where is_delete<>'1' ";
                var data = DapperHelper.selecttable(sql);
                sql = @"select code,name,descr from TStepCheckItem where is_delete<>'1' and torg_code=@torg_code";
                dynamicParams.Add("@torg_code", WorkShop);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.data = data;
@@ -460,12 +462,27 @@


        #region[工序检验项目列表查询]
        public static ToMessage StepCheckItemSearch(string itemcode, string itemname, string itemdescr, int startNum, int endNum, string prop, string order)
        public static ToMessage StepCheckItemSearch(string stu_torgcode,string stu_torgtypecode, string itemcode, string itemname, string itemdescr, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                switch (stu_torgtypecode)
                {
                    case "":
                        break;
                    case "D":
                        search += "and L.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    case "W":
                        search += "and C.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    default:
                        break;
                }
                if (itemcode != "" && itemcode != null)
                {
                    search += "and A.code like '%'+@itemcode+'%' ";
@@ -484,8 +501,10 @@

                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select A.code,A.name,A.descr,U.username as lm_user,A.lm_date  from TStepCheckItem A
                var sql = @"select C.org_code,C.org_name,A.code,A.name,A.descr,U.username as lm_user,A.lm_date  from TStepCheckItem A
                            left join TUser U on A.lm_user=U.usercode
                            left join TOrganization C on A.torg_code=C.org_code
                            left join TOrganization L on  C.parent_id=L.id
                            where A.is_delete<>'1' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
@@ -505,7 +524,7 @@
        #endregion

        #region[工序检验项目新增、编辑提交]
        public static ToMessage AddUpdateStepCheckItem(string checkitemcode, string checkitemname, string checkitemdescr, string opertype, string username)
        public static ToMessage AddUpdateStepCheckItem(string wkshopcode, string checkitemcode, string checkitemname, string checkitemdescr, string opertype, string username)
        {
            var sql = "";
            var dynamicParams = new DynamicParameters();
@@ -515,8 +534,8 @@
                if (opertype == "Add")
                {
                    //写入缺陷定义定义表
                    sql = @"insert into TStepCheckItem(code,name,descr,lm_user,lm_date)
                                values(@checkitemcode,@checkitemname,@checkitemdescr,@username,@CreateDate)";
                    sql = @"insert into TStepCheckItem(code,name,descr,lm_user,lm_date,torg_code)
                                values(@checkitemcode,@checkitemname,@checkitemdescr,@username,@CreateDate,@torg_code)";
                    list.Add(new
                    {
                        str = sql,
@@ -526,7 +545,8 @@
                            checkitemname = checkitemname,
                            checkitemdescr = checkitemdescr,
                            username = username,
                            CreateDate = DateTime.Now.ToString()
                            CreateDate = DateTime.Now.ToString(),
                            torg_code=wkshopcode
                        }
                    });
                    bool aa = DapperHelper.DoTransaction(list);
@@ -547,7 +567,7 @@
                }
                if (opertype == "Update")
                {
                    sql = @"update TStepCheckItem set name=@checkitemname,descr=@checkitemdescr,lm_user=@username,lm_date=@CreateDate where code=@checkitemcode";
                    sql = @"update TStepCheckItem set name=@checkitemname,descr=@checkitemdescr,lm_user=@username,lm_date=@CreateDate,torg_code=@torg_code where code=@checkitemcode";
                    list.Add(new
                    {
                        str = sql,
@@ -557,7 +577,8 @@
                            checkitemname = checkitemname,
                            checkitemdescr = checkitemdescr,
                            username = username,
                            CreateDate = DateTime.Now.ToString()
                            CreateDate = DateTime.Now.ToString(),
                            torg_code=wkshopcode
                        }
                    });
                    bool aa = DapperHelper.DoTransaction(list);
@@ -882,12 +903,27 @@


        #region[质检方案列表查询]
        public static ToMessage QualityInspectionSearch(string qualityinsptcode, string qualityinsptname, string status, string checktype, string sampltype, string suitobject, int startNum, int endNum, string prop, string order)
        public static ToMessage QualityInspectionSearch(string stu_torgcode,string stu_torgtypecode, string qualityinsptcode, string qualityinsptname, string status, string checktype, string sampltype, string suitobject, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                switch (stu_torgtypecode)
                {
                    case "":
                        break;
                    case "D":
                        search += "and AA.Lorg_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    case "W":
                        search += "and AA.org_code=@stu_torgcode ";
                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
                        break;
                    default:
                        break;
                }
                if (qualityinsptcode != "" && qualityinsptcode != null)
                {
                    search += "and AA.code like '%'+@qualityinsptcode+'%' ";
@@ -926,7 +962,7 @@
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select *  from(
                            select A.code,A.name,A.status,A.checktype,A.sampmethod,A.sampscare,A.suitobject,A.stepcode,S.stepname,A.descr,A.suitpart,A.lm_date,U.username,
                            select C.org_code,C.org_name,L.org_code as Lorg_code,A.code,A.name,A.status,A.checktype,A.sampmethod,A.sampscare,A.suitobject,A.stepcode,S.stepname,A.descr,A.suitpart,A.lm_date,U.username,
                            case when A.suitobject='P' then
                            STUFF(( SELECT ';' + partname
                            FROM TMateriel_Info
@@ -942,6 +978,8 @@
                            from TStepCheckStandard A
                            left join TUser U on  A.lm_user=U.usercode
                            left join TStep S on A.stepcode=S.stepcode
                            left join TOrganization C on A.torg_code=C.org_code
                            left join TOrganization L on  C.parent_id=L.id
                            ) as AA 
                            where " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
@@ -992,7 +1030,7 @@
        #endregion

        #region[质检方案新增/编辑提交]
        public static ToMessage QualityInspectionAddEditSave(string qualityinsptcode, string qualityinsptname, string status, string checktype, string sampmethod, string sampscare, string suitobject, string suitpart, string descr,string stepcode, string checkitem, string type, string username)
        public static ToMessage QualityInspectionAddEditSave(string wkshopcode, string qualityinsptcode, string qualityinsptname, string status, string checktype, string sampmethod, string sampscare, string suitobject, string suitpart, string descr,string stepcode, string checkitem, string type, string username)
        {
            var sql = "";
            List<object> list = new List<object>();
@@ -1007,8 +1045,8 @@
                {
                    case "Add": //新增
                        //写入质检方案主表
                        sql = @"insert into  TStepCheckStandard(code,name,status,checktype,sampmethod,sampscare,suitobject,suitpart,stepcode,descr,lm_user,lm_date) 
                                values(@code,@name,@status,@checktype,@sampmethod,@sampscare,@suitobject,@suitpart,@stepcode,@descr,@lm_user,@lm_date)";
                        sql = @"insert into  TStepCheckStandard(code,name,status,checktype,sampmethod,sampscare,suitobject,suitpart,stepcode,descr,lm_user,lm_date,torg_code) 
                                values(@code,@name,@status,@checktype,@sampmethod,@sampscare,@suitobject,@suitpart,@stepcode,@descr,@lm_user,@lm_date,@torg_code)";
                        list.Add(new
                        {
                            str = sql,
@@ -1025,14 +1063,15 @@
                                stepcode= stepcode,
                                descr = descr,
                                lm_user = username,
                                lm_date = date
                                lm_date = date,
                                torg_code= wkshopcode
                            }
                        });
                        //写入质检方案子表
                        for (int i = 0; i < arra.Count; i++)
                        {
                            sql = @"insert into  TStepCheckStandardSub(stepstaned_code,stepcheckitem_seq,stepcheckitem_code,required,numberjudge,unit,decimalnum,standvalue,uppervalue,lowervalue,stepcheckitem_desc,lm_user,lm_date) 
                                values(@stepstaned_code,@stepcheckitem_seq,@stepcheckitem_code,@required,@numberjudge,@unit,@decimalnum,@standvalue,@uppervalue,@lowervalue,@stepcheckitem_desc,@lm_user,@lm_date)";
                            sql = @"insert into  TStepCheckStandardSub(stepstaned_code,stepcheckitem_seq,stepcheckitem_code,required,numberjudge,unit,decimalnum,standvalue,uppervalue,lowervalue,stepcheckitem_desc,lm_user,lm_date,torg_code) 
                                values(@stepstaned_code,@stepcheckitem_seq,@stepcheckitem_code,@required,@numberjudge,@unit,@decimalnum,@standvalue,@uppervalue,@lowervalue,@stepcheckitem_desc,@lm_user,@lm_date,@torg_code)";
                            list.Add(new
                            {
                                str = sql,
@@ -1050,7 +1089,8 @@
                                    lowervalue = arra[i]["lowervalue"].ToString(),
                                    stepcheckitem_desc = arra[i]["stepcheckitem_desc"].ToString(),
                                    lm_user = username,
                                    lm_date = date
                                    lm_date = date,
                                    torg_code=wkshopcode
                                }
                            });
                        }
@@ -1074,7 +1114,7 @@
                        list.Add(new { str = sql, parm = new { code = qualityinsptcode } });
                        //修改质检方案主表
                        sql = @"update TStepCheckStandard set name=@name,status=@status,checktype=@checktype,sampmethod=@sampmethod,sampscare=@sampscare,
                                suitobject=@suitobject,suitpart=@suitpart,stepcode=@stepcode,descr=@descr
                                suitobject=@suitobject,suitpart=@suitpart,stepcode=@stepcode,descr=@descr,torg_code=@torg_code
                                where code=@code";
                        list.Add(new
                        {
@@ -1091,13 +1131,14 @@
                                suitpart = suitpart,
                                stepcode = stepcode,
                                descr = descr,
                                torg_code=wkshopcode
                            }
                        });
                        //新增质检方案子表
                        for (int i = 0; i < arra.Count; i++)
                        {
                            sql = @"insert into  TStepCheckStandardSub(stepstaned_code,stepcheckitem_seq,stepcheckitem_code,required,numberjudge,unit,decimalnum,standvalue,uppervalue,lowervalue,stepcheckitem_desc,lm_user,lm_date) 
                                values(@stepstaned_code,@stepcheckitem_seq,@stepcheckitem_code,@required,@numberjudge,@unit,@decimalnum,@standvalue,@uppervalue,@lowervalue,@stepcheckitem_desc,@lm_user,@lm_date)";
                            sql = @"insert into  TStepCheckStandardSub(stepstaned_code,stepcheckitem_seq,stepcheckitem_code,required,numberjudge,unit,decimalnum,standvalue,uppervalue,lowervalue,stepcheckitem_desc,lm_user,lm_date,torg_code) 
                                values(@stepstaned_code,@stepcheckitem_seq,@stepcheckitem_code,@required,@numberjudge,@unit,@decimalnum,@standvalue,@uppervalue,@lowervalue,@stepcheckitem_desc,@lm_user,@lm_date,@torg_code)";
                            list.Add(new
                            {
                                str = sql,
@@ -1115,7 +1156,8 @@
                                    lowervalue = arra[i]["lowervalue"].ToString(),
                                    stepcheckitem_desc = arra[i]["stepcheckitem_desc"].ToString(),
                                    lm_user = username,
                                    lm_date = date
                                    lm_date = date,
                                    torg_code=wkshopcode
                                }
                            });
                        }

 VueWebApi/DLL/DAL/ReportManagerDAL.cs

@@ -20,12 +20,17 @@


        #region[委外报表记录查询]
        public static ToMessage OutSourceReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate, int startNum, int endNum, string prop, string order)
        public static ToMessage OutSourceReportSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                if (wkshopcode != "" && wkshopcode != null)
                {
                    search += "and W.wkshp_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                if (wocode != "" && wocode != null)
                {
                    search += "and A.wo_code like '%'+@wocode+'%' ";
@@ -90,7 +95,7 @@
                search = search.Substring(3);//截取索引2后面的字符
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select A.wo_code,M.partcode,M.partname,M.partspec,S.stepcode,S.stepname,C.code,C.name,(case when A.style='F' then '发料' when A.style='S' then '收料'  end) as style,
                var sql = @"select W.wkshp_code,F.org_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,S.stepcode,S.stepname,C.code,C.name,(case when A.style='F' then '发料' when A.style='S' then '收料'  end) as style,
                            A.fqty,A.sqty,A.ng_qty,A.bad_qty,U.username as out_person,B.out_time,T.username as in_person,B.in_time   
                            from TK_Wrk_OutRecord A
                            inner join TK_Wrk_OutRecordSub B on A.id=B.m_id
@@ -99,6 +104,8 @@
                            left  join TCustomer C on A.wx_code=C.code
                            left  join TUser U on B.out_person=U.usercode
                            left  join TUser T on B.in_person=T.usercode 
                            left  join TK_Wrk_Man W on A.wo_code=W.wo_code
                            left join TOrganization F on W.wkshp_code=F.org_code
                            where " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
@@ -118,12 +125,17 @@
        #endregion

        #region[委外报表记录导出]
        public static ToMessage OutSourceReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate)
        public static ToMessage OutSourceReportExcelSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                if (wkshopcode != "" && wkshopcode != null)
                {
                    search += "and K.wkshp_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                if (wocode != "" && wocode != null)
                {
                    search += "and A.wo_code like '%'+@wocode+'%' ";
@@ -188,7 +200,7 @@
                search = search.Substring(3);//截取索引2后面的字符
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select A.wo_code as '工单编号',M.partcode as '产品编码',M.partname as '产品名称',M.partspec as '产品规格',S.stepcode as '工序编码',S.stepname as '工序名称',
                var sql = @"select W.wkshp_code as è½¦é—´ç¼–码,F.org_name as è½¦é—´åç§°,A.wo_code as '工单编号',M.partcode as '产品编码',M.partname as '产品名称',M.partspec as '产品规格',S.stepcode as '工序编码',S.stepname as '工序名称',
                            C.code as '外协供方编码',C.name as '外协供方名称',(case when A.style='F' then '发料' when A.style='S' then '收料'  end) as '操作类型',
                            A.fqty as '发料数量',A.sqty as '收料数量',A.ng_qty as '不良数量',A.bad_qty as '报废数量',U.username as '发料人员',B.out_time as '发料时间',
                            T.username as '收料人员',B.in_time as '收料时间'  
@@ -199,6 +211,8 @@
                            left  join TCustomer C on A.wx_code=C.code
                            left  join TUser U on B.out_person=U.usercode
                            left  join TUser T on B.in_person=T.usercode
                            left  join TK_Wrk_Man W on A.wo_code=W.wo_code
                            left join TOrganization F on W.wkshp_code=F.org_code
                            where " + search;
                DataTable data = DapperHelper.selectdata(sql, dynamicParams);
                data.TableName = "Table"; //设置DataTable的名称
@@ -221,12 +235,17 @@


        #region[班组工资报表记录查询]
        public static ToMessage GroupSalaryReportSearch(string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate, string rejectstepcode, int startNum, int endNum, string prop, string order)
        public static ToMessage GroupSalaryReportSearch(string wkshopcode, string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate, string rejectstepcode, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                if (wkshopcode != "" && wkshopcode != null)
                {
                    search += "and K.wkshp_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                if (compute == "last")  //末道工序
                {
                    search += "and P.isend=@isend ";
@@ -286,7 +305,7 @@
                //search = search.Substring(3);//截取索引2后面的字符
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select distinct A.id,A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,A.task_qty,G.group_code,G.group_name,A.good_qty,
                var sql = @"select distinct A.id,K.wkshp_code,F.org_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,A.task_qty,G.group_code,G.group_name,A.good_qty,
                            isnull(S.unprice,0) as unprice,A.good_qty*isnull(S.unprice,0) as usermoney,U.username as lm_user,A.lm_date,B.report_date   
                            from TK_Wrk_Record A
                            inner join TK_Wrk_RecordSub B on A.id=B.m_id
@@ -297,6 +316,7 @@
                            left  join TMateriel_Info M on A.materiel_code=M.partcode
                            left  join TStep T on A.step_code=T.stepcode
                            left  join TUser U on A.lm_user=U.usercode 
                            left  join TOrganization F on K.wkshp_code=F.org_code
                            where G.group_code<>'' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
@@ -344,12 +364,17 @@
        #endregion

        #region[班组工资报表记录导出]
        public static ToMessage GroupSalaryReportExcelSearch(string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate,string rejectstepcode)
        public static ToMessage GroupSalaryReportExcelSearch(string wkshopcode, string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate,string rejectstepcode)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                if (wkshopcode != "" && wkshopcode != null)
                {
                    search += "and K.wkshp_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                if (compute == "last")  //末道工序
                {
                    search += "and P.isend=@isend ";
@@ -409,7 +434,7 @@
                //search = search.Substring(3);//截取索引2后面的字符
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select distinct A.wo_code as å·¥å•ç¼–号,M.partcode as äº§å“ç¼–码,M.partname as äº§å“åç§°,M.partspec as äº§å“è§„æ ¼,
                var sql = @"select distinct K.wkshp_code as è½¦é—´ç¼–码,F.org_name as è½¦é—´åç§°,A.wo_code as å·¥å•ç¼–号,M.partcode as äº§å“ç¼–码,M.partname as äº§å“åç§°,M.partspec as äº§å“è§„æ ¼,
                            T.stepcode as å·¥åºç¼–码,T.stepname as å·¥åºåç§°,A.task_qty as ä»»åŠ¡æ•°é‡,G.group_code as ç­ç»„编码,G.group_name as ç­ç»„名称,
                            A.good_qty as æŠ¥å·¥æ•°é‡,isnull(S.unprice,0) as å·¥åºå•ä»·,A.good_qty*isnull(S.unprice,0) as è®¡ä»¶å·¥èµ„,U.username as æ“ä½œäººå‘˜,A.lm_date as æ“ä½œæ—¶é—´,B.report_date as æŠ¥å·¥æ—¶é—´ 
                            from TK_Wrk_Record A
@@ -421,6 +446,7 @@
                            left  join TMateriel_Info M on A.materiel_code=M.partcode
                            left  join TStep T on A.step_code=T.stepcode
                            left  join TUser U on A.lm_user=U.usercode 
                            left  join TOrganization F on K.wkshp_code=F.org_code
                            where G.group_code<>'' " + search;
                DataTable data = DapperHelper.selectdata(sql, dynamicParams);
                data.TableName = "Table"; //设置DataTable的名称
@@ -443,12 +469,17 @@


        #region[人员工资明细报表]
        public static ToMessage PeopleSalaryReportSearch(string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string reportname, string reportopendate, string reportclosedate,string rejectstepcode, int startNum, int endNum, string prop, string order)
        public static ToMessage PeopleSalaryReportSearch(string wkshopcode, string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string reportname, string reportopendate, string reportclosedate,string rejectstepcode, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                if (wkshopcode != "" && wkshopcode != null)
                {
                    search += "and AA.wkshp_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                if (compute == "last")  //末道工序
                {
                    search += "and AA.isend=@isend ";
@@ -508,11 +539,11 @@
                search = search.Substring(3);//截取索引2后面的字符
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select AA.wo_code,AA.partcode,AA.partname,AA.partspec,AA.stepcode,AA.stepname,
                var sql = @"select AA.wkshp_code,AA.wkshp_name,AA.wo_code,AA.partcode,AA.partname,AA.partspec,AA.stepcode,AA.stepname,
                            AA.task_qty,AA.group_code,AA.group_name,AA.report_qty,AA.unprice,AA.ratio,AA.isend,
                            AA.moneys as usermoney,AA.username,AA.report_date
                            from (
                            select distinct A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,
                            select distinct K.wkshp_code,F.org_name as wkshp_name, A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,
                            A.task_qty,G.group_code,G.group_name,B.report_qty,isnull(S.unprice,0) as unprice,B.ratio,P.isend,
                            (B.report_qty*isnull(S.unprice,0))*(B.ratio/100) as moneys,U.username,B.report_date
                            from TK_Wrk_Record A
@@ -524,6 +555,7 @@
                            left  join TMateriel_Info M on A.materiel_code=M.partcode
                            left  join TStep T on A.step_code=T.stepcode
                            left  join TUser U on B.report_person=U.usercode
                            left join TOrganization F on K.wkshp_code=F.org_code
                            ) as AA
                            where " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
@@ -544,12 +576,17 @@
        #endregion

        #region[人员工资明细报表导出]
        public static ToMessage PeopleSalaryReportExcelSearch(string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string reportname, string reportopendate, string reportclosedate,string rejectstepcode)
        public static ToMessage PeopleSalaryReportExcelSearch(string wkshopcode, string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string reportname, string reportopendate, string reportclosedate,string rejectstepcode)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                if (wkshopcode != "" && wkshopcode != null)
                {
                    search += "and AA.wkshp_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                if (compute == "last")  //末道工序
                {
                    search += "and AA.isend=@isend ";
@@ -609,11 +646,11 @@
                search = search.Substring(3);//截取索引2后面的字符
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select AA.wo_code as å·¥å•ç¼–号,AA.partcode as äº§å“ç¼–码,AA.partname as äº§å“åç§°,AA.partspec as äº§å“è§„æ ¼,AA.stepcode as å·¥åºç¼–码,AA.stepname as å·¥åºåç§°,AA.isend as æ˜¯å¦æœ«é“工序,
                var sql = @"select K.wkshp_code as è½¦é—´ç¼–码,F.org_name as è½¦é—´åç§°,AA.wo_code as å·¥å•ç¼–号,AA.partcode as äº§å“ç¼–码,AA.partname as äº§å“åç§°,AA.partspec as äº§å“è§„æ ¼,AA.stepcode as å·¥åºç¼–码,AA.stepname as å·¥åºåç§°,AA.isend as æ˜¯å¦æœ«é“工序,
                            AA.task_qty as ä»»åŠ¡æ•°é‡,AA.group_code as ç”Ÿäº§ç­ç»„编码,AA.group_name as ç”Ÿäº§ç­ç»„名称,AA.report_qty as æŠ¥å·¥æ•°é‡,AA.unprice as å·¥åºå•ä»·,AA.ratio as åˆ†é…æ¯”例,
                            AA.moneys as è®¡ä»¶å·¥èµ„,AA.username as æŠ¥å·¥äººå‘˜,AA.report_date as æŠ¥å·¥æ—¶é—´
                            from (
                            select distinct A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,
                            select distinct K.wkshp_code,F.org_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,
                            A.task_qty,G.group_code,G.group_name,B.report_qty,isnull(S.unprice,0) as unprice,B.ratio,P.isend,
                            (B.report_qty*isnull(S.unprice,0))*(B.ratio/100) as moneys,U.username,B.report_date
                            from TK_Wrk_Record A
@@ -625,6 +662,7 @@
                            left  join TMateriel_Info M on A.materiel_code=M.partcode
                            left  join TStep T on A.step_code=T.stepcode
                            left  join TUser U on B.report_person=U.usercode
                            left join TOrganization F on K.wkshp_code=F.org_code
                            ) as AA
                            where " + search;
                DataTable data = DapperHelper.selectdata(sql, dynamicParams);
@@ -648,12 +686,17 @@


        #region[不良明细报表]
        public static ToMessage DefectDetailsReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate, int startNum, int endNum, string prop, string order)
        public static ToMessage DefectDetailsReportSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                if (wkshopcode != "" && wkshopcode != null)
                {
                    search += "and W.wkshp_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                if (wocode != "" && wocode != null)
                {
                    search += "and A.wo_code like '%'+@wocode+'%' ";
@@ -708,7 +751,7 @@
                search = search.Substring(3);//截取索引2后面的字符
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,P.plan_qty,A.defect_qty,
                var sql = @"select W.wkshp_code,L.org_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,P.plan_qty,A.defect_qty,
                            F.code as defect_code,F.name as defect_name,A.style,U.username as lm_user,A.lm_date   
                            from CSR_WorkRecord_Defect A
                            inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code 
@@ -716,6 +759,8 @@
                            left  join TStep T on A.step_code=T.stepcode
                            left  join TDefect F on A.defect_code=F.code
                            left  join TUser U on A.lm_user=U.usercode
                            left  join TK_Wrk_Man W on A.wo_code=W.wo_code
                            left join TOrganization L on W.wkshp_code=L.org_code
                            where " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
@@ -735,12 +780,17 @@
        #endregion

        #region[不良明细报表导出]
        public static ToMessage DefectDetailsReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate)
        public static ToMessage DefectDetailsReportExcelSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                if (wkshopcode != "" && wkshopcode != null)
                {
                    search += "and W.wkshp_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                if (wocode != "" && wocode != null)
                {
                    search += "and A.wo_code like '%'+@wocode+'%' ";
@@ -795,7 +845,7 @@
                search = search.Substring(3);//截取索引2后面的字符
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select A.wo_code as å·¥å•ç¼–号,M.partcode as äº§å“ç¼–码,M.partname as äº§å“åç§°,M.partspec as äº§å“è§„æ ¼,T.stepcode as å·¥åºç¼–码,
                var sql = @"select W.wkshp_code as è½¦é—´ç¼–码,L.org_name as è½¦é—´åç§°,A.wo_code as å·¥å•ç¼–号,M.partcode as äº§å“ç¼–码,M.partname as äº§å“åç§°,M.partspec as äº§å“è§„æ ¼,T.stepcode as å·¥åºç¼–码,
                            T.stepname as å·¥åºåç§°,P.plan_qty as ä»»åŠ¡æ•°é‡,A.defect_qty as ä¸è‰¯æ•°é‡,F.code as ç¼ºé™·ä»£ç ,F.name as ç¼ºé™·åç§°,
                            (case when A.style='B' then '报工' when A.style='S' then '收料'  end) as '操作类型',U.username as æ“ä½œäººå‘˜,A.lm_date as æ“ä½œæ—¶é—´  
                            from CSR_WorkRecord_Defect A
@@ -804,6 +854,8 @@
                            left  join TStep T on A.step_code=T.stepcode
                            left  join TDefect F on A.defect_code=F.code
                            left  join TUser U on A.lm_user=U.usercode
                            left  join TK_Wrk_Man W on A.wo_code=W.wo_code
                            left  join TOrganization L on W.wkshp_code=L.org_code
                            where " + search;
                DataTable data = DapperHelper.selectdata(sql, dynamicParams);
                data.TableName = "Table"; //设置DataTable的名称
@@ -856,12 +908,17 @@


        #region[维修明细报表]
        public static ToMessage MaintenanceDetailsReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate, int startNum, int endNum, string prop, string order)
        public static ToMessage MaintenanceDetailsReportSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                if (wkshopcode != "" && wkshopcode != null)
                {
                    search += "and AA.wkshp_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                if (wocode != "" && wocode != null)
                {
                    search += "and AA.wo_code like '%'+@wocode+'%' ";
@@ -916,10 +973,10 @@
                search = search.Substring(3);//截取索引2后面的字符
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select AA.wo_code,AA.partcode,AA.partname,AA.partspec,AA.stepcode,AA.stepname,(case when AA.style='B' then '报工' when AA.style='S' then '收料' end) as style,
                var sql = @"select AA.wkshp_code,AA.wkshp_name,AA.wo_code,AA.partcode,AA.partname,AA.partspec,AA.stepcode,AA.stepname,(case when AA.style='B' then '报工' when AA.style='S' then '收料' end) as style,
                            AA.plan_qty,AA.repair_qty,AA.bad_qty,AA.defect_code,AA.defect_name,AA.lm_user,AA.lm_date
                            from(
                            select F.wo_code,M.partcode,M.partname,M.partspec,S.stepcode,S.stepname,F.style,P.plan_qty,F.repair_qty,F.bad_qty,F.defect_code,
                            select W.wkshp_code,L.org_name as wkshp_name,F.wo_code,M.partcode,M.partname,M.partspec,S.stepcode,S.stepname,F.style,P.plan_qty,F.repair_qty,F.bad_qty,F.defect_code,
                            defect_name = STUFF(( SELECT ',' + T.name
                            FROM TDefect as T
                            where PATINDEX('%,' + RTRIM(T.code) + ',%',',' + F.defect_code + ',')>0
@@ -930,6 +987,8 @@
                            left  join TMateriel_Info M on F.partnumber=M.partcode
                            left  join TStep S on F.step_code=S.stepcode
                            left  join TUser U on F.lm_user=U.usercode
                            left  join TK_Wrk_Man W on F.wo_code=W.wo_code
                            left join TOrganization L on W.wkshp_code=L.org_code
                            ) as AA
                            where " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
@@ -950,12 +1009,17 @@
        #endregion

        #region[维修明细报表导出]
        public static ToMessage MaintenanceDetailsReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate)
        public static ToMessage MaintenanceDetailsReportExcelSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                if (wkshopcode != "" && wkshopcode != null)
                {
                    search += "and AA.wkshp_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                if (wocode != "" && wocode != null)
                {
                    search += "and AA.wo_code like '%'+@wocode+'%' ";
@@ -1010,11 +1074,11 @@
                search = search.Substring(3);//截取索引2后面的字符
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select AA.wo_code as å·¥å•ç¼–号,AA.partcode as äº§å“ç¼–码,AA.partname as äº§å“åç§°,AA.partspec as äº§å“è§„æ ¼,AA.stepcode as å·¥åºç¼–码,AA.stepname as å·¥åºåç§°,
                var sql = @"select AA.wkshp_code as è½¦é—´ç¼–码,AA.wkshp_name as è½¦é—´åç§°,AA.wo_code as å·¥å•ç¼–号,AA.partcode as äº§å“ç¼–码,AA.partname as äº§å“åç§°,AA.partspec as äº§å“è§„æ ¼,AA.stepcode as å·¥åºç¼–码,AA.stepname as å·¥åºåç§°,
                            (case when AA.style='B' then '报工' when AA.style='S' then '收料' end) as æ“ä½œç±»åž‹,
                            AA.plan_qty as ä»»åŠ¡æ•°é‡,AA.repair_qty as ç»´ä¿®æ•°é‡,AA.bad_qty as æŠ¥åºŸæ•°é‡,AA.defect_name as ç¼ºé™·åç§°,AA.lm_user as ç»´ä¿®äººå‘˜,AA.lm_date as ç»´ä¿®æ—¶é—´
                            from(
                            select F.wo_code,M.partcode,M.partname,M.partspec,S.stepcode,S.stepname,F.style,P.plan_qty,F.repair_qty,F.bad_qty,F.defect_code,
                            select W.wkshp_code,L.org_name as wkshp_name,F.wo_code,M.partcode,M.partname,M.partspec,S.stepcode,S.stepname,F.style,P.plan_qty,F.repair_qty,F.bad_qty,F.defect_code,
                            defect_name = STUFF(( SELECT ',' + T.name
                            FROM TDefect as T
                            where PATINDEX('%,' + RTRIM(T.code) + ',%',',' + F.defect_code + ',')>0
@@ -1025,6 +1089,8 @@
                            left  join TMateriel_Info M on F.partnumber=M.partcode
                            left  join TStep S on F.step_code=S.stepcode
                            left  join TUser U on F.lm_user=U.usercode
                            left  join TK_Wrk_Man W on F.wo_code=W.wo_code
                            left join TOrganization L on W.wkshp_code=L.org_code
                            ) as AA
                            where " + search;
                DataTable data = DapperHelper.selectdata(sql, dynamicParams);
@@ -1481,12 +1547,17 @@


        #region[生产进度报表]
        public static ToMessage ProductionScheduleReportSearch(string status, string wocode, string routecode, string routename, string partcode, string partname, string partspec,string opendate,string closedate, int startNum, int endNum, string prop, string order)
        public static ToMessage ProductionScheduleReportSearch(string wkshopcode, string status, string wocode, string routecode, string routename, string partcode, string partname, string partspec,string opendate,string closedate, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                if (wkshopcode != "" && wkshopcode != null)
                {
                    search += "and AA.wkshp_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                if (status != "" && status != null) 
                {
                    switch (status)
@@ -1545,11 +1616,11 @@
                search = search.Substring(3);//截取索引2后面的字符
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select  AA.saleOrderCode,AA.m_po,AA.wo_code,
                var sql = @"select  AA.saleOrderCode,AA.m_po,AA.wkshp_code,AA.wkshp_name,AA.wo_code,
                            (case when AA.status='START' then '执行中' when AA.status='CLOSED' then '已完成' else '未开始' end) as status,
                            AA.lm_date,AA.route_code,AA.route_name,AA.partcode,AA.partname,AA.partspec,AA.plan_qty,left(AA.concat_name,len(concat_name)-1) as concat_name  from
                            (
                            select E.saleOrderCode,W.m_po,m.wo_code,W.status,W.lm_date,W.route_code,R.name as route_name,P.partcode,P.partname,P.partspec,m.plan_qty,
                            select E.saleOrderCode,W.m_po,m.wo_code,W.wkshp_code,F.org_name as wkshp_name,W.status,W.lm_date,W.route_code,R.name as route_name,P.partcode,P.partname,P.partspec,m.plan_qty,
                            (select s.stepname+'/'+cast(cast(n.good_qty as decimal(18,2)) AS varchar(50))+',' from TK_Wrk_Step n
                             inner join TStep S on n.step_code=S.stepcode
                             where n.wo_code=m.wo_code for xml path('')) as concat_name
@@ -1558,8 +1629,9 @@
                            left join TKimp_Ewo E on W.m_po=E.wo
                            inner join TMateriel_Info P on W.materiel_code=p.partcode
                            inner join TFlw_Rout R on W.route_code=R.code
                            group by E.saleOrderCode,W.m_po,m.wo_code,W.status,W.lm_date,W.route_code,R.name,P.partcode,P.partname,P.partspec,m.plan_qty
                            ) AA  
                            left join  TOrganization F on W.wkshp_code=F.org_code
                            group by E.saleOrderCode,W.m_po,m.wo_code,W.wkshp_code,F.org_name,W.status,W.lm_date,W.route_code,R.name,P.partcode,P.partname,P.partspec,m.plan_qty
                            ) AA 
                            where " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
@@ -1579,12 +1651,17 @@
        #endregion

        #region[生产进度报表导出]
        public static ToMessage ProductionScheduleReportExcelSearch(string status, string wocode, string routecode, string routename, string partcode, string partname, string partspec,string opendate,string closedate)
        public static ToMessage ProductionScheduleReportExcelSearch(string wkshopcode, string status, string wocode, string routecode, string routename, string partcode, string partname, string partspec,string opendate,string closedate)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                if (wkshopcode != "" && wkshopcode != null)
                {
                    search += "and AA.wkshp_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                if (status != "" && status != null)
                {
                    switch (status)
@@ -1643,12 +1720,12 @@
                search = search.Substring(3);//截取索引2后面的字符
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select  AA.saleOrderCode as ERP源单号,AA.m_po as ERP生产订单,AA.wo_code as ç”Ÿäº§å·¥å•å·,
                var sql = @"select  AA.saleOrderCode as ERP源单号,AA.m_po as ERP生产订单,AA.wkshp_code as è½¦é—´ç¼–码,AA.wkshp_name as è½¦é—´åç§°,AA.wo_code as ç”Ÿäº§å·¥å•å·,
                            (case when AA.status='START' then '执行中' when AA.status='CLOSED' then '已完成' else '未开始' end) as å·¥å•çŠ¶æ€,
                            AA.lm_date as å•æ®æ—¥æœŸ,AA.route_code as å·¥è‰ºè·¯çº¿ç¼–号,AA.route_name as å·¥è‰ºè·¯çº¿åç§°,
                            AA.partcode as äº§å“ç¼–码,AA.partname as äº§å“åç§°,AA.partspec as äº§å“è§„æ ¼,AA.plan_qty as ä»»åŠ¡æ•°é‡,left(AA.concat_name,len(concat_name)-1) as ç”Ÿäº§è¿›åº¦  from
                            (
                            select E.saleOrderCode,W.m_po,m.wo_code,W.status,W.lm_date,W.route_code,R.name as route_name,P.partcode,P.partname,P.partspec,m.plan_qty,
                            select E.saleOrderCode,W.m_po,m.wo_code,W.wkshp_code,F.org_name as wkshp_name,W.status,W.lm_date,W.route_code,R.name as route_name,P.partcode,P.partname,P.partspec,m.plan_qty,
                            (select s.stepname+'/'+cast(cast(n.good_qty as decimal(18,2)) AS varchar(50))+',' from TK_Wrk_Step n
                             inner join TStep S on n.step_code=S.stepcode
                             where n.wo_code=m.wo_code for xml path('')) as concat_name
@@ -1657,7 +1734,8 @@
                            left join TKimp_Ewo E on W.m_po=E.wo
                            inner join TMateriel_Info P on W.materiel_code=p.partcode
                            inner join TFlw_Rout R on W.route_code=R.code
                            group by E.saleOrderCode,W.m_po,m.wo_code,W.status,W.lm_date,W.route_code,R.name,P.partcode,P.partname,P.partspec,m.plan_qty
                            left join  TOrganization F on W.wkshp_code=F.org_code
                            group by E.saleOrderCode,W.m_po,m.wo_code,W.wkshp_code,F.org_name,W.status,W.lm_date,W.route_code,R.name,P.partcode,P.partname,P.partspec,m.plan_qty
                            ) AA  
                            where " + search;
                DataTable data = DapperHelper.selectdata(sql, dynamicParams);

 VueWebApi/Models/MaterialRout.cs

@@ -8,6 +8,8 @@
{
    public class MaterialRout
    {
        public string wkshopcode { get; set; }
        public string wkshopname { get; set; }
        public string code { get; set; }
        public string name { get; set; }
        public string flag { get; set; }

 VueWebApi/Models/ObjectData.cs

@@ -9,5 +9,6 @@
    {
        public string code { get; set; }
        public string name { get; set; }
        public string flag { get; set; }
    }
}

 VueWebApi/Models/PartRout.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;

namespace VueWebApi.Models
{
    public class PartRout
    {
        public string wkshopcode { get; set; }
        public string code { get; set; }
        public string name { get; set; }
        public string flag { get; set; }
    }
}

 VueWebApi/Models/RoutEdit.cs

@@ -12,6 +12,7 @@
        public string name { get; set; }
        public string enable { get; set; }
        public string description { get; set; }
        public string wkshopcode { get; set; }
        public DataTable Data { get; set; }
    }
}

 VueWebApi/Models/ScanStartReportData.cs

@@ -23,5 +23,9 @@
        public decimal noreportqty { get; set; } //未报数量
        public decimal reportqty { get; set; } //已报数量
        public decimal noputqty { get; set; } //未收数量
        public string wkshopcode { get; set; } //车间编码
        public string wkshopname { get; set; } //车间名称
        public string eqpcode { get; set; } //设备编码
        public string eqpname { get; set; } //设备名称
    }
}

 VueWebApi/Models/ScanStartReportDataOut.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,29 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;

namespace VueWebApi.Models
{
    public class ScanStartReportDataOut
    {
        public string wo_code { get; set; }  //工单编号
        public string partnumber { get; set; } //产品编码
        public string partname { get; set; } //产品名称
        public string partspec { get; set; } //产品规格
        public string seq { get; set; } //当前工序序号
        public string stepcode { get; set; } //当前工序编码
        public string stepname { get; set; } //当前工序
        public string nextstepcode { get; set; } //下道工序编码
        public string nextstepname { get; set; } //下道工序
        public string stepdesc { get; set; } //工序描述
        public string wkshopcode { get; set; } //车间编码
        public string wkshopname { get; set; } //车间名称
        public decimal planqty { get; set; } //任务数量
        public decimal startqty { get; set; } //开工数量
        public decimal noreportqty { get; set; } //未报数量
        public decimal reportqty { get; set; } //已报数量
        public decimal noputqty { get; set; } //未收数量
        public object list { get; set; }
    }
}

 VueWebApi/Models/StepDefect.cs

@@ -7,6 +7,7 @@
{
    public class StepDefect
    {
        public string storg_code { get; set; }
        public string code { get; set; }
        public string name { get; set; }
        public string flag { get; set; }

 VueWebApi/Models/User.cs

@@ -14,5 +14,8 @@
        public string password { get; set; }
        public string usertype { get; set; }
        public string rediskey { get; set; }
        public string stu_torgcode { get; set; }
        public string stu_torgname { get; set; }
        public string description { get; set; }
    }
}

 VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121. 
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <DeleteExistingFiles>False</DeleteExistingFiles>
    <ExcludeApp_Data>False</ExcludeApp_Data>
    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
    <PublishUrl>D:\网站发布\MES正清河</PublishUrl>
    <WebPublishMethod>FileSystem</WebPublishMethod>
  </PropertyGroup>
</Project>

 VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,1131 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121. 
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\MES正清河</_PublishTargetUrl>
    <History>True|2023-06-13T02:24:59.6876648Z;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="Areas/HelpPage/HelpPage.css">
      <publishTime>06/10/2022 08:20:30</publishTime>
    </File>
    <File Include="Areas/HelpPage/Views/Help/Api.cshtml">
      <publishTime>06/10/2022 08:20:30</publishTime>
    </File>
    <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/ApiGroup.cshtml">
      <publishTime>06/10/2022 08:20:30</publishTime>
    </File>
    <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/CollectionModelDescription.cshtml">
      <publishTime>06/10/2022 08:20:30</publishTime>
    </File>
    <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/ComplexTypeModelDescription.cshtml">
      <publishTime>06/10/2022 08:20:30</publishTime>
    </File>
    <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/DictionaryModelDescription.cshtml">
      <publishTime>06/10/2022 08:20:30</publishTime>
    </File>
    <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/EnumTypeModelDescription.cshtml">
      <publishTime>06/10/2022 08:20:30</publishTime>
    </File>
    <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/HelpPageApiModel.cshtml">
      <publishTime>06/10/2022 08:20:30</publishTime>
    </File>
    <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/ImageSample.cshtml">
      <publishTime>06/10/2022 08:20:30</publishTime>
    </File>
    <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/InvalidSample.cshtml">
      <publishTime>06/10/2022 08:20:30</publishTime>
    </File>
    <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/KeyValuePairModelDescription.cshtml">
      <publishTime>06/10/2022 08:20:30</publishTime>
    </File>
    <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/ModelDescriptionLink.cshtml">
      <publishTime>06/10/2022 08:20:30</publishTime>
    </File>
    <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/Parameters.cshtml">
      <publishTime>06/10/2022 08:20:30</publishTime>
    </File>
    <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/Samples.cshtml">
      <publishTime>06/10/2022 08:20:30</publishTime>
    </File>
    <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/SimpleTypeModelDescription.cshtml">
      <publishTime>06/10/2022 08:20:30</publishTime>
    </File>
    <File Include="Areas/HelpPage/Views/Help/DisplayTemplates/TextSample.cshtml">
      <publishTime>06/10/2022 08:20:30</publishTime>
    </File>
    <File Include="Areas/HelpPage/Views/Help/Index.cshtml">
      <publishTime>06/10/2022 08:20:30</publishTime>
    </File>
    <File Include="Areas/HelpPage/Views/Help/ResourceModel.cshtml">
      <publishTime>06/10/2022 08:20:30</publishTime>
    </File>
    <File Include="Areas/HelpPage/Views/Shared/_Layout.cshtml">
      <publishTime>06/10/2022 08:20:30</publishTime>
    </File>
    <File Include="Areas/HelpPage/Views/Web.config">
      <publishTime>06/10/2022 08:20:30</publishTime>
    </File>
    <File Include="Areas/HelpPage/Views/_ViewStart.cshtml">
      <publishTime>06/10/2022 08:20:24</publishTime>
    </File>
    <File Include="bin/Antlr3.Runtime.dll">
      <publishTime>09/10/2013 16:29:20</publishTime>
    </File>
    <File Include="bin/Antlr3.Runtime.pdb">
      <publishTime>09/10/2013 16:29:20</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>11/03/2021 22:07:30</publishTime>
    </File>
    <File Include="bin/FastReport.dll">
      <publishTime>06/30/2022 13:48:06</publishTime>
    </File>
    <File Include="bin/FastReport.Web.dll">
      <publishTime>06/30/2022 13:48:36</publishTime>
    </File>
    <File Include="bin/Fleck.dll">
      <publishTime>04/22/2021 11:48:12</publishTime>
    </File>
    <File Include="bin/GetuiServerApiSDK.dll">
      <publishTime>12/13/2018 15:35:36</publishTime>
    </File>
    <File Include="bin/Google.ProtocolBuffers.dll">
      <publishTime>12/12/2018 17:31:14</publishTime>
    </File>
    <File Include="bin/ICSharpCode.SharpZipLib.dll">
      <publishTime>09/19/2021 17:20:28</publishTime>
    </File>
    <File Include="bin/ICSharpCode.SharpZipLib.pdb">
      <publishTime>09/19/2021 17:20:28</publishTime>
    </File>
    <File Include="bin/Jiguang.JPush.dll">
      <publishTime>11/26/2019 17:25:54</publishTime>
    </File>
    <File Include="bin/JWT.dll">
      <publishTime>01/23/2022 00:17:46</publishTime>
    </File>
    <File Include="bin/JWT.pdb">
      <publishTime>01/23/2022 00:17:46</publishTime>
    </File>
    <File Include="bin/log4net.dll">
      <publishTime>12/17/2021 18:45:06</publishTime>
    </File>
    <File Include="bin/Microsoft.AspNet.SignalR.Core.dll">
      <publishTime>05/04/2017 02:25:34</publishTime>
    </File>
    <File Include="bin/Microsoft.AspNet.SignalR.SystemWeb.dll">
      <publishTime>05/04/2017 02:25:40</publishTime>
    </File>
    <File Include="bin/Microsoft.AspNetCore.Http.Abstractions.dll">
      <publishTime>11/13/2018 01:29:00</publishTime>
    </File>
    <File Include="bin/Microsoft.AspNetCore.Http.Features.dll">
      <publishTime>11/13/2018 01:28:58</publishTime>
    </File>
    <File Include="bin/Microsoft.AspNetCore.Mvc.Abstractions.dll">
      <publishTime>11/13/2018 01:40:10</publishTime>
    </File>
    <File Include="bin/Microsoft.AspNetCore.Routing.Abstractions.dll">
      <publishTime>11/13/2018 01:38:16</publishTime>
    </File>
    <File Include="bin/Microsoft.Bcl.AsyncInterfaces.dll">
      <publishTime>10/20/2020 02:40:36</publishTime>
    </File>
    <File Include="bin/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll">
      <publishTime>09/05/2018 16:10:50</publishTime>
    </File>
    <File Include="bin/Microsoft.Extensions.Primitives.dll">
      <publishTime>11/11/2018 08:26:36</publishTime>
    </File>
    <File Include="bin/Microsoft.Net.Http.Headers.dll">
      <publishTime>11/13/2018 01:28:58</publishTime>
    </File>
    <File Include="bin/Microsoft.Owin.Cors.dll">
      <publishTime>02/14/2018 00:28:06</publishTime>
    </File>
    <File Include="bin/Microsoft.Owin.dll">
      <publishTime>02/14/2018 00:28:04</publishTime>
    </File>
    <File Include="bin/Microsoft.Owin.Host.SystemWeb.dll">
      <publishTime>02/14/2018 00:28:12</publishTime>
    </File>
    <File Include="bin/Microsoft.Owin.Security.dll">
      <publishTime>02/14/2018 00:28:16</publishTime>
    </File>
    <File Include="bin/Microsoft.Web.Infrastructure.dll">
      <publishTime>07/25/2012 11:48:56</publishTime>
    </File>
    <File Include="bin/Microsoft.Win32.Primitives.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/netstandard.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/Newtonsoft.Json.dll">
      <publishTime>04/22/2019 01:06:16</publishTime>
    </File>
    <File Include="bin/NPOI.dll">
      <publishTime>04/26/2022 00:23:22</publishTime>
    </File>
    <File Include="bin/NPOI.OOXML.dll">
      <publishTime>04/26/2022 00:23:22</publishTime>
    </File>
    <File Include="bin/NPOI.OOXML.pdb">
      <publishTime>04/26/2022 00:23:22</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXml4Net.dll">
      <publishTime>04/26/2022 00:23:22</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXml4Net.pdb">
      <publishTime>04/26/2022 00:23:22</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXmlFormats.dll">
      <publishTime>04/26/2022 00:23:22</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXmlFormats.pdb">
      <publishTime>04/26/2022 00:23:22</publishTime>
    </File>
    <File Include="bin/NPOI.pdb">
      <publishTime>04/26/2022 00:23:22</publishTime>
    </File>
    <File Include="bin/Owin.dll">
      <publishTime>11/13/2012 20:19:34</publishTime>
    </File>
    <File Include="bin/Pipelines.Sockets.Unofficial.dll">
      <publishTime>12/14/2021 20:20:48</publishTime>
    </File>
    <File Include="bin/roslyn/csc.exe">
      <publishTime>08/08/2018 05:38:48</publishTime>
    </File>
    <File Include="bin/roslyn/csc.exe.config">
      <publishTime>08/08/2018 12:18:12</publishTime>
    </File>
    <File Include="bin/roslyn/csc.rsp">
      <publishTime>08/08/2018 12:09:42</publishTime>
    </File>
    <File Include="bin/roslyn/csi.exe">
      <publishTime>08/08/2018 05:38:48</publishTime>
    </File>
    <File Include="bin/roslyn/csi.exe.config">
      <publishTime>08/08/2018 12:18:34</publishTime>
    </File>
    <File Include="bin/roslyn/csi.rsp">
      <publishTime>08/08/2018 12:09:56</publishTime>
    </File>
    <File Include="bin/roslyn/Microsoft.Build.Tasks.CodeAnalysis.dll">
      <publishTime>08/08/2018 05:38:48</publishTime>
    </File>
    <File Include="bin/roslyn/Microsoft.CodeAnalysis.CSharp.dll">
      <publishTime>08/08/2018 05:38:48</publishTime>
    </File>
    <File Include="bin/roslyn/Microsoft.CodeAnalysis.CSharp.Scripting.dll">
      <publishTime>08/08/2018 05:38:48</publishTime>
    </File>
    <File Include="bin/roslyn/Microsoft.CodeAnalysis.dll">
      <publishTime>08/08/2018 05:38:48</publishTime>
    </File>
    <File Include="bin/roslyn/Microsoft.CodeAnalysis.Scripting.dll">
      <publishTime>08/08/2018 05:38:48</publishTime>
    </File>
    <File Include="bin/roslyn/Microsoft.CodeAnalysis.VisualBasic.dll">
      <publishTime>08/08/2018 05:38:48</publishTime>
    </File>
    <File Include="bin/roslyn/Microsoft.CSharp.Core.targets">
      <publishTime>08/08/2018 12:09:42</publishTime>
    </File>
    <File Include="bin/roslyn/Microsoft.DiaSymReader.Native.amd64.dll">
      <publishTime>12/05/2017 09:36:44</publishTime>
    </File>
    <File Include="bin/roslyn/Microsoft.DiaSymReader.Native.x86.dll">
      <publishTime>12/05/2017 09:36:44</publishTime>
    </File>
    <File Include="bin/roslyn/Microsoft.Managed.Core.targets">
      <publishTime>08/08/2018 12:09:42</publishTime>
    </File>
    <File Include="bin/roslyn/Microsoft.VisualBasic.Core.targets">
      <publishTime>08/08/2018 12:09:42</publishTime>
    </File>
    <File Include="bin/roslyn/Microsoft.Win32.Primitives.dll">
      <publishTime>11/05/2016 18:55:32</publishTime>
    </File>
    <File Include="bin/roslyn/System.AppContext.dll">
      <publishTime>11/05/2016 18:55:34</publishTime>
    </File>
    <File Include="bin/roslyn/System.Collections.Immutable.dll">
      <publishTime>05/16/2018 03:29:34</publishTime>
    </File>
    <File Include="bin/roslyn/System.Console.dll">
      <publishTime>11/05/2016 18:55:48</publishTime>
    </File>
    <File Include="bin/roslyn/System.Diagnostics.DiagnosticSource.dll">
      <publishTime>11/05/2016 18:55:52</publishTime>
    </File>
    <File Include="bin/roslyn/System.Diagnostics.FileVersionInfo.dll">
      <publishTime>11/05/2016 18:55:56</publishTime>
    </File>
    <File Include="bin/roslyn/System.Diagnostics.StackTrace.dll">
      <publishTime>11/05/2016 18:55:52</publishTime>
    </File>
    <File Include="bin/roslyn/System.Globalization.Calendars.dll">
      <publishTime>11/05/2016 18:56:02</publishTime>
    </File>
    <File Include="bin/roslyn/System.IO.Compression.dll">
      <publishTime>11/05/2016 18:56:08</publishTime>
    </File>
    <File Include="bin/roslyn/System.IO.Compression.ZipFile.dll">
      <publishTime>11/05/2016 18:56:04</publishTime>
    </File>
    <File Include="bin/roslyn/System.IO.FileSystem.dll">
      <publishTime>11/05/2016 18:56:08</publishTime>
    </File>
    <File Include="bin/roslyn/System.IO.FileSystem.Primitives.dll">
      <publishTime>11/05/2016 18:56:08</publishTime>
    </File>
    <File Include="bin/roslyn/System.Net.Http.dll">
      <publishTime>11/05/2016 18:56:30</publishTime>
    </File>
    <File Include="bin/roslyn/System.Net.Sockets.dll">
      <publishTime>11/05/2016 18:56:34</publishTime>
    </File>
    <File Include="bin/roslyn/System.Reflection.Metadata.dll">
      <publishTime>05/16/2018 03:29:44</publishTime>
    </File>
    <File Include="bin/roslyn/System.Runtime.InteropServices.RuntimeInformation.dll">
      <publishTime>11/05/2016 18:57:00</publishTime>
    </File>
    <File Include="bin/roslyn/System.Security.Cryptography.Algorithms.dll">
      <publishTime>11/05/2016 18:57:14</publishTime>
    </File>
    <File Include="bin/roslyn/System.Security.Cryptography.Encoding.dll">
      <publishTime>11/05/2016 18:57:08</publishTime>
    </File>
    <File Include="bin/roslyn/System.Security.Cryptography.Primitives.dll">
      <publishTime>11/05/2016 18:57:18</publishTime>
    </File>
    <File Include="bin/roslyn/System.Security.Cryptography.X509Certificates.dll">
      <publishTime>11/05/2016 18:57:18</publishTime>
    </File>
    <File Include="bin/roslyn/System.Text.Encoding.CodePages.dll">
      <publishTime>11/05/2016 18:57:20</publishTime>
    </File>
    <File Include="bin/roslyn/System.Threading.Tasks.Extensions.dll">
      <publishTime>11/05/2016 18:57:24</publishTime>
    </File>
    <File Include="bin/roslyn/System.ValueTuple.dll">
      <publishTime>11/05/2016 18:57:30</publishTime>
    </File>
    <File Include="bin/roslyn/System.Xml.ReaderWriter.dll">
      <publishTime>11/05/2016 18:57:36</publishTime>
    </File>
    <File Include="bin/roslyn/System.Xml.XmlDocument.dll">
      <publishTime>11/05/2016 18:57:34</publishTime>
    </File>
    <File Include="bin/roslyn/System.Xml.XPath.dll">
      <publishTime>11/05/2016 18:57:40</publishTime>
    </File>
    <File Include="bin/roslyn/System.Xml.XPath.XDocument.dll">
      <publishTime>11/05/2016 18:57:34</publishTime>
    </File>
    <File Include="bin/roslyn/vbc.exe">
      <publishTime>08/08/2018 05:38:48</publishTime>
    </File>
    <File Include="bin/roslyn/vbc.exe.config">
      <publishTime>08/08/2018 12:18:18</publishTime>
    </File>
    <File Include="bin/roslyn/vbc.rsp">
      <publishTime>08/08/2018 12:09:46</publishTime>
    </File>
    <File Include="bin/roslyn/VBCSCompiler.exe">
      <publishTime>08/08/2018 05:38:48</publishTime>
    </File>
    <File Include="bin/roslyn/VBCSCompiler.exe.config">
      <publishTime>08/08/2018 12:18:16</publishTime>
    </File>
    <File Include="bin/ServiceStack.Common.dll">
      <publishTime>12/11/2017 11:54:52</publishTime>
    </File>
    <File Include="bin/ServiceStack.Interfaces.dll">
      <publishTime>12/11/2017 11:54:26</publishTime>
    </File>
    <File Include="bin/ServiceStack.Redis.dll">
      <publishTime>12/10/2017 11:11:26</publishTime>
    </File>
    <File Include="bin/ServiceStack.Text.dll">
      <publishTime>12/10/2017 22:53:52</publishTime>
    </File>
    <File Include="bin/StackExchange.Redis.dll">
      <publishTime>04/03/2022 06:42:16</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>07/08/2017 01:30:56</publishTime>
    </File>
    <File Include="bin/System.AppContext.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>02/19/2020 10:05:18</publishTime>
    </File>
    <File Include="bin/System.CodeDom.dll">
      <publishTime>10/23/2021 07:52:04</publishTime>
    </File>
    <File Include="bin/System.Collections.Concurrent.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Collections.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Collections.NonGeneric.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Collections.Specialized.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.ComponentModel.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.ComponentModel.EventBasedAsync.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.ComponentModel.Primitives.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.ComponentModel.TypeConverter.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Console.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Data.Common.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Diagnostics.Contracts.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Diagnostics.Debug.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Diagnostics.FileVersionInfo.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Diagnostics.PerformanceCounter.dll">
      <publishTime>10/20/2020 02:49:34</publishTime>
    </File>
    <File Include="bin/System.Diagnostics.Process.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Diagnostics.StackTrace.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Diagnostics.TextWriterTraceListener.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Diagnostics.Tools.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Diagnostics.TraceSource.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Diagnostics.Tracing.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Drawing.Primitives.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Dynamic.Runtime.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Globalization.Calendars.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Globalization.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Globalization.Extensions.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.IO.Compression.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.IO.Compression.ZipFile.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.IO.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.IO.FileSystem.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.IO.FileSystem.DriveInfo.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.IO.FileSystem.Primitives.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.IO.FileSystem.Watcher.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.IO.IsolatedStorage.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.IO.MemoryMappedFiles.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.IO.Pipelines.dll">
      <publishTime>11/26/2020 10:00:22</publishTime>
    </File>
    <File Include="bin/System.IO.Pipes.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.IO.UnmanagedMemoryStream.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Linq.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Linq.Expressions.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Linq.Parallel.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Linq.Queryable.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Memory.dll">
      <publishTime>02/19/2020 10:05:18</publishTime>
    </File>
    <File Include="bin/System.Net.Http.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Net.Http.Formatting.dll">
      <publishTime>05/28/2022 07:41:34</publishTime>
    </File>
    <File Include="bin/System.Net.NameResolution.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Net.NetworkInformation.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Net.Ping.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Net.Primitives.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Net.Requests.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Net.Security.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Net.Sockets.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Net.WebHeaderCollection.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Net.WebSockets.Client.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Net.WebSockets.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Numerics.Vectors.dll">
      <publishTime>05/15/2018 13:29:44</publishTime>
    </File>
    <File Include="bin/System.ObjectModel.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Reflection.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Reflection.Extensions.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Reflection.Primitives.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Resources.Reader.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Resources.ResourceManager.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Resources.Writer.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
      <publishTime>02/19/2020 10:05:16</publishTime>
    </File>
    <File Include="bin/System.Runtime.CompilerServices.VisualC.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Runtime.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Runtime.Extensions.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Runtime.Handles.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Runtime.InteropServices.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Runtime.InteropServices.RuntimeInformation.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Runtime.Numerics.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Runtime.Serialization.Formatters.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Runtime.Serialization.Json.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Runtime.Serialization.Primitives.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Runtime.Serialization.Xml.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Security.Claims.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Security.Cryptography.Algorithms.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Security.Cryptography.Csp.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Security.Cryptography.Encoding.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Security.Cryptography.Primitives.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Security.Cryptography.X509Certificates.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Security.Principal.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Security.SecureString.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Text.Encoding.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Text.Encoding.Extensions.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Text.Encodings.Web.dll">
      <publishTime>05/15/2018 21:29:52</publishTime>
    </File>
    <File Include="bin/System.Text.RegularExpressions.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Threading.Channels.dll">
      <publishTime>10/20/2020 02:46:24</publishTime>
    </File>
    <File Include="bin/System.Threading.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Threading.Overlapped.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Threading.Tasks.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Threading.Tasks.Extensions.dll">
      <publishTime>02/19/2020 10:05:18</publishTime>
    </File>
    <File Include="bin/System.Threading.Tasks.Parallel.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Threading.Thread.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Threading.ThreadPool.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Threading.Timer.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.ValueTuple.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Web.Cors.dll">
      <publishTime>11/28/2018 12:58:44</publishTime>
    </File>
    <File Include="bin/System.Web.Helpers.dll">
      <publishTime>11/28/2018 13:04:24</publishTime>
    </File>
    <File Include="bin/System.Web.Http.Cors.dll">
      <publishTime>11/28/2018 13:01:26</publishTime>
    </File>
    <File Include="bin/System.Web.Http.dll">
      <publishTime>05/28/2022 07:41:46</publishTime>
    </File>
    <File Include="bin/System.Web.Http.WebHost.dll">
      <publishTime>05/28/2022 07:41:54</publishTime>
    </File>
    <File Include="bin/System.Web.Mvc.dll">
      <publishTime>11/28/2018 12:59:46</publishTime>
    </File>
    <File Include="bin/System.Web.Optimization.dll">
      <publishTime>02/11/2014 15:26:04</publishTime>
    </File>
    <File Include="bin/System.Web.Razor.dll">
      <publishTime>11/28/2018 13:00:12</publishTime>
    </File>
    <File Include="bin/System.Web.WebPages.Deployment.dll">
      <publishTime>11/28/2018 13:04:24</publishTime>
    </File>
    <File Include="bin/System.Web.WebPages.dll">
      <publishTime>11/28/2018 13:04:24</publishTime>
    </File>
    <File Include="bin/System.Web.WebPages.Razor.dll">
      <publishTime>11/28/2018 13:04:24</publishTime>
    </File>
    <File Include="bin/System.Xml.ReaderWriter.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Xml.XDocument.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Xml.XmlDocument.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Xml.XmlSerializer.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Xml.XPath.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/System.Xml.XPath.XDocument.dll">
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/VueWebApi.dll">
      <publishTime>06/17/2023 11:08:15</publishTime>
    </File>
    <File Include="bin/VueWebApi.pdb">
      <publishTime>06/17/2023 11:08:15</publishTime>
    </File>
    <File Include="bin/VueWebApi.xml">
      <publishTime>06/17/2023 11:08:15</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>02/08/2013 16:42:28</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>01/23/2014 13:57:34</publishTime>
    </File>
    <File Include="bin/zh-Hans/Microsoft.AspNet.SignalR.Core.resources.dll">
      <publishTime>05/04/2017 10:34:10</publishTime>
    </File>
    <File Include="bin/zh-Hans/Microsoft.AspNet.SignalR.SystemWeb.resources.dll">
      <publishTime>05/04/2017 10:34:16</publishTime>
    </File>
    <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
      <publishTime>05/28/2022 07:34:44</publishTime>
    </File>
    <File Include="bin/zh-Hans/System.Web.Helpers.resources.dll">
      <publishTime>11/29/2018 21:29:50</publishTime>
    </File>
    <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
      <publishTime>05/28/2022 07:34:04</publishTime>
    </File>
    <File Include="bin/zh-Hans/System.Web.Http.WebHost.resources.dll">
      <publishTime>05/28/2022 07:34:44</publishTime>
    </File>
    <File Include="bin/zh-Hans/System.Web.Mvc.resources.dll">
      <publishTime>11/29/2018 21:25:14</publishTime>
    </File>
    <File Include="bin/zh-Hans/System.Web.Optimization.resources.dll">
      <publishTime>02/11/2014 23:28:40</publishTime>
    </File>
    <File Include="bin/zh-Hans/System.Web.Razor.resources.dll">
      <publishTime>11/29/2018 21:25:38</publishTime>
    </File>
    <File Include="bin/zh-Hans/System.Web.WebPages.Deployment.resources.dll">
      <publishTime>11/29/2018 21:29:50</publishTime>
    </File>
    <File Include="bin/zh-Hans/System.Web.WebPages.Razor.resources.dll">
      <publishTime>11/29/2018 21:29:50</publishTime>
    </File>
    <File Include="bin/zh-Hans/System.Web.WebPages.resources.dll">
      <publishTime>11/29/2018 21:29:50</publishTime>
    </File>
    <File Include="Content/bootstrap-theme.css">
      <publishTime>06/10/2022 08:20:26</publishTime>
    </File>
    <File Include="Content/bootstrap-theme.css.map">
      <publishTime>06/10/2022 08:20:26</publishTime>
    </File>
    <File Include="Content/bootstrap-theme.min.css">
      <publishTime>06/10/2022 08:20:26</publishTime>
    </File>
    <File Include="Content/bootstrap-theme.min.css.map">
      <publishTime>06/10/2022 08:20:26</publishTime>
    </File>
    <File Include="Content/bootstrap.css">
      <publishTime>06/10/2022 08:20:26</publishTime>
    </File>
    <File Include="Content/bootstrap.css.map">
      <publishTime>06/10/2022 08:20:26</publishTime>
    </File>
    <File Include="Content/bootstrap.min.css">
      <publishTime>06/10/2022 08:20:26</publishTime>
    </File>
    <File Include="Content/bootstrap.min.css.map">
      <publishTime>06/10/2022 08:20:26</publishTime>
    </File>
    <File Include="Content/Site.css">
      <publishTime>06/10/2022 08:20:24</publishTime>
    </File>
    <File Include="Excel/仓库库位清单.xls">
      <publishTime>07/25/2022 13:45:20</publishTime>
    </File>
    <File Include="Excel/往来单位.xls">
      <publishTime>02/11/2023 00:38:51</publishTime>
    </File>
    <File Include="Excel/物料清单.xls">
      <publishTime>11/07/2022 17:57:07</publishTime>
    </File>
    <File Include="Excel/用户清单.xls">
      <publishTime>07/20/2022 10:52:30</publishTime>
    </File>
    <File Include="Excel/缺陷定义.xls">
      <publishTime>08/12/2022 10:41:48</publishTime>
    </File>
    <File Include="Excel/节拍工价.xls">
      <publishTime>09/06/2022 18:29:08</publishTime>
    </File>
    <File Include="Excel/角色清单.xls">
      <publishTime>07/22/2022 11:26:24</publishTime>
    </File>
    <File Include="Excel/设备保养标准.xls">
      <publishTime>11/18/2022 09:16:10</publishTime>
    </File>
    <File Include="Excel/设备保养项目.xls">
      <publishTime>08/29/2022 12:08:02</publishTime>
    </File>
    <File Include="Excel/设备清单.xls">
      <publishTime>11/07/2022 16:13:05</publishTime>
    </File>
    <File Include="Excel/设备点检标准.xls">
      <publishTime>11/18/2022 09:15:43</publishTime>
    </File>
    <File Include="Excel/设备点检项目.xls">
      <publishTime>08/17/2022 09:56:57</publishTime>
    </File>
    <File Include="favicon.ico">
      <publishTime>06/10/2022 08:20:24</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.eot">
      <publishTime>06/10/2022 08:20:26</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.svg">
      <publishTime>06/10/2022 08:20:26</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.ttf">
      <publishTime>06/10/2022 08:20:26</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.woff">
      <publishTime>06/10/2022 08:20:26</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.woff2">
      <publishTime>06/10/2022 08:20:26</publishTime>
    </File>
    <File Include="Global.asax">
      <publishTime>06/10/2022 08:20:24</publishTime>
    </File>
    <File Include="grf/Rework.frx">
      <publishTime>07/26/2022 14:37:33</publishTime>
    </File>
    <File Include="grf/产品流传单.grf">
      <publishTime>06/30/2022 09:56:18</publishTime>
    </File>
    <File Include="grf/产品流传单A5.grf">
      <publishTime>06/30/2022 19:42:17</publishTime>
    </File>
    <File Include="grf/外协收料标签.grf">
      <publishTime>07/07/2022 16:11:14</publishTime>
    </File>
    <File Include="grf/报工产出标签.grf">
      <publishTime>07/07/2022 16:11:14</publishTime>
    </File>
    <File Include="grf/报工打印标签.grf">
      <publishTime>07/07/2022 14:52:14</publishTime>
    </File>
    <File Include="Grid/grwebapp.js">
      <publishTime>06/30/2022 17:10:44</publishTime>
    </File>
    <File Include="Grid/webapp-ws-tutorial.htm">
      <publishTime>07/08/2022 15:15:11</publishTime>
    </File>
    <File Include="Hubs/HubsMessage.html">
      <publishTime>10/20/2022 17:43:21</publishTime>
    </File>
    <File Include="Hubs/HubsMessage1.html">
      <publishTime>10/22/2022 12:01:05</publishTime>
    </File>
    <File Include="Hubs/HubsMessage2.html">
      <publishTime>10/22/2022 12:00:56</publishTime>
    </File>
    <File Include="Image/1.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
    </File>
    <File Include="Image/2.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
    </File>
    <File Include="Image/3.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
    </File>
    <File Include="Image/4.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
    </File>
    <File Include="Image/5.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
    </File>
    <File Include="Image/6.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
    </File>
    <File Include="Image/7.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
    </File>
    <File Include="Image/8.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
    </File>
    <File Include="Image/9.png">
      <publishTime>08/11/2022 08:20:52</publishTime>
    </File>
    <File Include="Image/app_1.png">
      <publishTime>08/11/2022 16:01:00</publishTime>
    </File>
    <File Include="Image/app_1_1.png">
      <publishTime>08/11/2022 17:50:13</publishTime>
    </File>
    <File Include="Image/app_1_2.png">
      <publishTime>08/11/2022 17:52:44</publishTime>
    </File>
    <File Include="Image/app_1_3.png">
      <publishTime>05/24/2023 08:22:19</publishTime>
    </File>
    <File Include="Image/app_2.png">
      <publishTime>08/11/2022 16:26:50</publishTime>
    </File>
    <File Include="Image/app_3.png">
      <publishTime>08/11/2022 16:36:55</publishTime>
    </File>
    <File Include="Image/app_3_1.png">
      <publishTime>08/11/2022 17:56:50</publishTime>
    </File>
    <File Include="Image/app_3_2.png">
      <publishTime>08/11/2022 17:58:41</publishTime>
    </File>
    <File Include="Image/app_4.png">
      <publishTime>08/11/2022 16:45:29</publishTime>
    </File>
    <File Include="Image/app_4_1.png">
      <publishTime>08/11/2022 18:21:11</publishTime>
    </File>
    <File Include="Image/app_4_2.png">
      <publishTime>08/11/2022 18:34:58</publishTime>
    </File>
    <File Include="Image/app_4_3.png">
      <publishTime>08/15/2022 10:56:14</publishTime>
    </File>
    <File Include="Image/app_4_4.png">
      <publishTime>08/15/2022 11:10:31</publishTime>
    </File>
    <File Include="Image/app_4_5.png">
      <publishTime>09/26/2022 13:30:58</publishTime>
    </File>
    <File Include="Image/app_5.png">
      <publishTime>08/11/2022 16:49:33</publishTime>
    </File>
    <File Include="Image/app_5_1.png">
      <publishTime>08/19/2022 08:43:07</publishTime>
    </File>
    <File Include="Image/app_5_2.png">
      <publishTime>08/19/2022 08:50:32</publishTime>
    </File>
    <File Include="Image/app_5_3.png">
      <publishTime>08/19/2022 09:06:09</publishTime>
    </File>
    <File Include="Image/app_5_4.png">
      <publishTime>08/19/2022 09:08:44</publishTime>
    </File>
    <File Include="Image/app_5_5.png">
      <publishTime>08/19/2022 09:11:02</publishTime>
    </File>
    <File Include="Image/app_5_6.png">
      <publishTime>08/19/2022 09:20:23</publishTime>
    </File>
    <File Include="Image/app_5_7.png">
      <publishTime>08/19/2022 09:22:07</publishTime>
    </File>
    <File Include="Image/app_5_8.png">
      <publishTime>08/19/2022 09:44:32</publishTime>
    </File>
    <File Include="Image/app_5_9.png">
      <publishTime>08/19/2022 09:45:37</publishTime>
    </File>
    <File Include="Image/app_6.png">
      <publishTime>08/11/2022 17:06:12</publishTime>
    </File>
    <File Include="Image/app_6_1.png">
      <publishTime>08/19/2022 10:21:21</publishTime>
    </File>
    <File Include="Image/app_6_10.png">
      <publishTime>08/19/2022 11:44:16</publishTime>
    </File>
    <File Include="Image/app_6_11.png">
      <publishTime>08/22/2022 11:40:51</publishTime>
    </File>
    <File Include="Image/app_6_12.png">
      <publishTime>08/22/2022 11:35:34</publishTime>
    </File>
    <File Include="Image/app_6_13.png">
      <publishTime>08/22/2022 12:04:47</publishTime>
    </File>
    <File Include="Image/app_6_14.png">
      <publishTime>08/22/2022 12:07:20</publishTime>
    </File>
    <File Include="Image/app_6_2.png">
      <publishTime>08/19/2022 10:23:11</publishTime>
    </File>
    <File Include="Image/app_6_3.png">
      <publishTime>08/19/2022 10:40:17</publishTime>
    </File>
    <File Include="Image/app_6_4.png">
      <publishTime>08/19/2022 10:43:18</publishTime>
    </File>
    <File Include="Image/app_6_5.png">
      <publishTime>08/19/2022 10:54:32</publishTime>
    </File>
    <File Include="Image/app_6_6.png">
      <publishTime>08/19/2022 10:57:24</publishTime>
    </File>
    <File Include="Image/app_6_7.png">
      <publishTime>08/19/2022 11:03:26</publishTime>
    </File>
    <File Include="Image/app_6_8.png">
      <publishTime>08/19/2022 11:09:23</publishTime>
    </File>
    <File Include="Image/app_6_9.png">
      <publishTime>08/19/2022 11:22:26</publishTime>
    </File>
    <File Include="Image/app_7.png">
      <publishTime>08/11/2022 17:11:08</publishTime>
    </File>
    <File Include="Image/app_7_1.png">
      <publishTime>08/30/2022 09:55:08</publishTime>
    </File>
    <File Include="Image/app_7_2.png">
      <publishTime>08/30/2022 10:10:08</publishTime>
    </File>
    <File Include="Image/app_7_3.png">
      <publishTime>08/30/2022 09:36:11</publishTime>
    </File>
    <File Include="Image/app_7_4.png">
      <publishTime>08/30/2022 09:46:50</publishTime>
    </File>
    <File Include="Image/app_8.png">
      <publishTime>08/11/2022 17:29:21</publishTime>
    </File>
    <File Include="Image/app_8_1.png">
      <publishTime>05/25/2023 10:50:06</publishTime>
    </File>
    <File Include="Image/app_8_2.png">
      <publishTime>05/25/2023 10:50:55</publishTime>
    </File>
    <File Include="Image/app_8_3.png">
      <publishTime>05/17/2023 09:19:44</publishTime>
    </File>
    <File Include="Image/app_8_7.png">
      <publishTime>04/04/2023 15:18:56</publishTime>
    </File>
    <File Include="Image/app_9.png">
      <publishTime>08/11/2022 17:36:50</publishTime>
    </File>
    <File Include="Image/app_9_1.png">
      <publishTime>01/03/2023 10:54:40</publishTime>
    </File>
    <File Include="Image/app_9_2.png">
      <publishTime>05/17/2023 08:46:43</publishTime>
    </File>
    <File Include="Image/app_9_3.png">
      <publishTime>05/17/2023 09:04:42</publishTime>
    </File>
    <File Include="Image/app_9_4.png">
      <publishTime>05/17/2023 09:02:12</publishTime>
    </File>
    <File Include="Image/app_9_5.png">
      <publishTime>05/17/2023 08:24:38</publishTime>
    </File>
    <File Include="Image/index_1.png">
      <publishTime>08/15/2022 14:13:17</publishTime>
    </File>
    <File Include="Image/index_2.png">
      <publishTime>08/15/2022 14:13:29</publishTime>
    </File>
    <File Include="InExcel/9/设备清单66.xls">
      <publishTime>11/04/2022 15:22:03</publishTime>
    </File>
    <File Include="libman.json">
      <publishTime>06/10/2022 09:23:15</publishTime>
    </File>
    <File Include="log4net.config">
      <publishTime>05/10/2023 09:38:48</publishTime>
    </File>
    <File Include="Scripts/bootstrap.js">
      <publishTime>06/10/2022 08:20:26</publishTime>
    </File>
    <File Include="Scripts/bootstrap.min.js">
      <publishTime>06/10/2022 08:20:26</publishTime>
    </File>
    <File Include="Scripts/jquery-3.4.1.js">
      <publishTime>06/10/2022 08:20:27</publishTime>
    </File>
    <File Include="Scripts/jquery-3.4.1.min.js">
      <publishTime>06/10/2022 08:20:27</publishTime>
    </File>
    <File Include="Scripts/jquery-3.4.1.min.map">
      <publishTime>06/10/2022 08:20:27</publishTime>
    </File>
    <File Include="Scripts/jquery-3.4.1.slim.js">
      <publishTime>06/10/2022 08:20:27</publishTime>
    </File>
    <File Include="Scripts/jquery-3.4.1.slim.min.js">
      <publishTime>06/10/2022 08:20:27</publishTime>
    </File>
    <File Include="Scripts/jquery-3.4.1.slim.min.map">
      <publishTime>06/10/2022 08:20:27</publishTime>
    </File>
    <File Include="Scripts/jquery.signalR-2.2.2.js">
      <publishTime>08/30/2022 13:49:42</publishTime>
    </File>
    <File Include="Scripts/jquery.signalR-2.2.2.min.js">
      <publishTime>08/30/2022 13:49:42</publishTime>
    </File>
    <File Include="Scripts/modernizr-2.8.3.js">
      <publishTime>06/10/2022 08:20:31</publishTime>
    </File>
    <File Include="Scripts/swagger_lang.js">
      <publishTime>06/16/2022 13:39:23</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>06/17/2023 11:08:21</publishTime>
    </File>
  </ItemGroup>
</Project>

 VueWebApi/Tools/ScanStartReport.cs

@@ -34,17 +34,20 @@
            {
              
                //1.根据工单+工序查找当前工序是否首道工序
                sql = @"select A.wo_code,P.partcode,P.partname,P.partspec, T.stepcode,T.stepname,A.seq,T.flwtype,T.descr,A.status,A.plan_qty,A.isbott,A.isend  
                sql = @"select A.wo_code,P.partcode,P.partname,P.partspec, T.stepcode,T.stepname,A.seq,T.flwtype,T.descr,A.status,A.plan_qty,A.isbott,A.isend,L.org_code,L.org_name  
                        from TK_Wrk_Step A
                        left join  TStep T on A.step_code=T.stepcode
                        left join  TK_Wrk_Man M on A.wo_code=M.wo_code
                        left join  TMateriel_Info P on M.materiel_code=P.partcode
                        left join  TOrganization L on M.wkshp_code=L.org_code
                        where A.wo_code=@ordercode and A.step_code=@stepcode";
                dynamicParams.Add("@ordercode", ordercode);
                dynamicParams.Add("@stepcode", stepcode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                if (data.Rows.Count > 0)
                {
                    rt.wkshopcode= data.Rows[0]["org_code"].ToString(); //车间编码
                    rt.wkshopname = data.Rows[0]["org_name"].ToString(); //车间名称
                    rt.wo_code = data.Rows[0]["WO_CODE"].ToString(); //工单号
                    rt.partnumber = data.Rows[0]["PARTCODE"].ToString(); //产品编码
                    rt.partname = data.Rows[0]["PARTNAME"].ToString(); //产品名称
@@ -91,7 +94,9 @@
                        if (isbott == "Y")  //首道工序
                        {
                            //1.首道工序时，判断是否有开工记录
                            sql = @"select *   from TK_Wrk_Record where wo_code=@ordercode and step_code=@stepcode and style='S'";
                            sql = @"select *   from TK_Wrk_Record R
                                    left join TEqpInfo E on R.eqp_code=E.code
                                    where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='S'";
                            dynamicParams.Add("@ordercode", ordercode);
                            dynamicParams.Add("@stepcode", stepcode);
                            var data0 = DapperHelper.selectdata(sql, dynamicParams);
@@ -119,6 +124,8 @@
                                    }
                                    else
                                    {
                                        rt.eqpcode = data0.Rows[0]["code"].ToString();                              //开工设备编码
                                        rt.eqpname = data0.Rows[0]["name"].ToString();                              //开工设备名称
                                        rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString());            //任务数量
                                        rt.startqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString());           //开工数量=任务数量
                                        rt.noreportqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()) - good_qty- ng_qty-bad_qty;  //未报数量=任务数量-已报数量-不良数量-报废数量
@@ -131,6 +138,8 @@
                                }
                                else
                                {
                                    rt.eqpcode = data0.Rows[0]["code"].ToString();                              //开工设备编码
                                    rt.eqpname = data0.Rows[0]["name"].ToString();                              //开工设备名称
                                    rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //任务数量
                                    rt.startqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //开工数量
                                    rt.noreportqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //未报数量
@@ -166,7 +175,9 @@
                            if (data0.Rows.Count > 0)
                            {
                                //1.非首道工序时，判断本道是否有开工记录
                                sql = @"select *   from TK_Wrk_Record where wo_code=@ordercode and step_code=@stepcode and style='S'";
                                sql = @"select *   from TK_Wrk_Record R
                                        left join TEqpInfo E on R.eqp_code=E.code
                                        where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='S'";
                                dynamicParams.Add("@ordercode", ordercode);
                                dynamicParams.Add("@stepcode", stepcode);
                                var data1 = DapperHelper.selectdata(sql, dynamicParams);
@@ -179,7 +190,7 @@
                                    var data2 = DapperHelper.selectdata(sql, dynamicParams);
                                    if (data2.Rows.Count > 0) //有报工记录
                                    {
                                        if (data0.Rows[0]["FLWTYPE"].ToString() == "Z")  //自制工序
                                        if (data0.Rows[0]["FLWTYPE"].ToString() == "Z")  //判断上道工序属性：自制工序
                                        {
                                            //查找上到工序报工记录
                                            sql = @"select *   from TK_Wrk_Record where wo_code=@ordercode and step_code=@stepcode and style='B'";
@@ -204,6 +215,8 @@
                                                }
                                                else
                                                {
                                                    rt.eqpcode = data1.Rows[0]["code"].ToString();                              //开工设备编码
                                                    rt.eqpname = data1.Rows[0]["name"].ToString();                              //开工设备名称
                                                    rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //任务数量
                                                    rt.startqty = sybqty;                                                //开工数量=本道剩余可报数量
                                                    rt.noreportqty = sybqty;                                             //未报数量=本道剩余可报数量
@@ -223,7 +236,7 @@
                                                return mes;
                                            }
                                        }
                                        if (data0.Rows[0]["FLWTYPE"].ToString() == "W")  //委外工序
                                        if (data0.Rows[0]["FLWTYPE"].ToString() == "W")  //判断上道工序属性：委外工序
                                        {
                                            //查找上到工序收料记录
                                            sql = @"select *   from TK_Wrk_OutRecord where wo_code=@ordercode and step_code=@stepcode and style='S'";
@@ -248,6 +261,8 @@
                                                }
                                                else
                                                {
                                                    rt.eqpcode = data1.Rows[0]["code"].ToString();                              //开工设备编码
                                                    rt.eqpname = data1.Rows[0]["name"].ToString();                              //开工设备名称
                                                    rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //任务数量
                                                    rt.startqty = sybqty;                                                //开工数量=本道剩余可报数量
                                                    rt.noreportqty = sybqty;                                             //未报数量=本道剩余可报数量
@@ -282,6 +297,8 @@
                                                decimal sgood_qty = data3.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum();  //本道报工总数量
                                                decimal sybqty = sgood_qty;                                      //本道剩余可报数量=上道报工数量

                                                rt.eqpcode = data1.Rows[0]["code"].ToString();                              //开工设备编码
                                                rt.eqpname = data1.Rows[0]["name"].ToString();                              //开工设备名称
                                                rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //任务数量
                                                rt.startqty = sybqty;                                                //开工数量=本道剩余可报数量
                                                rt.noreportqty = sybqty;                                             //未报数量=本道剩余可报数量
@@ -312,6 +329,8 @@
                                                decimal sqty = data3.AsEnumerable().Select(d =>d.Field<decimal>("SQTY")).Sum();//上道收料数量
                                                decimal sybqty = sqty;                   //本道剩余可收数量=上道收料数量

                                                rt.eqpcode = data1.Rows[0]["code"].ToString();                              //开工设备编码
                                                rt.eqpname = data1.Rows[0]["name"].ToString();                              //开工设备名称
                                                rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //任务数量
                                                rt.startqty = sybqty;                                                //开工数量=本道剩余可收数量
                                                rt.noreportqty = sybqty;                                             //未报数量=本道剩余可收数量
@@ -448,23 +467,25 @@
            string isend = "";  //末道工序
            string seq = "";    //工序序号
            List<object> list = new List<object>();
            ScanStartReportData rt = new ScanStartReportData();
            ScanStartReportDataOut rt = new ScanStartReportDataOut();
            var dynamicParams = new DynamicParameters();
            try
            {
                //1.根据工单+工序查找当前工序是否首道工序
                sql = @"select A.wo_code,P.partcode,P.partname,P.partspec, T.stepcode,T.stepname,A.seq,T.flwtype,T.descr,A.status,A.plan_qty,A.isbott,A.isend  
                sql = @"select A.wo_code,P.partcode,P.partname,P.partspec, T.stepcode,T.stepname,A.seq,T.flwtype,T.descr,A.status,A.plan_qty,A.isbott,A.isend,L.org_code,L.org_name   
                        from TK_Wrk_Step A
                        left join  TStep T on A.step_code=T.stepcode
                        left join  TK_Wrk_Man M on A.wo_code=M.wo_code
                        left join  TMateriel_Info P on M.materiel_code=P.partcode
                        left join  TOrganization L on M.wkshp_code=L.org_code
                        where A.wo_code=@ordercode and A.step_code=@stepcode";
                dynamicParams.Add("@ordercode", ordercode);
                dynamicParams.Add("@stepcode", stepcode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                if (data.Rows.Count > 0)
                {

                    rt.wkshopcode = data.Rows[0]["org_code"].ToString(); //车间编码
                    rt.wkshopname = data.Rows[0]["org_name"].ToString(); //车间名称
                    rt.wo_code = data.Rows[0]["WO_CODE"].ToString(); //工单号
                    rt.partnumber = data.Rows[0]["PARTCODE"].ToString(); //产品编码
                    rt.partname = data.Rows[0]["PARTNAME"].ToString(); //产品名称
@@ -520,7 +541,9 @@
                                if (isbott == "Y")  //首道工序
                                {
                                    //1.首道工序时，判断是否有发料记录
                                    sql = @"select *   from TK_Wrk_OutRecord where wo_code=@ordercode and step_code=@stepcode and style='F'";
                                    sql = @"select *   from TK_Wrk_OutRecord R
                                            left join TCustomer C on R.wx_code=C.code
                                            where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='F'";
                                    dynamicParams.Add("@ordercode", ordercode);
                                    dynamicParams.Add("@stepcode", stepcode);
                                    var data0 = DapperHelper.selectdata(sql, dynamicParams);
@@ -575,13 +598,15 @@
                                    if (data0.Rows.Count > 0)
                                    {
                                        //1.非首道工序时，判断本道是否有发料记录
                                        sql = @"select *   from TK_Wrk_OutRecord where wo_code=@ordercode and step_code=@stepcode and style='F'";
                                        sql = @"select *   from TK_Wrk_OutRecord R
                                                left join TCustomer C on R.wx_code=C.code
                                                where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='F'";
                                        dynamicParams.Add("@ordercode", ordercode);
                                        dynamicParams.Add("@stepcode", stepcode);
                                        var data1 = DapperHelper.selectdata(sql, dynamicParams);
                                        if (data1.Rows.Count > 0)//本道有发料记录
                                        {
                                            if (data0.Rows[0]["FLWTYPE"].ToString() == "Z")  //自制工序
                                            if (data0.Rows[0]["FLWTYPE"].ToString() == "Z")  //判断上道工序属性：自制工序
                                            {
                                                //查找上到工序报工记录
                                                sql = @"select *   from TK_Wrk_Record where wo_code=@ordercode and step_code=@stepcode and style='B'";
@@ -626,7 +651,7 @@
                                                    return mes;
                                                }
                                            }
                                            if (data0.Rows[0]["FLWTYPE"].ToString() == "W")  //外协工序
                                            if (data0.Rows[0]["FLWTYPE"].ToString() == "W")  //判断上道工序属性：外协工序
                                            {
                                                //查找上到工序收料记录
                                                sql = @"select *   from TK_Wrk_OutRecord where wo_code=@ordercode and step_code=@stepcode and style='S'";
@@ -778,14 +803,25 @@
                                if (isbott == "Y")  //首道工序
                                {
                                    //1.首道工序时，判断是否有发料记录
                                    sql = @"select *   from TK_Wrk_OutRecord where wo_code=@ordercode and step_code=@stepcode and style='F'";
                                    sql = @"select R.wo_code,R.step_code,R.wx_code as code,C.name,R.materiel_code, 
                                            isnull(sum(R.fqty),0) as fqty,isnull(sum(R.sqty),0) as sqty,isnull(sum(R.ng_qty),0) as ng_qty,isnull(sum(R.bad_qty),0) as bad_qty   
                                            from TK_Wrk_OutRecord R
                                            left join TCustomer C on R.wx_code=C.code
                                            where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='F'
                                            group by R.wo_code,R.step_code,R.wx_code,C.name,R.materiel_code";
                                    dynamicParams.Add("@ordercode", ordercode);
                                    dynamicParams.Add("@stepcode", stepcode);
                                    var data0 = DapperHelper.selectdata(sql, dynamicParams);
                                    if (data0.Rows.Count > 0)  //有发料记录
                                    {
                                        //1.首道工序时，判断是否有收料记录
                                        sql = @"select *   from TK_Wrk_OutRecord where wo_code=@ordercode and step_code=@stepcode and style='S'";
                                        sql = @"select R.wo_code,R.step_code,R.wx_code as code,C.name,R.materiel_code, 
                                                isnull(sum(R.fqty),0) as fqty,isnull(sum(R.sqty),0) as sqty,isnull(sum(R.ng_qty),0) as ng_qty,isnull(sum(R.bad_qty),0) as bad_qty     
                                                from TK_Wrk_OutRecord R
                                                left join TCustomer C on R.wx_code=C.code
                                                where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='S'
                                                group by R.wo_code,R.step_code,R.wx_code,C.name,R.materiel_code";
                                        //sql = @"select *   from TK_Wrk_OutRecord where wo_code=@ordercode and step_code=@stepcode and style='S'";
                                        dynamicParams.Add("@ordercode", ordercode);
                                        dynamicParams.Add("@stepcode", stepcode);
                                        var data1 = DapperHelper.selectdata(sql, dynamicParams);
@@ -810,6 +846,21 @@
                                                rt.noreportqty = ksqty;                                              //未收数量=本道发料数量
                                                rt.reportqty = sqty + ng_qty+bad_qty;                                //已收数量                                   
                                                rt.startqty = ksqty;                                                  //收料数量=本道发料数量      
                                              
                                                data0.Merge(data1);//将指定的dt合并                                                 
                                                rt.list = data0.AsEnumerable().GroupBy(r => new {
                                                    wo_code = r["wo_code"],
                                                    step_code = r["step_code"],
                                                    code = r["code"],
                                                    name = r["name"]
                                                }).Select(g => new {
                                                    Name = g.Key.code,
                                                    tp = g.Key.name,
                                                    fqty = g.Sum(i => (decimal)i["fqty"]),
                                                    sqty = g.Sum(i => (decimal)i["sqty"]),
                                                    ng_qty = g.Sum(i => (decimal)i["ng_qty"]),
                                                    bad_qty = g.Sum(i => (decimal)i["bad_qty"])
                                                }).ToList();

                                                mes.code = "200";
                                                mes.count = 3;
@@ -821,11 +872,25 @@
                                        else
                                        {
                                            decimal fqty = data0.AsEnumerable().Select(d => d.Field<decimal>("FQTY")).Sum();//本道发料数量

                                            rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString());     //任务数量
                                            rt.noreportqty = fqty;                                               //未收数量=本道发料数量
                                            rt.reportqty = 0;                                                    //已收数量                                   
                                            rt.startqty = fqty;                                                  //收料数量=本道发料数量      
                                            rt.startqty = fqty;                                                  //收料数量=本道发料数量
                                                                                                                 //
                                            data0.Merge(data1);//将指定的dt合并                                                 
                                            rt.list = data0.AsEnumerable().GroupBy(r => new {
                                                wo_code = r["wo_code"],
                                                step_code = r["step_code"],
                                                code = r["code"],
                                                name = r["name"]
                                            }).Select(g => new {
                                                Name = g.Key.code,
                                                tp = g.Key.name,
                                                fqty = g.Sum(i => (decimal)i["fqty"]),
                                                sqty = g.Sum(i => (decimal)i["sqty"]),
                                                ng_qty = g.Sum(i => (decimal)i["ng_qty"]),
                                                bad_qty = g.Sum(i => (decimal)i["bad_qty"])
                                            }).ToList();

                                            mes.code = "200";
                                            mes.count = 3;
@@ -855,14 +920,24 @@
                                    if (data0.Rows.Count > 0)
                                    {
                                        //1.非首道工序时，判断本道是否有发料记录
                                        sql = @"select *   from TK_Wrk_OutRecord where wo_code=@ordercode and step_code=@stepcode and style='F'";
                                        sql = @"select R.wo_code,R.step_code,R.wx_code as code,C.name,R.materiel_code, 
                                            isnull(sum(R.fqty),0) as fqty,isnull(sum(R.sqty),0) as sqty,isnull(sum(R.ng_qty),0) as ng_qty,isnull(sum(R.bad_qty),0) as bad_qty   
                                            from TK_Wrk_OutRecord R
                                            left join TCustomer C on R.wx_code=C.code
                                            where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='F'
                                            group by R.wo_code,R.step_code,R.wx_code,C.name,R.materiel_code";
                                        dynamicParams.Add("@ordercode", ordercode);
                                        dynamicParams.Add("@stepcode", stepcode);
                                        var data1 = DapperHelper.selectdata(sql, dynamicParams);
                                        if (data1.Rows.Count > 0)//本道有发料记录
                                        {
                                            //2.非首道工序时，判断本道是否有收料记录
                                            sql = @"select *   from TK_Wrk_OutRecord where wo_code=@ordercode and step_code=@stepcode and style='S'";
                                            sql = @"select R.wo_code,R.step_code,R.wx_code as code,C.name,R.materiel_code, 
                                                isnull(sum(R.fqty),0) as fqty,isnull(sum(R.sqty),0) as sqty,isnull(sum(R.ng_qty),0) as ng_qty,isnull(sum(R.bad_qty),0) as bad_qty     
                                                from TK_Wrk_OutRecord R
                                                left join TCustomer C on R.wx_code=C.code
                                                where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='S'
                                                group by R.wo_code,R.step_code,R.wx_code,C.name,R.materiel_code";
                                            dynamicParams.Add("@ordercode", ordercode);
                                            dynamicParams.Add("@stepcode", stepcode);
                                            var data2 = DapperHelper.selectdata(sql, dynamicParams);
@@ -887,7 +962,22 @@
                                                    rt.noreportqty = ksqty;                                              //未收数量=本道发料数量
                                                    rt.reportqty = sqty + ng_qty+bad_qty;                                 //已收数量                                   
                                                    rt.startqty = ksqty;                                                  //收料数量=本道发料数量      

                                                    
                                                    data1.Merge(data2);//将指定的dt合并                                                 
                                                    rt.list = data1.AsEnumerable().GroupBy(r => new { 
                                                        wo_code = r["wo_code"], 
                                                        step_code = r["step_code"],
                                                        code= r["code"],
                                                        name = r["name"]
                                                    }).Select(g => new { 
                                                        Name = g.Key.code, 
                                                        tp = g.Key.name, 
                                                        fqty = g.Sum(i => (decimal)i["fqty"]),
                                                        sqty = g.Sum(i => (decimal)i["sqty"]),
                                                        ng_qty = g.Sum(i => (decimal)i["ng_qty"]),
                                                        bad_qty = g.Sum(i => (decimal)i["bad_qty"])
                                                    }).ToList();
                                                  
                                                    mes.code = "200";
                                                    mes.count = 3;
                                                    mes.Message = "弹窗收料界面!";
@@ -897,12 +987,24 @@
                                            else
                                            {
                                                decimal fqty = data1.AsEnumerable().Select(d => d.Field<decimal>("FQTY")).Sum();  //本道发料数量

                                                rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString());     //任务数量
                                                rt.noreportqty = fqty;                                               //未收数量=本道发料数量
                                                rt.reportqty = 0;                                                    //已收数量                                   
                                                rt.startqty = fqty;                                                  //收料数量=本道发料数量      

                                                data1.Merge(data2);//将指定的dt合并                                                 
                                                rt.list = data1.AsEnumerable().GroupBy(r => new {
                                                    wo_code = r["wo_code"],
                                                    step_code = r["step_code"],
                                                    code = r["code"],
                                                    name = r["name"]
                                                }).Select(g => new {
                                                    Name = g.Key.code,
                                                    tp = g.Key.name,
                                                    fqty = g.Sum(i => (decimal)i["fqty"]),
                                                    sqty = g.Sum(i => (decimal)i["sqty"]),
                                                    ng_qty = g.Sum(i => (decimal)i["ng_qty"]),
                                                    bad_qty = g.Sum(i => (decimal)i["bad_qty"])
                                                }).ToList();
                                                mes.code = "200";
                                                mes.count = 3;
                                                mes.Message = "弹窗收料界面!";

 VueWebApi/VueWebApi.csproj

@@ -418,10 +418,12 @@
    <Compile Include="Models\MaterialRout.cs" />
    <Compile Include="Models\ObjectData.cs" />
    <Compile Include="Models\ObjectDataCont.cs" />
    <Compile Include="Models\PartRout.cs" />
    <Compile Include="Models\ReportDefectHandle.cs" />
    <Compile Include="Models\RoleUserSubmit.cs" />
    <Compile Include="Models\RoutEdit.cs" />
    <Compile Include="Models\ScanStartReportData.cs" />
    <Compile Include="Models\ScanStartReportDataOut.cs" />
    <Compile Include="Models\StandEqp.cs" />
    <Compile Include="Models\StepCheck.cs" />
    <Compile Include="Models\StepDefect.cs" />

 VueWebApi/VueWebApi.csproj.user

@@ -9,7 +9,7 @@
    <IISExpressUseClassicPipelineMode />
    <UseGlobalApplicationHostFile />
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <NameOfLastUsedPublishProfile>D:\新凯迪MES\MES产品\VueWebApi\VueWebApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
    <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
    <Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>

 VueWebApi/Web.config

@@ -16,7 +16,7 @@
        <!--本地环境-->
        <!--<add key="DBServer" value="Data Source=.;Initial Catalog=vmes;Integrated Security=True" />-->
        <!--服务器环境-->
        <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes;User ID=sa;Password=xkd@20230101;pooling=false" />
        <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes_zqh;User ID=sa;Password=xkd@20230101;pooling=false" />
        <!--大岛服务器环境-->
        <!--<add key="DBServer" value="Data Source=192.168.2.138;Initial Catalog=vmes;User ID=sa;Password=Dd@20220727;pooling=false" />-->
        <!--redis企业配置-->

 VueWebApi/bin/VueWebApi.dll.config

@@ -16,7 +16,7 @@
        <!--本地环境-->
        <!--<add key="DBServer" value="Data Source=.;Initial Catalog=vmes;Integrated Security=True" />-->
        <!--服务器环境-->
        <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes;User ID=sa;Password=xkd@20230101;pooling=false" />
        <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes_zqh;User ID=sa;Password=xkd@20230101;pooling=false" />
        <!--大岛服务器环境-->
        <!--<add key="DBServer" value="Data Source=192.168.2.138;Initial Catalog=vmes;User ID=sa;Password=Dd@20220727;pooling=false" />-->
        <!--redis企业配置-->

 VueWebApi/bin/VueWebApi.pdb

Binary files differ

 VueWebApi/bin/VueWebApi.xml

@@ -549,10 +549,11 @@
            <param name="orderstepqrcode">扫描二维码信息</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.AppProductionManagementController.MesOrderStepReportSelectUserGroup">
        <member name="M:VueWebApi.Controllers.AppProductionManagementController.MesOrderStepReportSelectUserGroup(System.String)">
            <summary>
            ç”Ÿäº§å¼€æŠ¥å·¥ï¼šæŠ¥å·¥æ—¶èŽ·å–生产班组下拉框
            </summary>
            <param name="wkshopcode">车间编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.AppProductionManagementController.MesOrderGroupSelectUser(System.String)">
@@ -812,6 +813,22 @@
            <param name="param">存货信息</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BaseDateController.StorgGroupSelect(System.String,System.String)">
            <summary>
            é€šè¿‡é€‰æ‹©çš„所属组织查询所属班组
            </summary>
            <param name="stu_torgcode">组织编码</param>
            <param name="description">组织类型</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BaseDateController.StorgRoleSelect(System.String,System.String)">
            <summary>
            é€šè¿‡é€‰æ‹©çš„所属组织查询所属角色类型
            </summary>
            <param name="stu_torgcode">组织编码</param>
            <param name="description">组织类型</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BaseDateController.ErpWkshopDepartmentSelect">
            <summary>
            ERP生产车间/部门信息查询
@@ -930,10 +947,11 @@
            <param name="partcode">物料编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            å§”外报表记录查询
            </summary>
            <param name="wkshopcode">车间编码</param>
            <param name="wocode">工单编号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
@@ -948,10 +966,11 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            å§”外报表记录导出
            </summary>
            <param name="wkshopcode">车间编码</param>
            <param name="wocode">工单编号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
@@ -962,10 +981,11 @@
            <param name="receivdate">收料时间</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            ç­ç»„工资报表记录查询
            </summary>
            <param name=" wkshopcode">车间编码</param>
            <param name="compute">计算方式(逐道/末道)</param>
            <param name="wocode">工单编号</param>
            <param name="partcode">产品编码</param>
@@ -989,10 +1009,11 @@
            <param name="id">报工记录主表id</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            ç­ç»„工资报表记录查询
            </summary>
            <param name=" wkshopcode">车间编码</param>
            <param name="compute">计算方式(逐道/末道)</param>
            <param name="wocode">工单编号</param>
            <param name="partcode">产品编码</param>
@@ -1005,10 +1026,11 @@
            <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.PeopleSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.PeopleSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            äººå‘˜å·¥èµ„明细报表
            </summary>
            <param name=" wkshopcode">车间编码</param>
            <param name="compute">计算方式(逐道/末道)</param>
            <param name="wocode">工单编号</param>
            <param name="partcode">产品编码</param>
@@ -1025,10 +1047,11 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.PeopleSalaryReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.PeopleSalaryReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            äººå‘˜å·¥èµ„明细报表导出
            </summary>
            <param name=" wkshopcode">车间编码</param>
            <param name="compute">计算方式(逐道/末道)</param>
            <param name="wocode">工单编号</param>
            <param name="partcode">产品编码</param>
@@ -1041,10 +1064,11 @@
            <param name = "rejectstepcode" > å‰”除工序(固定薪资工序不参与计算) </param >
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.DefectDetailsReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.DefectDetailsReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            ä¸è‰¯æ˜Žç»†æŠ¥è¡¨ 
            </summary>
            <param name=" wkshopcode">车间编码</param>
            <param name="wocode">工单编号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
@@ -1060,10 +1084,11 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.DefectDetailsReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.DefectDetailsReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            ä¸è‰¯æ˜Žç»†æŠ¥è¡¨å¯¼å‡º 
            </summary>
            <param name=" wkshopcode">车间编码</param>
            <param name="wocode">工单编号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
@@ -1199,10 +1224,11 @@
            <param name="checkid">检验记录ID</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.ProductionScheduleReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.ProductionScheduleReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            ç”Ÿäº§è¿›åº¦æŠ¥è¡¨
            </summary>
            <param name=" wkshopcode">车间编码</param>
            <param name="status">工单状态</param>
            <param name="wocode">工单编号</param>
            <param name="routecode">工艺路线编码</param>
@@ -1217,10 +1243,11 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.ProductionScheduleReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.ProductionScheduleReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            ç”Ÿäº§è¿›åº¦æŠ¥è¡¨å¯¼å‡º
            </summary>
            <param name=" wkshopcode">车间编码</param>
            <param name="status">工单状态</param>
            <param name="wocode">工单编号</param>
            <param name="routecode">工艺路线编码</param>
@@ -1428,13 +1455,14 @@
            <param name="orgid">组织id</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.UserSearch(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.BasicSettingController.UserSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
            <summary>
            ç”¨æˆ·æ¸…单查询
            </summary>
            <param name="UserCode">用户编码</param>
            <param name="UserName">用户名称</param>
            <param name="StuOrg">所属组织</param>
            <param name="description">所属组织类型</param>
            <param name="wagetype">工资类型</param>
            <param name="Enable">在职状态</param>
            <param name="page">页码</param>
@@ -1469,18 +1497,22 @@
            <param name="Userid">用户id</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.UserAssociationRole(System.String)">
        <member name="M:VueWebApi.Controllers.BasicSettingController.UserAssociationRole(System.String,System.String,System.String)">
            <summary>
            ç”¨æˆ·æ¸…单关联角色查询
            </summary>
            <param name="usercode">用户编码</param>
            <param name="stu_torgcode">所属组织编码</param>
            <param name="description">所属组织类型</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.SaveUserAssoctRole(System.String,System.Collections.Generic.List{VueWebApi.Models.RoleUserSubmit})">
        <member name="M:VueWebApi.Controllers.BasicSettingController.SaveUserAssoctRole(System.String,System.String,System.String,System.Collections.Generic.List{VueWebApi.Models.RoleUserSubmit})">
            <summary>
            ç”¨æˆ·æ¸…单关联角色保存
            </summary>
            <param name="usercode">用户编码</param>
            <param name="stu_torgcode">所属组织编码</param>
            <param name="description">所属组织类型</param>
            <param name="json">提交数据对象</param>
            <returns></returns>
        </member>
@@ -2307,7 +2339,7 @@
            <param name="usertype">操作端类型(PC APP)</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.LoginController.ForcedOffline(System.Int32,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.LoginController.ForcedOffline(System.Int32,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            å¼ºåˆ¶ä¸‹çº¿æŽ¥å£
            </summary>
@@ -2316,6 +2348,7 @@
            <param name="username">用户名</param>
            <param name="usertype">操作端PC/APP</param>
            <param name="rid">rid极光推送获取设备id</param>
            <param name="stu_torgcode">所属组织编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.LoginController.LoginMenu(System.String,System.String)">
@@ -2336,7 +2369,7 @@
            <param name="newpassword">新密码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.LoginController.LoginOut(System.Int32,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.LoginController.LoginOut(System.Int32,System.String,System.String,System.String,System.String)">
            <summary>
            PC登出
            </summary>
@@ -2344,6 +2377,7 @@
            <param name="usercode">用户编码</param>
            <param name="username">用户名</param>
            <param name="usertype">操作端PC/APP</param>
            <param name="stu_torgcode">所属组织编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.LoginController.LoginAppSave(System.String,System.String,System.String,System.String)">
@@ -2526,19 +2560,19 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.PartSelectRoute(System.String)">
        <member name="M:VueWebApi.Controllers.ProductionManagementController.PartSelectRoute(System.String,System.String)">
            <summary>
            äº§å“ç¼–码查找工艺路线下拉接口
            </summary>
            <param name="partcode">产品编码</param>
            <param name="wkshopcode">车间编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.RouteSelectWkshop(System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ProductionManagementController.RouteSelectWkshop(System.String)">
            <summary>
            äº§å“+工艺路线查找车间下拉接口
            </summary>
            <param name="partcode">产品编码</param>
            <param name="routecode">工艺路线编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.SelectRouteStep(System.String)">
@@ -2672,10 +2706,11 @@
            <param name="orderstepqrcode">扫描二维码信息</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepReportSelectUserGroup">
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepReportSelectUserGroup(System.String)">
            <summary>
            ç”Ÿäº§å¼€æŠ¥å·¥ï¼šæŠ¥å·¥æ—¶èŽ·å–生产班组下拉框
            </summary>
            <param name="wkshopcode">车间编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderGroupSelectUser(System.String)">
@@ -3049,7 +3084,7 @@
            <param name="partcode">物料编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.SaveInventoryFile(System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData},System.String)">
        <member name="M:VueWebApi.Controllers.ProductModelController.SaveInventoryFile(System.String,System.Collections.Generic.List{VueWebApi.Models.PartRout},System.String)">
            <summary>
            å­˜è´§æ¡£æ¡ˆå…³è”工艺路线提交
            </summary>
@@ -3103,16 +3138,17 @@
            <param name="bomid">Bom主表id</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.StepSelect">
        <member name="M:VueWebApi.Controllers.ProductModelController.StepSelect(System.String)">
            <summary>
            å·¥åºä¸‹æ‹‰æŸ¥è¯¢æŽ¥å£
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.RouteSearch(System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ProductModelController.RouteSearch(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
            <summary>
            å·¥è‰ºè·¯çº¿æŸ¥è¯¢
            </summary>
            <param name="WorkShop">所属车间</param>
            <param name="routecode">工艺路线编码</param>
            <param name="routename">工艺路线名称</param>
            <param name="description">工艺路线描述</param>
@@ -3146,10 +3182,11 @@
            <param name="routecode">工艺路线编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.StepSearch(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ProductModelController.StepSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
            <summary>
            å·¥åºæŸ¥è¯¢
            </summary>
            <param name="WorkShop">所属车间</param>
            <param name="stepcode">工序编码</param>
            <param name="stepname">工序名称</param>
            <param name="enable">启用状态</param>
@@ -3175,29 +3212,30 @@
            <param name="stepcode">工序编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.StepAssociationEqp(System.String)">
        <member name="M:VueWebApi.Controllers.ProductModelController.StepAssociationEqp(System.String,System.String)">
            <summary>
            å·¥åºå®šä¹‰å…³è”工作站查询
            </summary>
            <param name="stepcode">工序编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.SaveStepAssociationEqp(System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
        <member name="M:VueWebApi.Controllers.ProductModelController.SaveStepAssociationEqp(System.String,System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
            <summary>
            å·¥åºå®šä¹‰å…³è”工作站提交
            </summary>
            <param name="WorkShop">所属组织编码(车间)</param>
            <param name="stepcode">工序编码</param>
            <param name="json">提交数据</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.StepAssociationDefect(System.String)">
        <member name="M:VueWebApi.Controllers.ProductModelController.StepAssociationDefect(System.String,System.String)">
            <summary>
            å·¥åºå…³è”缺陷查询
            </summary>
            <param name="stepcode">工序编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.SaveStepAssociationDefect(System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
        <member name="M:VueWebApi.Controllers.ProductModelController.SaveStepAssociationDefect(System.String,System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
            <summary>
            å·¥åºå…³è”缺陷提交
            </summary>
@@ -3324,10 +3362,11 @@
            <param name="defectcode">工序检验标准编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.QualityManagementController.StepCheckItemSelect">
        <member name="M:VueWebApi.Controllers.QualityManagementController.StepCheckItemSelect(System.String)">
            <summary>
            å·¥åºæ£€éªŒæ ‡å‡†æ–°å¢žã€ç¼–辑获取检验项目下拉列表
            </summary>
            <param name="WorkShop">车间编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.QualityManagementController.DeleteStepCheckStaned(System.String)">

 VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache

Binary files differ

 VueWebApi/obj/Release/Package/PackageTmp/Web.config

@@ -16,7 +16,7 @@
    <!--本地环境-->
    <!--<add key="DBServer" value="Data Source=.;Initial Catalog=vmes;Integrated Security=True" />-->
    <!--服务器环境-->
    <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes;User ID=sa;Password=xkd@20230101;pooling=false" />
    <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes_zqh;User ID=sa;Password=xkd@20230101;pooling=false" />
    <!--大岛服务器环境-->
    <!--<add key="DBServer" value="Data Source=192.168.2.138;Initial Catalog=vmes;User ID=sa;Password=Dd@20220727;pooling=false" />-->
    <!--redis企业配置-->

 VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb

Binary files differ

 VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml

@@ -549,10 +549,11 @@
            <param name="orderstepqrcode">扫描二维码信息</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.AppProductionManagementController.MesOrderStepReportSelectUserGroup">
        <member name="M:VueWebApi.Controllers.AppProductionManagementController.MesOrderStepReportSelectUserGroup(System.String)">
            <summary>
            ç”Ÿäº§å¼€æŠ¥å·¥ï¼šæŠ¥å·¥æ—¶èŽ·å–生产班组下拉框
            </summary>
            <param name="wkshopcode">车间编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.AppProductionManagementController.MesOrderGroupSelectUser(System.String)">
@@ -812,6 +813,22 @@
            <param name="param">存货信息</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BaseDateController.StorgGroupSelect(System.String,System.String)">
            <summary>
            é€šè¿‡é€‰æ‹©çš„所属组织查询所属班组
            </summary>
            <param name="stu_torgcode">组织编码</param>
            <param name="description">组织类型</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BaseDateController.StorgRoleSelect(System.String,System.String)">
            <summary>
            é€šè¿‡é€‰æ‹©çš„所属组织查询所属角色类型
            </summary>
            <param name="stu_torgcode">组织编码</param>
            <param name="description">组织类型</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BaseDateController.ErpWkshopDepartmentSelect">
            <summary>
            ERP生产车间/部门信息查询
@@ -930,10 +947,11 @@
            <param name="partcode">物料编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            å§”外报表记录查询
            </summary>
            <param name="wkshopcode">车间编码</param>
            <param name="wocode">工单编号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
@@ -948,10 +966,11 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            å§”外报表记录导出
            </summary>
            <param name="wkshopcode">车间编码</param>
            <param name="wocode">工单编号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
@@ -962,10 +981,11 @@
            <param name="receivdate">收料时间</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            ç­ç»„工资报表记录查询
            </summary>
            <param name=" wkshopcode">车间编码</param>
            <param name="compute">计算方式(逐道/末道)</param>
            <param name="wocode">工单编号</param>
            <param name="partcode">产品编码</param>
@@ -989,10 +1009,11 @@
            <param name="id">报工记录主表id</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            ç­ç»„工资报表记录查询
            </summary>
            <param name=" wkshopcode">车间编码</param>
            <param name="compute">计算方式(逐道/末道)</param>
            <param name="wocode">工单编号</param>
            <param name="partcode">产品编码</param>
@@ -1005,10 +1026,11 @@
            <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.PeopleSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.PeopleSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            äººå‘˜å·¥èµ„明细报表
            </summary>
            <param name=" wkshopcode">车间编码</param>
            <param name="compute">计算方式(逐道/末道)</param>
            <param name="wocode">工单编号</param>
            <param name="partcode">产品编码</param>
@@ -1025,10 +1047,11 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.PeopleSalaryReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.PeopleSalaryReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            äººå‘˜å·¥èµ„明细报表导出
            </summary>
            <param name=" wkshopcode">车间编码</param>
            <param name="compute">计算方式(逐道/末道)</param>
            <param name="wocode">工单编号</param>
            <param name="partcode">产品编码</param>
@@ -1041,10 +1064,11 @@
            <param name = "rejectstepcode" > å‰”除工序(固定薪资工序不参与计算) </param >
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.DefectDetailsReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.DefectDetailsReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            ä¸è‰¯æ˜Žç»†æŠ¥è¡¨ 
            </summary>
            <param name=" wkshopcode">车间编码</param>
            <param name="wocode">工单编号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
@@ -1060,10 +1084,11 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.DefectDetailsReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.DefectDetailsReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            ä¸è‰¯æ˜Žç»†æŠ¥è¡¨å¯¼å‡º 
            </summary>
            <param name=" wkshopcode">车间编码</param>
            <param name="wocode">工单编号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
@@ -1199,10 +1224,11 @@
            <param name="checkid">检验记录ID</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.ProductionScheduleReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.ProductionScheduleReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            ç”Ÿäº§è¿›åº¦æŠ¥è¡¨
            </summary>
            <param name=" wkshopcode">车间编码</param>
            <param name="status">工单状态</param>
            <param name="wocode">工单编号</param>
            <param name="routecode">工艺路线编码</param>
@@ -1217,10 +1243,11 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.ProductionScheduleReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ReportManagerController.ProductionScheduleReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            ç”Ÿäº§è¿›åº¦æŠ¥è¡¨å¯¼å‡º
            </summary>
            <param name=" wkshopcode">车间编码</param>
            <param name="status">工单状态</param>
            <param name="wocode">工单编号</param>
            <param name="routecode">工艺路线编码</param>
@@ -1428,13 +1455,14 @@
            <param name="orgid">组织id</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.UserSearch(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.BasicSettingController.UserSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
            <summary>
            ç”¨æˆ·æ¸…单查询
            </summary>
            <param name="UserCode">用户编码</param>
            <param name="UserName">用户名称</param>
            <param name="StuOrg">所属组织</param>
            <param name="description">所属组织类型</param>
            <param name="wagetype">工资类型</param>
            <param name="Enable">在职状态</param>
            <param name="page">页码</param>
@@ -1469,18 +1497,22 @@
            <param name="Userid">用户id</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.UserAssociationRole(System.String)">
        <member name="M:VueWebApi.Controllers.BasicSettingController.UserAssociationRole(System.String,System.String,System.String)">
            <summary>
            ç”¨æˆ·æ¸…单关联角色查询
            </summary>
            <param name="usercode">用户编码</param>
            <param name="stu_torgcode">所属组织编码</param>
            <param name="description">所属组织类型</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.SaveUserAssoctRole(System.String,System.Collections.Generic.List{VueWebApi.Models.RoleUserSubmit})">
        <member name="M:VueWebApi.Controllers.BasicSettingController.SaveUserAssoctRole(System.String,System.String,System.String,System.Collections.Generic.List{VueWebApi.Models.RoleUserSubmit})">
            <summary>
            ç”¨æˆ·æ¸…单关联角色保存
            </summary>
            <param name="usercode">用户编码</param>
            <param name="stu_torgcode">所属组织编码</param>
            <param name="description">所属组织类型</param>
            <param name="json">提交数据对象</param>
            <returns></returns>
        </member>
@@ -2307,7 +2339,7 @@
            <param name="usertype">操作端类型(PC APP)</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.LoginController.ForcedOffline(System.Int32,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.LoginController.ForcedOffline(System.Int32,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            å¼ºåˆ¶ä¸‹çº¿æŽ¥å£
            </summary>
@@ -2316,6 +2348,7 @@
            <param name="username">用户名</param>
            <param name="usertype">操作端PC/APP</param>
            <param name="rid">rid极光推送获取设备id</param>
            <param name="stu_torgcode">所属组织编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.LoginController.LoginMenu(System.String,System.String)">
@@ -2336,7 +2369,7 @@
            <param name="newpassword">新密码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.LoginController.LoginOut(System.Int32,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.LoginController.LoginOut(System.Int32,System.String,System.String,System.String,System.String)">
            <summary>
            PC登出
            </summary>
@@ -2344,6 +2377,7 @@
            <param name="usercode">用户编码</param>
            <param name="username">用户名</param>
            <param name="usertype">操作端PC/APP</param>
            <param name="stu_torgcode">所属组织编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.LoginController.LoginAppSave(System.String,System.String,System.String,System.String)">
@@ -2526,19 +2560,19 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.PartSelectRoute(System.String)">
        <member name="M:VueWebApi.Controllers.ProductionManagementController.PartSelectRoute(System.String,System.String)">
            <summary>
            äº§å“ç¼–码查找工艺路线下拉接口
            </summary>
            <param name="partcode">产品编码</param>
            <param name="wkshopcode">车间编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.RouteSelectWkshop(System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ProductionManagementController.RouteSelectWkshop(System.String)">
            <summary>
            äº§å“+工艺路线查找车间下拉接口
            </summary>
            <param name="partcode">产品编码</param>
            <param name="routecode">工艺路线编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.SelectRouteStep(System.String)">
@@ -2672,10 +2706,11 @@
            <param name="orderstepqrcode">扫描二维码信息</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepReportSelectUserGroup">
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepReportSelectUserGroup(System.String)">
            <summary>
            ç”Ÿäº§å¼€æŠ¥å·¥ï¼šæŠ¥å·¥æ—¶èŽ·å–生产班组下拉框
            </summary>
            <param name="wkshopcode">车间编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderGroupSelectUser(System.String)">
@@ -3049,7 +3084,7 @@
            <param name="partcode">物料编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.SaveInventoryFile(System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData},System.String)">
        <member name="M:VueWebApi.Controllers.ProductModelController.SaveInventoryFile(System.String,System.Collections.Generic.List{VueWebApi.Models.PartRout},System.String)">
            <summary>
            å­˜è´§æ¡£æ¡ˆå…³è”工艺路线提交
            </summary>
@@ -3103,16 +3138,17 @@
            <param name="bomid">Bom主表id</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.StepSelect">
        <member name="M:VueWebApi.Controllers.ProductModelController.StepSelect(System.String)">
            <summary>
            å·¥åºä¸‹æ‹‰æŸ¥è¯¢æŽ¥å£
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.RouteSearch(System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ProductModelController.RouteSearch(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
            <summary>
            å·¥è‰ºè·¯çº¿æŸ¥è¯¢
            </summary>
            <param name="WorkShop">所属车间</param>
            <param name="routecode">工艺路线编码</param>
            <param name="routename">工艺路线名称</param>
            <param name="description">工艺路线描述</param>
@@ -3146,10 +3182,11 @@
            <param name="routecode">工艺路线编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.StepSearch(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ProductModelController.StepSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
            <summary>
            å·¥åºæŸ¥è¯¢
            </summary>
            <param name="WorkShop">所属车间</param>
            <param name="stepcode">工序编码</param>
            <param name="stepname">工序名称</param>
            <param name="enable">启用状态</param>
@@ -3175,29 +3212,30 @@
            <param name="stepcode">工序编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.StepAssociationEqp(System.String)">
        <member name="M:VueWebApi.Controllers.ProductModelController.StepAssociationEqp(System.String,System.String)">
            <summary>
            å·¥åºå®šä¹‰å…³è”工作站查询
            </summary>
            <param name="stepcode">工序编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.SaveStepAssociationEqp(System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
        <member name="M:VueWebApi.Controllers.ProductModelController.SaveStepAssociationEqp(System.String,System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
            <summary>
            å·¥åºå®šä¹‰å…³è”工作站提交
            </summary>
            <param name="WorkShop">所属组织编码(车间)</param>
            <param name="stepcode">工序编码</param>
            <param name="json">提交数据</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.StepAssociationDefect(System.String)">
        <member name="M:VueWebApi.Controllers.ProductModelController.StepAssociationDefect(System.String,System.String)">
            <summary>
            å·¥åºå…³è”缺陷查询
            </summary>
            <param name="stepcode">工序编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.SaveStepAssociationDefect(System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
        <member name="M:VueWebApi.Controllers.ProductModelController.SaveStepAssociationDefect(System.String,System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
            <summary>
            å·¥åºå…³è”缺陷提交
            </summary>
@@ -3324,10 +3362,11 @@
            <param name="defectcode">工序检验标准编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.QualityManagementController.StepCheckItemSelect">
        <member name="M:VueWebApi.Controllers.QualityManagementController.StepCheckItemSelect(System.String)">
            <summary>
            å·¥åºæ£€éªŒæ ‡å‡†æ–°å¢žã€ç¼–辑获取检验项目下拉列表
            </summary>
            <param name="WorkShop">车间编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.QualityManagementController.DeleteStepCheckStaned(System.String)">

 VueWebApi/obj/Release/TransformWebConfig/original/Web.config

@@ -16,7 +16,7 @@
        <!--本地环境-->
        <!--<add key="DBServer" value="Data Source=.;Initial Catalog=vmes;Integrated Security=True" />-->
        <!--服务器环境-->
        <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes;User ID=sa;Password=xkd@20230101;pooling=false" />
        <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes_zqh;User ID=sa;Password=xkd@20230101;pooling=false" />
        <!--大岛服务器环境-->
        <!--<add key="DBServer" value="Data Source=192.168.2.138;Initial Catalog=vmes;User ID=sa;Password=Dd@20220727;pooling=false" />-->
        <!--redis企业配置-->

 VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config

@@ -16,7 +16,7 @@
    <!--本地环境-->
    <!--<add key="DBServer" value="Data Source=.;Initial Catalog=vmes;Integrated Security=True" />-->
    <!--服务器环境-->
    <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes;User ID=sa;Password=xkd@20230101;pooling=false" />
    <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes_zqh;User ID=sa;Password=xkd@20230101;pooling=false" />
    <!--大岛服务器环境-->
    <!--<add key="DBServer" value="Data Source=192.168.2.138;Initial Catalog=vmes;User ID=sa;Password=Dd@20220727;pooling=false" />-->
    <!--redis企业配置-->

 VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache

Binary files differ

 VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
969b832d89240596687981bd38845c8e69e94403
2afdf41ddd3903e818761fc01011a4cda747719f

 VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt

@@ -568,3 +568,285 @@
D:\新凯迪MES\MES产品\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CopyComplete
D:\新凯迪MES\MES产品\VueWebApi\VueWebApi\obj\Release\VueWebApi.dll
D:\新凯迪MES\MES产品\VueWebApi\VueWebApi\obj\Release\VueWebApi.pdb
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\VueWebApi.dll.config
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\VueWebApi.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\VueWebApi.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\VueWebApi.pdb
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\csc.exe
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\csc.exe.config
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\csc.rsp
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\csi.exe
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\csi.exe.config
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\csi.rsp
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\Microsoft.Build.Tasks.CodeAnalysis.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\Microsoft.CodeAnalysis.CSharp.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\Microsoft.CodeAnalysis.CSharp.Scripting.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\Microsoft.CodeAnalysis.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\Microsoft.CodeAnalysis.Scripting.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\Microsoft.CodeAnalysis.VisualBasic.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\Microsoft.CSharp.Core.targets
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\Microsoft.DiaSymReader.Native.amd64.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\Microsoft.DiaSymReader.Native.x86.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\Microsoft.Managed.Core.targets
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\Microsoft.VisualBasic.Core.targets
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\Microsoft.Win32.Primitives.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.AppContext.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.Collections.Immutable.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.Console.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.Diagnostics.DiagnosticSource.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.Diagnostics.FileVersionInfo.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.Diagnostics.StackTrace.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.Globalization.Calendars.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.IO.Compression.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.IO.Compression.ZipFile.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.IO.FileSystem.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.IO.FileSystem.Primitives.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.Net.Http.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.Net.Sockets.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.Reflection.Metadata.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.Runtime.InteropServices.RuntimeInformation.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.Security.Cryptography.Algorithms.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.Security.Cryptography.Encoding.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.Security.Cryptography.Primitives.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.Security.Cryptography.X509Certificates.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.Text.Encoding.CodePages.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.Threading.Tasks.Extensions.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.ValueTuple.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.Xml.ReaderWriter.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.Xml.XmlDocument.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.Xml.XPath.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\System.Xml.XPath.XDocument.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\vbc.exe
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\vbc.exe.config
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\vbc.rsp
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\VBCSCompiler.exe
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\roslyn\VBCSCompiler.exe.config
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.Win32.Primitives.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\netstandard.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.AppContext.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Collections.Concurrent.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Collections.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Collections.NonGeneric.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Collections.Specialized.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.ComponentModel.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.ComponentModel.EventBasedAsync.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.ComponentModel.Primitives.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.ComponentModel.TypeConverter.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Console.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Data.Common.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Diagnostics.Contracts.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Diagnostics.Debug.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Diagnostics.FileVersionInfo.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Diagnostics.Process.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Diagnostics.StackTrace.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Diagnostics.TextWriterTraceListener.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Diagnostics.Tools.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Diagnostics.TraceSource.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Diagnostics.Tracing.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Drawing.Primitives.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Dynamic.Runtime.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Globalization.Calendars.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Globalization.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Globalization.Extensions.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.IO.Compression.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.IO.Compression.ZipFile.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.IO.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.IO.FileSystem.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.IO.FileSystem.DriveInfo.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.IO.FileSystem.Primitives.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.IO.FileSystem.Watcher.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.IO.IsolatedStorage.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.IO.MemoryMappedFiles.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.IO.Pipes.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.IO.UnmanagedMemoryStream.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Linq.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Linq.Expressions.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Linq.Parallel.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Linq.Queryable.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Net.Http.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Net.NameResolution.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Net.NetworkInformation.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Net.Ping.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Net.Primitives.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Net.Requests.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Net.Security.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Net.Sockets.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Net.WebHeaderCollection.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Net.WebSockets.Client.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Net.WebSockets.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.ObjectModel.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Reflection.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Reflection.Extensions.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Reflection.Primitives.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Resources.Reader.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Resources.ResourceManager.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Resources.Writer.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Runtime.CompilerServices.VisualC.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Runtime.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Runtime.Extensions.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Runtime.Handles.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Runtime.InteropServices.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Runtime.InteropServices.RuntimeInformation.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Runtime.Numerics.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Runtime.Serialization.Formatters.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Runtime.Serialization.Json.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Runtime.Serialization.Primitives.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Runtime.Serialization.Xml.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Security.Claims.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Security.Cryptography.Algorithms.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Security.Cryptography.Csp.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Security.Cryptography.Encoding.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Security.Cryptography.Primitives.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Security.Cryptography.X509Certificates.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Security.Principal.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Security.SecureString.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Text.Encoding.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Text.Encoding.Extensions.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Text.RegularExpressions.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Threading.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Threading.Overlapped.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Threading.Tasks.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Threading.Tasks.Parallel.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Threading.Thread.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Threading.ThreadPool.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Threading.Timer.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.ValueTuple.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Xml.ReaderWriter.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Xml.XDocument.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Xml.XmlDocument.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Xml.XmlSerializer.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Xml.XPath.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Xml.XPath.XDocument.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Antlr3.Runtime.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\BouncyCastle.Crypto.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Dapper.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Fleck.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\ICSharpCode.SharpZipLib.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Jiguang.JPush.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\JWT.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\log4net.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.AspNet.SignalR.Core.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.AspNet.SignalR.SystemWeb.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.AspNetCore.Http.Abstractions.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.AspNetCore.Http.Features.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.AspNetCore.Mvc.Abstractions.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.AspNetCore.Routing.Abstractions.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.Bcl.AsyncInterfaces.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.Extensions.Primitives.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.Net.Http.Headers.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.Owin.Cors.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.Owin.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.Owin.Host.SystemWeb.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.Owin.Security.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.Web.Infrastructure.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Newtonsoft.Json.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\NPOI.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\NPOI.OOXML.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\NPOI.OpenXml4Net.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\NPOI.OpenXmlFormats.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Owin.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Pipelines.Sockets.Unofficial.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\ServiceStack.Common.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\ServiceStack.Interfaces.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\ServiceStack.Redis.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\ServiceStack.Text.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\StackExchange.Redis.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Swashbuckle.Core.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Buffers.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.CodeDom.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Diagnostics.PerformanceCounter.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.IO.Pipelines.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Memory.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Net.Http.Formatting.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Numerics.Vectors.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Runtime.CompilerServices.Unsafe.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Text.Encodings.Web.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Threading.Channels.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Threading.Tasks.Extensions.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Web.Cors.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Web.Helpers.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Web.Http.Cors.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Web.Http.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Web.Http.WebHost.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Web.Mvc.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Web.Optimization.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Web.Razor.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Web.WebPages.Deployment.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Web.WebPages.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Web.WebPages.Razor.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\WebActivatorEx.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\WebGrease.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\BouncyCastle.Crypto.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Dapper.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\ICSharpCode.SharpZipLib.pdb
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\ICSharpCode.SharpZipLib.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\JWT.pdb
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\JWT.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\log4net.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.AspNet.SignalR.Core.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.AspNet.SignalR.SystemWeb.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.AspNetCore.Http.Abstractions.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.AspNetCore.Http.Features.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.AspNetCore.Mvc.Abstractions.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.AspNetCore.Routing.Abstractions.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.Bcl.AsyncInterfaces.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.Extensions.Primitives.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.Net.Http.Headers.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.Owin.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.Owin.Cors.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.Owin.Host.SystemWeb.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.Owin.Security.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Newtonsoft.Json.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\NPOI.pdb
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\NPOI.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\NPOI.OOXML.pdb
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\NPOI.OOXML.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\NPOI.OpenXml4Net.pdb
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\NPOI.OpenXml4Net.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\NPOI.OpenXmlFormats.pdb
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Pipelines.Sockets.Unofficial.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\ServiceStack.Common.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\ServiceStack.Interfaces.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\ServiceStack.Redis.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\ServiceStack.Text.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\StackExchange.Redis.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Buffers.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.CodeDom.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Diagnostics.PerformanceCounter.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.IO.Pipelines.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Memory.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Net.Http.Formatting.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Numerics.Vectors.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Runtime.CompilerServices.Unsafe.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Text.Encodings.Web.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Threading.Channels.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Threading.Tasks.Extensions.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Web.Http.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Web.Http.Cors.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Web.Http.WebHost.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Web.Helpers.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Web.Mvc.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Web.Optimization.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Web.Razor.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Web.WebPages.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Web.WebPages.Deployment.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\System.Web.WebPages.Razor.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Antlr3.Runtime.pdb
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.xml
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\zh-Hans\Microsoft.AspNet.SignalR.Core.resources.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\zh-Hans\Microsoft.AspNet.SignalR.SystemWeb.resources.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\zh-Hans\System.Net.Http.Formatting.resources.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.Http.resources.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.Http.WebHost.resources.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.Helpers.resources.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.Mvc.resources.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.Optimization.resources.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.Razor.resources.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.resources.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Deployment.resources.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Razor.resources.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CoreCompileInputs.cache
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CopyComplete
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\obj\Release\VueWebApi.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\obj\Release\VueWebApi.pdb

 VueWebApi/obj/Release/VueWebApi.pdb

Binary files differ

 VueWebApi/obj/Release/_WPPLastBuildInfo.txt

Binary files differ