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

zrg

2024-01-03 64b3893b55020b994d5f3a9dd6035592c1602596

 WebAPI/Controllers/LMESController.cs

@@ -289,6 +289,7 @@

                    long HInterID1 = DBUtility.ClsPub.CreateBillID(oBill.omodel.HBillType, ref DBUtility.ClsPub.sExeReturnInfo);
                    string HBillNo = DBUtility.ClsPub.CreateBillCode(oBill.omodel.HBillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
                    HBillNo = HBillNo.Replace("GXLX", "ZYK0");
                    oBill.omodel.HInterID = HInterID1;
                    oBill.omodel.HBillNo = HBillNo;
                    oBill.omodel.HBillSubType = "SUB";
@@ -1214,6 +1215,54 @@
            return GetObjectJson(ds);
        }

        #region 生产分析报表
        [Route("LEMS/ProductionAnalysisReportList")]
        [HttpGet]
        public object ProductionAnalysisReportList(string DateYear, string HType, string user)
        {
            try
            {
                DataSet ds;
                List<object> columnNameList = new List<object>();

                if (DateYear == null || DateYear.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "请选择有效年份";
                    return objJsonResult;
                }
                else
                {
                      ds = oCN.RunProcReturn("exec [h_p_Sc_ProductionAnalysisReportList] '" + DateYear + "','" + HType + "'", "[h_p_Sc_ProductionAnalysisReportList]");
                }

                //添加列名
                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

        #region 客户订单  生产订单完工
        [Route("LEMS/sc_ICOMReportClose")]
        [HttpPost]