优化检验方案 上偏差赋值错 优化开完工编辑后，不回传id 智云MES测试记录20250603的文档进行软件完善

zrg

2025-06-26 779cd1aa145b8038391ba93158d476dfcf6032d9

 WebAPI/Controllers/Æ·ÖʹÜÀí/ÖÊÁ¿±¨±í/QC_QualityReportsController.cs

@@ -489,8 +489,9 @@
                int HMaterID = int.Parse(dic["HMaterID"].ToString());
                string HMouldNum = dic["HMouldNum"].ToString();
                string HSourceID = dic["HSourceID"].ToString();
                string HProcID = dic["HProcID"].ToString();

                ds = oCN.RunProcReturn("exec h_p_QC_InspectionFormReport '" + HBeginDate + "','" + HEndDate + "'," + limit + "," + HQCCheckItemID + "," + HMaterID + ",'" + HMouldNum + "','"+ HSourceID + "','"+ HDeptID + "'", "h_p_QC_InspectionFormReport");
                ds = oCN.RunProcReturn("exec h_p_QC_InspectionFormReport '" + HBeginDate + "','" + HEndDate + "'," + limit + "," + HQCCheckItemID + "," + HMaterID + ",'" + HMouldNum + "','"+ HSourceID + "','"+ HDeptID + "','"+ HProcID + "'", "h_p_QC_InspectionFormReport");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1688,7 +1689,7 @@
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
                //}
            
            }
            catch (Exception e)
            {
@@ -2201,6 +2202,135 @@
        }
        #endregion

        #region è´¨é‡æ¨¡å— å…¨ç¨‹è´¨é‡è¿½æº¯   (根据生产订单查询) 
        //页面初始化加载
        [Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList_HICM")]
        [HttpGet]
        public object Get_QC_FiveMenOneRingList_HICM(string HICMOBillNo, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                ds = oCN.RunProcReturn("exec h_p_QC_FiveMenOneRingList_HICM '" + HICMOBillNo + "'", "h_p_QC_FiveMenOneRingList_HICM");
                if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "此条码查无数据!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                // éåŽ†æ‰€æœ‰è¡¨
                foreach (DataTable table in ds.Tables)
                {
                    List<object> tableColumnList = new List<object>();

                    // æ·»åŠ åˆ—名
                    foreach (DataColumn col in table.Columns)
                    {
                        Type dataType = col.DataType;
                        string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                        tableColumnList.Add(JsonConvert.DeserializeObject(ColmString));
                    }

                    // å°†æ¯ä¸ªè¡¨çš„列名列表添加到总列名列表
                    columnNameList.Add(new { TableName = table.TableName, Columns = tableColumnList });
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds;
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }


        //根据生产订单查询
        [Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList_HICMOBillNoID")]
        [HttpGet]
        public object Get_QC_FiveMenOneRingList_HICMOBillNoID(string HICMOBillNo, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                ds = oCN.RunProcReturn("select top 1 hmainid,HEntryID from h_v_IF_ICMOBillList where å•æ®å·= '" + HICMOBillNo + "'", "h_v_Sc_ProcessExchangeBillList_Query");

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



        //点击主表格的生产订单,查询子表格数据
        [Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList_Right_ICM")]
        [HttpGet]
        public object Get_QC_FiveMenOneRingList_Right_ICM(string linterid, string HEntryID, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                ds = oCN.RunProcReturn("exec h_p_QC_FiveMenOneRingList_Query_HICM '" + linterid + "','" + HEntryID + "'", "h_p_QC_FiveMenOneRingList_Query_HICM");

                // éåŽ†æ‰€æœ‰è¡¨
                foreach (DataTable table in ds.Tables)
                {
                    List<object> tableColumnList = new List<object>();

                    // æ·»åŠ åˆ—名
                    foreach (DataColumn col in table.Columns)
                    {
                        Type dataType = col.DataType;
                        string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                        tableColumnList.Add(JsonConvert.DeserializeObject(ColmString));
                    }

                    // å°†æ¯ä¸ªè¡¨çš„列名列表添加到总列名列表
                    columnNameList.Add(new { TableName = table.TableName, Columns = tableColumnList });
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds;
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion
    }
}