1.App 智能分析，生产进度看板接口 2.PC端设备点检项目、保养项目、点检标准、保养标准、点检记录、保养记录、维修记录 3.工序检验扫码添加判断(...

yl

2023-12-11 22af5bed0da8a5852bd824a1e21e6fc43df6df2a

1.App 智能分析，生产进度看板接口
2.PC端设备点检项目、保养项目、点检标准、保养标准、点检记录、保养记录、维修记录
3.工序检验扫码添加判断(条码任务是否存在、工单是否关闭)
4.添加App图标图片文件

 VueWebCoreApi/Controllers/AppAnalyticsController.cs

@@ -42,5 +42,32 @@
            return Json(mes);
        }
        #endregion

        #region[App生产进度看板单据信息]
        /// <summary>
        /// App生产进度看板单据信息
        /// </summary>
        /// <param name="ordertype">单据类型(SO:销售订单、MO:生产订单、PO:生产工单)</param>
        /// <param name="partcode">产品信息(可多个)</param>
        /// <param name="Ratetime">单据日期范围</param>
        /// <returns></returns>
        [Route(template: "ProductionScheduleKanban")]
        [HttpGet]
        public JsonResult ProductionScheduleKanban(string ordertype, string partcode = null, string Ratetime = null)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            //var token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyY29kZSI6Ijk5OCIsInVzZXJuYW1lIjoi5rWL6K-V6LSm5Y-3MSIsInN0b3JnX2NvZGUiOiJTQ0IwMV8xXzEiLCJzdG9yZ19uYW1lIjoi57K-5bel6L2m6Ze0IiwiaXNfc3lzdGVtX2FkbWluIjoiTiIsInJvbGVfY29kZSI6Ijk5OTkiLCJyb2xlX2RhdGFwZXJtaXNzaW9ucyI6IiIsInVzZXJ0eXBlIjoiQVBQIiwicmVkaXNrZXkiOiJOZXdNRVNMb2dpblVzZXJJREFQUDk5OCIsInRpbWVvdXQiOiIyMDIzLTEyLTA3VDE0OjU0OjAzLjU0NDMxMjMrMDg6MDAifQ._L0xdKgeD_dgnedzV8EEN6y2Xad0J7beswuIcNj4OKs";
            User us = JwtTools.Denocode(token.ToString());
            string startopendate = "";  //开始时间
            string endclosedate = "";    //结束时间
            if (Ratetime != "" && Ratetime != null)
            {
                startopendate = Ratetime.Split('~')[0].ToString();
                endclosedate = Ratetime.Split('~')[1].ToString();
            }
            mes = AppAnalyticsBLL.ProductionScheduleKanban(us,ordertype, partcode, startopendate, endclosedate);
            return Json(mes);
        }
        #endregion
    }
}

 VueWebCoreApi/Controllers/DeviceManagerController.cs

@@ -45,11 +45,11 @@
        /// <returns></returns>
        [Route(template: "AddUpdateDeviceType")]
        [HttpPost]
        public JsonResult AddUpdateDeviceType(string OperType,List<ObjectDataCont> json)
        public JsonResult AddUpdateDeviceType(string OperType, List<ObjectDataCont> json)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            mes = DeviceManagerBLL.AddUpdateDeviceType(OperType,json, us);
            mes = DeviceManagerBLL.AddUpdateDeviceType(OperType, json, us);
            return Json(mes);
        }
        #endregion
@@ -117,7 +117,7 @@
            string storgcode = obj["storgcode"].ToString(); //所属组织编码
            string status = obj["status"].ToString(); //使用状态
            string OperType = obj["OperType"].ToString();  //操作类型
            mes = DeviceManagerBLL.AddUpdateDeviceManger(devicecode, devicename, devicetype, storgcode, status,OperType, us);
            mes = DeviceManagerBLL.AddUpdateDeviceManger(devicecode, devicename, devicetype, storgcode, status, OperType, us);
            return Json(mes);
        }
        #endregion
