设备点检记录功能、大岛车间综合看板接口变更、工单批量关闭查询，提交

yl

2022-09-05 6b8782c6810660751b40d284d40ea7a13656c5b7

 VueWebApi/Controllers/DeviceManagerController.cs

@@ -14,6 +14,7 @@
{
    [RoutePrefix(prefix: "api/DeviceManager")]
    [ControllerGroup("设备管理", "在线接口")]
    [ChannelActionFilter]
    public class DeviceManagerController : ApiController
    {
        //定义全局信息返回变量
@@ -285,7 +286,7 @@
        /// <returns></returns>
        [Route(template: "DeviceCheckItemSearch")]
        [HttpGet]
        public HttpResponseMessage DeviceCheckItemSearch(string checkitemcode = null, string checkitemname = null, string checkdescr = null, string isqrcode = null,string cycle=null, int page = 0, int rows = 0, string prop = null, string order = null)
        public HttpResponseMessage 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
@@ -342,7 +343,6 @@
        /// <param name="maiitemname">保养部位名称</param>
        /// <param name="maidescr">保养要求</param>
        /// <param name="isqrcode">选中扫码</param>
        /// <param name="cycle">保养周期</param>
        /// <param name="page">页码</param>
        /// <param name="rows">每页显示条数</param>
        /// <param name="prop">排序字段</param>
@@ -350,11 +350,11 @@
        /// <returns></returns>
        [Route(template: "DeviceMaiItemSearch")]
        [HttpGet]
        public HttpResponseMessage DeviceMaiItemSearch(string maiitemcode = null, string maiitemname = null, string maidescr = null, string isqrcode = null, string cycle = null, int page = 0, int rows = 0, string prop = null, string order = null)
        public HttpResponseMessage 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, cycle, startNum, endNum, prop, order);
            mes = DeviceManagerBLL.DeviceMaiItemSearch(maiitemcode, maiitemname, maidescr, isqrcode, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -373,11 +373,10 @@
            string maiitemcode = obj["maiitemcode"].ToString(); //设备保养部位编码
            string maiitemname = obj["maiitemname"].ToString(); //设备保养部位名称
            string maiitemdescr = obj["maiitemdescr"].ToString(); //设备保养部位要求
            string cycle = obj["cycle"].ToString(); //设备点检部位周期
            string isqrcode = obj["isqrcode"].ToString(); //是否扫码
            var usercode = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
            string OperType = obj["OperType"].ToString();  //操作类型
            mes = DeviceManagerBLL.AddUpdateDeviceMaiItem(maiitemid, maiitemcode, maiitemname, maiitemdescr, cycle, isqrcode, usercode, OperType);
            mes = DeviceManagerBLL.AddUpdateDeviceMaiItem(maiitemid, maiitemcode, maiitemname, maiitemdescr, isqrcode, usercode, OperType);
            return TJson.toJson(mes);
        }
        #endregion
@@ -412,7 +411,7 @@
        /// <returns></returns>
        [Route(template: "DeviceCheckStandArdSearch")]
        [HttpGet]
        public HttpResponseMessage DeviceCheckStandArdSearch(string checkstandcode = null, string checkstandname = null, string checkcontr = null,int page = 0, int rows = 0, string prop = null, string order = null)
        public HttpResponseMessage DeviceCheckStandArdSearch(int page, int rows, string prop, string order,string checkstandcode = null, string checkstandname = null, string checkcontr = null)
        {
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
@@ -482,5 +481,204 @@
        }
        #endregion

        #region[设备点检标准关联工作站查询]
        /// <summary>
        /// 设备点检标准关联工作站查询
        /// </summary>
        /// <param name="checkstand_code">设备点检标准编码</param>
        /// <returns></returns>
        [Route(template: "DeviceCheckStanedAssociationEqp")]
        [HttpGet]
        public HttpResponseMessage DeviceCheckStanedAssociationEqp(string checkstand_code)
        {
            mes = DeviceManagerBLL.DeviceCheckStanedAssociationEqp(checkstand_code);
            return TJson.toJson(mes);
        }
        #endregion

        #region [设备点检标准关联工作站提交]
        /// <summary>
        /// 设备点检标准关联工作站提交
        /// </summary>
        /// <param name="checkstand_code">设备点检标准编码</param>
        /// <param name="json">提交数据</param>
        /// <returns></returns>
        [Route(template: "SaveDeviceCheckStanedAssociationEqp")]
        [HttpPost]
        public HttpResponseMessage SaveDeviceCheckStanedAssociationEqp(string checkstand_code, List<ObjectData> json)
        {
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = DeviceManagerBLL.SaveDeviceCheckStanedAssociationEqp(checkstand_code, username, json);
            return TJson.toJson(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 HttpResponseMessage DeviceRepairStandArdSearch(int page, int rows, string prop, string order,string repairstandcode = null, string repairstandname = null, string repairstanddescr = null)
        {
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = DeviceManagerBLL.DeviceRepairStandArdSearch(repairstandcode, repairstandname, repairstanddescr, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion

        #region[设备保养标准新增、编辑获取保养项目下拉列表]
        /// <summary>
        /// 设备保养标准新增、编辑获取保养项目下拉列表
        /// </summary>
        /// <returns></returns>
        [Route(template: "DeviceRepairItemSelect")]
        [HttpGet]
        public HttpResponseMessage DeviceRepairItemSelect()
        {
            mes = DeviceManagerBLL.DeviceRepairItemSelect();
            return TJson.toJson(mes);
        }
        #endregion

        #region[设备保养标准编辑/查看获取数据]
        /// <summary>
        /// 设备保养标准编辑/查看获取数据
        /// </summary>
        /// <param name="repairstand_code">设备保养标准编码</param>
        /// <returns></returns>
        [Route(template: "ViewDeviceRepairStanedSearch")]
        [HttpPost]
        public HttpResponseMessage ViewDeviceRepairStanedSearch(string repairstand_code)
        {
            mes = DeviceManagerBLL.ViewDeviceRepairStanedSearch(repairstand_code);
            return TJson.toJson(mes);
        }
        #endregion

        #region[设备保养标准新增编辑]
        /// <summary>
        /// 设备保养标准新增编辑
        /// </summary>
        /// <param name="opertype">操作类型</param>
        /// <param name="json">提交数据</param>
        /// <returns></returns>
        [Route(template: "AddUpdateDeviceRepairStandArd")]
        [HttpPost]
        public HttpResponseMessage AddUpdateDeviceRepairStandArd(string opertype, EqpRepair json)
        {
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = DeviceManagerBLL.AddUpdateDeviceRepairStandArd(opertype, json, username);
            return TJson.toJson(mes);
        }
        #endregion

        #region[设备保养标准删除]
        /// <summary>
        /// 设备保养标准删除
        /// </summary>
        /// <param name="repairstand_code">设备保养标准编码</param>
        /// <returns></returns>
        [Route(template: "DeleteDeviceRepairStaned")]
        [HttpPost]
        public HttpResponseMessage DeleteDeviceRepairStaned(string repairstand_code)
        {
            mes = DeviceManagerBLL.DeleteDeviceRepairStaned(repairstand_code);
            return TJson.toJson(mes);
        }
        #endregion

        #region[设备保养标准关联工作站查询]
        /// <summary>
        /// 设备保养标准关联工作站查询
        /// </summary>
        /// <param name="repairstand_code">设备保养标准编码</param>
        /// <returns></returns>
        [Route(template: "DeviceRepairStanedAssociationEqp")]
        [HttpGet]
        public HttpResponseMessage DeviceRepairStanedAssociationEqp(string repairstand_code)
        {
            mes = DeviceManagerBLL.DeviceRepairStanedAssociationEqp(repairstand_code);
            return TJson.toJson(mes);
        }
        #endregion

        #region [设备保养标准关联工作站提交]
        /// <summary>
        /// 设备保养标准关联工作站提交
        /// </summary>
        /// <param name="repairstand_code">设备保养标准编码</param>
        /// <param name="json">提交数据</param>
        /// <returns></returns>
        [Route(template: "SaveDeviceRepairStanedAssociationEqp")]
        [HttpPost]
        public HttpResponseMessage SaveDeviceRepairStanedAssociationEqp(string repairstand_code, List<ObjectData> json)
        {
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = DeviceManagerBLL.SaveDeviceRepairStanedAssociationEqp(repairstand_code, username, json);
            return TJson.toJson(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>
        /// <param name="page">页码</param>
        /// <param name="rows">每页显示条数</param>
        /// <param name="prop">排序字段</param>
        /// <param name="order">排序规则</param>
        /// <returns></returns>
        [Route(template: "DeviceCheckTakeSearch")]
        [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)
        {
            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(wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion

        #region[设备保养记录明细查询]
        /// <summary>
        /// 设备保养记录明细查询
        /// </summary>
        /// <param name="djwo">设备点检单号</param>
        /// <returns></returns>
        [Route(template: "DeviceCheckSubTakeSearch")]
        [HttpGet]
        public HttpResponseMessage DeviceCheckSubTakeSearch(string djwo)
        {
            mes = DeviceManagerBLL.DeviceCheckSubTakeSearch(djwo);
            return TJson.toJson(mes);
        }
        #endregion

    }
}