1

llj

2025-11-27 b382d78a5401a6a2997a6cd301329478460a08c0

1

 WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs

@@ -127,7 +127,7 @@
        #region 车间工序全程跟踪报表 查询
        [Route("Mes_OrderProcFlowAllReport/OrderProcFlowAllReportList_TK")]
        [HttpGet]
        public object OrderProcFlowAllReportList_TK(string txtHOrderProcNo, string txtHMaterNumber, string check, string txtHDeptName, string sWhere)
        public object OrderProcFlowAllReportList_TK(DateTime HDate1,DateTime HDate2, string txtHOrderProcNo, string txtHMaterNumber, string check, string txtHDeptName, string sWhere)
        {
            try
            {
@@ -137,7 +137,7 @@
                    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 '" + 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");


 WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs

@@ -1275,5 +1275,154 @@
            }
        }
        #endregion


        #region 出厂检验单根据源单获取信息-源单为销售订单通过单据号(1401)
        /// <summary>
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("QC_OutCompCheckBill/get_SeOrderBill_Tmp_ByBiilNo")]
        [HttpGet]
        public object get_SeOrderBill_Tmp_ByBiilNo(string HBillNo, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                if ( HBillNo.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "参数不全，获取源单信息失败！ ";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                string sReturn = "";
                string sql = "";
                if (oSystemParameter.ShowBill(ref sReturn))
                {
                    switch (oSystemParameter.omodel.QC_OutCompCheckBill_QCSchemeSource)
                    {
                        case "物料":
                            sql = "exec h_p_QC_GetInfoBySeOrderBill_ByBillNo " + "'物料'" + ",'" + HBillNo +"'";
                            break;
                    }

                }

                ds = oCN.RunProcReturn(sql, "h_p_QC_GetInfoBySeOrderBill_ByBillNo");

                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没查询到数据！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    //添加列名
                    foreach (DataColumn col in ds.Tables[0].Columns)
                    {
                        Type dataType = col.DataType;
                        string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                        columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                    }

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "返回记录成功！";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "查询数据异常，请与管理员联系！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region 出厂检验单根据源单获取信息-源单为发货通知单通过单据号(1401)
        /// <summary>
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("QC_OutCompCheckBill/get_SeOutStockBill_Tmp_ByBillNo")]
        [HttpGet]
        public object get_SeOutStockBill_Tmp_ByBillNo(string HBillNo, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                if (HBillNo.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "参数不全，获取源单信息失败！ ";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                string sReturn = "";
                string sql = "";
                if (oSystemParameter.ShowBill(ref sReturn))
                {
                    switch (oSystemParameter.omodel.QC_OutCompCheckBill_QCSchemeSource)
                    {
                        case "物料":
                            sql = "exec h_p_QC_GetInfoBySeOutStockBill_ByBillNo " + "'物料'" + ",'" + HBillNo + "'";
                            break;
                    }

                }

                ds = oCN.RunProcReturn(sql, "h_p_QC_GetInfoBySeOutStockBill_ByBillNo");

                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没查询到数据！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    //添加列名
                    foreach (DataColumn col in ds.Tables[0].Columns)
                    {
                        Type dataType = col.DataType;
                        string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                        columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                    }

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "返回记录成功！";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "查询数据异常，请与管理员联系！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}