修改单据重复显示问题，增加工单源单id关联

yl

2024-03-29 9c634fd767aec36ef97c3a814bf7a29c67d20ee1

 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
@@ -413,9 +417,11 @@
        [HttpGet]
        public HttpResponseMessage DeviceCheckStandArdSearch(int page, int rows, string prop, string order,string checkstandcode = null, string checkstandname = null, string checkcontr = 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 = DeviceManagerBLL.DeviceCheckStandArdSearch(checkstandcode, checkstandname, checkcontr, startNum, endNum, prop, order);
            mes = DeviceManagerBLL.DeviceCheckStandArdSearch(stu_torgcode, stu_torgtypecode,checkstandcode, checkstandname, checkcontr, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -491,7 +497,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
@@ -507,8 +515,10 @@
        [HttpPost]
        public HttpResponseMessage SaveDeviceCheckStanedAssociationEqp(string checkstand_code, List<ObjectData> json)
        {
            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 = DeviceManagerBLL.SaveDeviceCheckStanedAssociationEqp(checkstand_code, username, json);
            mes = DeviceManagerBLL.SaveDeviceCheckStanedAssociationEqp(stu_torgcode, stu_torgtypecode,checkstand_code, username, json);
            return TJson.toJson(mes);
        }
        #endregion
@@ -531,9 +541,11 @@
        [HttpGet]
        public HttpResponseMessage DeviceRepairStandArdSearch(int page, int rows, string prop, string order,string repairstandcode = null, string repairstandname = null, string repairstanddescr = 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 = DeviceManagerBLL.DeviceRepairStandArdSearch(repairstandcode, repairstandname, repairstanddescr, startNum, endNum, prop, order);
            mes = DeviceManagerBLL.DeviceRepairStandArdSearch(stu_torgcode, stu_torgtypecode,repairstandcode, repairstandname, repairstanddescr, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -609,7 +621,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
@@ -625,13 +639,288 @@
        [HttpPost]
        public HttpResponseMessage SaveDeviceRepairStanedAssociationEqp(string repairstand_code, List<ObjectData> json)
        {
            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 = DeviceManagerBLL.SaveDeviceRepairStanedAssociationEqp(repairstand_code, username, json);
            mes = DeviceManagerBLL.SaveDeviceRepairStanedAssociationEqp(stu_torgcode, stu_torgtypecode, 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)
        {
            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)
            {
                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(stu_torgcode, description,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

        #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 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)
            {
                checkopendate = checkdate.Split('~')[0].ToString();
                checkclosedate = checkdate.Split('~')[1].ToString();
            }
            mes = DeviceManagerBLL.DeviceCheckTakeOutExcel(stu_torgcode, description,wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate);
            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="repairuser">保养人员</param>
        /// <param name="repairdate">保养时间</param>
        /// <param name="repairresult">保养结果</param>
        /// <param name="page">页码</param>
        /// <param name="rows">每页显示条数</param>
        /// <param name="prop">排序字段</param>
        /// <param name="order">排序规则</param>
        /// <returns></returns>
        [Route(template: "DeviceRepairTakeSearch")]
        [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)
            {
                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(stu_torgcode, description, wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion

        #region[设备保养记录明细查询]
        /// <summary>
        /// 设备保养记录明细查询
        /// </summary>
        /// <param name="bywo">设备保养单号</param>
        /// <returns></returns>
        [Route(template: "DeviceRepairSubTakeSearch")]
        [HttpGet]
        public HttpResponseMessage DeviceRepairSubTakeSearch(string bywo)
        {
            mes = DeviceManagerBLL.DeviceRepairSubTakeSearch(bywo);
            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="repairuser">保养人员</param>
        /// <param name="repairdate">保养时间</param>
        /// <param name="repairresult">保养结果</param>
        /// <returns></returns>
        [Route(template: "DeviceRepairTakeOutExcel")]
        [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)
            {
                repairopendate = repairdate.Split('~')[0].ToString();
                repairclosedate = repairdate.Split('~')[1].ToString();
            }
            mes = DeviceManagerBLL.DeviceRepairTakeOutExcel(stu_torgcode, description,wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult);
            return TJson.toJson(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 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 = "";  //维修开始时间
            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(stu_torgcode, description,wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion

        #region[设备维修记录明细查询]
        /// <summary>
        /// 设备维修记录明细查询
        /// </summary>
        /// <param name="repair_code">设备维修单号</param>
        /// <returns></returns>
        [Route(template: "DeviceUpdateSubSearch")]
        [HttpGet]
        public HttpResponseMessage DeviceUpdateSubSearch(string repair_code)
        {
            mes = DeviceManagerBLL.DeviceUpdateSubSearch(repair_code);
            return TJson.toJson(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 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 = "";  //维修开始时间
            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(stu_torgcode, description,wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate);
            return TJson.toJson(mes);
        }
        #endregion
    }
}