盘料库出入库流程测试修改,盘料库入库创建入库任务逻辑添加到绑定完成里面
This commit is contained in:
parent
1fa11ab235
commit
771c12040c
@ -81,6 +81,7 @@ namespace HHWMS.Web
|
||||
// 更新库存
|
||||
task.Status = TaskStatusEnum.完成;
|
||||
taskfromlocatioin.Status = LocationStatus.空仓位;
|
||||
taskfromlocatioin.ContainerCode = "";
|
||||
_unitwork.Update(taskfromlocatioin);
|
||||
|
||||
tasktolocatioin.Status = tasktolocatioin.Length == 1 ? LocationStatus.满货 : LocationStatus.有货;
|
||||
@ -219,7 +220,7 @@ namespace HHWMS.Web
|
||||
//更新库存数据
|
||||
var taskdetail = task.TaskDetails.First(x => x.FromLocation == ll);
|
||||
var invIn = _unitwork.Find<Inventory>(n => n.UniqueCode == taskdetail.UniqueCode
|
||||
&& n.LocationCode == task.FromLocation
|
||||
&& n.ContainerCode == task.FromLocation
|
||||
&& n.TaskStatus == InventoryTaskStatus.任务中).FirstOrDefault();
|
||||
if (invIn != null)
|
||||
{
|
||||
@ -233,7 +234,7 @@ namespace HHWMS.Web
|
||||
// 查询料塔 是否还有 此料盒 已下发,未完成的盘料入库任务 有不操作,没有 创建料盒入库任务
|
||||
if (!task.TaskDetails.Any(x => x.Status < TaskStatusEnum.完成 && x.ContainerCode.Equals(containerCode)))
|
||||
{
|
||||
var station = _unitwork.Find<Location>(x => x.Code == task.ContainerCode).FirstOrDefault();
|
||||
var station = _unitwork.Find<Location>(x => x.Code == task.FromLocation).FirstOrDefault();
|
||||
// 创建料盒入库任务
|
||||
// 查找回库的任务起点,
|
||||
var fromLocation = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.ToLocation)).ContiguousCode;
|
||||
|
||||
@ -10,6 +10,7 @@ using Microsoft.EntityFrameworkCore;
|
||||
using System.Linq;
|
||||
using Newtonsoft.Json;
|
||||
using System.Collections.Generic;
|
||||
using System.Reflection.Emit;
|
||||
|
||||
namespace HHWMS.Web.Controllers
|
||||
{
|
||||
@ -63,10 +64,10 @@ namespace HHWMS.Web.Controllers
|
||||
public ActionResult ScanBox(string boxCode)
|
||||
{
|
||||
// 判断任务重复
|
||||
if (_unitWork.IsExit<TaskHeader>(x => x.ZoneCode.Equals(ZoneCodeEnum.盘料库) && x.ContainerCode.Equals(boxCode)))
|
||||
if (_unitWork.IsExit<TaskHeader>(x => x.FromLocation == boxCode || x.ToLocation == boxCode))
|
||||
{
|
||||
return JsonMore(null, 500, $"库内已存在{boxCode}的任务,请勿重复操作!");
|
||||
};
|
||||
}
|
||||
// 判断箱号是否合理
|
||||
var box = _unitWork.FindSingle<Location>(x => x.Code.Equals(boxCode));
|
||||
if (box != null)
|
||||
@ -76,10 +77,10 @@ namespace HHWMS.Web.Controllers
|
||||
box.ContainerCode = boxCode;
|
||||
_unitWork.Update(box);
|
||||
}
|
||||
else
|
||||
{
|
||||
return JsonMore(null, 500, $"{boxCode}已经被其他任务占用,无法入库!");
|
||||
}
|
||||
//else
|
||||
//{
|
||||
// return JsonMore(null, 500, $"{boxCode}已经被其他任务占用,无法入库!");
|
||||
//}
|
||||
return JsonMore(null);
|
||||
}
|
||||
else
|
||||
@ -89,7 +90,7 @@ namespace HHWMS.Web.Controllers
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 入库盘料绑定操作
|
||||
/// 入库盘料绑定并创建入库任务
|
||||
/// </summary>
|
||||
/// <param name="data"></param>
|
||||
/// <returns></returns>
|
||||
@ -126,10 +127,40 @@ namespace HHWMS.Web.Controllers
|
||||
Qty = receipt.Qty,
|
||||
Lot = item.Index.ToString(),
|
||||
ContainerCode = item.BoxCode,
|
||||
Status = "0",
|
||||
TaskStatus = InventoryTaskStatus.任务中
|
||||
};
|
||||
_unitWork.Add(inventory);
|
||||
}
|
||||
var boxcode = data.First().BoxCode;
|
||||
//创建入库任务
|
||||
var invList = _unitWork.Find<Inventory>(x => x.ContainerCode.Equals(boxcode))
|
||||
.ToList();
|
||||
if (invList.Count == 0)
|
||||
{
|
||||
return JsonMore(null, 500, $"站台{boxcode}没有绑定数据,请正确操作!");
|
||||
}
|
||||
var task = new TaskHeader
|
||||
{
|
||||
TaskNo = _unitWork.GetSerialNumber("pin", 4),
|
||||
TaskType = TaskTypeEnum.盘料入库,
|
||||
Status = TaskStatusEnum.待下发,
|
||||
ZoneCode = ZoneCodeEnum.盘料库,
|
||||
FromLocation = boxcode,
|
||||
TaskDetails = new List<TaskDetail>(),
|
||||
};
|
||||
foreach (var item in invList)
|
||||
{
|
||||
var detail = new TaskDetail
|
||||
{
|
||||
UniqueCode = item.UniqueCode,
|
||||
FromLocation = item.Lot,
|
||||
Status = TaskStatusEnum.新建,
|
||||
CreateTime = DateTime.Now
|
||||
};
|
||||
task.TaskDetails.Add(detail);
|
||||
}
|
||||
_unitWork.Add(task);
|
||||
return JsonMore(null);
|
||||
}
|
||||
|
||||
|
||||
@ -50,6 +50,7 @@ public class ReceiptInOperationController : BaseController
|
||||
TaskNo = _unitWork.GetSerialNumber("pin", 4),
|
||||
TaskType = TaskTypeEnum.盘料入库,
|
||||
Status = TaskStatusEnum.待下发,
|
||||
ZoneCode = ZoneCodeEnum.盘料库,
|
||||
FromLocation = boxCode,
|
||||
TaskDetails = new List<TaskDetail>(),
|
||||
};
|
||||
|
||||
@ -85,7 +85,7 @@ public class ReceiptSLInController : BaseController
|
||||
public ActionResult ScanBox(string boxCode)
|
||||
{
|
||||
// 判断任务重复
|
||||
if (_unitWork.IsExit<TaskHeader>(x => x.ZoneCode.Equals(ZoneCodeEnum.散料库) && x.ContainerCode.Equals(boxCode)))
|
||||
if (_unitWork.IsExit<TaskHeader>(x => x.ZoneCode.Equals(ZoneCodeEnum.散料库) && x.ContainerCode.Equals(boxCode) && x.Status < TaskStatusEnum.完成))
|
||||
{
|
||||
return JsonMore(null, 500, $"库内已存在{boxCode}的任务,请勿重复操作!");
|
||||
};
|
||||
@ -163,6 +163,7 @@ public class ReceiptSLInController : BaseController
|
||||
Qty = item.BindQty,
|
||||
Lot = item.Size.ToString(),
|
||||
ContainerCode = item.BoxCode,
|
||||
Status = "0",
|
||||
TaskStatus = InventoryTaskStatus.任务中
|
||||
};
|
||||
_unitWork.Add(inventory);
|
||||
@ -180,7 +181,7 @@ public class ReceiptSLInController : BaseController
|
||||
public ActionResult BoxBack(string boxCode, bool isFull)
|
||||
{
|
||||
// 判断任务重复
|
||||
if (_unitWork.IsExit<TaskHeader>(x => x.ZoneCode.Equals(ZoneCodeEnum.散料库) && x.ContainerCode.Equals(boxCode)))
|
||||
if (_unitWork.IsExit<TaskHeader>(x => x.ZoneCode.Equals(ZoneCodeEnum.散料库) && x.ContainerCode.Equals(boxCode) && x.Status < TaskStatusEnum.完成))
|
||||
{
|
||||
return JsonMore(null, 500, $"库内已存在{boxCode}的任务,请勿重复操作!");
|
||||
};
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
<el-input v-model="form.code" readonly></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="周转箱编码" prop="boxCode">
|
||||
<el-input v-model="form.boxCode" @@change="scanBox"></el-input>
|
||||
<el-input v-model="form.boxCode" @@change="scanBox" ref="boxCode"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="料盘尺寸" prop="size">
|
||||
<el-select v-model="form.size" placeholder="请选择料盘尺寸" style="width:100%" @@change="changeSize" clearable>
|
||||
@ -61,9 +61,9 @@
|
||||
<el-table-column label="料盘尺寸" align="center" prop="size" :formatter="sizeFormatter"></el-table-column>
|
||||
</el-table>
|
||||
<el-form-item style="float:right">
|
||||
<el-button type="primary" @@click="onSubmit">绑定</el-button>
|
||||
<el-button type="primary" @@click="onSubmit">绑定入库</el-button>
|
||||
<el-button @@click="resetForm('form')">重置</el-button>
|
||||
<el-button type="primary" @@click="inOperation">启动入库</el-button>
|
||||
@* <el-button type="primary" @@click="inOperation">启动入库</el-button> *@
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-card>
|
||||
@ -137,54 +137,26 @@
|
||||
success: function (json) {
|
||||
if (json.Code == 200) {
|
||||
_this.$message({
|
||||
message: '绑定成功!'
|
||||
message: '入库成功!',
|
||||
type: 'success'
|
||||
});
|
||||
_this.resetForm('form');
|
||||
}
|
||||
else {
|
||||
_this.$message({
|
||||
message: '绑定失败!',
|
||||
message: '入库失败!',
|
||||
type: 'warning'
|
||||
});
|
||||
}
|
||||
},
|
||||
error: function (json) {
|
||||
_this.$message({
|
||||
message: '绑定失败!',
|
||||
message: '入库失败!',
|
||||
type: 'error'
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
// 启动入库
|
||||
inOperation() {
|
||||
var _this = this;
|
||||
console.log(_this);
|
||||
$.ajax({
|
||||
type: "post",
|
||||
dataType: "json",
|
||||
data: { data: this.form.boxCode },
|
||||
url: "/receipt/ReceiptInOperation/InOperation",
|
||||
success: function (json) {
|
||||
if (json.Code == 200) {
|
||||
_this.$message({
|
||||
message: "启动成功!",
|
||||
type: "success",
|
||||
});
|
||||
}
|
||||
else{
|
||||
_this.$message({
|
||||
message: "启动入库失败!" + json.Msg,
|
||||
type: "warning",
|
||||
duration: "10000",
|
||||
});
|
||||
}
|
||||
},
|
||||
error: function (json) {
|
||||
alert("加载失败");
|
||||
}
|
||||
});
|
||||
},
|
||||
resetForm(formName) {
|
||||
this.$refs[formName].resetFields();
|
||||
this.form.boxSize = [];
|
||||
@ -214,7 +186,6 @@
|
||||
}
|
||||
});
|
||||
})
|
||||
console.log(json.Data);
|
||||
},
|
||||
error: function (json) {
|
||||
_this.$message({
|
||||
@ -260,6 +231,11 @@
|
||||
});
|
||||
}
|
||||
else {
|
||||
_this.$message({
|
||||
message: "扫描成功!",
|
||||
type: "success",
|
||||
duration: "10000",
|
||||
});
|
||||
_this.$refs.uniqueCode.focus();
|
||||
}
|
||||
},
|
||||
@ -269,13 +245,14 @@
|
||||
type: "error",
|
||||
duration: "10000",
|
||||
});
|
||||
return;
|
||||
},
|
||||
});
|
||||
// 重新扫描箱号后,待绑定列表清空
|
||||
_this.bindingData = [];
|
||||
_this.changeselect(_this.value);
|
||||
|
||||
_this.$refs.uniqueCode.focus();
|
||||
|
||||
// _this.$refs.uniqueCode.focus();
|
||||
},
|
||||
// 选择尺寸后
|
||||
changeSize() {
|
||||
|
||||
53
HHWMS.Web/Areas/System/Controllers/jobs/InvBackJob.cs
Normal file
53
HHWMS.Web/Areas/System/Controllers/jobs/InvBackJob.cs
Normal file
@ -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.新建);
|
||||
//根据盘料出库的托盘创建盘料盒出库任务
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user