杨乐
2022-02-10 777db38816776abbe4b864d26a6c0381b75e8f9d
修改页码及排序
89个文件已修改
455 ■■■■ 已修改文件
WebAPI/Controllers/BLL/Xt_BillTypeController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BLL/Xt_SystemLogController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BLL/Xt_SystemParameterController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BLL/Xt_XtgnbController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_CurrencyController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_CustomerController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_GroupController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_ProcessController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_PropertyController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_RoutingGroupController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_SourceController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_SupplierController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_UnitController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Xt_DataDictionary_ProcController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/GG_NoticeController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/GZGL/Gy_DuSubsidyItemBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/GZGL/Gy_WorkPayTypeBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/GZGL/Gy_WorkTypeBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/LMESController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/QC_ManagementController.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/QC_POStockInCheckBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/Sc_ICBomBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sc_GroupOrderBillController.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sc_MouldOtherInBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sc_ProcessMangementController.cs 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/仓存管理/扫码异常记录/KF_PonderationBillController.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/仓存管理/条码库存/KF_ICInventoryList_WMSBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/仓存管理/调拨盘点/Kf_MoveStockRequestBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/品质管理/工序检验单/QC_ProcessCheckBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/基础资料/基础资料/Gy_ConkReasonBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/基础资料/基础资料/Gy_DotCheckBillController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/基础资料/基础资料/Gy_MaintainBillController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/基础资料/基础资料/Gy_RepairBillController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/基础资料/基础资料/Gy_RepairCheckBillController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/基础资料/基础资料/Gy_StockCheckItemBillController.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/基础资料/工资基础资料/Gy_ProcPriceController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/工资管理/Gy_ClassTimePrjBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/工资管理/Gy_ClassTimePrjSubController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/工资管理/Gy_GroupEmpBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/工资管理/Pay_GroupBalBillController.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/工资管理/Pay_OtherBalBillController.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/工资管理/Pay_SingleBalBillController.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/工资管理/Pay_WorkTimesBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/生产管理/报工台工序/Sc_MESBeginStepWorkBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/生产管理/报工台工序/Sc_MESEndStepWorkBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/生产管理/报工台工序/Sc_MESProductReportStepBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/生产管理/报工台工序/Sc_MESReturnStepWorkBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/生产管理/报工台工序/Sc_MESStopStepWorkBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/生产管理/报工台工序/Sc_MaterToSourceStepBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/生产管理/报工台工序/Sc_QualityReportStepBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BLL/Xt_BillTypeController.cs
@@ -31,12 +31,12 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Xt_BillTypeList " + sWhere, "h_v_Xt_BillTypeList");
                    ds = oCN.RunProcReturn("select * from h_v_Xt_BillTypeList " + sWhere+ "  order by hitemid desc", "h_v_Xt_BillTypeList");
                }
                else
                {
                    string sql1 = "select * from h_v_Xt_BillTypeList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ "  order by hitemid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Xt_BillTypeList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/BLL/Xt_SystemLogController.cs
@@ -31,12 +31,12 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Xt_SystemLogList " + sWhere + " order by æ—¥æœŸ desc", "h_v_Xt_SystemLogList");
                    ds = oCN.RunProcReturn("select * from h_v_Xt_SystemLogList " + sWhere + " order by hid desc", "h_v_Xt_SystemLogList");
                }
                else
                {
                    string sql1 = "select * from h_v_Xt_SystemLogList where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by æ—¥æœŸ desc";
                    string sql = sql1 + sWhere + " order by hid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Xt_SystemLogList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/BLL/Xt_SystemParameterController.cs
@@ -31,12 +31,12 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Xt_SystemParameterList " + sWhere, "h_v_Xt_SystemParameterList");
                    ds = oCN.RunProcReturn("select * from h_v_Xt_SystemParameterList " + sWhere+ "  order by hitemid desc", "h_v_Xt_SystemParameterList");
                }
                else
                {
                    string sql1 = "select * from h_v_Xt_SystemParameterList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ "  order by hitemid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_Proh_v_Xt_SystemParameterListpertyList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/BLL/Xt_XtgnbController.cs
@@ -31,12 +31,12 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Xt_XtgnbList " + sWhere, "h_v_Xt_XtgnbList");
                    ds = oCN.RunProcReturn("select * from h_v_Xt_XtgnbList " + sWhere+ "  order by hitemid desc", "h_v_Xt_XtgnbList");
                }
                else
                {
                    string sql1 = "select * from h_v_Xt_XtgnbList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ "  order by hitemid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Xt_XtgnbList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
@@ -31,12 +31,12 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_BadReasonList " + sWhere+ " order by HItemID desc", "h_v_IF_BadReasonList");
                    ds = oCN.RunProcReturn("select * from h_v_IF_BadReasonList " + sWhere+ " order by ä¸è‰¯åŽŸå› ä»£ç  ", "h_v_IF_BadReasonList");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_BadReasonList where 1 = 1";
                    string sql = sql1 + sWhere+ " order by HItemID desc";
                    string sql = sql1 + sWhere+ " order by ä¸è‰¯åŽŸå› ä»£ç  ";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_BadReasonList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
@@ -33,12 +33,12 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_QCCheckItemList " + sWhere, "h_v_IF_QCCheckItemList");
                    ds = oCN.RunProcReturn("select * from h_v_IF_QCCheckItemList  order by ä»£ç ", "h_v_IF_QCCheckItemList");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_QCCheckItemList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by ä»£ç ";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_QCCheckItemList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/BaseSet/Gy_CurrencyController.cs
@@ -33,12 +33,12 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_CurrencyList where ç¦ç”¨æ ‡è®°=''" + sWhere, "h_v_Gy_CurrencyList");
                    ds = oCN.RunProcReturn("select * from h_v_Gy_CurrencyList where ç¦ç”¨æ ‡è®°=''" + sWhere+ " order by è´§å¸ä»£ç ", "h_v_Gy_CurrencyList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_CurrencyList where ç¦ç”¨æ ‡è®°='' ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by è´§å¸ä»£ç ";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_CurrencyList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
@@ -32,11 +32,11 @@
                string sql1 = string.Format(@"select * from h_v_Gy_CustomerList where ç»„织名称='" + Organization + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by HItemID desc", "h_v_Gy_CustomerList");
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by å®¢æˆ·ä»£ç  ", "h_v_Gy_CustomerList");
                }
                else
                {
                    string sql = sql1 + sWhere + " order by HItemID desc";
                    string sql = sql1 + sWhere + " order by å®¢æˆ·ä»£ç  ";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_CustomerList");
                }
                objJsonResult.code = "1";
WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
@@ -32,11 +32,11 @@
                string sql1 = string.Format(@"select * from h_v_IF_DepartmentList where ç»„织名称='" + Organization + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_IF_DepartmentList");
                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by éƒ¨é—¨ä»£ç ", "h_v_IF_DepartmentList");
                }
                else
                {
                    string sql = sql1 + sWhere + "order by HItemID desc";
                    string sql = sql1 + sWhere + "order by éƒ¨é—¨ä»£ç  ";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_DepartmentList");
                }
WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
@@ -34,11 +34,11 @@
                string sql1 = string.Format(@"select * from h_v_IF_EmployeeList where ç»„织名称='" + Organization + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_IF_EmployeeList");
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by èŒå‘˜ä»£ç ", "h_v_IF_EmployeeList");
                }
                else
                {
                    string sql = sql1 + sWhere + "order by HItemID desc";
                    string sql = sql1 + sWhere + " order by èŒå‘˜ä»£ç ";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_EmployeeList");
                }
                objJsonResult.code = "1";
WebAPI/Controllers/BaseSet/Gy_GroupController.cs
@@ -42,12 +42,12 @@
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_GroupList " + sWhere+ " order by HItemID ", "h_v_GroupList");
                    ds = oCN.RunProcReturn("select * from h_v_GroupList " + sWhere+ " order by ç­ç»„代码 ", "h_v_GroupList");
                }
                else
                {
                    string sql1 = "select * from h_v_GroupList where 1 = 1 ";
                    string sql = sql1 + sWhere+ " order by HItemID ";
                    string sql = sql1 + sWhere+ " order by ç­ç»„代码 ";
                    ds = oCN.RunProcReturn(sql, "h_v_GroupList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -34,11 +34,11 @@
                string sql1 = string.Format(@"select * from h_v_Gy_MaterialList where ç»„织名称='" + Organization + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_Gy_MaterialList");
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by ç‰©æ–™ä»£ç  ", "h_v_Gy_MaterialList");
                }
                else
                {
                    string sql = sql1 + sWhere + "order by HItemID desc";
                    string sql = sql1 + sWhere + " order by ç‰©æ–™ä»£ç  ";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_MaterialList");
                }
@@ -363,12 +363,12 @@
                }
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere + "order by æ—¥æœŸ desc", "h_v_Gy_MouldFileList");
                    ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere + "order by hmainid desc", "h_v_Gy_MouldFileList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_MouldFileList where 1 = 1 ";
                    string sql = sql1 + sWhere + "order by æ—¥æœŸ desc";
                    string sql = sql1 + sWhere + "order by hmainid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_MouldFileList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -473,12 +473,12 @@
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList " + sWhere + "order by æ—¥æœŸ desc", "h_v_IF_BarCodeBillList");
                    ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList order by hmainid desc", "h_v_IF_BarCodeBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_BarCodeBillList where 1 = 1 ";
                    string sql = sql1 + sWhere + "order by æ—¥æœŸ desc";
                    string sql = sql1 + sWhere + "order by hmainid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_BarCodeBillList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs
@@ -42,7 +42,7 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                ds = oCN.RunProcReturn("select HItemID,HParentID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag from Gy_MouldType where 1=1 " + sWhere, "Gy_MouldType");
                ds = oCN.RunProcReturn("select HItemID,HParentID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag from Gy_MouldType where 1=1 " + sWhere+ " order by HNumber", "Gy_MouldType");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs
@@ -33,12 +33,12 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_OrderBackInfoList " + sWhere, "h_v_Gy_OrderBackInfoList");
                    ds = oCN.RunProcReturn("select * from h_v_Gy_OrderBackInfoList " + sWhere+ " order by åé¦ˆçŠ¶æ€ä»£ç ", "h_v_Gy_OrderBackInfoList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_OrderBackInfoList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by åé¦ˆçŠ¶æ€ä»£ç ";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_OrderBackInfoList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs
@@ -33,12 +33,12 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_OrderLevList " + sWhere, "h_v_Gy_OrderLevList");
                    ds = oCN.RunProcReturn("select * from h_v_Gy_OrderLevList " + sWhere+ " order by è®¢å•等级代码", "h_v_Gy_OrderLevList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_OrderLevList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by è®¢å•等级代码";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_OrderLevList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
@@ -440,12 +440,12 @@
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList " + sWhere, "h_v_Gy_ProcessList");
                    ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList order by å·¥åºä»£ç  ", "h_v_Gy_ProcessList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_ProcessList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by å·¥åºä»£ç  ";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_ProcessList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/BaseSet/Gy_PropertyController.cs
@@ -31,12 +31,12 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_PropertyList " + sWhere, "h_v_IF_PropertyList");
                    ds = oCN.RunProcReturn("select * from h_v_IF_PropertyList order by è¾…助属性代码", "h_v_IF_PropertyList");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_PropertyList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by è¾…助属性代码";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_PropertyList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs
@@ -33,12 +33,12 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_QCCheckClassList " + sWhere, "h_v_IF_QCCheckClassList");
                    ds = oCN.RunProcReturn("select * from h_v_IF_QCCheckClassList order by ä»£ç ", "h_v_IF_QCCheckClassList");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_QCCheckClassList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by ä»£ç ";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_QCCheckClassList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/BaseSet/Gy_RoutingGroupController.cs
@@ -26,11 +26,11 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from Gy_RoutingGroup where 1=1", "Gy_RoutingGroup");
                    ds = oCN.RunProcReturn("select * from Gy_RoutingGroup where 1=1 order by HItemID ", "Gy_RoutingGroup");
                }
                else
                {
                    string sql = "select * from Gy_RoutingGroup where 1 = 1 " + sWhere;
                    string sql = "select * from Gy_RoutingGroup where 1 = 1 " + sWhere+ " order by HItemID ";
                    ds = oCN.RunProcReturn(sql, "Gy_RoutingGroup");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/BaseSet/Gy_SourceController.cs
@@ -44,12 +44,12 @@
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_SourceList where 1=1 ", "h_v_IF_SourceList");
                    ds = oCN.RunProcReturn("select * from h_v_IF_SourceList where 1=1 order by ç”Ÿäº§èµ„源代码 ", "h_v_IF_SourceList");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_SourceList where 1=1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by ç”Ÿäº§èµ„源代码 ";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_SourceList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
@@ -32,11 +32,11 @@
                string sql1 = string.Format(@"select * from h_v_Gy_SupplierList where ç»„织名称='" + Organization + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by HItemID desc", "h_v_Gy_SupplierList");
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by ä¾›åº”商代码", "h_v_Gy_SupplierList");
                }
                else
                {
                    string sql = sql1 + sWhere + " order by HItemID desc";
                    string sql = sql1 + sWhere + " order by ä¾›åº”商代码 ";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_SupplierList");
                }
               
WebAPI/Controllers/BaseSet/Gy_UnitController.cs
@@ -34,11 +34,11 @@
                string sql1 = string.Format(@"select * from h_v_Gy_UnitList where ç¦ç”¨æ ‡è®°='' and ç»„织名称='" + Organization + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_Gy_UnitList");
                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by è®¡é‡å•位代码 ", "h_v_Gy_UnitList");
                }
                else
                {
                    string sql = sql1 + sWhere + "order by HItemID desc";
                    string sql = sql1 + sWhere + "order by è®¡é‡å•位代码 ";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_UnitList");
                }
                    objJsonResult.code = "1";
WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
@@ -32,11 +32,11 @@
                string sql1 = string.Format(@"select * from h_v_IF_WareHouseList where ç»„织名称='" + Organization + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_IF_WareHouseList");
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by ä»“库代码 ", "h_v_IF_WareHouseList");
                }
                else
                {
                    string sql = sql1 + sWhere + "order by HItemID desc";
                    string sql = sql1 + sWhere + " order by ä»“库代码 ";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_WareHouseList");
                }
                //if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
@@ -42,12 +42,12 @@
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_WorkCenterList " + sWhere, "h_v_WorkCenterList");
                    ds = oCN.RunProcReturn("select * from h_v_WorkCenterList order by å·¥ä½œä¸­å¿ƒä»£ç  ", "h_v_WorkCenterList");
                }
                else
                {
                    string sql1 = "select * from h_v_WorkCenterList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by å·¥ä½œä¸­å¿ƒä»£ç  ";
                    ds = oCN.RunProcReturn(sql, "h_v_WorkCenterList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/BaseSet/Xt_DataDictionary_ProcController.cs
@@ -31,12 +31,12 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_Proc where 1=1 ", "h_v_IF_DataDictionary_Proc");
                    ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_Proc where 1=1  order by HItemID desc", "h_v_IF_DataDictionary_Proc");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_DataDictionary_Proc where 1=1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ "  order by HItemID desc";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_DataDictionary_Proc");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs
@@ -31,12 +31,12 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_Table where 1=1 ", "h_v_IF_DataDictionary_Table");
                    ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_Table where 1=1  order by HItemID desc", "h_v_IF_DataDictionary_Table");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_DataDictionary_Table where 1=1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ "  order by HItemID desc";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_DataDictionary_Table");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs
@@ -31,12 +31,12 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_View where 1=1 ", "h_v_IF_DataDictionary_View");
                    ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_View where 1=1 order by HItemID desc", "h_v_IF_DataDictionary_View");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_DataDictionary_View where 1=1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by HItemID desc";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_DataDictionary_View");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs
@@ -32,11 +32,11 @@
                string sql1 = string.Format(@"select * from h_v_IF_ORGANIZATIONSList where ç»„织名称='" + Organization + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_IF_ORGANIZATIONSList");
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by ç»„织代码 ", "h_v_IF_ORGANIZATIONSList");
                }
                else
                {
                    string sql = sql1 + sWhere + "order by HItemID desc";
                    string sql = sql1 + sWhere + " order by ç»„织代码 ";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_ORGANIZATIONSList");
                }
                objJsonResult.code = "1";
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -40,12 +40,12 @@
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustInBillList " + sWhere+ " order by å‘出时间 desc", "h_v_MES_StationEntrustInBillList");
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustInBillList  order by hmainid desc", "h_v_MES_StationEntrustInBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_MES_StationEntrustInBillList where 1 = 1  order by å‘出时间 desc";
                    string sql = sql1 + sWhere;
                    string sql1 = "select * from h_v_MES_StationEntrustInBillList where 1 = 1  ";
                    string sql = sql1 + sWhere+ " order by hmainid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_MES_StationEntrustInBillList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs
@@ -40,12 +40,12 @@
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustOutBillList " + sWhere+ " order by æŽ¥æ”¶æ—¶é—´ desc", "h_v_MES_StationEntrustOutBillList");
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustOutBillList order by hmainid desc", "h_v_MES_StationEntrustOutBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_MES_StationEntrustOutBillList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by hmainid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_MES_StationEntrustOutBillList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -395,19 +395,19 @@
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationInBillList " + sWhere+ " order by è¿›ç«™æ—¶é—´ desc", "h_v_MES_StationInBillList");
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationInBillList order by hmainid desc", "h_v_MES_StationInBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_MES_StationInBillList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by hmainid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_MES_StationInBillList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查询数据异常,请与管理员联系!";
                    objJsonResult.Message = "无记录,请与管理员联系!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -430,19 +430,19 @@
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList " + sWhere + " order by å‡ºç«™æ—¶é—´ desc", "h_v_MES_StationOutBillList");
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList  order by hmainid desc", "h_v_MES_StationOutBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_MES_StationOutBillList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ "  order by hmainid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_MES_StationOutBillList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false!";
                    objJsonResult.Message = "无记录!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
WebAPI/Controllers/GG_NoticeController.cs
@@ -69,7 +69,7 @@
        public static DataSet Get_GG_NoticeBillList(string sWhere)
        {
            var sql = "select A.HInterID,b.HEntryID,A.HBillNo,A.HContext,A.HDeptID,D.HName HDeptName, A.HSendMan, B.HReceiveMan,A.HLevel,A.HDescription,case when B.HReadFlag=0 then '未阅' when B.HReadFlag=1 then '已阅' end HReadFlag, A.HMaker,A.HMakeDate,A.HUpDater,A.HUpDateDate" +
               " from OA_InformBillMain A inner join  OA_InformBillSub B on A.HInterID=B.HInterID left join Gy_Department D on A.HDeptID=D.HItemID where 1=1 " + sWhere;
               " from OA_InformBillMain A inner join  OA_InformBillSub B on A.HInterID=B.HInterID left join Gy_Department D on A.HDeptID=D.HItemID where 1=1 " + sWhere+ "  order by HInterID desc";
            return new SQLHelper.ClsCN().RunProcReturn(sql, "OA_InformBillMain");
        }
WebAPI/Controllers/GZGL/Gy_DuSubsidyItemBillController.cs
@@ -43,12 +43,12 @@
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_DuSubsidyItemList " + sWhere, "h_v_Gy_DuSubsidyItemList");
                    ds = oCN.RunProcReturn("select * from h_v_Gy_DuSubsidyItemList order by æ‰£è¡¥èµ„料代码  ", "h_v_Gy_DuSubsidyItemList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_DuSubsidyItemList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by æ‰£è¡¥èµ„料代码  ";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_DuSubsidyItemList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/GZGL/Gy_WorkPayTypeBillController.cs
@@ -42,12 +42,12 @@
                }
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_WorkPayTypeList " + sWhere, "h_v_Gy_WorkPayTypeList");
                    ds = oCN.RunProcReturn("select * from h_v_Gy_WorkPayTypeList order by å·¥èµ„类型代码 ", "h_v_Gy_WorkPayTypeList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_WorkPayTypeList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by å·¥èµ„类型代码 ";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_WorkPayTypeList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/GZGL/Gy_WorkTypeBillController.cs
@@ -44,12 +44,12 @@
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_WorkTypeList " + sWhere, "h_v_Gy_WorkTypeList");
                    ds = oCN.RunProcReturn("select * from h_v_Gy_WorkTypeList  order by å·¥ç§ä»£ç ", "h_v_Gy_WorkTypeList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_WorkTypeList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by å·¥ç§ä»£ç ";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_WorkTypeList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/LMESController.cs
@@ -70,7 +70,7 @@
                }
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillQuery where 1 = 1 " + sWhere, "h_v_Sc_ProcessExchangeBillQuery");
                ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillQuery where 1 = 1 " + sWhere+ " order by hmainid desc ", "h_v_Sc_ProcessExchangeBillQuery");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs
@@ -120,11 +120,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldMoveStockStepInBillListDetail where (调入组织='" + Organization + "' or è°ƒå‡ºç»„织='" + Organization + "' )");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by æ—¥æœŸ desc", "h_v_Sc_MouldMoveStockStepInBillListDetail");
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by hmainid desc", "h_v_Sc_MouldMoveStockStepInBillListDetail");
            }
            else
            {
                string sql = sql1 + sWhere + "order by æ—¥æœŸ desc";
                string sql = sql1 + sWhere + "order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldMoveStockStepInBillListDetail");
            }
WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
@@ -120,11 +120,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldMoveStockStepOutBill where (调出组织='" + Organization + "' or è°ƒå…¥ç»„织='" + Organization + "')");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by æ—¥æœŸ desc", "h_v_Sc_MouldMoveStockStepOutBill");
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by hmainid desc", "h_v_Sc_MouldMoveStockStepOutBill");
            }
            else
            {
                string sql = sql1 + sWhere+ "order by æ—¥æœŸ desc";
                string sql = sql1 + sWhere+ "order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldMoveStockStepOutBill");
            }
WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs
@@ -120,11 +120,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldOtherOutBillList where åº“存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by æ—¥æœŸ desc", "h_v_Sc_MouldOtherOutBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by hmainid desc", "h_v_Sc_MouldOtherOutBillList");
            }
            else
            {
                string sql = sql1 + sWhere+ "order by æ—¥æœŸ desc";
                string sql = sql1 + sWhere+ "order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldOtherOutBillList");
            }
WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
@@ -71,11 +71,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldProdInHouseBillList where åº“存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ sWhere + "order by æ—¥æœŸ desc", "h_v_Sc_MouldProdInHouseBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ sWhere + "order by hmainid desc", "h_v_Sc_MouldProdInHouseBillList");
            }
            else
            {
                string sql = sql1 + sWhere+ "order by æ—¥æœŸ desc";
                string sql = sql1 + sWhere+ "order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdInHouseBillList");
            }
        }
WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs
@@ -120,11 +120,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldProdMoveBillList where (调入组织='" + Organization + "' or è°ƒå‡ºç»„织='" + Organization + "')");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by æ—¥æœŸ desc", "h_v_Sc_MouldProdMoveBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by hmainid desc", "h_v_Sc_MouldProdMoveBillList");
            }
            else
            {
                string sql = sql1 + sWhere+ "order by æ—¥æœŸ desc";
                string sql = sql1 + sWhere+ "order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdMoveBillList");
            }
WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs
@@ -70,12 +70,12 @@
        {
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairChangeBillList " + sWhere + "order by æ—¥æœŸ desc", "h_v_Sc_MouldRepairChangeBillList");
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairChangeBillList " + sWhere + "order by hmainid desc", "h_v_Sc_MouldRepairChangeBillList");
            }
            else
            {
                string sql1 = "select * from h_v_Sc_MouldRepairChangeBillList where 1 = 1 ";
                string sql = sql1 + sWhere+ "order by æ—¥æœŸ desc";
                string sql = sql1 + sWhere+ "order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairChangeBillList");
            }
WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs
@@ -70,11 +70,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldRepairOutBillList where åº“存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by æ—¥æœŸ desc", "h_v_Sc_MouldRepairOutBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by hmainid desc", "h_v_Sc_MouldRepairOutBillList");
            }
            else
            {
                string sql = sql1 + sWhere+ "order by æ—¥æœŸ desc";
                string sql = sql1 + sWhere+ "order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairOutBillList");
            }
WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs
@@ -450,11 +450,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldScrapInHouseBillList where åº“存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + "order by æ—¥æœŸ desc", "h_v_Sc_MouldScrapInHouseBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + "order by hmainid desc", "h_v_Sc_MouldScrapInHouseBillList");
            }
            else
            {
                string sql = sql1 + sWhere + "order by æ—¥æœŸ desc";
                string sql = sql1 + sWhere + "order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldScrapInHouseBillList");
            }
WebAPI/Controllers/QC_ManagementController.cs
@@ -112,12 +112,12 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select  * from h_v_Gy_QCCheckProjectList", "h_v_Gy_QCCheckProjectList");
                    ds = oCN.RunProcReturn("select  * from h_v_Gy_QCCheckProjectList order by hmainid desc ", "h_v_Gy_QCCheckProjectList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_QCCheckProjectList where 1=1";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by hmainid desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_QCCheckProjectList");
                }
            }
@@ -182,12 +182,12 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sqlWhere == null || sqlWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select top 500 * from h_v_QC_FirstPieceCheckBillList  where  å…³é—­äºº='' ", "h_v_QC_FirstPieceCheckBillList");
                    ds = oCN.RunProcReturn("select top 500 * from h_v_QC_FirstPieceCheckBillList  where  å…³é—­äºº='' order by hmainid desc ", "h_v_QC_FirstPieceCheckBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_QC_FirstPieceCheckBillList where å…³é—­äºº='' ";
                    string sql = sql1 + sqlWhere;
                    string sql = sql1 + sqlWhere+ " order by hmainid desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_QC_FirstPieceCheckBillList");
                }
            }
@@ -217,12 +217,12 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sqlWhere == null || sqlWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select top 500 * from h_v_QC_PatrolProcCheckBillList where  å…³é—­äºº=''", "h_v_QC_PatrolProcCheckBillList");
                    ds = oCN.RunProcReturn("select top 500 * from h_v_QC_PatrolProcCheckBillList where  å…³é—­äºº='' order by hmainid desc ", "h_v_QC_PatrolProcCheckBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_QC_PatrolProcCheckBillList where å…³é—­äºº='' ";
                    string sql = sql1 + sqlWhere;
                    string sql = sql1 + sqlWhere+ " order by hmainid desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_QC_PatrolProcCheckBillList");
                }
            }
WebAPI/Controllers/QC_POStockInCheckBillController.cs
@@ -55,12 +55,12 @@
        {
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_QC_Edit_POStockInCheckBillList order by æ—¥æœŸ desc", "h_v_QC_Edit_POStockInCheckBillList");
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_QC_Edit_POStockInCheckBillList order by hmainid desc", "h_v_QC_Edit_POStockInCheckBillList");
            }
            else
            {
                string sql1 = "select * from h_v_QC_Edit_POStockInCheckBillList where 1 = 1 ";
                string sql = sql1 + sWhere + "order by æ—¥æœŸ desc";
                string sql = sql1 + sWhere + "order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_QC_Edit_POStockInCheckBillList");
            }
WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
@@ -37,12 +37,12 @@
                }
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select *from h_v_Gy_EquipFileMainList " + sWhere + "order by æ—¥æœŸ desc", "h_v_Gy_EquipFileMainList");
                    ds = oCN.RunProcReturn("select * from h_v_Gy_EquipFileMainList " + sWhere + " order by hmainid desc", "h_v_Gy_EquipFileMainList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_EquipFileMainList where 1 = 1 ";
                    string sql = sql1 + sWhere + "order by æ—¥æœŸ desc";
                    string sql = sql1 + sWhere + " order by hmainid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_EquipFileMainList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs
@@ -37,12 +37,12 @@
                    return objJsonResult;
                }
                ds = oCN.RunProcReturn("select HItemID,HParentID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag from Gy_EquipFileType where 1=1 " + sWhere, "Gy_EquipFileType");
                ds = oCN.RunProcReturn("select HItemID,HParentID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag from Gy_EquipFileType where 1=1 " + sWhere+ " order by HItemID ", "Gy_EquipFileType");
                if (ds == null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查询数据异常,请与管理员联系!";
                    objJsonResult.Message = "无记录,请与管理员联系!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs
@@ -39,11 +39,11 @@
                string sql = "select * from  h_v_Sb_EquipRepairSendWorkBillList where 1=1 ";
                if (sWhere == "" || sWhere == null)
                {
                    ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipRepairSendWorkBillList");
                    ds = oCN.RunProcReturn(sql+ " order by hmainid desc ", "h_v_Sb_EquipRepairSendWorkBillList");
                }
                else
                {
                    ds = oCN.RunProcReturn(sql + sWhere, "h_v_Sb_EquipRepairSendWorkBillList");
                    ds = oCN.RunProcReturn(sql + sWhere+ " order by hmainid desc ", "h_v_Sb_EquipRepairSendWorkBillList");
                }
                if (ds.Tables[0].Rows.Count == 0 || ds == null)
WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs
@@ -284,12 +284,12 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_QC_LastPieceCheckBillListDetail " + sWhere, "h_v_QC_LastPieceCheckBillListDetail");
                    ds = oCN.RunProcReturn("select * from h_v_QC_LastPieceCheckBillListDetail order by hmainid desc ", "h_v_QC_LastPieceCheckBillListDetail");
                }
                else
                {
                    string sql1 = "select * from h_v_QC_LastPieceCheckBillListDetail where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by hmainid desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_QC_LastPieceCheckBillListDetail");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
