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

wtt

2024-11-13 175b53e6f0adb40a0d861981f56f120615d55897

 WebAPI/Controllers/XSGL/Xs_CusBalanceReportController.cs

@@ -111,12 +111,12 @@
                //查询
                if (sWhere == null || sWhere.Equals(""))
                {
                    string sql = "exec h_p_Xs_CusBalanceReport_Query '','" + userid + "'";
                    string sql = "exec h_p_Xs_CusBalanceReport_HIsUsingBalanceEntry_Query '','" + userid + "'," + HCusID;
                    ds = oCN.RunProcReturn(sql, "h_p_Xs_CusBalanceReport_Query");
                }
                else
                {
                    string sql = "exec h_p_Xs_CusBalanceReport_Query '" + sWhere + "','" + userid + "'";
                    string sql = "exec h_p_Xs_CusBalanceReport_HIsUsingBalanceEntry_Query '" + sWhere +"','" + userid + "'," + HCusID;
                    ds = oCN.RunProcReturn(sql, "h_p_Xs_CusBalanceReport_Query");
                }

@@ -145,5 +145,64 @@
            }
        }
        #endregion

        #region 出库条码明细报表 查询
        /// <summary>
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Xs_SellOutCompareToProductReport/list")]
        [HttpGet]
        public object getXs_SellOutCompareToProductReport(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Xs_SellOutCompareToProductReport", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Xs_SellOutCompareToProductReport order by 生产单号 desc", "h_v_Xs_SellOutCompareToProductReport");
                }
                else
                {
                    string sql1 = "select * from h_v_Xs_SellOutCompareToProductReport where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by 生产单号 desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Xs_SellOutCompareToProductReport");
                }

                //添加列名
                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 = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                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
    }
}