龙巍PC前端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
kyy
6 天以前 9010fdfa1f7f6fe29c76111ef95d6383c74ea313 
 DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs


@@ -400,8 +400,8 @@


                            Memo = row["memo"].ToString(),


                            FupAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FupAllow"].ToString()),


                            FdownAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FdownAllow"].ToString()),


                            //ypsl = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["ypsl"].ToString()),


                            ypsl = _ycsl,


                            ypsl = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["ypsl"].ToString()),


                           // ypsl = _ycsl,


                            stationName = row["stationName"].ToString(),


                            FcheckType = row["FcheckType"].ToString(),


                            isRzxx = _isRzxx,


@@ -458,7 +458,7 @@


            _sbSqlWhere += " and b.guid is not null";


            _sbSqlWhere += " and a.FTYPE='" + this.strType + "'";


            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount,


                "org.FNumber asc ,b.item_no asc,a.FVERSION desc", "", "", _sbSqlWhere.ToString());


                "a.FONE_CHECKDATE desc", "", "", _sbSqlWhere.ToString());


            var json = JsonConvert.SerializeObject(pgq);


            try


            {