@@ -138,5 +138,657 @@
            return Json(mes);
        }
        #endregion



        #region[设备点检项列表查询]
        /// <summary>
        /// è®¾å¤‡ç‚¹æ£€é¡¹åˆ—表查询
        /// </summary>
        /// <param name="checkitemcode">点检部位编码</param>
        /// <param name="checkitemname">点检部位名称</param>
        /// <param name="checkdescr">点检要求</param>
        /// <param name="isqrcode">选中扫码</param>
        /// <param name="cycle">点检周期</param>
        /// <param name="page">页码</param>
        /// <param name="rows">每页显示条数</param>
        /// <param name="prop">排序字段</param>
        /// <param name="order">排序规则</param>
        /// <returns></returns>
        [Route(template: "DeviceCheckItemSearch")]
        [HttpGet]
        public JsonResult DeviceCheckItemSearch(int page, int rows, string prop, string order, string checkitemcode = null, string checkitemname = null, string checkdescr = null, string isqrcode = null, string cycle = null)
        {
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = DeviceManagerBLL.DeviceCheckItemSearch(checkitemcode, checkitemname, checkdescr, isqrcode, cycle, startNum, endNum, prop, order);
            return Json(mes);
        }
        #endregion

        #region[设备点检项新增编辑]
        /// <summary>
        /// è®¾å¤‡ç‚¹æ£€é¡¹æ–°å¢žç¼–辑
        /// </summary>
        /// <param name="obj">提交数据对象</param>
        /// <returns></returns>
        [Route(template: "AddUpdateDeviceCheckItem")]
        [HttpPost]
        public JsonResult AddUpdateDeviceCheckItem([FromBody] JObject obj)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            string checkitemid = obj["id"].ToString();    //设备点检项id(主键)
            string checkitemcode = obj["checkitemcode"].ToString(); //设备点检部位编码
            string checkitemname = obj["checkitemname"].ToString(); //设备点检部位名称
            string checkitemdescr = obj["checkitemdescr"].ToString(); //设备点检部位要求
            string cycle = obj["cycle"].ToString(); //设备点检部位周期
            string isqrcode = obj["isqrcode"].ToString(); //是否扫码
            string OperType = obj["OperType"].ToString();  //操作类型
            mes = DeviceManagerBLL.AddUpdateDeviceCheckItem(checkitemid, checkitemcode, checkitemname, checkitemdescr, cycle, isqrcode, us, OperType);
            return Json(mes);
        }
        #endregion

        #region[设备点检项删除]
        /// <summary>
        /// è®¾å¤‡ç‚¹æ£€é¡¹åˆ é™¤
        /// </summary>
        /// <param name="checkitemcode">设备点检项目(部位)编码</param>
        /// <returns></returns>
        [Route(template: "DeleteDeviceCheckItem")]
        [HttpPost]
        public JsonResult DeleteDeviceCheckItem(string checkitemcode)
        {
            mes = DeviceManagerBLL.DeleteDeviceCheckItem(checkitemcode);
            return Json(mes);
        }
        #endregion


        #region[设备保养项列表查询]
        /// <summary>
        /// è®¾å¤‡ä¿å…»é¡¹åˆ—表查询
        /// </summary>
        /// <param name="maiitemcode">保养部位编码</param>
        /// <param name="maiitemname">保养部位名称</param>
        /// <param name="maidescr">保养要求</param>
        /// <param name="isqrcode">选中扫码</param>
        /// <param name="page">页码</param>
        /// <param name="rows">每页显示条数</param>
        /// <param name="prop">排序字段</param>
        /// <param name="order">排序规则</param>
        /// <returns></returns>
        [Route(template: "DeviceMaiItemSearch")]
        [HttpGet]
        public JsonResult DeviceMaiItemSearch(int page, int rows, string prop, string order, string maiitemcode = null, string maiitemname = null, string maidescr = null, string isqrcode = null)
        {
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = DeviceManagerBLL.DeviceMaiItemSearch(maiitemcode, maiitemname, maidescr, isqrcode, startNum, endNum, prop, order);
            return Json(mes);
        }
        #endregion

        #region[设备保养项新增编辑]
        /// <summary>
        /// è®¾å¤‡ä¿å…»é¡¹æ–°å¢žç¼–辑
        /// </summary>
        /// <param name="obj">提交数据对象</param>
        /// <returns></returns>
        [Route(template: "AddUpdateDeviceMaiItem")]
        [HttpPost]
        public JsonResult AddUpdateDeviceMaiItem([FromBody] JObject obj)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            string maiitemid = obj["id"].ToString();    //设备保养项id(主键)
            string maiitemcode = obj["maiitemcode"].ToString(); //设备保养部位编码
            string maiitemname = obj["maiitemname"].ToString(); //设备保养部位名称
            string maiitemdescr = obj["maiitemdescr"].ToString(); //设备保养部位要求
            string isqrcode = obj["isqrcode"].ToString(); //是否扫码
            string OperType = obj["OperType"].ToString();  //操作类型
            mes = DeviceManagerBLL.AddUpdateDeviceMaiItem(maiitemid, maiitemcode, maiitemname, maiitemdescr, isqrcode, us, OperType);
            return Json(mes);
        }
        #endregion

        #region[设备保养项删除]
        /// <summary>
        /// è®¾å¤‡ä¿å…»é¡¹åˆ é™¤
        /// </summary>
        /// <param name="maiitemcode">设备保养项目(部位)编码</param>
        /// <returns></returns>
        [Route(template: "DeleteDeviceMaiItem")]
        [HttpPost]
        public JsonResult DeleteDeviceMaiItem(string maiitemcode)
        {
            mes = DeviceManagerBLL.DeleteDeviceMaiItem(maiitemcode);
            return Json(mes);
        }
        #endregion



        #region[设备点检标准列表查询]
        /// <summary>
        /// è®¾å¤‡ç‚¹æ£€æ ‡å‡†åˆ—表查询
        /// </summary>
        /// <param name="checkstandcode">点检标准编码</param>
        /// <param name="checkstandname">点检标准名称</param>
        /// <param name="checkcontr">点检管控</param>
        /// <param name="page">页码</param>
        /// <param name="rows">每页显示条数</param>
        /// <param name="prop">排序字段</param>
        /// <param name="order">排序规则</param>
        /// <returns></returns>
        [Route(template: "DeviceCheckStandArdSearch")]
        [HttpGet]
        public JsonResult DeviceCheckStandArdSearch(int page, int rows, string prop, string order, string checkstandcode = null, string checkstandname = null, string checkcontr = null)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = DeviceManagerBLL.DeviceCheckStandArdSearch(us, checkstandcode, checkstandname, checkcontr, startNum, endNum, prop, order);
            return Json(mes);
        }
        #endregion

        #region[设备点检标准新增、编辑获取检验项目下拉列表]
        /// <summary>
        /// è®¾å¤‡ç‚¹æ£€æ ‡å‡†æ–°å¢žã€ç¼–辑获取检验项目下拉列表
        /// </summary>
        /// <returns></returns>
        [Route(template: "DeviceCheckItemSelect")]
        [HttpGet]
        public JsonResult DeviceCheckItemSelect()
        {
            mes = DeviceManagerBLL.DeviceCheckItemSelect();
            return Json(mes);
        }
        #endregion

        #region[设备点检标准编辑/查看获取数据]
        /// <summary>
        /// è®¾å¤‡ç‚¹æ£€æ ‡å‡†ç¼–辑/查看获取数据
        /// </summary>
        /// <param name="checkstand_code">设备点检标准编码</param>
        /// <returns></returns>
        [Route(template: "ViewDeviceCheckStanedSearch")]
        [HttpPost]
        public JsonResult ViewDeviceCheckStanedSearch(string checkstand_code)
        {
            mes = DeviceManagerBLL.ViewDeviceCheckStanedSearch(checkstand_code);
            return Json(mes);
        }
        #endregion

        #region[设备点检标准新增编辑]
        /// <summary>
        /// è®¾å¤‡ç‚¹æ£€æ ‡å‡†æ–°å¢žç¼–辑
        /// </summary>
        /// <param name="opertype">操作类型</param>
        /// <param name="json">提交数据</param>
        /// <returns></returns>
        [Route(template: "AddUpdateDeviceCheckStandArd")]
        [HttpPost]
        public JsonResult AddUpdateDeviceCheckStandArd(string opertype, RoutEdit json)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            mes = DeviceManagerBLL.AddUpdateDeviceCheckStandArd(opertype, json, us);
            return Json(mes);
        }
        #endregion

        #region[设备点检标准删除]
        /// <summary>
        /// è®¾å¤‡ç‚¹æ£€æ ‡å‡†åˆ é™¤
        /// </summary>
        /// <param name="checkstand_code">设备点检标准编码</param>
        /// <returns></returns>
        [Route(template: "DeleteDeviceCheckStaned")]
        [HttpPost]
        public JsonResult DeleteDeviceCheckStaned(string checkstand_code)
        {
            mes = DeviceManagerBLL.DeleteDeviceCheckStaned(checkstand_code);
            return Json(mes);
        }
        #endregion

        #region[设备点检标准关联工作站查询]
        /// <summary>
        /// è®¾å¤‡ç‚¹æ£€æ ‡å‡†å…³è”工作站查询
        /// </summary>
        /// <param name="checkstand_code">设备点检标准编码</param>
        /// <returns></returns>
        [Route(template: "DeviceCheckStanedAssociationEqp")]
        [HttpGet]
        public JsonResult DeviceCheckStanedAssociationEqp(string checkstand_code)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            mes = DeviceManagerBLL.DeviceCheckStanedAssociationEqp(us, checkstand_code);
            return Json(mes);
        }
        #endregion

        #region [设备点检标准关联工作站提交]
        /// <summary>
        /// è®¾å¤‡ç‚¹æ£€æ ‡å‡†å…³è”工作站提交
        /// </summary>
        /// <param name="checkstand_code">设备点检标准编码</param>
        /// <param name="json">提交数据</param>
        /// <returns></returns>
        [Route(template: "SaveDeviceCheckStanedAssociationEqp")]
        [HttpPost]
        public JsonResult SaveDeviceCheckStanedAssociationEqp(string checkstand_code, List<ObjectData> json)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            mes = DeviceManagerBLL.SaveDeviceCheckStanedAssociationEqp(us, checkstand_code, json);
            return Json(mes);
        }
        #endregion



        #region[设备保养标准列表查询]
        /// <summary>
        /// è®¾å¤‡ä¿å…»æ ‡å‡†åˆ—表查询
        /// </summary>
        /// <param name="repairstandcode">保养标准编码</param>
        /// <param name="repairstandname">保养标准名称</param>
        /// <param name="repairstanddescr">保养标准描述</param>
        /// <param name="page">页码</param>
        /// <param name="rows">每页显示条数</param>
        /// <param name="prop">排序字段</param>
        /// <param name="order">排序规则</param>
        /// <returns></returns>
        [Route(template: "DeviceRepairStandArdSearch")]
        [HttpGet]
        public JsonResult DeviceRepairStandArdSearch(int page, int rows, string prop, string order, string repairstandcode = null, string repairstandname = null, string repairstanddescr = null)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = DeviceManagerBLL.DeviceRepairStandArdSearch(us, repairstandcode, repairstandname, repairstanddescr, startNum, endNum, prop, order);
            return Json(mes);
        }
        #endregion

        #region[设备保养标准新增、编辑获取保养项目下拉列表]
        /// <summary>
        /// è®¾å¤‡ä¿å…»æ ‡å‡†æ–°å¢žã€ç¼–辑获取保养项目下拉列表
        /// </summary>
        /// <returns></returns>
        [Route(template: "DeviceRepairItemSelect")]
        [HttpGet]
        public JsonResult DeviceRepairItemSelect()
        {
            mes = DeviceManagerBLL.DeviceRepairItemSelect();
            return Json(mes);
        }
        #endregion

        #region[设备保养标准编辑/查看获取数据]
        /// <summary>
        /// è®¾å¤‡ä¿å…»æ ‡å‡†ç¼–辑/查看获取数据
        /// </summary>
        /// <param name="repairstand_code">设备保养标准编码</param>
        /// <returns></returns>
        [Route(template: "ViewDeviceRepairStanedSearch")]
        [HttpPost]
        public JsonResult ViewDeviceRepairStanedSearch(string repairstand_code)
        {
            mes = DeviceManagerBLL.ViewDeviceRepairStanedSearch(repairstand_code);
            return Json(mes);
        }
        #endregion

        #region[设备保养标准新增编辑]
        /// <summary>
        /// è®¾å¤‡ä¿å…»æ ‡å‡†æ–°å¢žç¼–辑
        /// </summary>
        /// <param name="opertype">操作类型</param>
        /// <param name="json">提交数据</param>
        /// <returns></returns>
        [Route(template: "AddUpdateDeviceRepairStandArd")]
        [HttpPost]
        public JsonResult AddUpdateDeviceRepairStandArd(string opertype, EqpRepair json)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            mes = DeviceManagerBLL.AddUpdateDeviceRepairStandArd(opertype, json, us);
            return Json(mes);
        }
        #endregion

        #region[设备保养标准删除]
        /// <summary>
        /// è®¾å¤‡ä¿å…»æ ‡å‡†åˆ é™¤
        /// </summary>
        /// <param name="repairstand_code">设备保养标准编码</param>
        /// <returns></returns>
        [Route(template: "DeleteDeviceRepairStaned")]
        [HttpPost]
        public JsonResult DeleteDeviceRepairStaned(string repairstand_code)
        {
            mes = DeviceManagerBLL.DeleteDeviceRepairStaned(repairstand_code);
            return Json(mes);
        }
        #endregion

        #region[设备保养标准关联工作站查询]
        /// <summary>
        /// è®¾å¤‡ä¿å…»æ ‡å‡†å…³è”工作站查询
        /// </summary>
        /// <param name="repairstand_code">设备保养标准编码</param>
        /// <returns></returns>
        [Route(template: "DeviceRepairStanedAssociationEqp")]
        [HttpGet]
        public JsonResult DeviceRepairStanedAssociationEqp(string repairstand_code)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            mes = DeviceManagerBLL.DeviceRepairStanedAssociationEqp(us, repairstand_code);
            return Json(mes);
        }
        #endregion

        #region [设备保养标准关联工作站提交]
        /// <summary>
        /// è®¾å¤‡ä¿å…»æ ‡å‡†å…³è”工作站提交
        /// </summary>
        /// <param name="repairstand_code">设备保养标准编码</param>
        /// <param name="json">提交数据</param>
        /// <returns></returns>
        [Route(template: "SaveDeviceRepairStanedAssociationEqp")]
        [HttpPost]
        public JsonResult SaveDeviceRepairStanedAssociationEqp(string repairstand_code, List<ObjectData> json)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            mes = DeviceManagerBLL.SaveDeviceRepairStanedAssociationEqp(us, repairstand_code, json);
            return Json(mes);
        }
        #endregion



        #region[设备点检记录查询]
        /// <summary>
        /// è®¾å¤‡ç‚¹æ£€è®°å½•æŸ¥è¯¢
        /// </summary>
        /// <param name="page">页码</param>
        /// <param name="rows">每页显示条数</param>
        /// <param name="prop">排序字段</param>
        /// <param name="order">排序规则</param>
        /// <param name="wkshopcode">车间编码</param>
        /// <param name="eqpcode">设备编码</param>
        /// <param name="eqpname">设备名称</param>
        /// <param name="stanedname">点检标准名称</param>
        /// <param name="checkuser">点检人员</param>
        /// <param name="checkdate">点检时间</param>
        /// <returns></returns>
        [Route(template: "DeviceCheckTakeSearch")]
        [HttpGet]
        public JsonResult 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 token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            string checkopendate = "";//点检开始时间
            string checkclosedate = "";//点检结束时间
            if (checkdate != "" && checkdate != null)
            {
                checkopendate = checkdate.Split('~')[0].ToString();
                checkclosedate = checkdate.Split('~')[1].ToString();
            }
            int startNum = rows * (page - 1) + 1;//起始记录rowNum
            int endNum = rows * page; //结束记录rowNum
            mes = DeviceManagerBLL.DeviceCheckTakeSearch(us, wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate, startNum, endNum, prop, order);
            return Json(mes);
        }
        #endregion

        #region[设备点检记录明细查询]
        /// <summary>
        /// è®¾å¤‡ç‚¹æ£€è®°å½•æ˜Žç»†æŸ¥è¯¢
        /// </summary>
        /// <param name="djwo">设备点检单号</param>
        /// <returns></returns>
        [Route(template: "DeviceCheckSubTakeSearch")]
        [HttpGet]
        public JsonResult DeviceCheckSubTakeSearch(string djwo)
        {
            mes = DeviceManagerBLL.DeviceCheckSubTakeSearch(djwo);
            return Json(mes);
        }
        #endregion

        #region[设备点检记录导出]
        /// <summary>
        /// è®¾å¤‡ç‚¹æ£€è®°å½•å¯¼å‡º
        /// </summary>
        /// <param name="wkshopcode">车间编码</param>
        /// <param name="eqpcode">设备编号</param>
        /// <param name="eqpname">设备名称</param>
        /// <param name="stanedname">点检标准名称</param>
        /// <param name="checkuser">点检人员</param>
        /// <param name="checkdate">点检时间</param>
        /// <returns></returns>
        [Route(template: "DeviceCheckTakeOutExcel")]
        [HttpGet]
        public JsonResult DeviceCheckTakeOutExcel(string wkshopcode = null, string eqpcode = null, string eqpname = null, string stanedname = null, string checkuser = null, string checkdate = null)
        {
            var Token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(Token.ToString());
            string checkopendate = "";//点检开始时间
            string checkclosedate = "";//点检结束时间
            if (checkdate != "" && checkdate != null)
            {
                checkopendate = checkdate.Split('~')[0].ToString();
                checkclosedate = checkdate.Split('~')[1].ToString();
            }
            mes = DeviceManagerBLL.DeviceCheckTakeOutExcel(us,wkshopcode,eqpcode,eqpname,stanedname,checkuser,checkopendate,checkclosedate);
            return Json(mes);
        }
        #endregion


        #region[设备保养记录查询]
        /// <summary>
        /// è®¾å¤‡ä¿å…»è®°å½•æŸ¥è¯¢
        /// </summary>
        /// <param name="page">页码</param>
        /// <param name="rows">每页显示条数</param>
        /// <param name="prop">排序字段</param>
        /// <param name="order">排序规则</param>
        /// <param name="wkshopcode">车间编码</param>
        /// <param name="eqpcode">设备编码</param>
        /// <param name="eqpname">设备名称</param>
        /// <param name="stanedname">保养标准名称</param>
        /// <param name="repairuser">保养人员</param>
        /// <param name="repairdate">保养时间</param>
        /// <param name="repairresult">保养结果</param>
        /// <returns></returns>
        public JsonResult 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 token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            string repairopendate = "";  //点检开始时间
            string repairclosedate = "";    //点检结束时间
            if (repairdate != "" && repairdate != null)
            {
                repairopendate = repairdate.Split('~')[0].ToString();
                repairclosedate = repairdate.Split('~')[1].ToString();
            }
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = DeviceManagerBLL.DeviceRepairTakeSearch(us, wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult, startNum, endNum, prop, order);
            return Json(mes);
        }
        #endregion

        #region[设备保养记录明细查询]
        /// <summary>
        /// è®¾å¤‡ä¿å…»è®°å½•æ˜Žç»†æŸ¥è¯¢
        /// </summary>
        /// <param name="bywo">设备保养单号</param>
        /// <returns></returns>
        [Route(template: "DeviceRepairSubTakeSearch")]
        [HttpGet]
        public JsonResult DeviceRepairSubTakeSearch(string bywo)
        {
            mes = DeviceManagerBLL.DeviceRepairSubTakeSearch(bywo);
            return Json(mes);
        }
        #endregion

        #region[设备保养记录导出]
        /// <summary>
        /// è®¾å¤‡ä¿å…»è®°å½•å¯¼å‡º
        /// </summary>
        /// <param name="wkshopcode">车间编码</param>
        /// <param name="eqpcode">设备编号</param>
        /// <param name="eqpname">设备名称</param>
        /// <param name="stanedname">标准名称</param>
        /// <param name="repairuser">保养人员</param>
        /// <param name="repairdate">保养时间</param>
        /// <param name="repairresult">保养结果</param>
        /// <returns></returns>
        [Route(template: "DeviceRepairTakeOutExcel")]
        [HttpGet]
        public JsonResult DeviceRepairTakeOutExcel(string wkshopcode = null, string eqpcode = null, string eqpname = null, string stanedname = null, string repairuser = null, string repairdate = null, string repairresult = null)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            string repairopendate = "";  //点检开始时间
            string repairclosedate = "";    //点检结束时间
            if (repairdate != "" && repairdate != null)
            {
                repairopendate = repairdate.Split('~')[0].ToString();
                repairclosedate = repairdate.Split('~')[1].ToString();
            }
            mes = DeviceManagerBLL.DeviceRepairTakeOutExcel(us, wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult);
            return Json(mes);
        }
        #endregion


        #region[设备维修记录查询]
        /// <summary>
        /// è®¾å¤‡ç»´ä¿®è®°å½•æŸ¥è¯¢
        /// </summary>
        /// <param name="page">页码</param>
        /// <param name="rows">每页显示条数</param>
        /// <param name="prop">排序字段</param>
        /// <param name="order">排序规则</param>
        /// <param name="wkshopcode">车间编码</param>
        /// <param name="eqpcode">设备编码</param>
        /// <param name="eqpname">设备名称</param>
        /// <param name="reportuser">报修人员</param>
        /// <param name="repairuser">维修人员</param>
        /// <param name="vrifcatuser">验证人员</param>
        /// <param name="reportdate">报修时间</param>
        /// <param name="repairdate">维修时间</param>
        /// <param name="vrifcatdate">验证时间</param>
        /// <returns></returns>
        [Route(template: "DeviceUpdateSearch")]
        [HttpGet]
        public JsonResult 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 token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            string reportopendate = "";  //报修开始时间
            string reportclosedate = "";  //报修结束时间
            string repairopendate = "";  //维修开始时间
            string repairclosedate = "";  //维修结束时间
            string vrifcatopendate = "";  //维修验证开始时间
            string vrifcatclosedate = "";  //维修验证结束时间
            if (reportdate != "" && reportdate != null)
            {
                reportopendate = reportdate.Split('~')[0].ToString();
                reportclosedate = reportdate.Split('~')[1].ToString();
            }
            if (repairdate != "" && repairdate != null)
            {
                repairopendate = repairdate.Split('~')[0].ToString();
                repairclosedate = repairdate.Split('~')[1].ToString();
            }
            if (vrifcatdate != "" && vrifcatdate != null)
            {
                vrifcatopendate = vrifcatdate.Split('~')[0].ToString();
                vrifcatclosedate = vrifcatdate.Split('~')[1].ToString();
            }
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = DeviceManagerBLL.DeviceUpdateSearch(us, wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate, startNum, endNum, prop, order);
            return Json(mes);
        }
        #endregion

        #region[设备维修记录明细查询]
        /// <summary>
        /// è®¾å¤‡ç»´ä¿®è®°å½•æ˜Žç»†æŸ¥è¯¢
        /// </summary>
        /// <param name="repair_code">设备维修单号</param>
        /// <returns></returns>
        [Route(template: "DeviceUpdateSubSearch")]
        [HttpGet]
        public JsonResult DeviceUpdateSubSearch(string repair_code)
        {
            mes = DeviceManagerBLL.DeviceUpdateSubSearch(repair_code);
            return Json(mes);
        }
        #endregion

        #region[设备维修记录导出]
        /// <summary>
        /// è®¾å¤‡ç»´ä¿®è®°å½•å¯¼å‡º
        /// </summary>
        /// <param name="wkshopcode">车间编码</param>
        /// <param name="eqpcode">设备编码</param>
        /// <param name="eqpname">设备名称</param>
        /// <param name="reportuser">报修人员</param>
        /// <param name="repairuser">维修人员</param>
        /// <param name="vrifcatuser">验证人员</param>
        /// <param name="reportdate">报修时间</param>
        /// <param name="repairdate">维修时间</param>
        /// <param name="vrifcatdate">验证时间</param>
        /// <returns></returns>
        [Route(template: "DeviceUpdateOutExcel")]
        [HttpGet]
        public JsonResult 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 token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            string reportopendate = "";  //报修开始时间
            string reportclosedate = "";  //报修结束时间
            string repairopendate = "";  //维修开始时间
            string repairclosedate = "";  //维修结束时间
            string vrifcatopendate = "";  //维修验证开始时间
            string vrifcatclosedate = "";  //维修验证结束时间
            if (reportdate != "" && reportdate != null)
            {
                reportopendate = reportdate.Split('~')[0].ToString();
                reportclosedate = reportdate.Split('~')[1].ToString();
            }
            if (repairdate != "" && repairdate != null)
            {
                repairopendate = repairdate.Split('~')[0].ToString();
                repairclosedate = repairdate.Split('~')[1].ToString();
            }
            if (vrifcatdate != "" && vrifcatdate != null)
            {
                vrifcatopendate = vrifcatdate.Split('~')[0].ToString();
                vrifcatclosedate = vrifcatdate.Split('~')[1].ToString();
            }
            mes = DeviceManagerBLL.DeviceUpdateOutExcel(us, wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate);
            return Json(mes);
        }
        #endregion
    }
}

 VueWebCoreApi/DLL/BLL/AppAnalyticsBLL.cs