@@ -35,12 +35,12 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_QC_OutCompCheckBillList " + sWhere, "h_v_QC_OutCompCheckBillList");
                    ds = oCN.RunProcReturn("select * from h_v_QC_OutCompCheckBillList order by hmainid desc ", "h_v_QC_OutCompCheckBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_QC_OutCompCheckBillList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by hmainid desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_QC_OutCompCheckBillList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/SCGL/Sc_ICBomBillController.cs
@@ -41,12 +41,12 @@
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_ICBomBillList " + sWhere, "h_v_Gy_ICBomBillList");
                    ds = oCN.RunProcReturn("select * from h_v_Gy_ICBomBillList order by hmainid desc ", "h_v_Gy_ICBomBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_ICBomBillList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by hmainid desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_ICBomBillList");
                }
WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
@@ -47,12 +47,12 @@
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_ICMOReportBillList_Edit " + sWhere, "h_v_IF_ICMOReportBillList_Edit");
                    ds = oCN.RunProcReturn("select * from h_v_IF_ICMOReportBillList_Edit order by hmainid desc ", "h_v_IF_ICMOReportBillList_Edit");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_ICMOReportBillList_Edit where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by hmainid desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOReportBillList_Edit");
                }
              
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -410,7 +410,7 @@
                                      A.HSourceInterID,A.HSourceEntryID,A.HSourceBillNo,A.HSourceBillType
                                      from OA_ErrMsgBackBillMain A 
                                      inner join  OA_ErrMsgBackBillSub2 B on A.HInterID=B.HInterID 
                                      left join Gy_Department D on A.HDeptID=D.HItemID where 1=1 " + sWhere + "");
                                      left join Gy_Department D on A.HDeptID=D.HItemID where 1=1 " + sWhere + "   order by HItemID desc ");
            return new SQLHelper.ClsCN().RunProcReturn(sql, "OA_ErrMsgBackBillMain");
        }
WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs
@@ -43,12 +43,12 @@
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_PPBomBillList " + sWhere, "h_v_IF_PPBomBillList");
                    ds = oCN.RunProcReturn("select * from h_v_IF_PPBomBillList order by hmainid desc ", "h_v_IF_PPBomBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_PPBomBillList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by hmainid desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_PPBomBillList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs
@@ -56,11 +56,11 @@
                int pageSize = limit;
                if (sWhere == null || sWhere.Equals(""))
                {
                    sWhere = " where 1=1";
                    sWhere = " where 1=1 order by hmainid desc ";
                }
                else
                {
                    sWhere = " where 1=1" + sWhere;
                    sWhere = " where 1=1" + sWhere+ " order by hmainid desc ";
                }
                DataSet ds0 = oCn.RunProcReturn("select count(*) CountNum from h_v_PackUnionBillList "+sWhere+"", "h_v_PackUnionBillList");
WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
@@ -71,12 +71,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");
            }
            
@@ -134,7 +134,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");
            }
            
@@ -187,12 +187,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");
            }
        }
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
@@ -4250,11 +4250,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldRepairInBillList where åº“存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by æ—¥æœŸ desc", "h_v_Sc_MouldRepairInBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by hmainid desc", "h_v_Sc_MouldRepairInBillList");
            }
            else
            {
                string sql = sql1 + sWhere+ "order by æ—¥æœŸ desc";
                string sql = sql1 + sWhere+ "order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairInBillList");
            }
WebAPI/Controllers/Sc_GroupOrderBillController.cs
@@ -28,11 +28,21 @@
        /// <returns>object</returns>
        [Route("GroupOrderBill/List")]
        [HttpGet]
        public object List(string sWhere)
        public object List(string sWhere,string user)
        {
            DataSet ds;
            try
            {
                //判断是否有查询权限
                //if (!DBUtility.ClsPub.Security_Log("Sc_GroupOrderBillList_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(""))
                {
WebAPI/Controllers/Sc_MouldOtherInBillController.cs
@@ -119,11 +119,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldOtherInBillList where åº“存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by åˆ¶å•日期 desc", "h_v_Sc_MouldOtherInBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by hmainid desc", "h_v_Sc_MouldOtherInBillList");
            }
            else
            {
                string sql = sql1 + sWhere+ "order by åˆ¶å•日期 desc";
                string sql = sql1 + sWhere+ "order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldOtherInBillList");
            }
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -231,12 +231,12 @@
        {
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select *  from h_v_Sc_MouldMaintain order by æ—¥æœŸ desc", "h_v_Sc_MouldMaintain");
                return new SQLHelper.ClsCN().RunProcReturn("select *  from h_v_Sc_MouldMaintain order by hmainid desc", "h_v_Sc_MouldMaintain");
            }
            else
            {
                string sql1 = "select * from h_v_Sc_MouldMaintain where 1 = 1 ";
                string sql = sql1 + sWhere + "order by æ—¥æœŸ desc";
                string sql = sql1 + sWhere + "order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldMaintain");
            }
@@ -298,7 +298,7 @@
        public static DataSet Sc_MouldDotCheckPlanBillList_s(string sWhere)
        {
            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckPlanBillList order by æ—¥æœŸ desc", "h_v_Sc_MouldDotCheckPlanBillList");
            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckPlanBillList where 1=1 "+sWhere+ " order by hmainid desc", "h_v_Sc_MouldDotCheckPlanBillList");
        }
        #endregion
@@ -353,7 +353,7 @@
        public static DataSet Sc_MouldDotCheckBillList_s(string sWhere)
        {
            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckBillList where 1=1 " + sWhere + "order by æ—¥æœŸ desc", "h_v_Sc_MouldDotCheckBillList");
            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckBillList where 1=1 " + sWhere + "order by hmainid desc", "h_v_Sc_MouldDotCheckBillList");
        }
        #endregion
@@ -459,7 +459,7 @@
        public static DataSet Sc_MouldMaintainPlanBillList_s(string sWhere)
        {
            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintainPlanBillList where 1=1 "+sWhere+" order by æ—¥æœŸ desc", "h_v_Sc_MouldMaintainPlanBillList");
            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintainPlanBillList where 1=1 "+sWhere+ " order by hmainid desc", "h_v_Sc_MouldMaintainPlanBillList");
        }
        #endregion
@@ -508,7 +508,7 @@
            DataSet ds;
            if (sWhere == null || sWhere.Equals(""))
            {
                ds = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldConkBookBillList order by æ—¥æœŸ desc" + sWhere, "h_v_Sc_MouldConkBookBillList");
                ds = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldConkBookBillList where 1=1 " + sWhere+ " order by hmainid desc", "h_v_Sc_MouldConkBookBillList");
            }
            else
            {
@@ -567,12 +567,12 @@
            DataSet ds;
            if (sWhere == null || sWhere.Equals(""))
            {
                ds = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairCheckBillList_Edit order by æ—¥æœŸ desc" + sWhere, "h_v_Sc_MouldRepairCheckBillList_Edit");
                ds = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairCheckBillList_Edit where 1=1" + sWhere+ " order by hmainid desc", "h_v_Sc_MouldRepairCheckBillList_Edit");
            }
            else
            {
                string sql1 = "select * from h_v_Sc_MouldRepairCheckBillList_Edit where 1 = 1 ";
                string sql = sql1 + sWhere + "order by æ—¥æœŸ desc";
                string sql = sql1 + sWhere + "order by hmainid desc";
                ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairCheckBillList_Edit");
            }
            return ds;
@@ -691,12 +691,12 @@
        {
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairWorkBillList order by æ—¥æœŸ desc" + sWhere, "h_v_Sc_MouldRepairWorkBillList");
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairWorkBillList where 1=1 " + sWhere+ " order by hmainid desc", "h_v_Sc_MouldRepairWorkBillList");
            }
            else
            {
                string sql1 = "select * from h_v_Sc_MouldRepairWorkBillList where 1 = 1 ";
                string sql = sql1 + sWhere + "order by æ—¥æœŸ desc";
                string sql = sql1 + sWhere + "order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairWorkBillList");
            }
        }
