diff --git a/FactorySystemApi/Controllers/BaseController.cs b/FactorySystemApi/Controllers/BaseController.cs index 5837d4d..2e748ce 100644 --- a/FactorySystemApi/Controllers/BaseController.cs +++ b/FactorySystemApi/Controllers/BaseController.cs @@ -392,7 +392,7 @@ namespace FactorySystemApi.Controllers if (resModel.success) { List datas = JsonConvert.DeserializeObject>(resModel.data); - return datas.Count > 0 ? datas.First().mdm_code : ""; + return datas.Count > 0 ? datas.First().mdm_code.ToUpper() : ""; } } } diff --git a/FactorySystemBll/TaskBll.cs b/FactorySystemBll/TaskBll.cs index a6d0d73..4ca501c 100644 --- a/FactorySystemBll/TaskBll.cs +++ b/FactorySystemBll/TaskBll.cs @@ -81,6 +81,7 @@ namespace FactorySystemBll TFS_FTeamwork teamwork = db.Queryable().Where(s => s.FID == teamId).First(); List viewType = new List { + (int)Constant.ViewType.成品视图, (int)Constant.ViewType.半成品视图, (int)Constant.ViewType.中间品视图, (int)Constant.ViewType.香基视图