@@ -16,5 +16,12 @@
            return AppAnalyticsDAL.ProductionKanban(us, startopendate, endclosedate,defecttype);
        }
        #endregion

        #region[App生产进度看板单据信息]
        public static ToMessage ProductionScheduleKanban(User us, string ordertype, string partcode, string startopendate, string endclosedate)
        {
            return AppAnalyticsDAL.ProductionScheduleKanban(us, ordertype, partcode, startopendate, endclosedate);
        }
        #endregion
    }
}

 VueWebCoreApi/DLL/BLL/DeviceManagerBLL.cs

@@ -58,222 +58,6 @@



        #region[设备点检项列表查询]
        public static ToMessage DeviceCheckItemSearch(string checkitemcode, string checkitemname, string checkdescr, string isqrcode, string cycle, int startNum, int endNum, string prop, string order)
        {
            return DeviceManagerDAL.DeviceCheckItemSearch(checkitemcode, checkitemname, checkdescr, isqrcode, cycle, startNum, endNum, prop, order);
        }
        #endregion

        #region[设备点检项新增编辑]
        public static ToMessage AddUpdateDeviceCheckItem(string checkitemid, string checkitemcode, string checkitemname, string checkitemdescr, string cycle, string isqrcode, string usercode, string operType)
        {
            return DeviceManagerDAL.AddUpdateDeviceCheckItem(checkitemid, checkitemcode, checkitemname, checkitemdescr, cycle, isqrcode, usercode, operType);
        }
        #endregion

        #region[设备点检项删除]
        public static ToMessage DeleteDeviceCheckItem(string checkitemcode)
        {
            return DeviceManagerDAL.DeleteDeviceCheckItem(checkitemcode);
        }
        #endregion


        #region[设备保养项列表查询]
        public static ToMessage DeviceMaiItemSearch(string maiitemcode, string maiitemname, string maidescr, string isqrcode, int startNum, int endNum, string prop, string order)
        {
            return DeviceManagerDAL.DeviceMaiItemSearch(maiitemcode, maiitemname, maidescr, isqrcode, startNum, endNum, prop, order);
        }
        #endregion

        #region[设备保养项新增编辑]
        public static ToMessage AddUpdateDeviceMaiItem(string maiitemid, string maiitemcode, string maiitemname, string maiitemdescr, string isqrcode, string usercode, string operType)
        {
            return DeviceManagerDAL.AddUpdateDeviceMaiItem(maiitemid, maiitemcode, maiitemname, maiitemdescr, isqrcode, usercode, operType);
        }
        #endregion

        #region[设备保养项删除]
        public static ToMessage DeleteDeviceMaiItem(string maiitemcode)
        {
            return DeviceManagerDAL.DeleteDeviceMaiItem(maiitemcode);
        }
        #endregion



        #region[设备点检标准列表查询]
        public static ToMessage DeviceCheckStandArdSearch(string stu_torgcode, string stu_torgtypecode, string checkstandcode, string checkstandname, string checkcontr, int startNum, int endNum, string prop, string order)
        {
            return DeviceManagerDAL.DeviceCheckStandArdSearch(stu_torgcode, stu_torgtypecode, checkstandcode, checkstandname, checkcontr, startNum, endNum, prop, order);
        }
        #endregion

        #region[设备点检标准新增、编辑获取检验项目下拉列表]
        public static ToMessage DeviceCheckItemSelect()
        {
            return DeviceManagerDAL.DeviceCheckItemSelect();
        }
        #endregion

        #region[设备点检标准编辑/查看获取数据]
        public static ToMessage ViewDeviceCheckStanedSearch(string checkstand_code)
        {
            return DeviceManagerDAL.ViewDeviceCheckStanedSearch(checkstand_code);
        }
        #endregion

        #region[设备点检标准新增编辑]
        public static ToMessage AddUpdateDeviceCheckStandArd(string opertype, RoutEdit json, string username)
        {
            return DeviceManagerDAL.AddUpdateDeviceCheckStandArd(opertype, json, username);
        }
        #endregion

        #region[设备点检标准删除]
        public static ToMessage DeleteDeviceCheckStaned(string checkstand_code)
        {
            return DeviceManagerDAL.DeleteDeviceCheckStaned(checkstand_code);
        }
        #endregion

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

        #region [设备点检标准关联工作站提交]
        public static ToMessage SaveDeviceCheckStanedAssociationEqp(string stu_torgcode, string stu_torgtypecode, string checkstand_code, string username, List<ObjectData> json)
        {
            return DeviceManagerDAL.SaveDeviceCheckStanedAssociationEqp(stu_torgcode, stu_torgtypecode, checkstand_code, username, json);
        }
        #endregion



        #region[设备保养标准列表查询]
        public static ToMessage DeviceRepairStandArdSearch(string stu_torgcode, string stu_torgtypecode, string repairstandcode, string repairstandname, string repairstanddescr, int startNum, int endNum, string prop, string order)
        {
            return DeviceManagerDAL.DeviceRepairStandArdSearch(stu_torgcode, stu_torgtypecode, repairstandcode, repairstandname, repairstanddescr, startNum, endNum, prop, order);
        }
        #endregion

        #region[设备保养标准新增、编辑获取保养项目下拉列表]
        public static ToMessage DeviceRepairItemSelect()
        {
            return DeviceManagerDAL.DeviceRepairItemSelect();
        }
        #endregion

        #region[设备保养标准编辑/查看获取数据]
        public static ToMessage ViewDeviceRepairStanedSearch(string repairstand_code)
        {
            return DeviceManagerDAL.ViewDeviceRepairStanedSearch(repairstand_code);
        }
        #endregion

        #region[设备保养标准新增编辑]
        public static ToMessage AddUpdateDeviceRepairStandArd(string opertype, EqpRepair json, string username)
        {
            return DeviceManagerDAL.AddUpdateDeviceRepairStandArd(opertype, json, username);
        }
        #endregion

        #region[设备保养标准删除]
        public static ToMessage DeleteDeviceRepairStaned(string repairstand_code)
        {
            return DeviceManagerDAL.DeleteDeviceRepairStaned(repairstand_code);
        }
        #endregion

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

        #region [设备保养标准关联工作站提交]
        public static ToMessage SaveDeviceRepairStanedAssociationEqp(string stu_torgcode, string stu_torgtypecode, string repairstand_code, string username, List<ObjectData> json)
        {
            return DeviceManagerDAL.SaveDeviceRepairStanedAssociationEqp(stu_torgcode, stu_torgtypecode, repairstand_code, username, json);
        }
        #endregion



        #region[设备点检记录查询]
        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(stu_torgcode, description, wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate, startNum, endNum, prop, order);
        }
        #endregion

        #region[设备点检记录明细查询]
        public static ToMessage DeviceCheckSubTakeSearch(string djwo)
        {
            return DeviceManagerDAL.DeviceCheckSubTakeSearch(djwo);
        }
        #endregion

        #region[设备点检记录导出]
        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(stu_torgcode, description, wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate);
        }
        #endregion



        #region[设备保养记录查询]
        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(stu_torgcode, description, wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult, startNum, endNum, prop, order);
        }
        #endregion

        #region[设备保养记录明细查询]
        public static ToMessage DeviceRepairSubTakeSearch(string bywo)
        {
            return DeviceManagerDAL.DeviceRepairSubTakeSearch(bywo);
        }
        #endregion

        #region[设备保养记录导出]
        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(stu_torgcode, description, wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult);
        }
        #endregion



        #region[设备维修记录查询]
        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(stu_torgcode, description, wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate, startNum, endNum, prop, order);
        }
        #endregion

        #region[设备维修记录明细查询]
        public static ToMessage DeviceUpdateSubSearch(string repair_code)
        {
            return DeviceManagerDAL.DeviceUpdateSubSearch(repair_code);
        }
        #endregion

        #region[设备维修记录导出]
        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(stu_torgcode, description, wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate);
        }
        #endregion






