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

wtt

3 天以前 450d6ca292427262638ceb63bcfd9eb57b91c4a5

 WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs

@@ -8712,7 +8712,18 @@

                List<object> columnNameList = new List<object>();

                ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery  '" + HStatus + "','" + HBeginDate + "','" + HEndDate + "','" + HSourceID + "','" + user + "'"  , "h_p_OA_ErrMsgBackSelfQuery");
                string sReturn = "";
                if (oSystemParameter.ShowBill(ref sReturn) == true)
                {
                    if (oSystemParameter.omodel.OA_ErrMsgBackBill_Role == "Y") //系统参数  根据角色查看对应的单据进行下推
                    {
                        ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery_Role  '" + HStatus + "','" + HBeginDate + "','" + HEndDate + "','" + HSourceID + "','" + user + "'", "h_p_OA_ErrMsgBackSelfQuery_Role");
                    }
                    else
                    {
                        ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery  '" + HStatus + "','" + HBeginDate + "','" + HEndDate + "','" + HSourceID + "','" + user + "'", "h_p_OA_ErrMsgBackSelfQuery");
                    }
                }                

                if (ds.Tables[0].Rows.Count != 0 || ds != null)
                {
@@ -8766,8 +8777,18 @@
                string HEndDate = dic["HEndDate"].ToString();//结束日期

                List<object> columnNameList = new List<object>();

                ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery_APP '" + HBeginDate + "','" + HEndDate + "','" + user + "'", "h_p_OA_ErrMsgBackSelfQuery_APP");
                string sReturn = "";
                if (oSystemParameter.ShowBill(ref sReturn) == true)
                {
                    if (oSystemParameter.omodel.OA_ErrMsgBackBill_Role == "Y") //系统参数  根据角色查看对应的单据进行下推
                    {
                        ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery_APP_Role '" + HBeginDate + "','" + HEndDate + "','" + user + "'", "h_p_OA_ErrMsgBackSelfQuery_APP_Role");
                    }
                    else
                    {
                        ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery_APP '" + HBeginDate + "','" + HEndDate + "','" + user + "'", "h_p_OA_ErrMsgBackSelfQuery_APP");
                    }
                }

                if (ds.Tables[0].Rows.Count != 0 || ds != null)
                {