散料出入库扫描 站台,系统匹配料盒
This commit is contained in:
parent
b833415dbf
commit
b864a80e29
@ -107,7 +107,7 @@ namespace HHWMS.Web
|
||||
_unitwork.Update(taskfromlocatioin);
|
||||
|
||||
tasktolocatioin.Status = tasktolocatioin.Length == 1 ? LocationStatus.满货 : LocationStatus.有货;
|
||||
if (!_unitwork.IsExit<Inventory>(x => x.ContainerCode == tasktolocatioin.ContainerCode))
|
||||
if (!_unitwork.IsExit<Inventory>(x => x.ContainerCode == tasktolocatioin.Code))
|
||||
{
|
||||
tasktolocatioin.Status = LocationStatus.空容器;
|
||||
}
|
||||
@ -130,9 +130,9 @@ namespace HHWMS.Web
|
||||
// 更新库存
|
||||
task.Status = TaskStatusEnum.完成;
|
||||
|
||||
taskfromlocatioin.Status = LocationStatus.空仓位;
|
||||
taskfromlocatioin.ContainerCode = "";
|
||||
_unitwork.Update(taskfromlocatioin);
|
||||
//taskfromlocatioin.Status = LocationStatus.空仓位;
|
||||
//taskfromlocatioin.ContainerCode = "";
|
||||
//_unitwork.Update(taskfromlocatioin);
|
||||
|
||||
tasktolocatioin.Status = LocationStatus.有货;
|
||||
tasktolocatioin.ContainerCode = task.ContainerCode;
|
||||
@ -299,6 +299,7 @@ namespace HHWMS.Web
|
||||
//更新托盘物料数量
|
||||
var container = _unitwork.Find<Location>(n => n.Code == task.ContainerCode).FirstOrDefault();
|
||||
container.Width -= 1;
|
||||
if (container.Width < 0) container.Width = 0;
|
||||
_unitwork.Update(container);
|
||||
|
||||
//更新物料在料塔上的位置
|
||||
@ -351,7 +352,7 @@ namespace HHWMS.Web
|
||||
}
|
||||
else
|
||||
{
|
||||
return ApiResultError(msg: $"未找到任务号{taskno}对应的任务!");
|
||||
return ApiResult();
|
||||
}
|
||||
return ApiResult();
|
||||
}
|
||||
|
||||
@ -229,6 +229,10 @@ namespace HHWMS.Web.Controllers
|
||||
public ActionResult ReturnToMes(string id)
|
||||
{
|
||||
var inv = _unitwork.FindById<Inventory>(int.Parse(id));
|
||||
if(inv.Status == "1")
|
||||
{
|
||||
return FFResult().Message($"物料{inv.UniqueCode}已回传MES").RefreshGrid();
|
||||
}
|
||||
var qr = _unitwork.FindSingle<MaterialQr>(x => x.UniqueCode.Equals(inv.UniqueCode))?.QRCode;
|
||||
var bizData = new InStore
|
||||
{
|
||||
@ -263,6 +267,8 @@ namespace HHWMS.Web.Controllers
|
||||
var result = client.bizOperationV1Async(request).Result;
|
||||
if (result.Status == "Y")
|
||||
{
|
||||
inv.Status = "1";
|
||||
_unitwork.Update(inv);
|
||||
Wtm.DoLog("", ActionLogTypesEnum.Normal, "mes", request: JsonConvert.SerializeObject(request), result: "success");
|
||||
return FFResult().Message("库存回传成功").RefreshGrid();
|
||||
}
|
||||
|
||||
@ -5,6 +5,7 @@ using System.Reflection.Emit;
|
||||
using HHWMS.Web.Models;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using NPOI.SS.Formula.Functions;
|
||||
using WalkingTec.Mvvm.Core;
|
||||
using WalkingTec.Mvvm.Mvc;
|
||||
|
||||
@ -92,12 +93,15 @@ public class ReceiptSLInController : BaseController
|
||||
public ActionResult ScanBox(string boxCode)
|
||||
{
|
||||
// 判断任务重复
|
||||
if (_unitWork.IsExit<TaskHeader>(x => x.ZoneCode.Equals(ZoneCodeEnum.散料库) && x.ContainerCode.Equals(boxCode) && x.Status < TaskStatusEnum.完成))
|
||||
if (_unitWork.IsExit<TaskHeader>(x => x.ZoneCode.Equals(ZoneCodeEnum.散料库)
|
||||
&& (x.FromLocation.Equals(boxCode) || x.ToLocation.Equals(boxCode))
|
||||
&& x.Status < TaskStatusEnum.完成))
|
||||
{
|
||||
return JsonMore(null, 500, $"库内已存在{boxCode}的任务,请勿重复操作!");
|
||||
};
|
||||
// 判断箱号是否合理
|
||||
var box = _unitWork.FindSingle<Location>(x => x.ContainerCode.Equals(boxCode));
|
||||
var box = _unitWork.FindSingle<Location>(x => x.Code.Equals(boxCode) && x.Type == LocationTypeEnum.散料库站台);
|
||||
|
||||
if (box != null)
|
||||
{
|
||||
if (box.Type != LocationTypeEnum.散料库站台)
|
||||
@ -143,6 +147,7 @@ public class ReceiptSLInController : BaseController
|
||||
var receiptHeaderList = _unitWork.Find<ReceiptHeader>(x =>
|
||||
data.Select(x => x.ReceiptCode).ToList().Contains(x.ID.ToString()))
|
||||
.Include(x => x.ReceiptDetails).ToList();
|
||||
|
||||
// 查找明细,修改对应状态,并且 绑定物料周转箱
|
||||
foreach (Binding item in data.OrderBy(x => x.ReceiptCode))
|
||||
{
|
||||
@ -162,6 +167,7 @@ public class ReceiptSLInController : BaseController
|
||||
header.FirstStatus = ReceiptStatusEnum.收完;
|
||||
}
|
||||
}
|
||||
var station = _unitWork.FindSingle<Location>(x => x.Code == item.BoxCode);
|
||||
// 新建库存
|
||||
var inventory = new Inventory
|
||||
{
|
||||
@ -169,7 +175,8 @@ public class ReceiptSLInController : BaseController
|
||||
UniqueCode = item.UniqueCode,
|
||||
Qty = item.BindQty,
|
||||
Lot = item.Size.ToString(),
|
||||
ContainerCode = item.BoxCode,
|
||||
LocationCode = item.BoxCode,
|
||||
ContainerCode = station.ContainerCode,
|
||||
Status = "0",
|
||||
TaskStatus = InventoryTaskStatus.任务中
|
||||
};
|
||||
@ -193,19 +200,28 @@ public class ReceiptSLInController : BaseController
|
||||
return JsonMore(null, 500, $"库内已存在{boxCode}的任务,请勿重复操作!");
|
||||
};
|
||||
// 判断箱号是否合理
|
||||
var box = _unitWork.FindSingle<Location>(x => x.ContainerCode.Equals(boxCode));
|
||||
var station = _unitWork.FindSingle<Location>(x => x.Code.Equals(boxCode)
|
||||
&& x.Type == LocationTypeEnum.散料库站台);
|
||||
if (station == null)
|
||||
{
|
||||
return JsonMore(null, 500, $"站台{boxCode}不存在,无法入库!");
|
||||
}
|
||||
// 判断箱号是否合理
|
||||
var box = _unitWork.FindSingle<Location>(x => x.ContainerCode.Equals(station.ContainerCode)
|
||||
&& x.Type != LocationTypeEnum.散料库站台);
|
||||
|
||||
if (box != null)
|
||||
{
|
||||
if(box.Type != LocationTypeEnum.散料库站台)
|
||||
{
|
||||
return JsonMore(null, 500, $"{boxCode}不在站台,无法入库!");
|
||||
}
|
||||
else
|
||||
{
|
||||
//if(box.Type != LocationTypeEnum.散料库站台)
|
||||
//{
|
||||
// return JsonMore(null, 500, $"{boxCode}不在站台,无法入库!");
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// 查找目标库位,托盘回原库位
|
||||
var toLocation = _unitWork.FindSingle<Location>(x => x.Code.Equals(boxCode));
|
||||
var toLocation = _unitWork.FindSingle<Location>(x => x.Code.Equals(box.Code));
|
||||
|
||||
if (toLocation != null)
|
||||
if (toLocation != null)
|
||||
{
|
||||
// 创建任务
|
||||
var task = new TaskHeader
|
||||
@ -213,8 +229,8 @@ public class ReceiptSLInController : BaseController
|
||||
ZoneCode = ZoneCodeEnum.散料库,
|
||||
TaskNo = _unitWork.GetSerialNumber("CIn"),
|
||||
TaskType = TaskTypeEnum.散料盒入库,
|
||||
ContainerCode = boxCode,
|
||||
FromLocation = box.Code,
|
||||
ContainerCode = toLocation.Code,
|
||||
FromLocation = station.Code,
|
||||
ToLocation = toLocation.Code,
|
||||
Status = TaskStatusEnum.待下发,
|
||||
CreateBy = Wtm.LoginUserInfo.ITCode,
|
||||
@ -230,7 +246,7 @@ public class ReceiptSLInController : BaseController
|
||||
{
|
||||
return JsonMore(null, 500, $"库内无可用仓位,无法入库!");
|
||||
}
|
||||
}
|
||||
//}
|
||||
return JsonMore(data: null);
|
||||
}
|
||||
else
|
||||
|
||||
@ -116,24 +116,28 @@ public class ShipOutController : 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.FromLocation.Equals(boxCode))){
|
||||
return JsonMore(null, 500, $"库内已存在{boxCode}的任务,请勿重复操作!");
|
||||
};
|
||||
var station = _unitWork.FindSingle<Location>(x => x.Code.Equals(boxCode)
|
||||
&& x.Type == LocationTypeEnum.散料库站台);
|
||||
if(station == null)
|
||||
{
|
||||
return JsonMore(null, 500, $"站台{boxCode}不存在,无法入库!");
|
||||
}
|
||||
// 判断箱号是否合理
|
||||
var box = _unitWork.FindSingle<Location>(x => x.ContainerCode.Equals(boxCode));
|
||||
var box = _unitWork.FindSingle<Location>(x => x.ContainerCode.Equals(station.ContainerCode)
|
||||
&& x.Type != LocationTypeEnum.散料库站台);
|
||||
if (box != null)
|
||||
{
|
||||
if(box.Type != LocationTypeEnum.散料库站台)
|
||||
{
|
||||
return JsonMore(null, 500, $"{boxCode}不在站台,无法入库!");
|
||||
}
|
||||
else
|
||||
{
|
||||
// 查找目标库位
|
||||
var toLocation = _unitWork.FindSingle<Location>(x => x.Status.Equals(LocationStatus.空仓位)
|
||||
&& x.Type.Equals(LocationTypeEnum.散料库位)
|
||||
&& x.Code == boxCode
|
||||
&& x.Row.Equals(box.Row));
|
||||
//if(box.Type != LocationTypeEnum.散料库站台)
|
||||
//{
|
||||
// return JsonMore(null, 500, $"{boxCode}不在站台,无法入库!");
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// 查找目标库位 回原位
|
||||
var toLocation = _unitWork.FindSingle<Location>(x => x.Code.Equals(box.Code));
|
||||
|
||||
if (toLocation != null)
|
||||
{
|
||||
@ -143,8 +147,8 @@ public class ShipOutController : BaseController
|
||||
ZoneCode = ZoneCodeEnum.散料库,
|
||||
TaskNo = _unitWork.GetSerialNumber("CIn"),
|
||||
TaskType = TaskTypeEnum.散料盒入库,
|
||||
ContainerCode = boxCode,
|
||||
FromLocation = box.Code,
|
||||
ContainerCode = station.ContainerCode,
|
||||
FromLocation = station.Code,
|
||||
ToLocation = toLocation.Code,
|
||||
Status = TaskStatusEnum.待下发,
|
||||
CreateBy = Wtm.LoginUserInfo.ITCode,
|
||||
@ -160,7 +164,7 @@ public class ShipOutController : BaseController
|
||||
{
|
||||
return JsonMore(null, 500, $"库内无可用仓位,无法入库!");
|
||||
}
|
||||
}
|
||||
//}
|
||||
return JsonMore(data: null);
|
||||
}
|
||||
else
|
||||
|
||||
@ -83,6 +83,7 @@
|
||||
data() {
|
||||
return {
|
||||
form: {
|
||||
type:"",
|
||||
code: "",
|
||||
uniqueCode: "",
|
||||
materialCode: "",
|
||||
@ -112,6 +113,7 @@
|
||||
},
|
||||
select(data) {
|
||||
this.form.code = "";
|
||||
this.form.type = data;
|
||||
},
|
||||
// 扫描料塔站台号
|
||||
scanCode(data) {
|
||||
|
||||
@ -26,10 +26,61 @@ namespace HHWMS.Web
|
||||
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)
|
||||
{
|
||||
|
||||
var bizData = new InStore
|
||||
{
|
||||
INWMS = new INWMS
|
||||
{
|
||||
INITEMS = new INITEMS
|
||||
{
|
||||
INITEM = new List<INITEMItem>()
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
foreach (var inv in Invs)
|
||||
{
|
||||
//var inv = _unitwork.FindById<Inventory>(int.Parse(id));
|
||||
var qr = _unitwork.FindSingle<MaterialQr>(x => x.UniqueCode.Equals(inv.UniqueCode))?.QRCode;
|
||||
bizData.INWMS.INITEMS.INITEM.Add(
|
||||
new INITEMItem()
|
||||
{
|
||||
ERPSN = qr,
|
||||
WMSSN = inv?.UniqueCode,
|
||||
QTY = ((int?)inv?.Qty).ToString(),
|
||||
TYPE = "2"
|
||||
});
|
||||
}
|
||||
var str = JsonConvert.SerializeObject(bizData);
|
||||
var request = new ServiceReference1.bizOperationV1Request
|
||||
{
|
||||
fromUnit = "8357S",
|
||||
toUnit = "8357TEST",
|
||||
fromSys = "WMSTEST",
|
||||
toSys = "MES",
|
||||
bizOperation = "InStore",
|
||||
bizData = str
|
||||
};
|
||||
var client = new ServiceReference1.portTypeClient();
|
||||
var result = client.bizOperationV1Async(request).Result;
|
||||
if (result.Status == "Y")
|
||||
{
|
||||
_unitwork.BatchUpdate<Inventory>(x => Invs.Select(y => y.ID).Contains(x.ID), x => new Inventory
|
||||
{
|
||||
Status = "1",
|
||||
UpdateBy = "invjob",
|
||||
UpdateTime = DateTime.Now
|
||||
});
|
||||
Wtm.DoLog("", ActionLogTypesEnum.Normal, "mes", request: JsonConvert.SerializeObject(request), result: "success");
|
||||
//return FFResult().Message("库存回传成功").RefreshGrid();
|
||||
}
|
||||
else
|
||||
{
|
||||
Wtm.DoLog("", ActionLogTypesEnum.Normal, "mes", request: JsonConvert.SerializeObject(request), result: "error");
|
||||
//return FFResult().Message($"{result.Message}").RefreshGrid();
|
||||
}
|
||||
|
||||
#region 更新时间
|
||||
|
||||
var job = _unitwork.FindSingle<SysJob>(x => x.JobName == context.JobDetail.Key.Name);
|
||||
|
||||
@ -214,11 +214,13 @@ namespace HHWMS.Web
|
||||
.FirstOrDefault();
|
||||
|
||||
container = _unitwork.Find<Location>(x => x.Row == station.Row
|
||||
&& x.Type == LocationTypeEnum.盘料库位
|
||||
&& (x.Status == LocationStatus.有货 || x.Status == LocationStatus.空容器)
|
||||
&& x.Length == Length
|
||||
&& !x.IsStop)
|
||||
.OrderByDescending(x => x.Length - x.Width)
|
||||
&& x.Type == LocationTypeEnum.盘料库位
|
||||
&& (x.Status == LocationStatus.有货 || x.Status == LocationStatus.空容器)
|
||||
&& x.Length == Length
|
||||
&& !x.IsStop)
|
||||
.OrderByDescending(x => x.Length - x.Width)
|
||||
.ThenBy(x => x.Layer)
|
||||
.ThenByDescending(x => x.Line)
|
||||
.FirstOrDefault();
|
||||
|
||||
}
|
||||
|
||||
@ -63,14 +63,11 @@ namespace HHWMS.Web
|
||||
this.MakeGridHeader(x => x.ToLocation, 150),
|
||||
this.MakeGridHeader(x => x.Station,150),
|
||||
this.MakeGridHeader(x => x.ContainerCode, 150),
|
||||
this.MakeGridHeader(x => x.RoadWay, 150),
|
||||
this.MakeGridHeader(x => x.Priority, 150),
|
||||
this.MakeGridHeader(x => x.RoadWay, 150).SetHide(),
|
||||
this.MakeGridHeader(x => x.Priority, 150).SetHide(),
|
||||
this.MakeGridHeader(x => x.Status, 150),
|
||||
this.MakeGridHeader(x => x.ErrorMsg, 150),
|
||||
this.MakeGridHeader(x => x.CreateTime, 150),
|
||||
this.MakeGridHeader(x => x.CreateBy, 150),
|
||||
this.MakeGridHeader(x => x.UpdateTime, 150),
|
||||
this.MakeGridHeader(x => x.UpdateBy, 150),
|
||||
this.MakeGridHeader(x => x.CreateTime, 150).SetHide(),
|
||||
this.MakeGridHeader(x => x.ErrorMsg, 150).SetHide(),
|
||||
this.MakeGridHeaderAction(width: 200)
|
||||
};
|
||||
}
|
||||
|
||||
@ -334,14 +334,14 @@ namespace HHWMS.Web.Models
|
||||
public static class StationCode
|
||||
{
|
||||
/// <summary>
|
||||
/// 散料库左抽屉 = "C02-02-18-02";
|
||||
/// 散料库左抽屉 = "C02-02-18-03";
|
||||
/// </summary>
|
||||
public const string 散料库左抽屉 = "C02-02-18-02";
|
||||
public const string 散料库左抽屉 = "C02-02-18-03";
|
||||
|
||||
/// <summary>
|
||||
/// 散料库右抽屉 = "C02-01-18-02";
|
||||
/// 散料库右抽屉 = "C02-01-18-03";
|
||||
/// </summary>
|
||||
public const string 散料库右抽屉 = "C02-01-18-02";
|
||||
public const string 散料库右抽屉 = "C02-01-18-03";
|
||||
|
||||
/// <summary>
|
||||
/// 盘料库左工位 = "L01-02-34-02";
|
||||
|
||||
@ -27,18 +27,18 @@
|
||||
// "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模式
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user