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

jhz

2022-07-26 1f49f98a07ae1c31a1967c5c36b382d6c855becd

 WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs

@@ -45,15 +45,12 @@
                }

                ds = Sb_EquipRepairWorkBill_s(sWhere);
               
                   
              
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "返回记录成功！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "返回记录成功！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception ex)
            {
@@ -71,12 +68,12 @@
        {
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairWorkBillList "+sWhere+ "order by hmainid desc", "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+ "order by hmainid desc";
                string sql = sql1 + sWhere+ " order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sb_EquipRepairWorkBillList");
            }
            
@@ -106,12 +103,12 @@
                }

                ds = Sb_EquipRepairCheckWorkBill_s(sWhere);

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "返回记录成功！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;

            }
            catch (Exception ex)
            {
@@ -134,7 +131,7 @@
            else
            {
                string sql1 = "select * from h_v_Sb_EquipRepairCheckBillList where 1 = 1 ";
                string sql = sql1 + sWhere+ "order by hmainid desc";
                string sql = sql1 + sWhere+ " order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sb_EquipRepairCheckBillList");
            }
            
@@ -164,6 +161,7 @@
                }

                ds = Sb_EqpConkBookBillList_s(sWhere);

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "返回记录成功！";
@@ -187,12 +185,12 @@
        {
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipConkBookBillList order by hmainid desc" + sWhere, "h_v_Sb_EquipConkBookBillList");
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipConkBookBillList order by hmainid desc" , "h_v_Sb_EquipConkBookBillList");
            }
            else
            {
                string sql1 = "select * from h_v_Sb_EquipConkBookBillList where 1 = 1 ";
                string sql = sql1 + sWhere+ "order by hmainid desc";
                string sql = sql1 + sWhere+ " order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sb_EquipConkBookBillList");
            }
        }