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

yangle

2022-09-22 ba20a82da8d901a3e87ff49fe798f7fc7d3d122d

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

 WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs

@@ -40,7 +40,8 @@

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustInBillList  order by hmainid desc", "h_v_MES_StationEntrustInBillList");
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustInBillList", "h_v_MES_StationEntrustInBillList");
                    //  order by hmainid desc 排序丢到数据库里进行处理
                }
                else
                {

 WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs

@@ -40,7 +40,8 @@

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustOutBillList order by hmainid desc", "h_v_MES_StationEntrustOutBillList");
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustOutBillList ", "h_v_MES_StationEntrustOutBillList");
                    //order by hmainid desc 排序丢到数据库里进行处理
                }
                else
                {