力阔现场出入库流程
agv任务下发 修改部分实体类错误和页面字段等 layout 添加条码库 添加容器逻辑修改
This commit is contained in:
1 parent
345b5a3d5b
commit
b4632cfc33
29 files changed
+618
-849
No files matched your search
@@ -12,12 +12,6 @@ namespace HHWMS.Web
|
||||
{
|
||||
public partial class MaterialTemplateVM : BaseTemplateVM
|
||||
{
|
||||
[Display(Name = "Inventory.UniqueCode")]
|
||||
public ExcelPropety UniqueCode_Excel = ExcelPropety.CreateProperty<Material>(x => x.UniqueCode);
|
||||
[Display(Name = "Inventory.QRCode")]
|
||||
public ExcelPropety QRCode_Excel = ExcelPropety.CreateProperty<Material>(x => x.QRCode);
|
||||
[Display(Name = "Inventory.SourceCode")]
|
||||
public ExcelPropety SourceCode_Excel = ExcelPropety.CreateProperty<Material>(x => x.SourceCode);
|
||||
[Display(Name = "Inventory.MaterialCode")]
|
||||
public ExcelPropety MaterialCode_Excel = ExcelPropety.CreateProperty<Material>(x => x.MaterialCode);
|
||||
[Display(Name = "Inventory.MaterialType")]
|
||||
|
||||
@@ -32,9 +32,6 @@ namespace HHWMS.Web
|
||||
protected override IEnumerable<IGridColumn<Material_View>> InitGridHeader()
|
||||
{
|
||||
return new List<GridColumn<Material_View>>{
|
||||
this.MakeGridHeader(x => x.UniqueCode).SetHide(),
|
||||
this.MakeGridHeader(x => x.QRCode),
|
||||
this.MakeGridHeader(x => x.SourceCode).SetHide(),
|
||||
this.MakeGridHeader(x => x.MaterialCode),
|
||||
this.MakeGridHeader(x => x.MaterialType),
|
||||
this.MakeGridHeader(x => x.MaterialName),
|
||||
@@ -52,15 +49,10 @@ namespace HHWMS.Web
|
||||
public override IOrderedQueryable<Material_View> GetSearchQuery()
|
||||
{
|
||||
var query = DC.Set<Material>()
|
||||
.CheckContain(Searcher.UniqueCode, x=>x.UniqueCode)
|
||||
.CheckContain(Searcher.QRCode, x=>x.QRCode)
|
||||
.CheckContain(Searcher.MaterialCode, x=>x.MaterialCode)
|
||||
.Select(x => new Material_View
|
||||
{
|
||||
ID = x.ID,
|
||||
UniqueCode = x.UniqueCode,
|
||||
QRCode = x.QRCode,
|
||||
SourceCode = x.SourceCode,
|
||||
MaterialCode = x.MaterialCode,
|
||||
MaterialType = x.MaterialType,
|
||||
MaterialName = x.MaterialName,
|
||||
|
||||
@@ -12,10 +12,6 @@ namespace HHWMS.Web
|
||||
{
|
||||
public partial class MaterialSearcher : BaseSearcher
|
||||
{
|
||||
[Display(Name = "Inventory.UniqueCode")]
|
||||
public String UniqueCode { get; set; }
|
||||
[Display(Name = "Inventory.QRCode")]
|
||||
public String QRCode { get; set; }
|
||||
[Display(Name = "Inventory.MaterialCode")]
|
||||
public String MaterialCode { get; set; }
|
||||
|
||||
|
||||
Reference in new issue
Block a user