@@ -315,11 +99,226 @@
        }
        #endregion

        #region[#region[设备信息删除]]
        #region[设备信息删除]
        public static ToMessage DeleteDeviceManger(string devicecode,User us)
        {
            return DeviceManagerDAL.DeleteDeviceManger(devicecode,us);
        }
        #endregion


        #region[设备点检项列表查询]
        public static ToMessage DeviceCheckItemSearch(string checkitemcode, string checkitemname, string checkdescr, string isqrcode, string cycle, int startNum, int endNum, string prop, string order)
        {
            return DeviceManagerDAL.DeviceCheckItemSearch(checkitemcode, checkitemname, checkdescr, isqrcode, cycle, startNum, endNum, prop, order);
        }
        #endregion

        #region[设备点检项新增编辑]
        public static ToMessage AddUpdateDeviceCheckItem(string checkitemid, string checkitemcode, string checkitemname, string checkitemdescr, string cycle, string isqrcode, User us, string operType)
        {
            return DeviceManagerDAL.AddUpdateDeviceCheckItem(checkitemid, checkitemcode, checkitemname, checkitemdescr, cycle, isqrcode, us, operType);
        }
        #endregion

        #region[设备点检项删除]
        public static ToMessage DeleteDeviceCheckItem(string checkitemcode)
        {
            return DeviceManagerDAL.DeleteDeviceCheckItem(checkitemcode);
        }
        #endregion


        #region[设备保养项列表查询]
        public static ToMessage DeviceMaiItemSearch(string maiitemcode, string maiitemname, string maidescr, string isqrcode, int startNum, int endNum, string prop, string order)
        {
            return DeviceManagerDAL.DeviceMaiItemSearch(maiitemcode, maiitemname, maidescr, isqrcode, startNum, endNum, prop, order);
        }
        #endregion

        #region[设备保养项新增编辑]
        public static ToMessage AddUpdateDeviceMaiItem(string maiitemid, string maiitemcode, string maiitemname, string maiitemdescr, string isqrcode, User us, string operType)
        {
            return DeviceManagerDAL.AddUpdateDeviceMaiItem(maiitemid, maiitemcode, maiitemname, maiitemdescr, isqrcode, us, operType);
        }
        #endregion

        #region[设备保养项删除]
        public static ToMessage DeleteDeviceMaiItem(string maiitemcode)
        {
            return DeviceManagerDAL.DeleteDeviceMaiItem(maiitemcode);
        }
        #endregion



        #region[设备点检标准列表查询]
        public static ToMessage DeviceCheckStandArdSearch(User us, string checkstandcode, string checkstandname, string checkcontr, int startNum, int endNum, string prop, string order)
        {
            return DeviceManagerDAL.DeviceCheckStandArdSearch(us, checkstandcode, checkstandname, checkcontr, startNum, endNum, prop, order);
        }
        #endregion

        #region[设备点检标准新增、编辑获取检验项目下拉列表]
        public static ToMessage DeviceCheckItemSelect()
        {
            return DeviceManagerDAL.DeviceCheckItemSelect();
        }
        #endregion

        #region[设备点检标准编辑/查看获取数据]
        public static ToMessage ViewDeviceCheckStanedSearch(string checkstand_code)
        {
            return DeviceManagerDAL.ViewDeviceCheckStanedSearch(checkstand_code);
        }
        #endregion

        #region[设备点检标准新增编辑]
        public static ToMessage AddUpdateDeviceCheckStandArd(string opertype, RoutEdit json, User us)
        {
            return DeviceManagerDAL.AddUpdateDeviceCheckStandArd(opertype, json, us);
        }
        #endregion

        #region[设备点检标准删除]
        public static ToMessage DeleteDeviceCheckStaned(string checkstand_code)
        {
            return DeviceManagerDAL.DeleteDeviceCheckStaned(checkstand_code);
        }
        #endregion

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

        #region [设备点检标准关联工作站提交]
        public static ToMessage SaveDeviceCheckStanedAssociationEqp(User us, string checkstand_code, List<ObjectData> json)
        {
            return DeviceManagerDAL.SaveDeviceCheckStanedAssociationEqp(us, checkstand_code, json);
        }
        #endregion



        #region[设备保养标准列表查询]
        public static ToMessage DeviceRepairStandArdSearch(User us, string repairstandcode, string repairstandname, string repairstanddescr, int startNum, int endNum, string prop, string order)
        {
            return DeviceManagerDAL.DeviceRepairStandArdSearch(us, repairstandcode, repairstandname, repairstanddescr, startNum, endNum, prop, order);
        }
        #endregion

        #region[设备保养标准新增、编辑获取保养项目下拉列表]
        public static ToMessage DeviceRepairItemSelect()
        {
            return DeviceManagerDAL.DeviceRepairItemSelect();
        }
        #endregion

        #region[设备保养标准编辑/查看获取数据]
        public static ToMessage ViewDeviceRepairStanedSearch(string repairstand_code)
        {
            return DeviceManagerDAL.ViewDeviceRepairStanedSearch(repairstand_code);
        }
        #endregion

        #region[设备保养标准新增编辑]
        public static ToMessage AddUpdateDeviceRepairStandArd(string opertype, EqpRepair json, User us)
        {
            return DeviceManagerDAL.AddUpdateDeviceRepairStandArd(opertype, json, us);
        }
        #endregion

        #region[设备保养标准删除]
        public static ToMessage DeleteDeviceRepairStaned(string repairstand_code)
        {
            return DeviceManagerDAL.DeleteDeviceRepairStaned(repairstand_code);
        }
        #endregion

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

        #region [设备保养标准关联工作站提交]
        public static ToMessage SaveDeviceRepairStanedAssociationEqp(User us, string repairstand_code, List<ObjectData> json)
        {
            return DeviceManagerDAL.SaveDeviceRepairStanedAssociationEqp(us, repairstand_code, json);
        }
        #endregion



        #region[设备点检记录查询]
        public static ToMessage DeviceCheckTakeSearch(User us, 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(us, wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate, startNum, endNum, prop, order);
        }
        #endregion

        #region[设备点检记录明细查询]
        public static ToMessage DeviceCheckSubTakeSearch(string djwo)
        {
            return DeviceManagerDAL.DeviceCheckSubTakeSearch(djwo);
        }
        #endregion

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


        #region[设备保养记录查询]
        public static ToMessage DeviceRepairTakeSearch(User us, 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(us, wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult, startNum, endNum, prop, order);
        }
        #endregion

        #region[设备保养记录明细查询]
        public static ToMessage DeviceRepairSubTakeSearch(string bywo)
        {
            return DeviceManagerDAL.DeviceRepairSubTakeSearch(bywo);
        }
        #endregion

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



        #region[设备维修记录查询]
        public static ToMessage DeviceUpdateSearch(User us, 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(us, wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate, startNum, endNum, prop, order);
        }
        #endregion

        #region[设备维修记录明细查询]
        public static ToMessage DeviceUpdateSubSearch(string repair_code)
        {
            return DeviceManagerDAL.DeviceUpdateSubSearch(repair_code);
        }
        #endregion

        #region[设备维修记录导出]
        public static ToMessage DeviceUpdateOutExcel(User us, 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(us, wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate);
        }
        #endregion

    }
}

 VueWebCoreApi/DLL/DAL/AppAnalyticsDAL.cs

