1

wtt

2026-04-10 fae58e2951ccf415ad8e8098ca49f5611e410dd3

 WebAPI/Controllers/QC_ManagementController.cs

@@ -108,6 +108,51 @@
        /// <returns></returns>
        [Route("QC_Management/MES_QC_CheckProjectList_Json_Main")]
        [HttpGet]
        public object MES_QC_CheckProjectList_Json_Main2(string sWhere, string user, int page = -1, int size = -1)
        {
            if(page == -1 || size == -1)
            {
                return MES_QC_CheckProjectList_Json_Main(sWhere, user);
            }
            DataSet ds;
            try
            {
                //判断权限
                if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckProject_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查询权限";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn($@"select  * from h_v_Gy_QCCheckProjectList_Main  order by 日期 desc,单据号 DESC 
                    offset {(page-1)*size} rows fetch {size} rows only
                    ", "h_v_Gy_QCCheckProjectList_Main");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_QCCheckProjectList_Main where 1=1";
                    string sql = sql1 + sWhere + $" order by 日期 desc,单据号 DESC offset {(page-1)*size} rows fetch {size} rows only ";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_QCCheckProjectList_Main");
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
            return GetObjectJson(ds);
        }


        public object MES_QC_CheckProjectList_Json_Main(string sWhere, string user)
        {
            DataSet ds;
@@ -126,12 +171,12 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select  * from h_v_Gy_QCCheckProjectList_Main  order by 日期 desc ", "h_v_Gy_QCCheckProjectList_Main");
                    ds = oCN.RunProcReturn("select  * from h_v_Gy_QCCheckProjectList_Main  order by 日期 desc,单据号 DESC ", "h_v_Gy_QCCheckProjectList_Main");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_QCCheckProjectList_Main where 1=1";
                    string sql = sql1 + sWhere + " order by 日期 desc ";
                    string sql = sql1 + sWhere + " order by 日期 desc,单据号 DESC ";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_QCCheckProjectList_Main");
                }
            }
@@ -297,13 +342,13 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sqlWhere == null || sqlWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select top 500 * from h_v_QC_PatrolProcCheckBillList where  关闭人='' order by hmainid desc ", "h_v_QC_PatrolProcCheckBillList");
                    ds = oCN.RunProcReturn("select top 500 * from h_v_QC_PatrolProcCheckBillMainList where  关闭人='' order by hmainid desc ", "h_v_QC_PatrolProcCheckBillMainList");
                }
                else
                {
                    string sql1 = "select * from h_v_QC_PatrolProcCheckBillList where 关闭人='' ";
                    string sql1 = "select * from h_v_QC_PatrolProcCheckBillMainList where 关闭人='' ";
                    string sql = sql1 + sqlWhere+ " order by 制单日期 desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_QC_PatrolProcCheckBillList");
                    ds = oCN.RunProcReturn(sql, "h_v_QC_PatrolProcCheckBillMainList");
                }
            }
            catch (Exception e)
@@ -1353,8 +1398,21 @@
                {
                    //判断单据是否已经审核
                    DataSet ds;
                    string sql = "select * from  Gy_QCCheckProjectMain  where HInterID = " + HInterID;
                    string sql;
                    if(HInterID=="0")
                    {
                        sql = "select top 1 * from  Gy_QCCheckProjectMain  order by HInterID desc";
                        
                    }
                    else
                     sql = "select * from  Gy_QCCheckProjectMain  where HInterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, oBill.MvarItemKey);
                    if(ds!=null)
                    {
                        oBill.omodel.HInterID = Convert.ToInt64(ds.Tables[0].Rows[0]["HInterID"]);
                        HInterID = Convert.ToInt64(ds.Tables[0].Rows[0]["HInterID"]).ToString();
                    }
                    
                    if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
                    {
                        objJsonResult.code = "0";
@@ -2119,7 +2177,7 @@
                    UserName = oItem.HMaker;
                    oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
                    oItem.HDate=oItem.HDate.ToString()==""? DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")) : oItem.HDate;
                    oItem.HBillType = "7506";
                    oItem.HBillSubType = "7506";
                    oItem.HBillStatus = 0;