@@ -823,11 +823,11 @@
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_MoveStockBillList order by æ—¥æœŸ desc", "h_v_IF_MoveStockBillList");
                    ds = oCN.RunProcReturn("select * from h_v_IF_MoveStockBillList order by hmainid desc", "h_v_IF_MoveStockBillList");
                }
                else
                {
                    string sql = "select * from h_v_IF_MoveStockBillList where 1=1 " + sWhere+ "order by æ—¥æœŸ desc";
                    string sql = "select * from h_v_IF_MoveStockBillList where 1=1 " + sWhere+ "order by hmainid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_MoveStockBillList");
                }
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
@@ -4000,11 +4000,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldScrapOutHouseBillList where åº“存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by åˆ¶å•日期 desc", "h_v_Sc_MouldScrapOutHouseBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by hmainid desc", "h_v_Sc_MouldScrapOutHouseBillList");
            }
            else
            {
                string sql = sql1 + sWhere + "order by åˆ¶å•日期 desc";
                string sql = sql1 + sWhere + "order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldScrapOutHouseBillList");
            }
        }
@@ -4575,11 +4575,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldProdBackBillList where åº“存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by åˆ¶å•日期 desc", "h_v_Sc_MouldProdBackBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by hmainid desc", "h_v_Sc_MouldProdBackBillList");
            }
            else
            {
                string sql = sql1 + sWhere + "order by åˆ¶å•日期 desc";
                string sql = sql1 + sWhere + "order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdBackBillList");
            }
@@ -5013,11 +5013,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldProdOutHouseBillList where åº“存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by åˆ¶å•日期 desc", "h_v_Sc_MouldProdOutHouseBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by hmainid desc", "h_v_Sc_MouldProdOutHouseBillList");
            }
            else
            {
                string sql = sql1 + sWhere + "order by åˆ¶å•日期 desc";
                string sql = sql1 + sWhere + "order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdOutHouseBillList");
            }
@@ -5484,12 +5484,12 @@
        {
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldLifeChangeBillList order by æ—¥æœŸ desc", "h_v_Sc_MouldLifeChangeBillList");
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldLifeChangeBillList order by hmainid desc", "h_v_Sc_MouldLifeChangeBillList");
            }
            else
            {
                string sql1 = "select * from h_v_Sc_MouldLifeChangeBillList where 1 = 1 ";
                string sql = sql1 + sWhere + "order by æ—¥æœŸ desc";
                string sql = sql1 + sWhere + "order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldLifeChangeBillList");
            }
WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
@@ -39,12 +39,12 @@
                }
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Sc_MouldRepairSendWorkBill ", "h_v_Sc_MouldRepairSendWorkBill");
                    ds = oCN.RunProcReturn("select * from h_v_Sc_MouldRepairSendWorkBill order by hmainid desc ", "h_v_Sc_MouldRepairSendWorkBill");
                }
                else
                {
                    string sql1 = "select * from h_v_Sc_MouldRepairSendWorkBill where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by hmainid desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRepairSendWorkBill");
                }
WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -122,12 +122,12 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select top 500 * from h_v_Sc_ProcessReportList ", "h_v_Sc_ProcessReportList");
                    ds = oCN.RunProcReturn("select top 500 * from h_v_Sc_ProcessReportList order by hmainid desc", "h_v_Sc_ProcessReportList");
                }
                else
                {
                    string sql1 = "select * from h_v_Sc_ProcessReportList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by hmainid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessReportList");
                }
            }
@@ -251,24 +251,24 @@
            DataSet ds;
            try
            {
                //if (!DBUtility.ClsPub.Security_Log("Sc_ProcessPlan_Query", 1, false, user))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无权限查询!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                if (!DBUtility.ClsPub.Security_Log("Sc_ProcessPlan_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 top 500 * from h_v_Sc_ProcessPlanList ", "h_v_Sc_ProcessPlanList");
                    ds = oCN.RunProcReturn("select top 500 * from h_v_Sc_ProcessPlanList order by hmainid desc ", "h_v_Sc_ProcessPlanList");
                }
                else
                {
                    string sql1 = "select * from h_v_Sc_ProcessPlanList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by hmainid desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessPlanList");
                }
            }
@@ -716,12 +716,12 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select top 500 * from h_v_Sc_ProcessSendWorkList ", "h_v_Sc_ProcessSendWorkList");
                    ds = oCN.RunProcReturn("select top 500 * from h_v_Sc_ProcessSendWorkList order by hmainid desc ", "h_v_Sc_ProcessSendWorkList");
                }
                else
                {
                    string sql1 = "select * from h_v_Sc_ProcessSendWorkList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by hmainid desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessSendWorkList");
                }
            }
@@ -1160,12 +1160,12 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select top 500 * from h_v_QC_NoPassProdCheckBillList ", "h_v_QC_NoPassProdCheckBillList");
                    ds = oCN.RunProcReturn("select top 500 * from h_v_QC_NoPassProdCheckBillList order by hmainid desc ", "h_v_QC_NoPassProdCheckBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_QC_NoPassProdCheckBillList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by hmainid desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_QC_NoPassProdCheckBillList");
                }
            }
@@ -2004,12 +2004,12 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sqlWhere == null || sqlWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustProcSendWorkBillList ", "h_v_WW_EntrustProcSendWorkBillList");
                    ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustProcSendWorkBillList order by hmainid desc ", "h_v_WW_EntrustProcSendWorkBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_WW_EntrustProcSendWorkBillList where 1 = 1 ";
                    string sql = sql1 + sqlWhere;
                    string sql = sql1 + sqlWhere+ " order by hmainid desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustProcSendWorkBillList");
                }
            }
@@ -2094,12 +2094,12 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sqlWhere == null || sqlWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustProcessSendOutBillList ", "h_v_WW_EntrustProcessSendOutBillList");
                    ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustProcessSendOutBillList order by hmainid desc ", "h_v_WW_EntrustProcessSendOutBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_WW_EntrustProcessSendOutBillList where 1 = 1 ";
                    string sql = sql1 + sqlWhere;
                    string sql = sql1 + sqlWhere+ " order by hmainid desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustProcessSendOutBillList");
                }
            }
WebAPI/Controllers/²Ö´æ¹ÜÀí/ɨÂëÒì³£¼Ç¼/KF_PonderationBillController.cs
@@ -26,10 +26,9 @@
            try
            {
                ds = oCN.RunProcReturn("exec h_p_WMS_BarCodeStatusQuery '" + HbarCode + "'", "h_p_WMS_BarCodeStatusQuery");
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
WebAPI/Controllers/²Ö´æ¹ÜÀí/ÌõÂë¿â´æ/KF_ICInventoryList_WMSBillController.cs
@@ -35,11 +35,11 @@
              
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql, "h_v_KF_ICInventoryList_WMS");
                    ds = oCN.RunProcReturn(sql+ " order by æ¡ç ç¼–号 desc", "h_v_KF_ICInventoryList_WMS");
                }
                else
                {
                    ds = oCN.RunProcReturn(sql + sWhere, "h_v_KF_ICInventoryList_WMS");
                    ds = oCN.RunProcReturn(sql + sWhere+ " order by æ¡ç ç¼–号 desc", "h_v_KF_ICInventoryList_WMS");
                }
                
                //获取表头字段名称
