1

llj

4 天以前 99bcfefdb20187000fc89a8f2654745ad2f0e371

 WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs

@@ -9,6 +9,7 @@
using System.Net.Http;
using System.Web.Http;
using WebAPI.Models;
using WebAPI.Utility;

namespace WebAPI.Controllers.CJGL
{
@@ -86,13 +87,17 @@
        #region 车间工序全程跟踪报表 查询
        [Route("Mes_OrderProcFlowAllReport/OrderProcFlowAllReportList")]
        [HttpGet]
        public object OrderProcFlowAllReportList(string sWhere)
        public object OrderProcFlowAllReportList(string txtHOrderProcNo, string txtHMaterNumber, string check, string txtHDeptName, string sWhere)
        {
            try
            {
                //反序列化传递的值
                if (sWhere != null)
                {
                    sWhere = sWhere.Replace("'", "''");
                }

                ds = oCN.RunProcReturn($"exec h_p_Mes_OrderProcFlowAllReport " +sWhere+"", "h_p_Mes_OrderProcFlowAllReport");
                ds = oCN.RunProcReturn($"exec h_p_Mes_OrderProcFlowAllReport '" + txtHOrderProcNo +"','"+ txtHMaterNumber +"','"+ check +"','"+ txtHDeptName + "','"+sWhere+"'", "h_p_Mes_OrderProcFlowAllReport");

                List<object> listCol = new List<object>();
                foreach (DataColumn col in ds.Tables[0].Columns)
@@ -123,13 +128,19 @@
        #region 车间工序全程跟踪报表 查询
        [Route("Mes_OrderProcFlowAllReport/OrderProcFlowAllReportList_TK")]
        [HttpGet]
        public object OrderProcFlowAllReportList_TK(string sWhere)
        public object OrderProcFlowAllReportList_TK(DateTime HDate1,DateTime HDate2, string txtHOrderProcNo, string txtHMaterNumber, string check, string txtHDeptName, string sWhere)
        {
            try
            {
                //反序列化传递的值
                if (sWhere != null)
                {
                    sWhere = sWhere.Replace("'", "''");
                }

                ds = oCN.RunProcReturn($"exec h_p_Mes_OrderProcFlowAllReport_TK " + sWhere + "", "h_p_Mes_OrderProcFlowAllReport_TK");
                ds = oCN.RunProcReturn($"exec h_p_Mes_OrderProcFlowAllReport_TK '" + HDate1 +"','"+ HDate2+"','"+ txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "','" + txtHDeptName + "','" + sWhere + "'", "h_p_Mes_OrderProcFlowAllReport");

                // ds = oCN.RunProcReturn($"exec h_p_Mes_OrderProcFlowAllReport_TK " + sWhere + "", "h_p_Mes_OrderProcFlowAllReport_TK");

                List<object> listCol = new List<object>();
                foreach (DataColumn col in ds.Tables[0].Columns)
@@ -640,6 +651,7 @@
        /// <returns></returns>
        [Route("Mes_OrderProcFlowAllReportController/GetSc_ProcessErrStationReport_Json")]
        [HttpGet]
        [Permission(HModName = "Sc_ProcessErrStationReport")]
        public object GetSc_ProcessErrStationReport_Json(string sWhere,string user)
        {
            try