Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

jingh

2021-11-18 c9b9cff93130a51deac36c49372ab0d3f5b5b5ff

 WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs

@@ -63,12 +63,12 @@
        {
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairWorkBillList "+sWhere, "h_v_Sb_EquipRepairWorkBillList");
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairWorkBillList "+sWhere+ "order by hmainid desc", "h_v_Sb_EquipRepairWorkBillList");
            }
            else
            {
                string sql1 = "select * from h_v_Sb_EquipRepairWorkBillList where 1 = 1 ";
                string sql = sql1 + sWhere;
                string sql = sql1 + sWhere+ "order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sb_EquipRepairWorkBillList");
            }
            
@@ -113,12 +113,12 @@
        {
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairCheckBillList" + sWhere, "h_v_Sb_EquipRepairCheckBillList");
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairCheckBillList" + sWhere+ "order by hmainid desc", "h_v_Sb_EquipRepairCheckBillList");
            }
            else
            {
                string sql1 = "select * from h_v_Sb_EquipRepairCheckBillList where 1 = 1 ";
                string sql = sql1 + sWhere;
                string sql = sql1 + sWhere+ "order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sb_EquipRepairCheckBillList");
            }
            
@@ -163,12 +163,12 @@
        {
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipConkBookBillList" + sWhere, "h_v_Sb_EquipConkBookBillList");
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipConkBookBillList order by hmainid desc" + sWhere, "h_v_Sb_EquipConkBookBillList");
            }
            else
            {
                string sql1 = "select * from h_v_Sb_EquipConkBookBillList where 1 = 1 ";
                string sql = sql1 + sWhere;
                string sql = sql1 + sWhere+ "order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sb_EquipConkBookBillList");
            }
        }
@@ -184,9 +184,9 @@
        /// </summary>
        /// <param name="msg"></param>
        /// <returns></returns>
        [Route("Sb_EqpRepairWorkBill/SaveGetEqpRepairWorkBillList")]
        [Route("Sb_EqpRepairWorkBill/SaveGetEqpRepairWorkBillWebList")]
        [HttpPost]
        public object SaveGetMouldRepairWorkBillList([FromBody] JObject msg)
        public object SaveGetEqpRepairWorkBillWebList([FromBody] JObject msg)
        {
            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
@@ -879,7 +879,7 @@
        }
        #endregion

        #region[设备维修验收列表编辑时获取表头数据]
        #region[设备故障登记列表编辑时获取表头数据]
        [Route("Sb_EqpRepairWorkBill/Sb_EqpConkBookBillListCheckDetai")]
        [HttpGet]
        public ApiResult<DataSet> Sb_EqpConkBookBillListCheckDetai(string HID)
@@ -894,7 +894,7 @@
        }
        #endregion

        #region[设备维修列表编辑时获取表体数据]
        #region[设备故障登记列表编辑时获取表体数据]
        [Route("Sb_EqpRepairWorkBill/Sb_EqpConkBookBillListProjectDetai")]
        [HttpGet]
        public object Sb_EqpConkBookBillListProjectDetai(string sqlWhere)
@@ -935,9 +935,9 @@
        }
        #endregion

        #region [设备维修单删除功能]
        #region [设备故障登记单删除功能]
        /// <summary>
        /// 模具维修单删除功能
        /// 设备故障登记单删除功能
        /// </summary>
        /// <returns></returns>
        [Route("Sb_EqpRepairWorkBill/DeltetEqpConkBookBill")]