盘料出库1对多工位出库

This commit is contained in:
zgf 2023-11-21 23:37:55 +08:00
parent 30f1e69664
commit 2cae99cb34
12 changed files with 308 additions and 59 deletions

View File

@ -159,6 +159,7 @@ namespace HHWMS.Web
_unitwork.Update(taskfromlocatioin);
var invCount = _unitwork.GetCount<Inventory>(x => x.ContainerCode == tasktolocatioin.ContainerCode);
tasktolocatioin.Width = invCount;
if (invCount == tasktolocatioin.Length)
{
tasktolocatioin.Status = LocationStatus.满货;
@ -292,6 +293,12 @@ namespace HHWMS.Web
var lll = response.TaskId.Split("-")[1];
var taskde = task.TaskDetails.First(x => x.FromLocation == lll);
taskde.Status = TaskStatusEnum.完成;
//更新托盘物料数量
var container = _unitwork.Find<Location>(n => n.Code == task.ContainerCode).FirstOrDefault();
container.Width -= 1;
_unitwork.Update(container);
//更新物料在料塔上的位置
var tolocation = _unitwork.Find<Location>(n => n.Code == task.ToLocation).FirstOrDefault();
var inv = _unitwork.Find<Inventory>(n => n.UniqueCode == taskde.UniqueCode

View File

@ -281,7 +281,11 @@ namespace HHWMS.Web.Controllers
}
}
#endregion 新增库位
[ActionDescription("Sys.Print")]
public ActionResult Print()
{
return Ok();
}
}
}

View File

@ -8,7 +8,7 @@
</el-col>
<el-col :span="8">
<el-input v-model.number="num"
placeholder="请输入数量" readonly>
placeholder="请输入数量">
</el-input>
</el-col>
<el-col :span="4">
@ -34,6 +34,7 @@
gendCode: '',
qrcode: '',
num: 1,
clear: false,
template: {
"panels": [
{
@ -86,7 +87,10 @@
duration: "10000",
});
}
_this.printData = [];
if (_this.clear) {
_this.gendCode = "";
_this.printData = [];
}
},
error: function (json) {
_this.$message({
@ -149,20 +153,21 @@
});
},
});
_this.unm = 1;
_this.num = 1;
},
print() {
var _this = this;
_this.gendCode = "";
// _this.gendCode = "";
hiprint.init();
var hiprintTemplate = new hiprint.PrintTemplate({
template: this.template
})
hiprintTemplate.print(this.printData);
// _this.printData = [];
//清空
_this.clear = true;
//清空
_this.qrcode = '';
_this.unm = 1;
_this.num = 1;
}
}
});

View File

@ -56,7 +56,7 @@ namespace HHWMS.Web
return data?.Text ?? a.ZoneCode;
}),
this.MakeGridHeader(x => x.UniqueCode).SetWidth(230),
this.MakeGridHeader(x => x.ContainerCode),
this.MakeGridHeader(x => x.ContainerCode).SetHide(),
this.MakeGridHeader(x => x.LocationCode),
this.MakeGridHeader(x => x.MaterialCode),
this.MakeGridHeader(x => x.MaterialType),
@ -69,7 +69,7 @@ namespace HHWMS.Web
//this.MakeGridHeader(x => x.ExpirationDate),
//this.MakeGridHeader(x => x.CompanyCode),
//this.MakeGridHeader(x => x.SupplierCode),
this.MakeGridHeader(x => x.TaskQty),
this.MakeGridHeader(x => x.TaskQty).SetHide(),
this.MakeGridHeader(x => x.Qty),
//this.MakeGridHeader(x => x.SourceCode),
//this.MakeGridHeader(x => x.ReceiptCode),

View File

