修改任务明细为子任务
This commit is contained in:
1 parent
820d9d065b
commit
f8ee359644
19 files changed
+141
-63
No files matched your search
@@ -53,7 +53,7 @@ namespace HHWMS.Web
|
|||||||
[HttpPost]
|
[HttpPost]
|
||||||
public IActionResult ReturnStatus(WcsRequest request)
|
public IActionResult ReturnStatus(WcsRequest request)
|
||||||
{
|
{
|
||||||
// 参数判断
|
/*// 参数判断
|
||||||
if (request.State == null || request.PalletNo == null)
|
if (request.State == null || request.PalletNo == null)
|
||||||
{
|
{
|
||||||
return ApiResultError(msg: $"传入参数不正确!");
|
return ApiResultError(msg: $"传入参数不正确!");
|
||||||
@@ -123,6 +123,7 @@ namespace HHWMS.Web
|
|||||||
//3.更新库存信息的库位
|
//3.更新库存信息的库位
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
return ApiResult();
|
return ApiResult();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
using Microsoft.AspNetCore.Http;
|
using Microsoft.AspNetCore.Http;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using System;
|
using System;
|
||||||
using WalkingTec.Mvvm.Core;
|
using WalkingTec.Mvvm.Core;
|
||||||
@@ -9,9 +9,16 @@ using HHWMS.Web;
|
|||||||
namespace HHWMS.Web.Controllers
|
namespace HHWMS.Web.Controllers
|
||||||
{
|
{
|
||||||
[Area("taskManage")]
|
[Area("taskManage")]
|
||||||
[ActionDescription("任务明细")]
|
[ActionDescription("子任务")]
|
||||||
public partial class TaskDetailController : BaseController
|
public partial class TaskDetailController : BaseController
|
||||||
{
|
{
|
||||||
|
private readonly IUnitWork _unitwork;
|
||||||
|
|
||||||
|
public TaskDetailController(IUnitWork unitwork)
|
||||||
|
{
|
||||||
|
_unitwork = unitwork;
|
||||||
|
}
|
||||||
|
|
||||||
#region Search
|
#region Search
|
||||||
[ActionDescription("Sys.Search")]
|
[ActionDescription("Sys.Search")]
|
||||||
public ActionResult Index()
|
public ActionResult Index()
|
||||||
|
|||||||
@@ -250,26 +250,39 @@ namespace HHWMS.Web.Controllers
|
|||||||
public ActionResult Assign(string id)
|
public ActionResult Assign(string id)
|
||||||
{
|
{
|
||||||
var task = _unitwork.Find<TaskHeader>(x => x.ID == int.Parse(id)).Include(x => x.TaskDetails).FirstOrDefault();
|
var task = _unitwork.Find<TaskHeader>(x => x.ID == int.Parse(id)).Include(x => x.TaskDetails).FirstOrDefault();
|
||||||
if(task == null)
|
var tt = task.TaskDetails.ToList().Exists(x => x.ContainerCode == "123");
|
||||||
|
if (task == null)
|
||||||
return FFResult().RefreshGrid().Alert($"操作失败,此任务不存在!");
|
return FFResult().RefreshGrid().Alert($"操作失败,此任务不存在!");
|
||||||
var taskInfo = new TaskInfo();
|
var taskInfo = new TaskInfo();
|
||||||
|
|
||||||
var beginlocation = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.FromLocation));
|
var beginlocation = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.FromLocation));
|
||||||
var endLocation = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.ToLocation));
|
var endLocation = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.ToLocation));
|
||||||
var start = new CoordPos();
|
var start = new CoordPos();
|
||||||
var end = new CoordPos();
|
var end = new CoordPos();
|
||||||
if ((int)task.TaskType == 3 || (int)task.TaskType == 4)
|
|
||||||
|
if (task.TaskType == TaskTypeEnum.盘料入库 || task.TaskType == TaskTypeEnum.盘料出库)
|
||||||
{
|
{
|
||||||
// 盘料起点终点 与普通任务起点终点不一样,编码未在location中保存
|
// 盘料起点终点 与普通任务起点终点不一样,编码未在location中保存
|
||||||
var taskdel = task.TaskDetails.FirstOrDefault(x => x.Status.Equals(TaskStatusEnum.新建));
|
var taskdel = task.TaskDetails.FirstOrDefault(x => x.Status.Equals(TaskStatusEnum.新建));
|
||||||
start.X = int.Parse(taskdel.Batch.Split("-")[0]);
|
start.X = beginlocation.Line;
|
||||||
start.Y = int.Parse(taskdel.Batch.Split("-")[1]);
|
end.X = endLocation.Line;
|
||||||
start.Z = int.Parse(taskdel.Batch.Split("-")[2]);
|
if (task.TaskType == TaskTypeEnum.盘料入库)
|
||||||
|
{
|
||||||
|
start.Y = 2;
|
||||||
|
start.Z = int.Parse(taskdel.FromLocation);
|
||||||
|
|
||||||
end.X = int.Parse(taskdel.Lot.Split("-")[0]);
|
end.Y = int.Parse(taskdel.ToLocation);
|
||||||
end.Y = int.Parse(taskdel.Lot.Split("-")[1]);
|
end.Z = 2;
|
||||||
end.Z = int.Parse(taskdel.Lot.Split("-")[2]);
|
}
|
||||||
|
else if (task.TaskType == TaskTypeEnum.盘料出库)
|
||||||
|
{
|
||||||
|
start.Y = int.Parse(taskdel.FromLocation);
|
||||||
|
start.Z = 2;
|
||||||
|
|
||||||
taskInfo.TaskId = taskdel.TaskHeader.TaskNo;
|
end.Y = 2;
|
||||||
|
end.Z = int.Parse(taskdel.FromLocation);
|
||||||
|
}
|
||||||
|
taskInfo.TaskId = $"{taskdel.TaskHeader.TaskNo}-{taskdel.FromLocation}";
|
||||||
taskInfo.TaskType = (int)task.TaskType;
|
taskInfo.TaskType = (int)task.TaskType;
|
||||||
taskInfo.ObjId = taskdel.ContainerCode;
|
taskInfo.ObjId = taskdel.ContainerCode;
|
||||||
taskInfo.StartType = int.Parse(task.Station);
|
taskInfo.StartType = int.Parse(task.Station);
|
||||||
@@ -296,7 +309,7 @@ namespace HHWMS.Web.Controllers
|
|||||||
taskInfo.EndPos = end;
|
taskInfo.EndPos = end;
|
||||||
}
|
}
|
||||||
|
|
||||||
var res = Wtm.CallAPI<ApiJsonResult<dynamic>>("WCS", "TaskAssign", HttpMethodEnum.POST, taskInfo).Result.Data;
|
/* var res = Wtm.CallAPI<ApiJsonResult<dynamic>>("WCS", "TaskAssign", HttpMethodEnum.POST, taskInfo).Result.Data;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if ((bool)res?.Success)
|
if ((bool)res?.Success)
|
||||||
@@ -308,7 +321,7 @@ namespace HHWMS.Web.Controllers
|
|||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
return FFResult().Alert($"操作失败,{ex.Message}");
|
return FFResult().Alert($"操作失败,{ex.Message}");
|
||||||
}
|
}*/
|
||||||
return FFResult().RefreshGrid();
|
return FFResult().RefreshGrid();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.ComponentModel.DataAnnotations;
|
using System.ComponentModel.DataAnnotations;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
|||||||
@@ -17,6 +17,8 @@ namespace HHWMS.Web
|
|||||||
public ExcelPropety OrderCode_Excel = ExcelPropety.CreateProperty<TaskDetail>(x => x.OrderCode);
|
public ExcelPropety OrderCode_Excel = ExcelPropety.CreateProperty<TaskDetail>(x => x.OrderCode);
|
||||||
[Display(Name = "Inventory.ReceiptDetailId")]
|
[Display(Name = "Inventory.ReceiptDetailId")]
|
||||||
public ExcelPropety OrderDetailId_Excel = ExcelPropety.CreateProperty<TaskDetail>(x => x.OrderDetailId);
|
public ExcelPropety OrderDetailId_Excel = ExcelPropety.CreateProperty<TaskDetail>(x => x.OrderDetailId);
|
||||||
|
[Display(Name = "Inventory.UniqueCode")]
|
||||||
|
public ExcelPropety UniqueCode_Excel = ExcelPropety.CreateProperty<TaskDetail>(x => x.UniqueCode);
|
||||||
[Display(Name = "Inventory.MaterialCode")]
|
[Display(Name = "Inventory.MaterialCode")]
|
||||||
public ExcelPropety MaterialCode_Excel = ExcelPropety.CreateProperty<TaskDetail>(x => x.MaterialCode);
|
public ExcelPropety MaterialCode_Excel = ExcelPropety.CreateProperty<TaskDetail>(x => x.MaterialCode);
|
||||||
[Display(Name = "Inventory.MaterialName")]
|
[Display(Name = "Inventory.MaterialName")]
|
||||||
@@ -35,6 +37,10 @@ namespace HHWMS.Web
|
|||||||
public ExcelPropety Qty_Excel = ExcelPropety.CreateProperty<TaskDetail>(x => x.Qty);
|
public ExcelPropety Qty_Excel = ExcelPropety.CreateProperty<TaskDetail>(x => x.Qty);
|
||||||
[Display(Name = "TaskDetail.InventoryId")]
|
[Display(Name = "TaskDetail.InventoryId")]
|
||||||
public ExcelPropety InventoryId_Excel = ExcelPropety.CreateProperty<TaskDetail>(x => x.InventoryId);
|
public ExcelPropety InventoryId_Excel = ExcelPropety.CreateProperty<TaskDetail>(x => x.InventoryId);
|
||||||
|
[Display(Name = "Task.FromLocation")]
|
||||||
|
public ExcelPropety FromLocation_Excel = ExcelPropety.CreateProperty<TaskDetail>(x => x.FromLocation);
|
||||||
|
[Display(Name = "Task.ToLocation")]
|
||||||
|
public ExcelPropety ToLocation_Excel = ExcelPropety.CreateProperty<TaskDetail>(x => x.ToLocation);
|
||||||
[Display(Name = "TaskDetail.Status")]
|
[Display(Name = "TaskDetail.Status")]
|
||||||
public ExcelPropety Status_Excel = ExcelPropety.CreateProperty<TaskDetail>(x => x.Status);
|
public ExcelPropety Status_Excel = ExcelPropety.CreateProperty<TaskDetail>(x => x.Status);
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
@@ -33,17 +33,20 @@ namespace HHWMS.Web
|
|||||||
{
|
{
|
||||||
return new List<GridColumn<TaskDetail_View>>{
|
return new List<GridColumn<TaskDetail_View>>{
|
||||||
this.MakeGridHeader(x => x.TaskNo_view),
|
this.MakeGridHeader(x => x.TaskNo_view),
|
||||||
this.MakeGridHeader(x => x.OrderCode),
|
this.MakeGridHeader(x => x.OrderCode).SetHide(),
|
||||||
this.MakeGridHeader(x => x.OrderDetailId),
|
this.MakeGridHeader(x => x.OrderDetailId).SetHide(),
|
||||||
|
this.MakeGridHeader(x => x.UniqueCode),
|
||||||
this.MakeGridHeader(x => x.MaterialCode),
|
this.MakeGridHeader(x => x.MaterialCode),
|
||||||
this.MakeGridHeader(x => x.MaterialName),
|
this.MakeGridHeader(x => x.MaterialName).SetHide(),
|
||||||
this.MakeGridHeader(x => x.MaterialSpec),
|
this.MakeGridHeader(x => x.MaterialSpec).SetHide(),
|
||||||
this.MakeGridHeader(x => x.MaterialUnit),
|
this.MakeGridHeader(x => x.MaterialUnit).SetHide(),
|
||||||
this.MakeGridHeader(x => x.Batch),
|
this.MakeGridHeader(x => x.Batch).SetHide(),
|
||||||
this.MakeGridHeader(x => x.Lot),
|
this.MakeGridHeader(x => x.Lot).SetHide(),
|
||||||
this.MakeGridHeader(x => x.ContainerCode),
|
this.MakeGridHeader(x => x.ContainerCode),
|
||||||
this.MakeGridHeader(x => x.Qty),
|
this.MakeGridHeader(x => x.Qty),
|
||||||
this.MakeGridHeader(x => x.InventoryId),
|
this.MakeGridHeader(x => x.InventoryId).SetHide(),
|
||||||
|
this.MakeGridHeader(x => x.FromLocation),
|
||||||
|
this.MakeGridHeader(x => x.ToLocation),
|
||||||
this.MakeGridHeader(x => x.Status),
|
this.MakeGridHeader(x => x.Status),
|
||||||
this.MakeGridHeaderAction(width: 200)
|
this.MakeGridHeaderAction(width: 200)
|
||||||
};
|
};
|
||||||
@@ -52,19 +55,17 @@ namespace HHWMS.Web
|
|||||||
public override IOrderedQueryable<TaskDetail_View> GetSearchQuery()
|
public override IOrderedQueryable<TaskDetail_View> GetSearchQuery()
|
||||||
{
|
{
|
||||||
var query = DC.Set<TaskDetail>()
|
var query = DC.Set<TaskDetail>()
|
||||||
.CheckEqual(Searcher.TaskHeaderId, x=>x.TaskHeaderId)
|
.CheckContain(Searcher.UniqueCode, x=>x.UniqueCode)
|
||||||
.CheckContain(Searcher.MaterialCode, x=>x.MaterialCode)
|
.CheckContain(Searcher.MaterialCode, x=>x.MaterialCode)
|
||||||
.CheckContain(Searcher.MaterialName, x=>x.MaterialName)
|
.CheckContain(Searcher.FromLocation, x=>x.FromLocation)
|
||||||
.CheckContain(Searcher.MaterialSpec, x=>x.MaterialSpec)
|
.CheckContain(Searcher.ToLocation, x=>x.ToLocation)
|
||||||
.CheckContain(Searcher.Batch, x=>x.Batch)
|
|
||||||
.CheckContain(Searcher.ContainerCode, x=>x.ContainerCode)
|
|
||||||
.CheckEqual(Searcher.Status, x=>x.Status)
|
|
||||||
.Select(x => new TaskDetail_View
|
.Select(x => new TaskDetail_View
|
||||||
{
|
{
|
||||||
ID = x.ID,
|
ID = x.ID,
|
||||||
TaskNo_view = x.TaskHeader.TaskNo,
|
TaskNo_view = x.TaskHeader.TaskNo,
|
||||||
OrderCode = x.OrderCode,
|
OrderCode = x.OrderCode,
|
||||||
OrderDetailId = x.OrderDetailId,
|
OrderDetailId = x.OrderDetailId,
|
||||||
|
UniqueCode = x.UniqueCode,
|
||||||
MaterialCode = x.MaterialCode,
|
MaterialCode = x.MaterialCode,
|
||||||
MaterialName = x.MaterialName,
|
MaterialName = x.MaterialName,
|
||||||
MaterialSpec = x.MaterialSpec,
|
MaterialSpec = x.MaterialSpec,
|
||||||
@@ -74,6 +75,8 @@ namespace HHWMS.Web
|
|||||||
ContainerCode = x.ContainerCode,
|
ContainerCode = x.ContainerCode,
|
||||||
Qty = x.Qty,
|
Qty = x.Qty,
|
||||||
InventoryId = x.InventoryId,
|
InventoryId = x.InventoryId,
|
||||||
|
FromLocation = x.FromLocation,
|
||||||
|
ToLocation = x.ToLocation,
|
||||||
Status = x.Status,
|
Status = x.Status,
|
||||||
})
|
})
|
||||||
.OrderBy(x => x.ID);
|
.OrderBy(x => x.ID);
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.ComponentModel.DataAnnotations;
|
using System.ComponentModel.DataAnnotations;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
@@ -12,25 +12,17 @@ namespace HHWMS.Web
|
|||||||
{
|
{
|
||||||
public partial class TaskDetailSearcher : BaseSearcher
|
public partial class TaskDetailSearcher : BaseSearcher
|
||||||
{
|
{
|
||||||
public List<ComboSelectListItem> AllTaskHeaders { get; set; }
|
[Display(Name = "Inventory.UniqueCode")]
|
||||||
[Display(Name = "Task.TaskNo")]
|
public String UniqueCode { get; set; }
|
||||||
public int? TaskHeaderId { get; set; }
|
|
||||||
[Display(Name = "Inventory.MaterialCode")]
|
[Display(Name = "Inventory.MaterialCode")]
|
||||||
public String MaterialCode { get; set; }
|
public String MaterialCode { get; set; }
|
||||||
[Display(Name = "Inventory.MaterialName")]
|
[Display(Name = "Task.FromLocation")]
|
||||||
public String MaterialName { get; set; }
|
public String FromLocation { get; set; }
|
||||||
[Display(Name = "Inventory.MaterialSpec")]
|
[Display(Name = "Task.ToLocation")]
|
||||||
public String MaterialSpec { get; set; }
|
public String ToLocation { get; set; }
|
||||||
[Display(Name = "Inventory.Batch")]
|
|
||||||
public String Batch { get; set; }
|
|
||||||
[Display(Name = "Task.ContainerCode")]
|
|
||||||
public String ContainerCode { get; set; }
|
|
||||||
[Display(Name = "TaskDetail.Status")]
|
|
||||||
public TaskStatusEnum? Status { get; set; }
|
|
||||||
|
|
||||||
protected override void InitVM()
|
protected override void InitVM()
|
||||||
{
|
{
|
||||||
AllTaskHeaders = DC.Set<TaskHeader>().GetSelectListItems(Wtm, y => y.TaskNo);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,11 +8,18 @@ using Microsoft.EntityFrameworkCore;
|
|||||||
using System.ComponentModel.DataAnnotations;
|
using System.ComponentModel.DataAnnotations;
|
||||||
using HHWMS.Web.Models;
|
using HHWMS.Web.Models;
|
||||||
|
|
||||||
|
|
||||||
namespace HHWMS.Web
|
namespace HHWMS.Web
|
||||||
{
|
{
|
||||||
public partial class TaskHeaderListVM : BasePagedListVM<TaskHeader_View, TaskHeaderSearcher>
|
public partial class TaskHeaderListVM : BasePagedListVM<TaskHeader_View, TaskHeaderSearcher>
|
||||||
{
|
{
|
||||||
|
public List<ComboSelectListItem> ZoneCodes { get; set; }
|
||||||
|
|
||||||
|
protected override void InitVM()
|
||||||
|
{
|
||||||
|
var vm = Wtm.CreateVM<TaskHeaderVM>();
|
||||||
|
ZoneCodes = vm.ZoneCodes;
|
||||||
|
}
|
||||||
|
|
||||||
protected override List<GridAction> InitGridAction()
|
protected override List<GridAction> InitGridAction()
|
||||||
{
|
{
|
||||||
return new List<GridAction>
|
return new List<GridAction>
|
||||||
@@ -33,8 +40,14 @@ namespace HHWMS.Web
|
|||||||
|
|
||||||
protected override IEnumerable<IGridColumn<TaskHeader_View>> InitGridHeader()
|
protected override IEnumerable<IGridColumn<TaskHeader_View>> InitGridHeader()
|
||||||
{
|
{
|
||||||
|
InitVM();
|
||||||
return new List<GridColumn<TaskHeader_View>>{
|
return new List<GridColumn<TaskHeader_View>>{
|
||||||
this.MakeGridHeader(x => x.ZoneCode),
|
this.MakeGridHeader(x => x.ZoneCode)
|
||||||
|
.SetFormat((a, b) =>
|
||||||
|
{
|
||||||
|
var data = ZoneCodes.FirstOrDefault(x => x.Value.ToString() == a.ZoneCode);
|
||||||
|
return data?.Text ?? a.ZoneCode;
|
||||||
|
}),
|
||||||
this.MakeGridHeader(x => x.TaskNo),
|
this.MakeGridHeader(x => x.TaskNo),
|
||||||
this.MakeGridHeader(x => x.TaskType),
|
this.MakeGridHeader(x => x.TaskType),
|
||||||
this.MakeGridHeader(x => x.FromLocation),
|
this.MakeGridHeader(x => x.FromLocation),
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
@@ -12,6 +12,8 @@ namespace HHWMS.Web
|
|||||||
{
|
{
|
||||||
public partial class TaskHeaderVM : BaseCRUDVM<TaskHeader>
|
public partial class TaskHeaderVM : BaseCRUDVM<TaskHeader>
|
||||||
{
|
{
|
||||||
|
public List<ComboSelectListItem> ZoneCodes { get; set; }
|
||||||
|
private IUnitWork _unitWork { get; set; }
|
||||||
|
|
||||||
public TaskHeaderVM()
|
public TaskHeaderVM()
|
||||||
{
|
{
|
||||||
@@ -19,6 +21,8 @@ namespace HHWMS.Web
|
|||||||
|
|
||||||
protected override void InitVM()
|
protected override void InitVM()
|
||||||
{
|
{
|
||||||
|
var vm = Wtm.CreateVM<LocationVM>();
|
||||||
|
ZoneCodes = vm.ZoneCodes;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void DoAdd()
|
public override void DoAdd()
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
<wt:combobox field="Entity.TaskHeaderId" items="AllTaskHeaders"/>
|
<wt:combobox field="Entity.TaskHeaderId" items="AllTaskHeaders"/>
|
||||||
<wt:textbox field="Entity.OrderCode" />
|
<wt:textbox field="Entity.OrderCode" />
|
||||||
<wt:textbox field="Entity.OrderDetailId" />
|
<wt:textbox field="Entity.OrderDetailId" />
|
||||||
|
<wt:textbox field="Entity.UniqueCode" />
|
||||||
<wt:textbox field="Entity.MaterialCode" />
|
<wt:textbox field="Entity.MaterialCode" />
|
||||||
<wt:textbox field="Entity.MaterialName" />
|
<wt:textbox field="Entity.MaterialName" />
|
||||||
<wt:textbox field="Entity.MaterialSpec" />
|
<wt:textbox field="Entity.MaterialSpec" />
|
||||||
@@ -15,6 +16,8 @@
|
|||||||
<wt:textbox field="Entity.ContainerCode" />
|
<wt:textbox field="Entity.ContainerCode" />
|
||||||
<wt:textbox field="Entity.Qty" />
|
<wt:textbox field="Entity.Qty" />
|
||||||
<wt:textbox field="Entity.InventoryId" />
|
<wt:textbox field="Entity.InventoryId" />
|
||||||
|
<wt:textbox field="Entity.FromLocation" />
|
||||||
|
<wt:textbox field="Entity.ToLocation" />
|
||||||
<wt:combobox field="Entity.Status" />
|
<wt:combobox field="Entity.Status" />
|
||||||
</wt:row>
|
</wt:row>
|
||||||
<wt:row align="AlignEnum.Right">
|
<wt:row align="AlignEnum.Right">
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
<wt:display field="Entity.TaskHeader.TaskNo" />
|
<wt:display field="Entity.TaskHeader.TaskNo" />
|
||||||
<wt:display field="Entity.OrderCode" />
|
<wt:display field="Entity.OrderCode" />
|
||||||
<wt:display field="Entity.OrderDetailId" />
|
<wt:display field="Entity.OrderDetailId" />
|
||||||
|
<wt:display field="Entity.UniqueCode" />
|
||||||
<wt:display field="Entity.MaterialCode" />
|
<wt:display field="Entity.MaterialCode" />
|
||||||
<wt:display field="Entity.MaterialName" />
|
<wt:display field="Entity.MaterialName" />
|
||||||
<wt:display field="Entity.MaterialSpec" />
|
<wt:display field="Entity.MaterialSpec" />
|
||||||
@@ -16,6 +17,8 @@
|
|||||||
<wt:display field="Entity.ContainerCode" />
|
<wt:display field="Entity.ContainerCode" />
|
||||||
<wt:display field="Entity.Qty" />
|
<wt:display field="Entity.Qty" />
|
||||||
<wt:display field="Entity.InventoryId" />
|
<wt:display field="Entity.InventoryId" />
|
||||||
|
<wt:display field="Entity.FromLocation" />
|
||||||
|
<wt:display field="Entity.ToLocation" />
|
||||||
<wt:display field="Entity.Status" />
|
<wt:display field="Entity.Status" />
|
||||||
</wt:row>
|
</wt:row>
|
||||||
<wt:hidden field="Entity.ID" />
|
<wt:hidden field="Entity.ID" />
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
<wt:display field="Entity.TaskHeader.TaskNo" />
|
<wt:display field="Entity.TaskHeader.TaskNo" />
|
||||||
<wt:display field="Entity.OrderCode" />
|
<wt:display field="Entity.OrderCode" />
|
||||||
<wt:display field="Entity.OrderDetailId" />
|
<wt:display field="Entity.OrderDetailId" />
|
||||||
|
<wt:display field="Entity.UniqueCode" />
|
||||||
<wt:display field="Entity.MaterialCode" />
|
<wt:display field="Entity.MaterialCode" />
|
||||||
<wt:display field="Entity.MaterialName" />
|
<wt:display field="Entity.MaterialName" />
|
||||||
<wt:display field="Entity.MaterialSpec" />
|
<wt:display field="Entity.MaterialSpec" />
|
||||||
@@ -15,6 +16,8 @@
|
|||||||
<wt:display field="Entity.ContainerCode" />
|
<wt:display field="Entity.ContainerCode" />
|
||||||
<wt:display field="Entity.Qty" />
|
<wt:display field="Entity.Qty" />
|
||||||
<wt:display field="Entity.InventoryId" />
|
<wt:display field="Entity.InventoryId" />
|
||||||
|
<wt:display field="Entity.FromLocation" />
|
||||||
|
<wt:display field="Entity.ToLocation" />
|
||||||
<wt:display field="Entity.Status" />
|
<wt:display field="Entity.Status" />
|
||||||
</wt:row>
|
</wt:row>
|
||||||
<wt:row align="AlignEnum.Right">
|
<wt:row align="AlignEnum.Right">
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
<wt:combobox field="Entity.TaskHeaderId" items="AllTaskHeaders"/>
|
<wt:combobox field="Entity.TaskHeaderId" items="AllTaskHeaders"/>
|
||||||
<wt:textbox field="Entity.OrderCode" />
|
<wt:textbox field="Entity.OrderCode" />
|
||||||
<wt:textbox field="Entity.OrderDetailId" />
|
<wt:textbox field="Entity.OrderDetailId" />
|
||||||
|
<wt:textbox field="Entity.UniqueCode" />
|
||||||
<wt:textbox field="Entity.MaterialCode" />
|
<wt:textbox field="Entity.MaterialCode" />
|
||||||
<wt:textbox field="Entity.MaterialName" />
|
<wt:textbox field="Entity.MaterialName" />
|
||||||
<wt:textbox field="Entity.MaterialSpec" />
|
<wt:textbox field="Entity.MaterialSpec" />
|
||||||
@@ -15,6 +16,8 @@
|
|||||||
<wt:textbox field="Entity.ContainerCode" />
|
<wt:textbox field="Entity.ContainerCode" />
|
||||||
<wt:textbox field="Entity.Qty" />
|
<wt:textbox field="Entity.Qty" />
|
||||||
<wt:textbox field="Entity.InventoryId" />
|
<wt:textbox field="Entity.InventoryId" />
|
||||||
|
<wt:textbox field="Entity.FromLocation" />
|
||||||
|
<wt:textbox field="Entity.ToLocation" />
|
||||||
<wt:combobox field="Entity.Status" />
|
<wt:combobox field="Entity.Status" />
|
||||||
</wt:row>
|
</wt:row>
|
||||||
<wt:hidden field="Entity.ID" />
|
<wt:hidden field="Entity.ID" />
|
||||||
|
|||||||
@@ -3,13 +3,10 @@
|
|||||||
|
|
||||||
<wt:searchpanel vm="@Model" reset-btn="true">
|
<wt:searchpanel vm="@Model" reset-btn="true">
|
||||||
<wt:row items-per-row="ItemsPerRowEnum.Three">
|
<wt:row items-per-row="ItemsPerRowEnum.Three">
|
||||||
<wt:combobox field="Searcher.TaskHeaderId" items="Searcher.AllTaskHeaders" empty-text="@Localizer["Sys.All"]" />
|
<wt:textbox field="Searcher.UniqueCode" />
|
||||||
<wt:textbox field="Searcher.MaterialCode" />
|
<wt:textbox field="Searcher.MaterialCode" />
|
||||||
<wt:textbox field="Searcher.MaterialName" />
|
<wt:textbox field="Searcher.FromLocation" />
|
||||||
<wt:textbox field="Searcher.MaterialSpec" />
|
<wt:textbox field="Searcher.ToLocation" />
|
||||||
<wt:textbox field="Searcher.Batch" />
|
|
||||||
<wt:textbox field="Searcher.ContainerCode" />
|
|
||||||
<wt:combobox field="Searcher.Status" empty-text="@Localizer["Sys.All"]" />
|
|
||||||
</wt:row>
|
</wt:row>
|
||||||
</wt:searchpanel>
|
</wt:searchpanel>
|
||||||
<wt:grid vm="@Model" url="/taskManage/TaskDetail/Search"/>
|
<wt:grid vm="@Model" url="/taskManage/TaskDetail/Search"/>
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
@model HHWMS.Web.TaskHeaderListVM
|
@model HHWMS.Web.TaskHeaderListVM
|
||||||
@inject IStringLocalizer<Program> Localizer;
|
@inject IStringLocalizer<Program> Localizer;
|
||||||
|
|
||||||
<wt:searchpanel vm="@Model" reset-btn="true">
|
<wt:searchpanel vm="@Model" reset-btn="true">
|
||||||
<wt:row items-per-row="ItemsPerRowEnum.Three">
|
<wt:row items-per-row="ItemsPerRowEnum.Three">
|
||||||
<wt:textbox field="Searcher.ZoneCode" />
|
<wt:combobox field="Searcher.ZoneCode" items="ZoneCodes" />
|
||||||
<wt:textbox field="Searcher.TaskNo" />
|
<wt:textbox field="Searcher.TaskNo" />
|
||||||
<wt:combobox field="Searcher.TaskType" empty-text="@Localizer["Sys.All"]" />
|
<wt:combobox field="Searcher.TaskType" empty-text="@Localizer["Sys.All"]" />
|
||||||
<wt:textbox field="Searcher.FromLocation" />
|
<wt:textbox field="Searcher.FromLocation" />
|
||||||
|
|||||||
@@ -29,19 +29,25 @@ namespace HHWMS.Web.Models
|
|||||||
/// 入库任务
|
/// 入库任务
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Display(Name = "TaskType.In")]
|
[Display(Name = "TaskType.In")]
|
||||||
In = 100,
|
料盒入库 = 1,
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 出库任务
|
/// 出库任务
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Display(Name = "TaskType.Out")]
|
[Display(Name = "TaskType.Out")]
|
||||||
Out = 200,
|
料盒出库 = 2,
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 移库任务
|
/// 盘料入库
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Display(Name = "TaskType.Move")]
|
[Display(Name = "TaskType.PIn")]
|
||||||
Move = 300
|
盘料入库 = 3,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 盘料出库
|
||||||
|
/// </summary>
|
||||||
|
[Display(Name = "TaskType.POut")]
|
||||||
|
盘料出库 = 3
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -24,6 +24,10 @@ namespace HHWMS.Web.Models
|
|||||||
[Display(Name = "Inventory.ReceiptDetailId", Description = "明细ID")]
|
[Display(Name = "Inventory.ReceiptDetailId", Description = "明细ID")]
|
||||||
public int? OrderDetailId { get; set; }
|
public int? OrderDetailId { get; set; }
|
||||||
|
|
||||||
|
[Display(Name = "Inventory.UniqueCode", Description = "唯一码")]
|
||||||
|
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||||
|
public string UniqueCode { get; set; }
|
||||||
|
|
||||||
[Display(Name = "Inventory.MaterialCode", Description = "物料编码")]
|
[Display(Name = "Inventory.MaterialCode", Description = "物料编码")]
|
||||||
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
|
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||||
public string MaterialCode { get; set; }
|
public string MaterialCode { get; set; }
|
||||||
@@ -58,6 +62,14 @@ namespace HHWMS.Web.Models
|
|||||||
[Display(Name = "TaskDetail.InventoryId", Description = "库存Id")]
|
[Display(Name = "TaskDetail.InventoryId", Description = "库存Id")]
|
||||||
public int? InventoryId { get; set; }
|
public int? InventoryId { get; set; }
|
||||||
|
|
||||||
|
[Display(Name = "Task.FromLocation", Description = "起始仓位")]
|
||||||
|
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||||
|
public string FromLocation { get; set; }
|
||||||
|
|
||||||
|
[Display(Name = "Task.ToLocation", Description = "目标仓位")]
|
||||||
|
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||||
|
public string ToLocation { get; set; }
|
||||||
|
|
||||||
[Display(Name = "TaskDetail.Status", Description = "状态")]
|
[Display(Name = "TaskDetail.Status", Description = "状态")]
|
||||||
public TaskStatusEnum? Status { get; set; }
|
public TaskStatusEnum? Status { get; set; }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1002,6 +1002,9 @@
|
|||||||
<data name="Task.Priority" xml:space="preserve">
|
<data name="Task.Priority" xml:space="preserve">
|
||||||
<value>优先级</value>
|
<value>优先级</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="TaskHeader.Assign" xml:space="preserve">
|
||||||
|
<value>执行</value>
|
||||||
|
</data>
|
||||||
<data name="TaskDetail.Status" xml:space="preserve">
|
<data name="TaskDetail.Status" xml:space="preserve">
|
||||||
<value>状态</value>
|
<value>状态</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -1013,6 +1016,12 @@
|
|||||||
</data>
|
</data>
|
||||||
<data name="TaskType.Out" xml:space="preserve">
|
<data name="TaskType.Out" xml:space="preserve">
|
||||||
<value>出库任务</value>
|
<value>出库任务</value>
|
||||||
|
</data>
|
||||||
|
<data name="TaskType.PIn" xml:space="preserve">
|
||||||
|
<value>盘料入库</value>
|
||||||
|
</data>
|
||||||
|
<data name="TaskType.POut" xml:space="preserve">
|
||||||
|
<value>盘料出库</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="TaskType.Move" xml:space="preserve">
|
<data name="TaskType.Move" xml:space="preserve">
|
||||||
<value>移库任务</value>
|
<value>移库任务</value>
|
||||||
@@ -1223,6 +1232,9 @@
|
|||||||
</data>
|
</data>
|
||||||
<data name="Inventory.SourceCode" xml:space="preserve">
|
<data name="Inventory.SourceCode" xml:space="preserve">
|
||||||
<value>上游单号</value>
|
<value>上游单号</value>
|
||||||
|
</data>
|
||||||
|
<data name="Inventory.UniqueCode" xml:space="preserve">
|
||||||
|
<value>唯一码</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Inventory.ReceiptCode" xml:space="preserve">
|
<data name="Inventory.ReceiptCode" xml:space="preserve">
|
||||||
<value>单据单号</value>
|
<value>单据单号</value>
|
||||||
|
|||||||
@@ -134,7 +134,7 @@ namespace WalkingTec.Mvvm.Mvc
|
|||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
if (_sharedir == null)
|
/*if (_sharedir == null)
|
||||||
{
|
{
|
||||||
var up = Directory.GetParent(MainDir);
|
var up = Directory.GetParent(MainDir);
|
||||||
var sharedir = up.GetDirectories().Where(x => x.Name.ToLower().EndsWith(".shared")).FirstOrDefault();
|
var sharedir = up.GetDirectories().Where(x => x.Name.ToLower().EndsWith(".shared")).FirstOrDefault();
|
||||||
@@ -148,7 +148,7 @@ namespace WalkingTec.Mvvm.Mvc
|
|||||||
}
|
}
|
||||||
|
|
||||||
_sharedir = sharedir.FullName;
|
_sharedir = sharedir.FullName;
|
||||||
}
|
}*/
|
||||||
return _sharedir;
|
return _sharedir;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user