This commit is contained in:
parent
ea313cbbba
commit
63eb85a30f
|
@ -360,7 +360,7 @@ namespace BLL.API
|
|||
var q = from x in Funs.DB.Weld_UnitStore
|
||||
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
|
||||
orderby y.UnitName, x.UnitStoreCode
|
||||
select new { x.UnitStoreId, UnitStoreName = (y.UnitName + "(" + x.UnitStoreName + ")"), y.UnitName, x.UnitId };
|
||||
select new { x.UnitStoreId, UnitStoreName = x.UnitStoreName, y.UnitName, x.UnitId };
|
||||
List<BaseTeamgroupItem> res = new List<BaseTeamgroupItem>();
|
||||
foreach (var p in q)
|
||||
{
|
||||
|
|
|
@ -114,6 +114,28 @@ namespace BLL
|
|||
}
|
||||
}
|
||||
|
||||
public static void InitUnitStoreDropDownList2(FineUIPro.DropDownList dropName, string unitId, bool isShowPlease)
|
||||
{
|
||||
var store = from x in Funs.DB.Weld_UnitStore
|
||||
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
|
||||
orderby y.UnitName, x.UnitStoreCode
|
||||
select new { x.UnitStoreId, UnitStoreName = x.UnitStoreName, y.UnitName, x.UnitId };
|
||||
if (!string.IsNullOrEmpty(unitId))
|
||||
{
|
||||
store = store.Where(x => x.UnitId == unitId);
|
||||
}
|
||||
|
||||
dropName.DataValueField = "UnitStoreId";
|
||||
dropName.DataTextField = "UnitStoreName";
|
||||
dropName.DataGroupField = "UnitName";
|
||||
dropName.DataSource = store.ToList();
|
||||
dropName.DataBind();
|
||||
if (isShowPlease)
|
||||
{
|
||||
Funs.FineUIPleaseSelect(dropName);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据主键获取单位仓库
|
||||
/// </summary>
|
||||
|
|
|
@ -44,7 +44,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
|
|||
this.drpProjectId.DataBind();
|
||||
Funs.FineUIPleaseSelect(this.drpProjectId);
|
||||
|
||||
BLL.UnitStoreService.InitUnitStoreDropDownList(drpUnitStore, null, true);
|
||||
BLL.UnitStoreService.InitUnitStoreDropDownList2(drpUnitStore, null, true);
|
||||
|
||||
this.drpOrderTime.DataTextField = "Text";
|
||||
this.drpOrderTime.DataValueField = "Value";
|
||||
|
|
Loading…
Reference in New Issue