WebAPI/Controllers/²Ö´æ¹ÜÀí/µ÷²¦Å̵ã/Kf_MoveStockRequestBillController.cs
@@ -35,11 +35,11 @@
                string sql1 = string.Format("select * from h_v_IF_MoveStockRequestBillList_Litee where 1=1 ");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCn.RunProcReturn(sql1 + " order by æ—¥æœŸ desc", "h_v_IF_MoveStockRequestBillList_Litee");
                    ds = oCn.RunProcReturn(sql1 + " order by hmainid desc", "h_v_IF_MoveStockRequestBillList_Litee");
                }
                else
                {
                    string sql = sql1 + sWhere ;
                    string sql = sql1 + sWhere + " order by hmainid desc";
                    ds = oCn.RunProcReturn(sql, "h_v_IF_MoveStockRequestBillList_Litee");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/Æ·ÖʹÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBillController.cs
@@ -414,12 +414,12 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_QC_ProcessCheckBillListDetail " + sWhere, "h_v_QC_ProcessCheckBillListDetail");
                    ds = oCN.RunProcReturn("select * from h_v_QC_ProcessCheckBillListDetail order by hmainid desc ", "h_v_QC_ProcessCheckBillListDetail");
                }
                else
                {
                    string sql1 = "select * from h_v_QC_ProcessCheckBillListDetail where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by hmainid desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBillListDetail");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_ConkReasonBillController.cs
@@ -59,11 +59,11 @@
            string sql1 = string.Format(@"select * from h_v_Gy_ConkReasonList");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + " order by hitemid desc", "h_v_Gy_ConkReasonList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + " order by æ•…障原因代码 ", "h_v_Gy_ConkReasonList");
            }
            else
            {
                string sql = sql1 + sWhere + "order by hitemid desc";
                string sql = sql1 + sWhere + "order by æ•…障原因代码 ";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Gy_ConkReasonList");
            }
        }
WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_DotCheckBillController.cs
@@ -37,7 +37,7 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                ds = oCN.RunProcReturn("select HItemID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag from Gy_DotCheck where 1=1 " + sWhere, "Gy_DotCheck");
                ds = oCN.RunProcReturn("select HItemID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag from Gy_DotCheck where 1=1 " + sWhere+ " order by HNumber", "Gy_DotCheck");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_MaintainBillController.cs
@@ -36,7 +36,7 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                ds = oCN.RunProcReturn("select HItemID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag from Gy_Maintain where 1=1 " + sWhere, "Gy_Maintain");
                ds = oCN.RunProcReturn("select HItemID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag from Gy_Maintain where 1=1 " + sWhere+ "  order by HNumber", "Gy_Maintain");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_RepairBillController.cs
@@ -36,7 +36,7 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                ds = oCN.RunProcReturn("select HItemID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag from Gy_Repair where 1=1 " + sWhere, "Gy_Repair");
                ds = oCN.RunProcReturn("select HItemID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag from Gy_Repair where 1=1 " + sWhere+ "  order by HNumber", "Gy_Repair");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_RepairCheckBillController.cs
@@ -36,7 +36,7 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                ds = oCN.RunProcReturn("select HItemID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag from Gy_RepairCheck where 1=1 " + sWhere, "Gy_RepairCheck");
                ds = oCN.RunProcReturn("select HItemID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag from Gy_RepairCheck where 1=1 " + sWhere+ "  order by HNumber", "Gy_RepairCheck");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_StockCheckItemBillController.cs
@@ -264,11 +264,11 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sID == null || sID == "")
                {
                    sql = string.Format(@"select * from h_v_Sc_MouldInventoryAnalysisList where " + sWhere);
                    sql = string.Format(@"select * from h_v_Sc_MouldInventoryAnalysisList where " + sWhere+ " order by HItemID desc ");
                }
                else
                {
                    sql = string.Format(@"select * from h_v_Sc_MouldInventoryAnalysisList where " + sWhere + " and HSourceInterID=(select HItemID from Gy_StockCheckItem where HItemID=" + sID + ") and HMakeDate<=(select HEndDate from Gy_StockCheckItem where HItemID=" + sID + ")");
                    sql = string.Format(@"select * from h_v_Sc_MouldInventoryAnalysisList where " + sWhere + " and HSourceInterID=(select HItemID from Gy_StockCheckItem where HItemID=" + sID + ") and HMakeDate<=(select HEndDate from Gy_StockCheckItem where HItemID=" + sID + ") order by HItemID desc ");
                }
                ds = oCN.RunProcReturn(sql, "Sc_MouldStockBillMain_Temp");
                list.Add(ds.Tables[0]);
@@ -329,11 +329,11 @@
            string sql1 = string.Format(@"select * from h_v_Gy_MouldStockBillMainTempList where 1=1 ");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + " order by åˆ¶å•日期 desc", "h_v_Gy_MouldStockBillMainTempList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + " order by hitemid desc", "h_v_Gy_MouldStockBillMainTempList");
            }
            else
            {
                string sql = sql1 + sWhere + "order by åˆ¶å•日期 desc";
                string sql = sql1 + sWhere + "order by hitemid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Gy_MouldStockBillMainTempList");
            }
        }
