From d247a8069bce4d94efbb155058cb9d89ef0b0cdc Mon Sep 17 00:00:00 2001 From: "songnan.zhang" Date: Tue, 14 Jun 2022 09:59:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APP/QMAPP.Web/App_Data/MainPower.xml | 6 +- APP/QMAPP.Web/App_Data/Menu.xml | 11 +- .../QMAPP.FJC.BLL/Bucket/TSWeighRecoreBLL.cs | 20 + .../QMAPP.FJC.BLL/CheckTime/ProductTimeBLL.cs | 227 ++++++++++ APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj | 1 + .../QMAPP.FJC.DAL/Bucket/TSWeighRecoreDAL.cs | 28 ++ .../QMAPP.FJC.DAL/CheckTime/ProductTimeDAL.cs | 399 ++++++++++++++++++ APPQ5/QMAPP.FJC.DAL/QMAPP.FJC.DAL.csproj | 1 + .../DataValidators/TimeValidator.cs | 17 +- .../App_Data/Excel/TSWeighRecoreExp.xlsx | Bin 0 -> 9364 bytes .../App_Data/Excel/TSWeighRecoreExp.xml | 39 ++ APPQ5/QMAPP.FJC.Web/App_Data/Menu.xml | 19 +- .../Controllers/ProductTimeController.cs | 211 +++++++++ .../Controllers/TSWeighRecoreController.cs | 35 ++ .../Models/Bucket/TSWeighRecoreModel.cs | 4 +- .../Models/CheckTime/ProductTimeModel.cs | 297 +++++++++++++ APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj | 11 + .../Views/ProductTime/ProductTimeEdit.aspx | 166 ++++++++ .../Views/ProductTime/ProductTimeList.aspx | 115 +++++ AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs | 10 + .../App_Data/FJCServiceList.xml | 7 + 21 files changed, 1607 insertions(+), 17 deletions(-) create mode 100644 APPQ5/QMAPP.FJC.BLL/CheckTime/ProductTimeBLL.cs create mode 100644 APPQ5/QMAPP.FJC.DAL/CheckTime/ProductTimeDAL.cs create mode 100644 APPQ5/QMAPP.FJC.Web/App_Data/Excel/TSWeighRecoreExp.xlsx create mode 100644 APPQ5/QMAPP.FJC.Web/App_Data/Excel/TSWeighRecoreExp.xml create mode 100644 APPQ5/QMAPP.FJC.Web/Controllers/ProductTimeController.cs create mode 100644 APPQ5/QMAPP.FJC.Web/Models/CheckTime/ProductTimeModel.cs create mode 100644 APPQ5/QMAPP.FJC.Web/Views/ProductTime/ProductTimeEdit.aspx create mode 100644 APPQ5/QMAPP.FJC.Web/Views/ProductTime/ProductTimeList.aspx diff --git a/APP/QMAPP.Web/App_Data/MainPower.xml b/APP/QMAPP.Web/App_Data/MainPower.xml index 5a6f189..b681869 100644 --- a/APP/QMAPP.Web/App_Data/MainPower.xml +++ b/APP/QMAPP.Web/App_Data/MainPower.xml @@ -168,10 +168,14 @@ - + + + + + diff --git a/APP/QMAPP.Web/App_Data/Menu.xml b/APP/QMAPP.Web/App_Data/Menu.xml index 775d271..427bc11 100644 --- a/APP/QMAPP.Web/App_Data/Menu.xml +++ b/APP/QMAPP.Web/App_Data/Menu.xml @@ -242,12 +242,18 @@ 查询 - + 查询 修改 + + + 查询 + 修改 + + 查询 @@ -427,7 +433,8 @@ - 查询 + 查询 + 导出 diff --git a/APPQ5/QMAPP.FJC.BLL/Bucket/TSWeighRecoreBLL.cs b/APPQ5/QMAPP.FJC.BLL/Bucket/TSWeighRecoreBLL.cs index 1fa19ee..d764bf4 100644 --- a/APPQ5/QMAPP.FJC.BLL/Bucket/TSWeighRecoreBLL.cs +++ b/APPQ5/QMAPP.FJC.BLL/Bucket/TSWeighRecoreBLL.cs @@ -10,6 +10,7 @@ using QMFrameWork.Log; using QMAPP.FJC.Entity; using QMAPP.MD.Entity.Bucket; using QMAPP.FJC.DAL.Bucket; +using System.Data; namespace QMAPP.FJC.BLL.Bucket { @@ -161,5 +162,24 @@ namespace QMAPP.FJC.BLL.Bucket } } #endregion + + #region 导出数据 + /// + /// 获取导出的数据 + /// + /// 查询条件 + /// 数据 + public DataTable GetExportData(TSWeighRecore model) + { + try + { + return new TSWeighRecoreDAL().GetExportData(model); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion } } diff --git a/APPQ5/QMAPP.FJC.BLL/CheckTime/ProductTimeBLL.cs b/APPQ5/QMAPP.FJC.BLL/CheckTime/ProductTimeBLL.cs new file mode 100644 index 0000000..d3f7bf5 --- /dev/null +++ b/APPQ5/QMAPP.FJC.BLL/CheckTime/ProductTimeBLL.cs @@ -0,0 +1,227 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using QMAPP.BLL; + +using QMFrameWork.Data; + +using QMAPP.Entity; +using QMFrameWork.Log; +using System.Data; +using QMAPP.MD.Entity; +using QMAPP.MD.DAL; +using QMAPP.FJC.Entity.CheckTime; +using QMAPP.FJC.DAL.CheckTime; +using QMAPP.FJC.BLL.BZD; + +namespace QMAPP.FJC.BLL.CheckTime +{ + /// + ///　模块名称：本地库无记录的 时间验证 + ///　作 者：张松男 + ///　编写日期：2020年03月00日 + /// + public class ProductTimeBLL : BaseBLL + { + + #region 获取信息 + /// + /// 获取信息 + /// + /// 条件 + /// 信息 + public DataResult Get(ProductTime model) + { + DataResult result = new DataResult(); + try + { + result.Result = new ProductTimeDAL().Get(model); + } + catch (Exception ex) + { + result.IsSuccess = false; + result.Msg = Resource.SystemException; + throw ex; + } + result.IsSuccess = true; + return result; + } + #endregion + + #region 获取列表(分页) + /// + /// 获取列表 + /// + /// 条件 + /// 数据页 + /// 数据页 + public DataResult GetList(ProductTime condition, DataPage page) + { + DataResult result = new DataResult(); + try + { + //获取物料信息列表 + DataPage dataPage = new ProductTimeDAL().GetList(condition, page); + + result.Result = dataPage; + } + catch (Exception ex) + { + result.IsSuccess = false; + result.Msg = Resource.SystemException; + throw ex; + } + result.IsSuccess = true; + return result; + + } + /// + /// 获取全部条码格式规则 + /// + /// + public List GetAllList(string str) + { + return new ProductTimeDAL().GetAllList(); + } + #endregion + + #region 信息是否重复 + /// + /// 判断名称是否存在 + /// + /// 信息 + /// true:已存在；fasel:不存在。 + public bool Exists(ProductTime info) + { + try + { + return new ProductTimeDAL().Exists(info); + } + catch (Exception ex) + { + throw ex; + } + } + + #endregion + + #region 插入信息 + /// + /// 插入信息(单表) + /// + /// 信息 + /// 插入行数 + public DataResult Insert(ProductTime info) + { + DataResult result = new DataResult(); + try + { + + //基本信息 + info.PID = Guid.NewGuid().ToString(); + info.CREATEUSER = this.LoginUser.UserID; + info.CREATEDATE = DateTime.Now; + info.UPDATEUSER = info.CREATEUSER; + info.UPDATEDATE = info.CREATEDATE; + ProductTimeDAL cmdDAL = new ProductTimeDAL(); + result.Result = new ProductTimeDAL().Insert(info); + result.IsSuccess = true; + return result; + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 更新信息 + /// + /// 更新信息 + /// + /// 信息 + /// 更新行数 + public DataResult Update(ProductTime info) + { + DataResult result = new DataResult(); + try + { + info.UPDATEUSER = this.LoginUser.UserID; + info.UPDATEDATE = DateTime.Now; + result.Result = new ProductTimeDAL().Update(info); + result.IsSuccess = true; + return result; + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 删除 + /// + /// 删除信息 + /// + /// 主键串 + /// 删除个数 + public DataResult Delete(string strs) + { + int count = 0; + DataResult result = new DataResult(); + string[] list = strs.Split(":".ToCharArray()); + try + { + foreach (string str in list) + { + count += this.DeleteBarcodeRules(new ProductTime { PID = str }); + } + result.Result = count; + result.IsSuccess = true; + return result; + } + catch (Exception ex) + { + throw ex; + } + } + + /// + /// 删除信息 + /// + /// 信息 + /// 删除个数 + public int DeleteBarcodeRules(ProductTime info) + { + try + { + return new ProductTimeDAL().Delete(info); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 导出数据 + /// + /// 获取导出的数据 + /// + /// 查询条件 + /// 数据 + public DataTable GetExportData(ProductTime model) + { + try + { + return new ProductTimeDAL().GetExportData(model); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + } +} diff --git a/APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj b/APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj index 64cf804..f90278e 100644 --- a/APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj +++ b/APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj @@ -116,6 +116,7 @@ + diff --git a/APPQ5/QMAPP.FJC.DAL/Bucket/TSWeighRecoreDAL.cs b/APPQ5/QMAPP.FJC.DAL/Bucket/TSWeighRecoreDAL.cs index a9cbfb2..0182b37 100644 --- a/APPQ5/QMAPP.FJC.DAL/Bucket/TSWeighRecoreDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/Bucket/TSWeighRecoreDAL.cs @@ -340,5 +340,33 @@ namespace QMAPP.FJC.DAL.Bucket } #endregion + #region 获取导出的数据 + /// + /// 获取导出的数据 + /// + /// 查询条件 + /// 数据 + public DataTable GetExportData(TSWeighRecore model) + { + DataTable dt = null; + string sql = null; + List parameters = new List(); + try + { + //构成查询语句 + sql = this.GetQuerySql(model, ref parameters); + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + dt = session.GetTable(sql, parameters.ToArray()); + dt.TableName = "T_AW_TSWeighRecore"; + } + return dt; + } + catch (Exception ex) + { + throw ex; + } + } + #endregion } } diff --git a/APPQ5/QMAPP.FJC.DAL/CheckTime/ProductTimeDAL.cs b/APPQ5/QMAPP.FJC.DAL/CheckTime/ProductTimeDAL.cs new file mode 100644 index 0000000..29bab52 --- /dev/null +++ b/APPQ5/QMAPP.FJC.DAL/CheckTime/ProductTimeDAL.cs @@ -0,0 +1,399 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using QMAPP.FJC.Entity.CheckTime; +using QMFrameWork.Data; +using System.Data; +using QMAPP.Entity; + +namespace QMAPP.FJC.DAL.CheckTime +{ + /// + ///　模块名称：本地库无记录的 时间验证 + ///　作 者：张松男 + ///　编写日期：2020年03月00日 + /// + public class ProductTimeDAL + { + + #region 获取信息 + /// + /// 获取信息 + /// + /// 条件 + /// *信息 + public ProductTime Get(ProductTime info) + { + try + { + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //获取信息 + info = session.Get(info); + } + return info; + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 获取列表 + /// + /// 获取列表 + /// + /// 条件 + /// 数据页 + /// 数据页 + public DataPage GetList(ProductTime condition, DataPage page) + { + string sql = null; + List parameters = new List(); + try + { + sql = this.GetQuerySql(condition, ref parameters); + //分页关键字段及排序 + page.KeyName = "PID"; + //if (string.IsNullOrEmpty(page.SortExpression)) + // page.SortExpression = "CREATEDATE DESC"; + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + // 对应多种数据库 + //string sqlChange = this.ChangeSqlByDB(sql, session); + page = session.GetDataPage(sql, parameters.ToArray(), page); + } + return page; + } + catch (Exception ex) + { + throw ex; + } + } + /// + /// 获取全部规则 + /// + /// + public List GetAllList() + { + try + { + string sql = "SELECT * FROM [T_MD_PRODUCT_TIMECHECK]"; + List parameters = new List(); + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + return session.GetList(sql, parameters.ToArray()).ToList(); + } + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 获取查询语句 + /// + /// 获取查询语句 + /// + /// 查询条件 + /// 参数 + /// 查询语句 + private string GetQuerySql(ProductTime condition, ref List parameters) + { + StringBuilder sqlBuilder = new StringBuilder(); + StringBuilder whereBuilder = new StringBuilder(); + try + { + sqlBuilder.Append("SELECT [PID],[CWorkLoc_Code],[PWorkLoc_Code],[PWorkLoc_Column],[Product_Column],[Check],[Operator],[Check_Type],[Check_Value],[Check_Table],[Check_Column],[Pwhere],[Remark],[CREATEDATE],[CREATEUSER],[UPDATEDATE],[UPDATEUSER]"); + sqlBuilder.Append("FROM [T_MD_PRODUCT_TIMECHECK] "); + //whereBuilder.Append(" AND FLGDEL<> '1' "); + //查询条件 + + ////查询条件 + //if (string.IsNullOrEmpty(condition.FACTORY_CODE) == false) + //{ + // whereBuilder.Append(" AND FACTORY_CODE = @FACTORY_CODE "); + // parameters.Add(new DataParameter { ParameterName = "FACTORY_CODE", DataType = DbType.String, Value = condition.FACTORY_CODE }); + //} + //if (string.IsNullOrEmpty(condition.REGEX) == false) + //{ + // whereBuilder.Append(" AND REGEX LIKE @REGEX "); + // parameters.Add(new DataParameter { ParameterName = "REGEX", DataType = DbType.String, Value = "%" + condition.REGEX + "%" }); + //} + + + if (whereBuilder.Length > 0) + { + sqlBuilder.Append(" WHERE " + whereBuilder.ToString().Substring(4)); + } + return sqlBuilder.ToString(); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 信息是否重复 + /// + /// 判断名称是否存在 + /// + /// + /// true:已存在；fasel:不存在。 + public bool Exists(ProductTime info) + { + StringBuilder sqlBuilder = new StringBuilder(); + StringBuilder whereBuilder = new StringBuilder(); + List parameters = new List(); + int count = 0; + try + { + sqlBuilder.Append("SELECT COUNT(0) FROM T_MD_PRODUCT_TIMECHECK"); + if (info.PID == null) + { + info.PID = ""; + } + whereBuilder.Append(" AND PID <> @PID "); + parameters.Add(new DataParameter { ParameterName = "PID", DataType = DbType.String, Value = info.PID }); + + //添加进行无重复字段判断代码 + + if (whereBuilder.Length > 0) + { + sqlBuilder.Append(" WHERE " + whereBuilder.ToString().Substring(4)); + } + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + count = Convert.ToInt32(session.ExecuteSqlScalar(sqlBuilder.ToString(), parameters.ToArray())); + } + return count > 0; + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 插入信息 + /// + /// 插入信息(单表) + /// + /// 信息 + /// 插入行数 + public int Insert(ProductTime info) + { + int count = 0; + try + { + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //插入基本信息 + count = session.Insert(info); + } + return count; + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 更新信息 + /// + /// 更新信息 + /// + /// + /// 更新行数 + public int Update(ProductTime info) + { + int count = 0; + try + { + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //更新基本信息 + count = session.Update(info); + } + return count; + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 逻辑删除 + /// + /// 逻辑删除信息 + /// + /// + /// 删除个数 + public int Delete(ProductTime info) + { + StringBuilder sqlBuilder = new StringBuilder(); + List parameters = new List(); + int count = 0; + try + { + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //删除基本信息 + sqlBuilder.Append("delete T_MD_PRODUCT_TIMECHECK "); + sqlBuilder.Append("WHERE PID = @PID "); + parameters.Add(new DataParameter { ParameterName = "PID", DataType = DbType.String, Value = info.PID }); + count = session.ExecuteSql(sqlBuilder.ToString(), parameters.ToArray()); + } + return count; + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + public DateTime GetServiceDateTime() + { + StringBuilder sql = new StringBuilder(); + try + { + List parameters = new List(); + string sqlScript = @"select GetDATE() as time "; + DataTable datatable = new DataTable(); + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //插入基本信息 + datatable = session.GetTable(sqlScript, parameters.ToArray()); + } + + if (datatable.Rows.Count > 0) + { + string datetimestr = datatable.Rows[0]["time"].ToString(); + return DateTime.Parse(datetimestr); + } + + return DateTime.Now; + } + catch (Exception ex) + { + throw ex; + } + } + + /// + /// 根据工位查询出配置 + /// + /// + /// + public ProductTime GetTimeCheckCfg(string locCode, string DAI_Code) + { + List parameters = new List(); + DateTime dateTime = DateTime.MinValue; + DataTable dataTable = new DataTable(); + ProductTime timeCheck = new ProductTime(); + string sqlScript = $" select * from T_MD_PRODUCT_TIMECHECK where CWorkLoc_Code ='{locCode}' and DAI_Code = '{DAI_Code}' and [Check]='1' order by UPDATEDATE desc,CREATEDATE desc "; + + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //更新基本信息 + dataTable = session.GetTable(sqlScript, parameters.ToArray()); + } + + + if (dataTable.Rows.Count == 0) + { + return null; ; + } + else + { + DataRow row = dataTable.Rows[0]; + + timeCheck.PID = row["PID"].ToString(); + timeCheck.CWorkLoc_Code = row["CWorkLoc_Code"].ToString(); + timeCheck.PWorkLoc_Code = row["PWorkLoc_Code"].ToString(); + timeCheck.PWorkLoc_Column = row["PWorkLoc_Column"].ToString(); + timeCheck.Product_Column = row["Product_Column"].ToString(); + timeCheck.Check = row["Check"].ToString(); + timeCheck.Operator = row["Operator"].ToString(); + timeCheck.Check_Type = row["Check_Type"].ToString(); + timeCheck.Check_Value = row["Check_Value"].ToString(); + timeCheck.Check_Table = row["Check_Table"].ToString(); + timeCheck.Check_Column = row["Check_Column"].ToString(); + timeCheck.Remark = row["Remark"].ToString(); + if (DateTime.TryParse(row["CREATEDATE"].ToString(), out dateTime)) + { + timeCheck.CREATEDATE = dateTime; + } + timeCheck.CREATEUSER = row["CREATEUSER"].ToString(); + timeCheck.UPDATEUSER = row["UPDATEUSER"].ToString(); + if (DateTime.TryParse(row["CREATEDATE"].ToString(), out dateTime)) + { + timeCheck.UPDATEDATE = dateTime; + } + timeCheck.Column1 = row["Column1"].ToString(); + timeCheck.Column2 = row["Column2"].ToString(); + timeCheck.PWhere = row["PWhere"].ToString(); + timeCheck.DAI_Code = row["DAI_Code"].ToString(); + timeCheck.Check_ValueTo = row["Check_ValueTo"].ToString(); + } + return timeCheck; + } + + public DataTable GetConfigValue(ProductTime timeCheckModel, string productCode) + { + DataTable dataTable = new DataTable(); + List parameters = new List(); + string sqlScript = $" select {timeCheckModel.Check_Column} as CheckColumnValue from {timeCheckModel.Check_Table} where {timeCheckModel.PWorkLoc_Column} ='{timeCheckModel.PWorkLoc_Code}' and {timeCheckModel.Product_Column}='{productCode}' "; + if (!string.IsNullOrEmpty(timeCheckModel.PWhere)) + { + sqlScript = sqlScript + " and " + timeCheckModel.PWhere; + } + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //更新基本信息 + dataTable = session.GetTable(sqlScript, parameters.ToArray()); + } + + //DataSet dataSet = SqlHelper.ExecuteDataset(Config.maindbConnectionString, CommandType.Text, sqlScript); + return dataTable; + + } + + #region 获取导出的数据 + /// + /// 获取导出的数据 + /// + /// 查询条件 + /// 数据 + public DataTable GetExportData(ProductTime model) + { + DataTable dt = null; + string sql = null; + List parameters = new List(); + try + { + //构成查询语句 + sql = this.GetQuerySql(model, ref parameters); + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + dt = session.GetTable(sql, parameters.ToArray()); + dt.TableName = "T_MD_PRODUCT_TIMECHECK"; + } + return dt; + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + } +} diff --git a/APPQ5/QMAPP.FJC.DAL/QMAPP.FJC.DAL.csproj b/APPQ5/QMAPP.FJC.DAL/QMAPP.FJC.DAL.csproj index e9d58fb..673e01e 100644 --- a/APPQ5/QMAPP.FJC.DAL/QMAPP.FJC.DAL.csproj +++ b/APPQ5/QMAPP.FJC.DAL/QMAPP.FJC.DAL.csproj @@ -108,6 +108,7 @@ + diff --git a/APPQ5/QMAPP.FJC.TRACING/DataValidators/TimeValidator.cs b/APPQ5/QMAPP.FJC.TRACING/DataValidators/TimeValidator.cs index 0252eda..1f31c01 100644 --- a/APPQ5/QMAPP.FJC.TRACING/DataValidators/TimeValidator.cs +++ b/APPQ5/QMAPP.FJC.TRACING/DataValidators/TimeValidator.cs @@ -2,6 +2,7 @@ using QMAPP.FJC.TRACING.DAInterface; using QMAPP.FJC.Entity.QT; using System.Data; +using QMAPP.FJC.Entity.CheckTime; using QMAPP.FJC.DAL.CheckTime; namespace QMAPP.FJC.TRACING.DataValidators @@ -11,12 +12,11 @@ namespace QMAPP.FJC.TRACING.DataValidators /// public class TimeValidator : IDataValidator { - public ValidateResult Validate(DAObject data,DAIValidation validOption) + public ValidateResult Validate(DAObject data, DAIValidation validOption) { - CHECKTIMEDAL dal = new CHECKTIMEDAL(); - var timeCheck = dal.GetTimeCheckCfg(data.WorkLocState.WORKLOC_CODE, data.DAI.DA_CODE); - //T_MD_PRODUCT_TIMECHECK timeCheck = LocSwitchDataAccess.GetTimeCheckCfg(data.WorkLocState.WORKCELL_CODE, data.DAI.DA_CODE); - if(timeCheck == null) return new ValidateResult(true, ""); + ProductTimeDAL dal = new ProductTimeDAL(); + ProductTime timeCheck = dal.GetTimeCheckCfg(data.WorkLocState.WORKCELL_CODE, data.DAI.DA_CODE); + if (timeCheck == null) return new ValidateResult(true, ""); DataTable checkTable = dal.GetConfigValue(timeCheck, data.DAValue.ToString()); if (checkTable == null || checkTable.Rows.Count == 0) { @@ -27,9 +27,9 @@ namespace QMAPP.FJC.TRACING.DataValidators var ispass = TimeOutCompare(dataRow["CheckColumnValue"].ToString(), timeCheck.Operator, timeCheck.Check_Value, timeCheck.Check_ValueTo, timeCheck.Check_Type); - if(ispass) return new ValidateResult(true, ""); + if (ispass) return new ValidateResult(true, ""); else return new ValidateResult(false, "未达到时间验证标准！"); - + } /// @@ -53,7 +53,6 @@ namespace QMAPP.FJC.TRACING.DataValidators /// public static bool TimeOutCompare(string pCheckColumnValue, string pOperator, string pCheck_Value, string pCheck_ValueTo, string pCheck_Type) { - CHECKTIMEDAL dal = new CHECKTIMEDAL(); var preStatTime = DateTime.Now; if (!DateTime.TryParse(pCheckColumnValue, out preStatTime)) { @@ -73,7 +72,7 @@ namespace QMAPP.FJC.TRACING.DataValidators throw new Exception("验证值pCheck_ValueTo必须是int类型"); } } - + ProductTimeDAL dal = new ProductTimeDAL(); DateTime serviceTime = dal.GetServiceDateTime(); TimeSpan ts = serviceTime.Subtract(preStatTime); if (pCheck_Type == "1") diff --git a/APPQ5/QMAPP.FJC.Web/App_Data/Excel/TSWeighRecoreExp.xlsx b/APPQ5/QMAPP.FJC.Web/App_Data/Excel/TSWeighRecoreExp.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..7c9f74930ce127b01514e4ec6f5276279786a744 GIT binary patch literal 9364 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