@ -66,6 +66,7 @@ namespace HHWMS.Web.Controllers
}
else
{
vm.Entity.FirstStatus = ReceiptStatusEnum.新建;
vm.DoAdd();
if (!ModelState.IsValid)
{

View File

@ -45,13 +45,19 @@ public class ReceiptSLInController : BaseController
&& x.Status != LocationStatus.任务锁
&& x.Status != LocationStatus.满货
&& x.Status != LocationStatus.空仓位
&& x.Row == stations.First().Row).FirstOrDefault();
&& x.Row == stations.First().Row)
.OrderBy(x => x.Layer)
.ThenByDescending(x => x.Line)
.FirstOrDefault();
if (box == null && stations.Count == 2)
box = _unitWork.Find<Location>(x => (x.ZoneCode == ZoneCodeEnum.散料库)
&& x.Status != LocationStatus.任务锁
&& x.Status != LocationStatus.满货
&& x.Status != LocationStatus.空仓位
&& x.Row == stations.Last().Row).FirstOrDefault();
&& x.Row == stations.Last().Row)
.OrderBy(x => x.Layer)
.ThenByDescending(x => x.Line)
.FirstOrDefault();
if (box == null) return JsonMore(null, 500, "库内没有可用散料箱!");

View File

@ -10,8 +10,8 @@
<wt:textbox field="Entity.SupplierCode" />
<wt:textbox field="Entity.TotalQty" />
<wt:combobox field="Entity.LastStatus" />
<wt:textbox field="Entity.TotalLines" />*@
<wt:combobox field="Entity.FirstStatus" />
<wt:textbox field="Entity.TotalLines" />
<wt:combobox field="Entity.FirstStatus" />*@
<wt:datetime field="Entity.AppointmentTime" type="DateTime" />
<wt:textbox field="Entity.Remark" />
</wt:row>

View File