WebAPI/Controllers/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_ProcPriceController.cs
@@ -25,7 +25,7 @@
        {
            try
            {
                ds = oCN.RunProcReturn("select * from h_v_Gy_ProcPriceList where 1 = 1 " + sWhere, "h_v_Gy_ProcPriceList");
                ds = oCN.RunProcReturn("select * from h_v_Gy_ProcPriceList where 1 = 1 " + sWhere+ "  order by å·¥åºå·¥ä»·èµ„料代码", "h_v_Gy_ProcPriceList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
WebAPI/Controllers/¹¤×ʹÜÀí/Gy_ClassTimePrjBillController.cs
@@ -41,12 +41,12 @@
                }
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_ClassTimePrjList " + sWhere, "h_v_Gy_ClassTimePrjList");
                    ds = oCN.RunProcReturn("select * from h_v_Gy_ClassTimePrjList order by æ ¸ç®—方式代码  ", "h_v_Gy_ClassTimePrjList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_ClassTimePrjList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by æ ¸ç®—方式代码  ";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_ClassTimePrjList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/¹¤×ʹÜÀí/Gy_ClassTimePrjSubController.cs
@@ -40,12 +40,12 @@
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_ClassTimePrjSubList where 1=1 ", "h_v_Gy_ClassTimePrjSubList");
                    ds = oCN.RunProcReturn("select * from h_v_Gy_ClassTimePrjSubList where 1=1 order by HInterID desc", "h_v_Gy_ClassTimePrjSubList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_ClassTimePrjSubList where 1=1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by HInterID desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_ClassTimePrjSubList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/¹¤×ʹÜÀí/Gy_GroupEmpBillController.cs
@@ -61,12 +61,12 @@
        {
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Gy_GroupEmpBillList order by æ—¥æœŸ desc", "h_v_Gy_GroupEmpBillList");
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Gy_GroupEmpBillList order by hmainid desc", "h_v_Gy_GroupEmpBillList");
            }
            else
            {
                string sql1 = "select * from h_v_Gy_GroupEmpBillList where 1 = 1 ";
                string sql = sql1 + sWhere + " order by æ—¥æœŸ desc";
                string sql = sql1 + sWhere + " order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Gy_GroupEmpBillList");
            }
WebAPI/Controllers/¹¤×ʹÜÀí/Pay_GroupBalBillController.cs
@@ -23,7 +23,7 @@
        /// <summary>
        /// è¿”回工资结算个人列表
        /// è¿”回工资结算个人列表(集体)
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
@@ -63,12 +63,12 @@
        {
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Pay_GroupBalBillList order by æ—¥æœŸ desc", "h_v_Pay_GroupBalBillList");
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Pay_GroupBalBillList order by hmainid desc", "h_v_Pay_GroupBalBillList");
            }
            else
            {
                string sql1 = "select * from h_v_Pay_GroupBalBillList where 1 = 1 ";
                string sql = sql1 + sWhere + "order by æ—¥æœŸ desc";
                string sql = sql1 + sWhere + " order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Pay_GroupBalBillList");
            }
WebAPI/Controllers/¹¤×ʹÜÀí/Pay_OtherBalBillController.cs
@@ -24,7 +24,7 @@
        public DLL.ClsPay_OtherBalBill BillOld0 = new DLL.ClsPay_OtherBalBill();   //    
        /// <summary>
        /// è¿”回工资结算个人列表
        /// è¿”回工资结算个人列表(其他)
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
@@ -63,12 +63,12 @@
        {
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Pay_OtherBalBillList order by æ—¥æœŸ desc", "h_v_Pay_OtherBalBillList");
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Pay_OtherBalBillList order by hmainid desc", "h_v_Pay_OtherBalBillList");
            }
            else
            {
                string sql1 = "select * from h_v_Pay_OtherBalBillList where 1 = 1 ";
                string sql = sql1 + sWhere + "order by æ—¥æœŸ desc";
                string sql = sql1 + sWhere + " order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Pay_OtherBalBillList");
            }
WebAPI/Controllers/¹¤×ʹÜÀí/Pay_SingleBalBillController.cs
@@ -24,7 +24,7 @@
        public DLL.ClsPay_SingleBalBill BillOld0 = new DLL.ClsPay_SingleBalBill();   //                                                                                         
        /// <summary>
        /// è¿”回工资结算个人列表
        /// è¿”回工资结算个人列表(个人)
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
@@ -63,12 +63,12 @@
        {
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Pay_SingleBalBillList order by æ—¥æœŸ desc", "h_v_Pay_SingleBalBillList");
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Pay_SingleBalBillList order by hmainid desc", "h_v_Pay_SingleBalBillList");
            }
            else
            {
                string sql1 = "select * from h_v_Pay_SingleBalBillList where 1 = 1 ";
                string sql = sql1 + sWhere + "order by æ—¥æœŸ desc";
                string sql = sql1 + sWhere + " order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Pay_SingleBalBillList");
            }
WebAPI/Controllers/¹¤×ʹÜÀí/Pay_WorkTimesBillController.cs
@@ -64,12 +64,12 @@
        {
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Pay_WorkTimesBillList order by æ—¥æœŸ desc", "h_v_Pay_WorkTimesBillList");
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Pay_WorkTimesBillList order by hmainid desc", "h_v_Pay_WorkTimesBillList");
            }
            else
            {
                string sql1 = "select * from h_v_Pay_WorkTimesBillList where 1 = 1 ";
                string sql = sql1 + sWhere + "order by æ—¥æœŸ desc";
                string sql = sql1 + sWhere + " order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Pay_WorkTimesBillList");
            }
WebAPI/Controllers/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Sc_MESBeginStepWorkBillController.cs
@@ -75,12 +75,12 @@
        {
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MESBeginWorkBillList_NEW ", "h_v_Sc_MESBeginWorkBillList_NEW");
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MESBeginWorkBillList_NEW order by hmainid desc ", "h_v_Sc_MESBeginWorkBillList_NEW");
            }
            else
            {
                string sql1 = "select * from h_v_Sc_MESBeginWorkBillList_NEW where 1 = 1 ";
                string sql = sql1 + sWhere;
                string sql = sql1 + sWhere+ " order by hmainid desc ";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MESBeginWorkBillList_NEW");
            }
WebAPI/Controllers/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Sc_MESEndStepWorkBillController.cs
@@ -65,12 +65,12 @@
        {
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MESEndWorkBillList_NEW ", "h_v_Sc_MESEndWorkBillList_NEW");
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MESEndWorkBillList_NEW order by hmainid desc ", "h_v_Sc_MESEndWorkBillList_NEW");
            }
            else
            {
                string sql1 = "select * from h_v_Sc_MESEndWorkBillList_NEW where 1 = 1 ";
                string sql = sql1 + sWhere;
                string sql = sql1 + sWhere+ " order by hmainid desc ";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MESEndWorkBillList_NEW");
            }
WebAPI/Controllers/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Sc_MESProductReportStepBillController.cs
@@ -109,12 +109,12 @@
                }
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp " + sWhere + "order by å•据号 desc", "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
                    ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp order by HInterID desc", "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by å•据号 desc";
                    string sql = sql1 + sWhere + " order by HInterID desc";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
                }
                objJsonResult.code = "1";
WebAPI/Controllers/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Sc_MESReturnStepWorkBillController.cs
@@ -60,12 +60,12 @@
        {
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MESReturnWorkBillList_NEW ", "h_v_Sc_MESReturnWorkBillList_NEW");
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MESReturnWorkBillList_NEW order by hmainid desc ", "h_v_Sc_MESReturnWorkBillList_NEW");
            }
            else
            {
                string sql1 = "select * from h_v_Sc_MESReturnWorkBillList_NEW where 1 = 1 ";
                string sql = sql1 + sWhere;
                string sql = sql1 + sWhere+ " order by hmainid desc ";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MESReturnWorkBillList_NEW");
            }
WebAPI/Controllers/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Sc_MESStopStepWorkBillController.cs
@@ -46,12 +46,12 @@
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Sc_MESStopWorkBillList_NEW " + sWhere, "h_v_Sc_MESStopWorkBillList_NEW");
                    ds = oCN.RunProcReturn("select * from h_v_Sc_MESStopWorkBillList_NEW order by hmainid desc ", "h_v_Sc_MESStopWorkBillList_NEW");
                }
                else
                {
                    string sql1 = "select * from h_v_Sc_MESStopWorkBillList_NEW where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by hmainid desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MESStopWorkBillList_NEW");
                }
                objJsonResult.code = "1";
WebAPI/Controllers/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Sc_MaterToSourceStepBillController.cs
@@ -50,12 +50,12 @@
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Sc_MaterToSourceBillMain " + sWhere, "h_v_Sc_MaterToSourceBillMain");
                    ds = oCN.RunProcReturn("select * from h_v_Sc_MaterToSourceBillMain order by hmainid desc ", "h_v_Sc_MaterToSourceBillMain");
                }
                else
                {
                    string sql1 = "select * from h_v_Sc_MaterToSourceBillMain where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by hmainid desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MaterToSourceBillMain");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
WebAPI/Controllers/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Sc_QualityReportStepBillController.cs
@@ -42,12 +42,12 @@
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Sc_QualityReportBillListDetail " + sWhere, "h_v_Sc_QualityReportBillListDetail");
                    ds = oCN.RunProcReturn("select * from h_v_Sc_QualityReportBillListDetail order by hmainid desc ", "h_v_Sc_QualityReportBillListDetail");
                }
                else
                {
                    string sql1 = "select * from h_v_Sc_QualityReportBillListDetail where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by hmainid desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_QualityReportBillListDetail");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)