_NkD#2MMh2iD)x0jqMj6X-PH z3a&j8Bx}LAVO1$5^Llc5-)m#Q=NxxA=`M2(Cs4HCFMrOLUA__DG$Djw*hD^XWjP~`_;ku^n6~{tprK|pC(JIy&o*w?a8YS@xJ4{J3xftrzd!mDU1ga{)5~5EMeE0FF-iS z^Nd}BqJ!LJN{XaH7>g8{Fh|0Z+xwog!PsfrRyY-kxIpy{K6sA+80fn2Y+I8N53(b% zcE7Pz0GWy)3N}0yHZ8Y3haZG&2N@ty2^X2W2&JmB$_#K?M8pitHY0ABz2|slv_tiE zuTzZQ9kYM;i%vRk4hfM1OJm@d<)nw*@r%dfyq`xSybqz@LwA4!N!Rp?S&$%=)P)t5 zk~yQ9M*V0zVDR!1b_9wBvfzoD+Wg=AnB$W*c786S96EH*_Au6>swNP)DJH%1`nCW)acNo~nhAaFbkovt` zJ)&LML*=9v`n8!h<04<9*l|RPjY`c!Y`*1_KB}EiWaW(=Om37Euz;X#4 zy)BZAErbDB-xcE$r3dk$(1zl-R7*I+BcOVVP~a-J7}$s?iscz1uhIhv@(g1D?P$y%i%DO%;K`t{8!N;*0@puJ)0I;8;$O3I4wGxRbeV#Crj(}VP4!=M8> zo9LTl@j#6tySLroB84H8-I#@iq>Y@nq7V?qw~Zl5t`ac)H@U8)brQxBFuATtfw_ev z46SL>ws~pNA&X&w)aj$@KRs@O5)NBrujoCd8}I~qQ@&kv--@u^k~*>762u`*jc(C- zv}Pb{U2JA?(sQwAhVdS2-dOw?%72(2C-q@#u{eH@?#bpkKe(%bly%z%Q~~Szdyy=S9(|?{k$R5(j*+%nrJYfc=N#yX4x|k|eG;Xf z#>n1As~xts2*}Y)HbH()y4gxu_AqS5UL??F%=`4!&r!~g-@4DKRqn*YMRn0ntfXZM z)K$@@1FU)PO#d#xe~Tyf2OUY2mWTWpQ!qDWjM@0EB7px3H>*fKC!YbaKU<3xz-r)3 zwC4*RK$@p}iRz!SUUm3K+mLZi&o8;VhBjuw%q;r<@kv)_;|MIazJ zN9`PW2ala4f=fz`Y2igQ0}~ZO7dAD&+0rESYRce;l4cCw@J~!^ceF>1Yt#&iaRrcO z?LUz)^>%HEzl)3{MPp7;kdp$A?v`y5q7~s7kv`+2*3^68tx8G&uBNU zFb%lwWVrmqPm=^^L$;Jr7Lr`(7%kVfo3HBG1*huvCeIlG9{hJbTSLg&%E8FWK}XTm z#>iglB`cK14$6Qqq69tDe4RNO%nCMo;d;8OMujA6pp#c^EEnx#u=9KtRWg_7;!-XZ zSGjOsC-DQfPJ9^O3iLMpfEko!#+aH}pTv4shCXZmT@uAwP3%Cb7fFD^0w|hwD*fuH04J>FGHM#)agiVG zoq&u(q0hGUH+vwpEwGcp-kbcN=OY!JHI$bFFoz>6+q8l|Jd1XhE?cAOzR`R=Z$CF+ zyN3Ws0)wFZ+PHq-D0m&2=NSwH3`Fq!xr_${^bc|RZQ!37$Cs4zyS-dac#rdE0{Xkt z*D2^l=eJYyKXiUAng8ePWljEWFV0@tUoK7j-QVkL6EDKQ{gMAw?cbLuUPJWyGQgkO zpP#4nA5Q;sHQ=@SYl{0%_3P)9@u&J9g!lg&^b6_xyS)sW9PHl|@XK)jIV68aDF*j1 z3F>u6UuUuxKfh6G`m5T1<+ay#UZ0Tuv{Qun&*!Dr7G9ST|FqEiOlrTJxc(?A{y(t( zKK32RU#kD1+x|X7UK4JAdPIC?$Dcj^R{N8Fd)?*NXP!R|3_tG*&j$Vq+yCqI3v2(o xy+l~-cZ6S*|KRZd-t*Ti{)_JKs5$(X?w_1KKob1dVnu$w-U9h7=S=XT_b<4{4NCw3 literal 0 HcmV?d00001 diff --git a/APPQ5/QMAPP.FJC.Web/App_Data/Excel/TSWeighRecoreExp.xml b/APPQ5/QMAPP.FJC.Web/App_Data/Excel/TSWeighRecoreExp.xml new file mode 100644 index 0000000..6f471cc --- /dev/null +++ b/APPQ5/QMAPP.FJC.Web/App_Data/Excel/TSWeighRecoreExp.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/APPQ5/QMAPP.FJC.Web/App_Data/Menu.xml b/APPQ5/QMAPP.FJC.Web/App_Data/Menu.xml index 2de4d0f..c67f9d0 100644 --- a/APPQ5/QMAPP.FJC.Web/App_Data/Menu.xml +++ b/APPQ5/QMAPP.FJC.Web/App_Data/Menu.xml @@ -242,12 +242,18 @@ 查询 - + 查询 修改 + + + 查询 + 修改 + + 查询 @@ -427,7 +433,8 @@ - 查询 + 查询 + 导出 @@ -442,6 +449,12 @@ 导出 + + + 查询 + 导出 + +