@@ -30,7 +30,7 @@
            try
            {
                //获取当前用户所属组织及所有子节点组织
                mes = TOrganizationRecursion.TOrgCodeSeach("SCB");
                mes = TOrganizationRecursion.TOrgCodeSeach(us.storg_code);
                if (mes.code == "300")
                {
                    return mes;
@@ -78,5 +78,258 @@
            return mes;
        }
        #endregion

        #region[App生产进度看板单据信息]
        public static ToMessage ProductionScheduleKanban(User us, string ordertype, string partcode, string startopendate, string endclosedate)
        {
            Dictionary<object, object> dList = new Dictionary<object, object>();
            List<AppScheduleKanban> list = new List<AppScheduleKanban>();
            var dynamicParams = new DynamicParameters();
            string search = "", search1 = "", sql = "", torg_codelist = "";
            DataTable dt;
            try
            {
                //获取当前用户所属组织及所有子节点组织
                mes = TOrganizationRecursion.TOrgCodeSeachNo(us.storg_code);
                if (mes.code == "300")
                {
                    return mes;
                }
                else
                {
                    torg_codelist = mes.data.ToString(); //获取组织集合
                    string[] torglist = Array.ConvertAll<string, string>(torg_codelist.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string分割转string[] 
                    search1 += " and A.wkshp_code in @wkshp_code ";
                    dynamicParams.Add("@wkshp_code", torglist.ToArray());
                }
                
                //根据查询条件,查找符合要求的单据
                switch (ordertype)
                {
                    case "SO": //按销售订单统计
                        if (partcode != "" && partcode != null)
                        {
                            string[] selects = Array.ConvertAll<string, string>(partcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string分割转string[] 
                            search += " and A.materiel_code in @partcode ";
                            dynamicParams.Add("@partcode", selects.ToArray());
                        }
                        if (startopendate != "" && startopendate != null)
                        {
                            search += " and convert(varchar(100),A.saleOrderDate,21)>=@startopendate and convert(varchar(100),A.saleOrderDate,21)<=@endclosedate ";
                            dynamicParams.Add("@startopendate", startopendate + " 00:00:00");
                            dynamicParams.Add("@endclosedate", endclosedate + " 23:59:59");
                        }
                        //获取单据信息
                        sql = @"select distinct saleOrderCode,A.saleOrderDate,sum(A.saleOrderqty) as saleOrderqty
                                from TKimp_Ewo A 
                                where A.saleOrderCode<>'' " + search + " group by A.saleOrderCode,A.saleOrderDate  order by A.saleOrderDate desc";
                        dt = DapperHelper.selectlist(sql, dynamicParams);
                        if (dt.Rows.Count > 0)
                        {
                            for (int i = 0; i < dt.Rows.Count; i++)
                            {
                                AppScheduleKanban cmp = new AppScheduleKanban();
                                cmp.ordercode = dt.Rows[i]["saleOrderCode"].ToString();
                                cmp.orderqty = dt.Rows[i]["saleOrderqty"].ToString();
                                cmp.children = new List<AppScheduleKanbanSub>();
                                //获取单据下产品完成信息
                                sql = @"select AA.wo,AA.partcode,AA.partname,AA.partspec,AA.saleOrderqty,isnull(BB.good_qty,0) as good_qty  from(
                                        select distinct E.wo,T.partcode,T.partname,T.partspec,sum(E.saleOrderqty) as saleOrderqty   
                                        from TKimp_Ewo E 
                                        left  join TMateriel_Info T on E.materiel_code=T.partcode 
                                        where E.saleOrderCode=@saleOrderCode
                                        group by E.wo,T.partcode,T.partname,T.partspec
                                        ) as AA
                                        left join
                                        (
                                          select M.m_po,sum(S.good_qty) as good_qty    from TK_Wrk_Man M
                                          inner join TK_Wrk_Step S on M.wo_code=S.wo_code 
                                          where  S.isend='Y' and S.good_qty>0
                                          group by M.m_po
                                        ) as BB  on AA.wo=BB.m_po";
                                dynamicParams.Add("@saleOrderCode", dt.Rows[i]["saleOrderCode"].ToString());
                                var data = DapperHelper.selectdata(sql, dynamicParams);
                                decimal good_qty = data.AsEnumerable().Select(d => d.Field<decimal>("good_qty")).Sum();  //报工总数量
                                cmp.ordergoodqty = good_qty.ToString();
                                for (int j = 0; j < data.Rows.Count; j++)
                                {
                                    AppScheduleKanbanSub cbp = new AppScheduleKanbanSub();
                                    cbp.code = data.Rows[j]["partcode"].ToString();
                                    cbp.name = data.Rows[j]["partname"].ToString();
                                    cbp.spec = data.Rows[j]["partspec"].ToString();
                                    cbp.planqty = data.Rows[j]["saleOrderqty"].ToString();
                                    cbp.goodqty = data.Rows[j]["good_qty"].ToString();
                                    cmp.children.Add(cbp);
                                }
                                list.Add(cmp);
                            }
                            mes.code = "200";
                            mes.message = "success!";
                            mes.data = list;
                            return mes;
                        }
                        else
                        {
                            mes.code = "300";
                            mes.count = 0;
                            mes.message = "无符合要求单据！";
                            mes.data = null;
                        }
                        break;
                    case "MO": //按生产订单统计
                        if (partcode != "" && partcode != null)
                        {
                            string[] selects = Array.ConvertAll<string, string>(partcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string分割转string[] 
                            search += " and A.materiel_code in @partcode ";
                            dynamicParams.Add("@partcode", selects.ToArray());
                        }
                        if (startopendate != "" && startopendate != null)
                        {
                            search += " and convert(varchar(100),A.createdate,21)>=@startopendate and convert(varchar(100),A.createdate,21)<=@endclosedate ";
                            dynamicParams.Add("@startopendate", startopendate + " 00:00:00");
                            dynamicParams.Add("@endclosedate", endclosedate + " 23:59:59");
                        }
                        //获取单据信息
                        sql = @"select distinct A.wo,A.createdate,sum(A.qty) as orderqty
                                from TKimp_Ewo A  
                                where 1=1  " + search + " group by A.wo,A.createdate  order by A.createdate desc";
                        dt = DapperHelper.selectlist(sql, dynamicParams);
                        if (dt.Rows.Count > 0)
                        {
                            for (int i = 0; i < dt.Rows.Count; i++)
                            {
                                AppScheduleKanban cmp = new AppScheduleKanban();
                                cmp.ordercode = dt.Rows[i]["wo"].ToString();
                                cmp.orderqty = dt.Rows[i]["orderqty"].ToString();
                                cmp.children = new List<AppScheduleKanbanSub>();
                                //获取单据下产品完成信息
                                sql = @"select distinct E.wo,T.partcode,T.partname,T.partspec,sum(E.qty) as orderqty,isnull(BB.good_qty,0) as good_qty   
                                        from TKimp_Ewo E 
                                        left  join TMateriel_Info T on E.materiel_code=T.partcode 
                                        left  join (
                                          select M.m_po,sum(S.good_qty) as good_qty    from TK_Wrk_Man M
                                          inner join TK_Wrk_Step S on M.wo_code=S.wo_code 
                                          where  S.isend='Y' and S.good_qty>0
                                          group by M.m_po
                                        ) as BB  on E.wo=BB.m_po
                                        where E.wo=@wo
                                        group by E.wo,T.partcode,T.partname,T.partspec,BB.good_qty";
                                dynamicParams.Add("@wo", dt.Rows[i]["wo"].ToString());
                                var data = DapperHelper.selectdata(sql, dynamicParams);
                                decimal good_qty = data.AsEnumerable().Select(d => d.Field<decimal>("good_qty")).Sum();  //报工总数量
                                cmp.ordergoodqty = good_qty.ToString();
                                for (int j = 0; j < data.Rows.Count; j++)
                                {
                                    AppScheduleKanbanSub cbp = new AppScheduleKanbanSub();
                                    cbp.code = data.Rows[j]["partcode"].ToString();
                                    cbp.name = data.Rows[j]["partname"].ToString();
                                    cbp.spec = data.Rows[j]["partspec"].ToString();
                                    cbp.planqty = data.Rows[j]["orderqty"].ToString();
                                    cbp.goodqty = data.Rows[j]["good_qty"].ToString();
                                    cmp.children.Add(cbp);
                                }
                                list.Add(cmp);
                            }
                            mes.code = "200";
                            mes.message = "success!";
                            mes.data = list;
                            return mes;
                        }
                        else
                        {
                            mes.code = "300";
                            mes.count = 0;
                            mes.message = "无符合要求单据！";
                            mes.data = null;
                        }
                        break;
                    case "PO": //按生产工单统计
                        if (partcode != "" && partcode != null)
                        {
                            string[] selects = Array.ConvertAll<string, string>(partcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string分割转string[] 
                            search += " and A.materiel_code in @partcode ";
                            dynamicParams.Add("@partcode", selects.ToArray());
                        }
                        if (startopendate != "" && startopendate != null)
                        {
                            search += " and convert(varchar(100),A.lm_date,21)>=@startopendate and convert(varchar(100),A.lm_date,21)<=@endclosedate ";
                            dynamicParams.Add("@startopendate", startopendate + " 00:00:00");
                            dynamicParams.Add("@endclosedate", endclosedate + " 23:59:59");
                        }
                        //获取单据信息
                        sql = @"select distinct A.wo_code,T.partcode,T.partname,T.partspec,A.lm_date,sum(A.plan_qty) as orderqty
                                from TK_Wrk_Man A  
                                left  join TMateriel_Info T on A.materiel_code=T.partcode
                                where 1=1 " + search + search1 + " group by A.wo_code,T.partcode,T.partname,T.partspec,A.lm_date  order by A.lm_date desc";
                        dt = DapperHelper.selectlist(sql, dynamicParams);
                        if (dt.Rows.Count > 0)
                        {
                            for (int i = 0; i < dt.Rows.Count; i++)
                            {
                                AppScheduleKanban cmp = new AppScheduleKanban();
                                cmp.ordercode = dt.Rows[i]["wo_code"].ToString();
                                cmp.partcode = dt.Rows[i]["partcode"].ToString();
                                cmp.partname = dt.Rows[i]["partname"].ToString();
                                cmp.partspec = dt.Rows[i]["partspec"].ToString();
                                cmp.orderqty = dt.Rows[i]["orderqty"].ToString();
                                cmp.children = new List<AppScheduleKanbanSub>();
                                //获取单据下产品完成信息
                                sql = @"select M.wo_code,T.stepcode,T.stepname,S.plan_qty,S.good_qty,S.isend    
                                        from TK_Wrk_Man M
                                        inner join TK_Wrk_Step S on M.wo_code=S.wo_code 
                                        left  join TStep T on S.step_code=T.stepcode
                                        where  M.wo_code=@wo_code
                                        order by S.seq ";
                                dynamicParams.Add("@wo_code", dt.Rows[i]["wo_code"].ToString());
                                var data = DapperHelper.selectdata(sql, dynamicParams);
                                if (data.Rows.Count > 0)
                                {
                                    cmp.ordergoodqty = data.AsEnumerable().Where(t => t.Field<string>("isend") == "Y").ToList().Select(c => c.Field<decimal>("good_qty")).First().ToString();
                                    for (int j = 0; j < data.Rows.Count; j++)
                                    {
                                        AppScheduleKanbanSub cbp = new AppScheduleKanbanSub();
                                        cbp.code = data.Rows[j]["stepcode"].ToString();
                                        cbp.name = data.Rows[j]["stepname"].ToString();
                                        cbp.spec = data.Rows[j]["isend"].ToString();
                                        cbp.planqty = data.Rows[j]["plan_qty"].ToString();
                                        cbp.goodqty = data.Rows[j]["good_qty"].ToString();
                                        cmp.children.Add(cbp);
                                    }
                                    list.Add(cmp);
                                }
                                else
                                {
                                    cmp.ordergoodqty = "0";
                                    list.Add(cmp);
                                }
                            }
                            mes.code = "200";
                            mes.message = "success!";
                            mes.data = list;
                            return mes;
                        }
                        else
                        {
                            mes.code = "300";
                            mes.count = 0;
                            mes.message = "无符合要求单据！";
                            mes.data = null;
                        }
                        break;
                    default:
                        break;
                }
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion

    }
}

 VueWebCoreApi/DLL/DAL/DeviceManagerDAL.cs

ÎļþÌ«´ó

 VueWebCoreApi/DLL/DAL/QualityManagementDAL.cs

@@ -784,6 +784,31 @@
                        ordercode = arra[0]; //获取指定字符串前面的字符
                        stepcode = arra[1]; //获取指定字符串前面的字符
                    }
                    //0.判断当前条码工序任务不存在
                    sql = @"select *   from TK_Wrk_Step where wo_code=@ordercode and step_code=@step_code";
                    dynamicParams.Add("@ordercode", ordercode);
                    dynamicParams.Add("@step_code", stepcode);
                    var da1 = DapperHelper.selectdata(sql, dynamicParams);
                    if (da1.Rows.Count <= 0)
                    {
                        mes.code = "300";
                        mes.count = 0;
                        mes.message = "当前条码,工序任务不存在,请联系管理员!";
                        mes.data = null;
                        return mes;
                    }
                    //判断当前工单是否关闭
                    sql = @"select *   from TK_Wrk_Man where wo_code=@ordercode  and status='CLOSED'";
                    dynamicParams.Add("@ordercode", ordercode);
                    var da0 = DapperHelper.selectdata(sql, dynamicParams);
                    if (da0.Rows.Count > 0)
                    {
                        mes.code = "300";
                        mes.count = 0;
                        mes.message = "当前工单已关闭,不允许检验操作!";
                        mes.data = null;
                        return mes;
                    }                 
                    //通过扫描二维码信息查找任务信息
                    sql = @"select A.wo_code,A.good_qty,M.partcode,M.partname,M.partspec,M.idinventoryclass as stocktype_code,S.stepcode,S.stepname  
                            from TK_Wrk_Step A

 VueWebCoreApi/Tools/TOrganizationRecursion.cs

@@ -10,9 +10,9 @@
    {
        public static ToMessage mes = new ToMessage(); //定义全局返回信息对象

        #region [根据当前组织编码获取所有子节点组织(包含自身)]
        #region [根据当前组织编码获取所有子节点组织(包含自身,带单引号)]
        /// <summary>
        /// æ ¹æ®å½“前组织编码获取所有子节点组织(包含自身)
        /// æ ¹æ®å½“前组织编码获取所有子节点组织(包含自身,带单引号)
        /// </summary>
        /// <param name="torg_code">组织编码</param>
        /// <returns></returns>
@@ -60,5 +60,56 @@
            return mes;
        }
        #endregion

        #region [根据当前组织编码获取所有子节点组织(包含自身,不带单引号)]
        /// <summary>
        /// æ ¹æ®å½“前组织编码获取所有子节点组织(包含自身,不带单引号)
        /// </summary>
        /// <param name="torg_code">组织编码</param>
        /// <returns></returns>
        public static ToMessage TOrgCodeSeachNo(string torg_code)
        {
            string sql;
            var dynamicParams = new DynamicParameters();
            try
            {
                sql = @" WITH RecursiveCTE AS (
                      SELECT id, parent_id, torg_code, torg_name, status, leve, torg_seq 
                      FROM TOrganization 
                      WHERE torg_code = @torg_code
                      UNION ALL 
                      SELECT o.id, o.parent_id, o.torg_code, o.torg_name, o.status, o.leve, o.torg_seq 
                      FROM TOrganization o 
                      INNER JOIN RecursiveCTE r ON r.torg_code = o.parent_id 
                  ) 
                  SELECT STUFF((SELECT ',' + torg_code FROM RecursiveCTE 
                  FOR XML PATH('')), 1, 1, '') AS torg_codelist";
                dynamicParams.Add("@torg_code", torg_code);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                if (data.Rows.Count > 0 && data.Rows[0]["torg_codelist"].ToString() != null)
                {
                    mes.code = "200";
                    mes.count = 0;
                    mes.message = "查询成功!";
                    mes.data = data.Rows[0]["torg_codelist"].ToString();
                }
                else
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.message = "当前用户所属组织编码【" + torg_code + "】不存在!";
                    mes.data = null;
                }
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion
    }
}

 VueWebCoreApi/wwwroot/AppMenuImage/app_2_5.png

 VueWebCoreApi/wwwroot/AppMenuImage/app_4.png

 VueWebCoreApi/wwwroot/AppMenuImage/app_4_1.png

 VueWebCoreApi/wwwroot/AppMenuImage/app_4_2.png

 VueWebCoreApi/wwwroot/AppMenuImage/app_4_3.png

 VueWebCoreApi/wwwroot/AppMenuImage/app_4_4.png

 VueWebCoreApi/wwwroot/AppMenuImage/app_4_5.png

 VueWebCoreApi/wwwroot/AppMenuImage/app_6.png

 VueWebCoreApi/wwwroot/AppMenuImage/app_6_1.png

 VueWebCoreApi/wwwroot/AppMenuImage/app_6_10.png

 VueWebCoreApi/wwwroot/AppMenuImage/app_6_11.png

 VueWebCoreApi/wwwroot/AppMenuImage/app_6_12.png

 VueWebCoreApi/wwwroot/AppMenuImage/app_6_13.png

 VueWebCoreApi/wwwroot/AppMenuImage/app_6_14.png

 VueWebCoreApi/wwwroot/AppMenuImage/app_6_2.png

 VueWebCoreApi/wwwroot/AppMenuImage/app_6_3.png

 VueWebCoreApi/wwwroot/AppMenuImage/app_6_4.png

 VueWebCoreApi/wwwroot/AppMenuImage/app_6_5.png

 VueWebCoreApi/wwwroot/AppMenuImage/app_6_6.png

 VueWebCoreApi/wwwroot/AppMenuImage/app_6_7.png

 VueWebCoreApi/wwwroot/AppMenuImage/app_6_8.png

 VueWebCoreApi/wwwroot/AppMenuImage/app_6_9.png

 VueWebCoreApi/wwwroot/AppMenuImage/app_8.png

 VueWebCoreApi/wwwroot/AppMenuImage/app_8_1.png

 VueWebCoreApi/wwwroot/AppMenuImage/app_8_2.png