盘料库出入库流程测试修改,盘料库入库创建入库任务逻辑添加到绑定完成里面
This commit is contained in:
1 parent
1fa11ab235
commit
771c12040c
7 files changed
+128
-70
No files matched your search
@@ -0,0 +1,53 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using HHWMS.Web.Models;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Newtonsoft.Json;
|
||||
using Quartz;
|
||||
using WalkingTec.Mvvm.Core;
|
||||
using WalkingTec.Mvvm.Core.Support.Quartz;
|
||||
|
||||
namespace HHWMS.Web
|
||||
{
|
||||
//[QuartzRepeat(10,10, true, 30)]
|
||||
//定时回传入库完成物料信息
|
||||
[PersistJobDataAfterExecution]
|
||||
[DisallowConcurrentExecution]
|
||||
public class InvBackJob : WtmJob
|
||||
{
|
||||
public override Task Execute(IJobExecutionContext context)
|
||||
{
|
||||
try
|
||||
{
|
||||
var _unitwork = new UnitWork(Wtm);
|
||||
List<Inventory> inventories = _unitwork.Find<Inventory>(x => x.Status == "0").ToList();
|
||||
var Invs = inventories.Take(5).ToList();
|
||||
foreach (var Inv in Invs)
|
||||
{
|
||||
|
||||
}
|
||||
#region 更新时间
|
||||
|
||||
var job = _unitwork.FindSingle<SysJob>(x => x.JobName == context.JobDetail.Key.Name);
|
||||
if (job != null)
|
||||
{
|
||||
job.LastFireTime = TimeZoneInfo.ConvertTimeFromUtc(context.FireTimeUtc.DateTime, TimeZoneInfo.Local);
|
||||
// 只执行一次 没有下次执行时间
|
||||
if (context.NextFireTimeUtc != null)
|
||||
{
|
||||
job.NextFireTime = TimeZoneInfo.ConvertTimeFromUtc(context.NextFireTimeUtc.Value.DateTime, TimeZoneInfo.Local);
|
||||
}
|
||||
_unitwork.Update<SysJob>(job);
|
||||
}
|
||||
Wtm.DoLog("任务下发", ActionLogTypesEnum.Job, "SendWcsJob");
|
||||
#endregion 更新时间
|
||||
}
|
||||
catch { }
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -53,33 +53,28 @@ namespace HHWMS.Web
|
||||
// 调用wcs任务下发接口
|
||||
try
|
||||
{
|
||||
var res = Wtm.CallAPI<ApiJsonResult<dynamic>>("WCS", "TaskAssign", HttpMethodEnum.POST, item).Result.Data;
|
||||
if (res.Success)
|
||||
//var res = Wtm.CallAPI<ApiJsonResult<dynamic>>("WCS", "TaskAssign", HttpMethodEnum.POST, item).Result.Data;
|
||||
if (true)
|
||||
//if (res.Success)
|
||||
{
|
||||
Location LocStation = new Location();
|
||||
Location location = new Location();
|
||||
var locationList = _unitwork.Find<Location>(x => task.FromLocation.Equals(x.Code) || task.ToLocation.Equals(x.Code)).ToList();
|
||||
var begin = locationList.FirstOrDefault(x => x.Code.Equals(task.FromLocation));
|
||||
var end = locationList.FirstOrDefault(x => x.Code.Equals(task.ToLocation));
|
||||
switch (task.TaskType)
|
||||
{
|
||||
//根据任务类型不同,更新任务状态与库位状态
|
||||
case TaskTypeEnum.盘料盒入库:
|
||||
case TaskTypeEnum.散料盒入库:
|
||||
LocStation = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.FromLocation));
|
||||
location = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.ToLocation));
|
||||
LocStation.ContainerCode = "";
|
||||
location.ContainerCode = task.ContainerCode;
|
||||
end.ContainerCode = task.ContainerCode;
|
||||
task.Status = TaskStatusEnum.已下发;
|
||||
_unitwork.Update(LocStation);
|
||||
_unitwork.Update(location);
|
||||
break;
|
||||
case TaskTypeEnum.盘料盒出库:
|
||||
case TaskTypeEnum.散料盒出库:
|
||||
LocStation = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.ToLocation));
|
||||
location = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.FromLocation));
|
||||
LocStation.ContainerCode = task.ContainerCode;
|
||||
location.ContainerCode = "";
|
||||
begin.ContainerCode = task.ContainerCode;
|
||||
begin.Status = LocationStatus.任务锁;
|
||||
end.Status = LocationStatus.任务锁;
|
||||
end.ContainerCode = task.ContainerCode;
|
||||
task.Status = TaskStatusEnum.已下发;
|
||||
_unitwork.Update(LocStation);
|
||||
_unitwork.Update(location);
|
||||
break;
|
||||
//不带盒的更新明细任务状态
|
||||
case TaskTypeEnum.盘料入库:
|
||||
@@ -90,11 +85,12 @@ namespace HHWMS.Web
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
_unitwork.Update(begin);
|
||||
_unitwork.Update(end);
|
||||
}
|
||||
else
|
||||
{
|
||||
task.ErrorMsg += ",任务下发失败,失败原因:"+ res.Msg;
|
||||
task.ErrorMsg += ",任务下发失败,失败原因:";
|
||||
_unitwork.Update(task);
|
||||
continue;
|
||||
}
|
||||
@@ -199,9 +195,7 @@ namespace HHWMS.Web
|
||||
public void OutGenTask(TaskHeader task, UnitWork _unitwork)
|
||||
{
|
||||
//查找料塔工位
|
||||
var to = _unitwork.Find<Location>(x => string.IsNullOrEmpty(x.ContainerCode)
|
||||
&& x.Code == task.ToLocation).FirstOrDefault();
|
||||
if (string.IsNullOrEmpty(task.FromLocation) && to != null)
|
||||
if (string.IsNullOrEmpty(task.FromLocation))
|
||||
{
|
||||
var details = task.TaskDetails.Where(x => x.Status == TaskStatusEnum.新建);
|
||||
//根据盘料出库的托盘创建盘料盒出库任务
|
||||
|
||||
Reference in new issue
Block a user