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

ch

2021-11-25 0ecb3de2e8c6f26848b0891fdf28be4d98da5776

 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();