合并

ch

2021-08-02 6dee5ec23bd7b7d35e7820dd71d7a7ebe70fc69f

 WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs

@@ -573,7 +573,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.Message = "保存失败！";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
@@ -664,6 +664,8 @@
                model.HGroupID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HGroupID"]);
                model.HDeptID= DBUtility.ClsPub.isLong(ds0.Tables[0].Rows[0]["HDeptID"]);
                model.HPRDORGID = DBUtility.ClsPub.isLong(ds0.Tables[0].Rows[0]["HPRDORGID"]);
                model.HMainSourceInterID = HICMOInterID;
                model.HMainSourceEntryID = HICMOEntryID;
                WebS.WebService1 oWebs = new WebS.WebService1();
                bool flag=oWebs.set_SaveICMOProductReportBill_Layui(model, sHSourceType, ref DBUtility.ClsPub.sErrInfo);
                if (flag)
@@ -692,7 +694,56 @@
            return objJsonResult;
        }
        #endregion
   



        #region [动态列表]
        [Route("Sc_MESBeginWorkBill/ReportFrom")]
        [HttpGet]
        public object ReportFrom()
        {
            List<string> columnNameList = new List<string>();
            try
            {
                //根据选择资源ID获取当前生产工单、责任人
                ds = oCN.RunProcReturn("select HItemID,HNumber,HName,HRemark,HUseFlag,HBirthDay   from Gy_Employee where HItemID=9999", "Gy_Employee");
                string aa = ds.Tables[0].Columns[0].ToString();

                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    columnNameList.Add(col.ColumnName);//获取到DataColumn列对象的列名
                }
                if (ds.Tables[0].Rows.Count > 0)
                {

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取资源绑定数据成功！";
                    objJsonResult.data = ds;
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "暂无资源绑定！";
                    objJsonResult.data = null;
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {

                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = e.Message.ToString();
                objJsonResult.data = null;
                objJsonResult.list = columnNameList;
            }
            return objJsonResult;
        }
        #endregion
    }
}