新增从缓存列表页面返回信息调用方法

yxj

2023-07-04 6b2c7a19f95349edd1de84e3a2d857403abc6e1b

 WebAPI/Controllers/MateOutController.cs

@@ -553,7 +553,8 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "生成领料单成功！单据号为：";
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //成功！
                    //objJsonResult.Message = "生成领料单成功！单据号为：";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -561,7 +562,8 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "上传失败！" + DBUtility.ClsPub.sErrInfo;
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //失败！
                    //objJsonResult.Message = "上传失败！" + DBUtility.ClsPub.sErrInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -618,7 +620,8 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "生成退料单成功！单据号为：";
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //成功！
                    //objJsonResult.Message = "生成退料单成功！单据号为：";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -626,7 +629,8 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "上传失败！" + DBUtility.ClsPub.sErrInfo;
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //失败！
                    //objJsonResult.Message = "上传失败！" + DBUtility.ClsPub.sErrInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -1361,20 +1365,20 @@
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    int headLen = col.ColumnName.ToString().Length;        //列名的长度
                    int colLen = 0;
                    if (ds.Tables[1].Rows[0][col.ColumnName] != null)
                    {
                        string colLenStr=ds.Tables[1].Rows[0][col.ColumnName].ToString();
                        if(colLenStr != "")
                        {
                            colLen = int.Parse(colLenStr);   //列中最长数据的长度
                        }
                    //int headLen = col.ColumnName.ToString().Length;        //列名的长度
                    //int colLen = 0;
                    //if (ds.Tables[1].Rows[0][col.ColumnName] != null)
                    //{
                    //    string colLenStr=ds.Tables[1].Rows[0][col.ColumnName].ToString();
                    //    if(colLenStr != "")
                    //    {
                    //        colLen = int.Parse(colLenStr);   //列中最长数据的长度
                    //    }
                        
                    }
                    colLen = (headLen >= colLen) ? headLen : colLen;
                    //}
                    //colLen = (headLen >= colLen) ? headLen : colLen;
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\",\"width\":\"" + colLen + "\"}";
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name  + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

@@ -1422,20 +1426,20 @@
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    int headLen = col.ColumnName.ToString().Length;        //列名的长度
                    int colLen = 0;
                    if (ds.Tables[1].Rows[0][col.ColumnName] != null)
                    {
                        string colLenStr = ds.Tables[1].Rows[0][col.ColumnName].ToString();
                        if (colLenStr != "")
                        {
                            colLen = int.Parse(colLenStr);   //列中最长数据的长度
                        }
                    //int headLen = col.ColumnName.ToString().Length;        //列名的长度
                    //int colLen = 0;
                    //if (ds.Tables[1].Rows[0][col.ColumnName] != null)
                    //{
                    //    string colLenStr = ds.Tables[1].Rows[0][col.ColumnName].ToString();
                    //    if (colLenStr != "")
                    //    {
                    //        colLen = int.Parse(colLenStr);   //列中最长数据的长度
                    //    }

                    }
                    colLen = (headLen >= colLen) ? headLen : colLen;
                    //}
                    //colLen = (headLen >= colLen) ? headLen : colLen;
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name +"\",\"width\":\"" + colLen + "\"}";
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name  + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

@@ -1520,7 +1524,7 @@
                MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString());

                string sql = "" +
                    "( (工艺单日期 between ''" + com.HBeginDate + "'' and ''" + com.HEndDate + "'') or (''" + com.HBeginDate + "'' = '''' and ''" + com.HEndDate + "''='''') ) " +
                    "( (生产订单日期 between ''" + com.HBeginDate + "'' and ''" + com.HEndDate + "'') or (''" + com.HBeginDate + "'' = '''' and ''" + com.HEndDate + "''='''') ) " +
                    "and (产品代码=''" + com.HMaterNumber + "'' or ''" + com.HMaterNumber + "''='''') " +
                    "and (生产订单号=''" + com.HBillNo + "'' or ''" + com.HBillNo + "''='''') " +
                    "and (产品名称=''" + com.HProductName + "'' or ''" + com.HProductName + "''='''') " +
@@ -1560,7 +1564,7 @@



        #region 第三个报表
        #region 染厂产量报表
        [Route("ProdProcessSumReport/ProdProcessSumReport_DyeColor_third")]
        [HttpGet]
        public object ProdProcessSumReport_DyeColor_third(string sWhere)