1

wtt

3 天以前 7141e956ca8488f6feb082828cd60653382b6c89

 WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs

@@ -27,7 +27,7 @@
        {
            try
            {
                ds = oCN.RunProcReturn($"select DISTINCT HSeOrderBillNo from Sc_ICMOBillMain ", "Sc_ICMOBillMain");
                ds = oCN.RunProcReturn($"select DISTINCT HSeOrderBillNo from Sc_ICMOBillSub ", "Sc_ICMOBillSub");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
@@ -86,13 +86,60 @@
        #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)
                {
                    Type dataType = col.DataType;
                    string str = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    listCol.Add(JsonConvert.DeserializeObject(str));
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = listCol;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region 车间工序全程跟踪报表 查询
        [Route("Mes_OrderProcFlowAllReport/OrderProcFlowAllReportList_TK")]
        [HttpGet]
        public object OrderProcFlowAllReportList_TK(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 '" + 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)