@ -264,7 +264,7 @@ namespace HHWMS.Web
}
else
{
task.ErrorMsg = "库内没有符合条件的盘料箱";
task.ErrorMsg = "库内没有符合条件的盘料箱或站台被占用";
_unitwork.Update(task);
}
}
@ -438,7 +438,7 @@ namespace HHWMS.Web
break;
case TaskTypeEnum.盘料出库:
foreach (var item in task.TaskDetails)
foreach (var item in task.TaskDetails.Where(x => x.Status == TaskStatusEnum.待下发))
{
taskInfoList.Add(new TaskInfo
{

View File

@ -88,8 +88,15 @@ namespace HHWMS.Web
}
//出库库存通过托盘号分组
var lockInvs = _unitwork.Find<Inventory>(x => x.TaskStatus == InventoryTaskStatus.任务中).ToList();
var lockInvs = _unitwork.Find<Inventory>(x => x.TaskStatus == InventoryTaskStatus.任务中
&& !"L01,L02".Contains(x.ContainerCode))
.ToList();
shiInventorys.AddRange(lockInvs);
//已生成任务的库存不再生成任务
var taskUniques = _unitwork.Find<TaskDetail>(x => x.Status > TaskStatusEnum.新建)
.Select(x => x.UniqueCode).ToList();
var taskInvs = _unitwork.Find<Inventory>(x => taskUniques.Contains(x.UniqueCode)).ToList();
shiInventorys.Except(lockInvs);
shiInventorys.DistinctBy(x => x.UniqueCode);
var inventoryList = shiInventorys.GroupBy(x => x.ContainerCode)
.ToList();
@ -166,26 +173,41 @@ namespace HHWMS.Web
row = 1;
}
// 查找工位 G1
var gLoc = _unitwork.Find<Location>(x => string.IsNullOrEmpty(x.ContainerCode)
var gLoc = _unitwork.Find<Location>(x => x.ContainerCode == item.Key
&& x.Row == location.Row
&& x.Type.Equals(LocationTypeEnum.堆垛机工位)).FirstOrDefault();
// 新建盘料盒出库任务
if (gLoc != null)
{
var pTask = new TaskHeader
//盘料箱已在堆垛机工位,直接生成盘料出库任务
}
else
{
// 盘料箱在库内,工位为空,先生成料盘箱出库任务
gLoc = _unitwork.Find<Location>(x => string.IsNullOrEmpty(x.ContainerCode)
&& x.Row == location.Row
&& x.Type.Equals(LocationTypeEnum.堆垛机工位)).FirstOrDefault();
if (gLoc != null)
{
ZoneCode = ZoneCodeEnum.盘料库,
TaskNo = _unitwork.GetSerialNumber("Out"),
TaskType = TaskTypeEnum.盘料盒出库,
ContainerCode = item.Key,
FromLocation = location.ContainerCode,
ToLocation = gLoc.Code,
Status = TaskStatusEnum.待下发,
Priority = 0,
CreateTime = DateTime.Now,
CreateBy = "wmsjob"
};
//_unitwork.Add(pTask);
var pTask = new TaskHeader
{
ZoneCode = ZoneCodeEnum.盘料库,
TaskNo = _unitwork.GetSerialNumber("Out"),
TaskType = TaskTypeEnum.盘料盒出库,
ContainerCode = item.Key,
FromLocation = location.ContainerCode,
ToLocation = gLoc.Code,
Status = TaskStatusEnum.待下发,
Priority = 0,
CreateTime = DateTime.Now,
CreateBy = "wmsjob"
};
_unitwork.Add(pTask);
}
}
if (gLoc != null)
{
//查找料塔工位 T
var tLoc = _unitwork.Find<Location>(x => string.IsNullOrEmpty(x.ContainerCode)
&& x.Row == row
@ -210,23 +232,48 @@ namespace HHWMS.Web
{
if (tLoc.Height < tLoc.Length)
{
var detail = new TaskDetail
// 库存不在已建任务明细中,新增任务明细
if (!containerTask.TaskDetails.Any(x => x.UniqueCode.Equals(inventory.UniqueCode)))
{
UniqueCode = inventory.UniqueCode,
Lot = $"{Convert.ToInt32(location.Length)}-{tLoc.Code}",
FromLocation = inventory.Lot,
ToLocation = (Convert.ToInt32(tLoc.Height) + 1).ToString(),
Status = TaskStatusEnum.新建,
ContainerCode = inventory.ContainerCode,
CreateTime = DateTime.Now
};
tLoc.Height += 1;
containerTask.TaskDetails.Add(new TaskDetail
{
UniqueCode = inventory.UniqueCode,
Lot = $"{Convert.ToInt32(location.Length)}-{tLoc.Code}",
FromLocation = inventory.Lot,
ToLocation = (Convert.ToInt32(tLoc.Height) + 1).ToString(),
Status = TaskStatusEnum.待下发,
ContainerCode = inventory.ContainerCode,
CreateTime = DateTime.Now
});
tLoc.Height += 1;
}
//存在
else
{
foreach (var i in containerTask.TaskDetails.Where(x => x.Status == TaskStatusEnum.新建))
{
i.Lot = $"{Convert.ToInt32(location.Length)}-{tLoc.Code}";
i.ToLocation = (Convert.ToInt32(tLoc.Height) + 1).ToString();
i.Status = TaskStatusEnum.待下发;
tLoc.Height += 1;
}
}
containerTask.Status = TaskStatusEnum.待下发;
containerTask.TaskDetails.Add(detail);
}
else
{
break;
// 库存不在已建任务明细中,新增任务明细
if (!containerTask.TaskDetails.Any(x => x.UniqueCode.Equals(inventory.UniqueCode)))
{
containerTask.TaskDetails.Add(new TaskDetail
{
UniqueCode = inventory.UniqueCode,
FromLocation = inventory.Lot,
Status = TaskStatusEnum.新建,
ContainerCode = inventory.ContainerCode,
CreateTime = DateTime.Now
});
}
}
}
_unitwork.Update(tLoc);
@ -237,8 +284,7 @@ namespace HHWMS.Web
continue;
}
}
else
if (tLoc != null)
else if (tLoc != null)
{
task.ZoneCode = ZoneCodeEnum.盘料库;
task.TaskNo = _unitwork.GetSerialNumber("pout", 4);
@ -247,7 +293,7 @@ namespace HHWMS.Web
task.ContainerCode = item.Key;
task.Priority = 100;
task.FromLocation = _unitwork
.FindSingle<Location>(x => x.ContiguousCode == pTask.ToLocation)?.Code;
.FindSingle<Location>(x => x.ContiguousCode == gLoc.Code)?.Code;
task.ToLocation = tLoc.Code;
task.CreateTime = DateTime.Now;
task.CreateBy = "wmsjob";
@ -273,7 +319,6 @@ namespace HHWMS.Web
break;
}
}
_unitwork.Add(pTask);
_unitwork.Add(task);
//更新库位状态
var container = _unitwork.Find<Location>(x => x.ContainerCode == item.Key)
@ -323,5 +368,181 @@ namespace HHWMS.Web
catch { }
return Task.CompletedTask;
}
// 根据库存明细,生成盘料出库任务
public void GenPlcTask(List<Inventory> invs, UnitWork _unitwork)
{
// 按盘料箱分组
var inventoryList = invs.GroupBy(x => x.ContainerCode)
.ToList();
foreach (var item in inventoryList)
{
var task = new TaskHeader();
task.TaskDetails = new List<TaskDetail>();
var inv = item.FirstOrDefault();
var location = _unitwork.Find<Location>(x => x.ContainerCode == item.Key
&& x.Status != LocationStatus.空仓位
&& x.Status != LocationStatus.空容器).FirstOrDefault();
//查询仓位表是否符合
if (location != null)
{
var row = 1;
if (inv.Flag == 8)
{
row = 3;
}
else if (inv.Flag == 24 || inv.Flag == 16 || inv.Flag == 10)
{
row = 1;
}
// 查找工位 G1
var gLoc = _unitwork.Find<Location>(x => x.ContainerCode == item.Key
&& x.Row == location.Row
&& x.Type.Equals(LocationTypeEnum.堆垛机工位))
.FirstOrDefault();
// gLoc != null 盘料箱已在堆垛机工位,直接生成盘料出库任务
if (gLoc == null)
{
// 盘料箱不在工位,先生成料盘箱出库任务
gLoc = _unitwork.Find<Location>(x => string.IsNullOrEmpty(x.ContainerCode)
&& x.Row == location.Row
&& x.Type.Equals(LocationTypeEnum.堆垛机工位))
.FirstOrDefault();
if (gLoc != null)
{
var pTask = new TaskHeader
{
ZoneCode = ZoneCodeEnum.盘料库,
TaskNo = _unitwork.GetSerialNumber("Out"),
TaskType = TaskTypeEnum.盘料盒出库,
ContainerCode = item.Key,
FromLocation = location.ContainerCode,
ToLocation = gLoc.Code,
Status = TaskStatusEnum.待下发,
Priority = 0,
CreateTime = DateTime.Now,
CreateBy = "wmsjob"
};
_unitwork.Add(pTask);
}
else
{
// 找不到工位,直接跳出
return;
}
}
// 新建盘料盒出库任务
if (gLoc != null)
{
//查找料塔工位 T
var tLoc = _unitwork.Find<Location>(x => string.IsNullOrEmpty(x.ContainerCode)
&& x.Row == row
&& x.Type.Equals(LocationTypeEnum.料塔))
.FirstOrDefault();
//查询料塔是否为空
if (tLoc == null)
{
//判断是否存在此托盘的出库任务
var containerTask = _unitwork.Find<TaskHeader>(x => x.Status < TaskStatusEnum.已下发
&& x.ContainerCode == item.Key
&& x.TaskType == TaskTypeEnum.盘料出库)
.Include(x => x.TaskDetails)
.FirstOrDefault();
if (containerTask != null)
{
tLoc = _unitwork.Find<Location>(x => x.Code == containerTask.ToLocation
&& x.Type.Equals(LocationTypeEnum.料塔))
.FirstOrDefault();
foreach (var inventory in item)
{
if (tLoc.Height < tLoc.Length)
{
var detail = new TaskDetail
{
UniqueCode = inventory.UniqueCode,
Lot = $"{Convert.ToInt32(location.Length)}-{tLoc.Code}",
FromLocation = inventory.Lot,
ToLocation = (Convert.ToInt32(tLoc.Height) + 1).ToString(),
Status = TaskStatusEnum.新建,
ContainerCode = inventory.ContainerCode,
CreateTime = DateTime.Now
};
tLoc.Height += 1;
containerTask.Status = TaskStatusEnum.待下发;
containerTask.TaskDetails.Add(detail);
}
else
{
break;
}
}
_unitwork.Update(tLoc);
_unitwork.Update(containerTask);
}
else
{
continue;
}
}
else if (tLoc != null)
{
task.ZoneCode = ZoneCodeEnum.盘料库;
task.TaskNo = _unitwork.GetSerialNumber("pout", 4);
task.TaskType = TaskTypeEnum.盘料出库;
task.Status = TaskStatusEnum.待下发;
task.ContainerCode = item.Key;
task.Priority = 100;
task.FromLocation = _unitwork
.FindSingle<Location>(x => x.ContiguousCode == gLoc.Code)?.Code;
task.ToLocation = tLoc.Code;
task.CreateTime = DateTime.Now;
task.CreateBy = "wmsjob";
foreach (var inventory in item)
{
if (tLoc.Height < tLoc.Length)
{
var detail = new TaskDetail
{
UniqueCode = inventory.UniqueCode,
Lot = $"{Convert.ToInt32(location.Length)}-{tLoc.Code}",
FromLocation = inventory.Lot,
ToLocation = (Convert.ToInt32(tLoc.Height) + 1).ToString(),
Status = TaskStatusEnum.新建,
ContainerCode = inventory.ContainerCode,
CreateTime = DateTime.Now
};
task.TaskDetails.Add(detail);
tLoc.Height += 1;
}
else
{
break;
}
}
_unitwork.Add(task);
//更新库位状态
var container = _unitwork.Find<Location>(x => x.ContainerCode == item.Key)
.FirstOrDefault();
if (container != null)
{
container.Status = LocationStatus.任务锁;
container.UpdateTime = DateTime.Now;
container.UpdateBy = "wmsjob";
_unitwork.Update(container);
}
tLoc.ContainerCode = tLoc.Code;
tLoc.UpdateBy = "wmsjob";
tLoc.UpdateTime = DateTime.Now;
_unitwork.Update(tLoc);
}
}
}
}
}
}
}

View File

@ -40,8 +40,7 @@ namespace HHWMS.Web
this.MakeGridHeader(x => x.InventoryId).SetHide(),
this.MakeGridHeader(x => x.FromLocation),
this.MakeGridHeader(x => x.ToLocation),
this.MakeGridHeader(x => x.Status),
this.MakeGridHeaderAction(width: 200)
this.MakeGridHeader(x => x.Status)
};
}

View File

@ -1018,10 +1018,10 @@
<value>错误信息</value>
</data>
<data name="TaskType.In" xml:space="preserve">
<value>入库任务</value>
<value>盘料盒入库</value>
</data>
<data name="TaskType.Out" xml:space="preserve">
<value>出库任务</value>
<value>盘料盒出库</value>
</data>
<data name="TaskType.PIn" xml:space="preserve">
<value>盘料入库</value>
@ -1029,6 +1029,12 @@
<data name="TaskType.POut" xml:space="preserve">
<value>盘料出库</value>
</data>
<data name="TaskType.SIn" xml:space="preserve">
<value>散料盒入库</value>
</data>
<data name="TaskType.SOut" xml:space="preserve">
<value>散料盒出库</value>
</data>
<data name="TaskType.Move" xml:space="preserve">
<value>移库任务</value>
</data>

View File

@ -27,21 +27,21 @@
// "Value": "Server=127.0.0.1;Port=3306;Database=8357wms;Uid=root;Password=abc123*;Character Set=utf8mb4;",
// "DBType": "mysql"
//}
{
"Key": "default",
"Value": "Data Source=.;Initial Catalog=8357wms;User=sa;Password=abc123*;Persist Security Info=True",
"DbContext": "DataContext",
"DBType": "sqlserver" //DataBase, you can choose mysql,sqlserver,pgsql,sqlite,oracle
}
//{
// "Key": "default",
// "Value": "Data Source=10.18.106.4;Initial Catalog=8357wms;User=wms;Password=abc123*;Persist Security Info=True",
// "Value": "Data Source=.;Initial Catalog=8357wms;User=sa;Password=abc123*;Persist Security Info=True",
// "DbContext": "DataContext",
// "DBType": "sqlserver" //DataBase, you can choose mysql,sqlserver,pgsql,sqlite,oracle
//}
{
"Key": "default",
"Value": "Data Source=10.18.106.4;Initial Catalog=8357wms;User=wms;Password=abc123*;Persist Security Info=True",
"DbContext": "DataContext",
"DBType": "sqlserver" //DataBase, you can choose mysql,sqlserver,pgsql,sqlite,oracle
}
],
"CookiePre": "HHWMS", //cookie前缀
"IsQuickDebug": true, //是否启用debug模式
"IsQuickDebug": false, //是否启用debug模式
"EnableTenant": false, //是否启动多租户
"SyncDb": true, //是否自动同步数据库
"EncryptKey": "", //加密密钥