捡货方法再次修改,取消捡货后回传MES
入库时有出库的库存不再改变状态 交易记录新增容器和单号等信息
This commit is contained in:
parent
a64e3a36f4
commit
c286bf55d7
@ -133,7 +133,8 @@ namespace HHWMS.Web
|
||||
tasktolocatioin.ContainerCode = task.ContainerCode;
|
||||
_unitwork.Update(tasktolocatioin);
|
||||
|
||||
_unitwork.BatchUpdate<Inventory>(x => x.ContainerCode.Equals(task.ContainerCode),
|
||||
_unitwork.BatchUpdate<Inventory>(x => x.ContainerCode.Equals(task.ContainerCode)
|
||||
&& string.IsNullOrEmpty(x.SourceCode),
|
||||
x => new Inventory
|
||||
{
|
||||
LocationCode = tasktolocatioin.Code,
|
||||
@ -303,7 +304,7 @@ namespace HHWMS.Web
|
||||
station.ContainerCode = "";
|
||||
_unitwork.Update(station);
|
||||
}
|
||||
// 查询料塔 是否还有已下发,未完成的盘料入库任务
|
||||
// 查询料塔 是否还有已下发,未完成的盘料入库任务
|
||||
if (!task.TaskDetails.Any(x => x.Status < TaskStatusEnum.完成))
|
||||
{
|
||||
task.Status = TaskStatusEnum.完成;
|
||||
@ -366,7 +367,8 @@ namespace HHWMS.Web
|
||||
|| task.TaskType == TaskTypeEnum.散料盒入库)
|
||||
{
|
||||
var invList = _unitwork.Find<Inventory>(x => x.ContainerCode == task.ContainerCode
|
||||
&& x.TaskStatus == InventoryTaskStatus.任务中)
|
||||
&& x.TaskStatus == InventoryTaskStatus.任务中
|
||||
&& string.IsNullOrEmpty(x.SourceCode))
|
||||
.ToList();
|
||||
var listInvtran = new List<InventoryTransaction>();
|
||||
foreach (var inv in invList)
|
||||
@ -383,6 +385,7 @@ namespace HHWMS.Web
|
||||
MaterialType = inv.MaterialType,
|
||||
Batch = inv.Batch,
|
||||
Lot = inv.Lot,
|
||||
ContainerCode = task.ContainerCode,
|
||||
CompanyCode = inv.CompanyCode,
|
||||
LocationCode = inv.LocationCode,
|
||||
SupplierCode = inv.SupplierCode,
|
||||
@ -464,11 +467,11 @@ namespace HHWMS.Web
|
||||
// 料盒出库是为了入,还是为了出 1是出,2是入
|
||||
/*if (task.Station == "1")
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
else if (task.Station == "2")
|
||||
{
|
||||
|
||||
|
||||
}*/
|
||||
// 测试 创建盘料出库任务
|
||||
var locationList = _unitwork.Find<Location>(x => x.Row == tasktolocatioin.Row && "T,G2".Contains(x.Type)).ToList();
|
||||
|
||||
@ -100,15 +100,16 @@ public class ShipOutController : BaseController
|
||||
return JsonMore(null, 500, "未找到该出库单!");
|
||||
}
|
||||
|
||||
var header = _unitWork.Find<ShipmentHeader>(x => x.ID.Equals(shipment.ShipmentHeaderId))
|
||||
.Include(x => x.ShipmentDetails)
|
||||
.FirstOrDefault();
|
||||
var detail = header.ShipmentDetails.First(x => x.ID == shipment.ID);
|
||||
detail.Status = ShipStatusEnum.拣货完成;
|
||||
detail.UpdateTime = DateTime.Now;
|
||||
detail.UpdateBy = Wtm.LoginUserInfo?.ITCode??"WMS";
|
||||
shipment.Status = ShipStatusEnum.拣货完成;
|
||||
shipment.UpdateTime = DateTime.Now;
|
||||
shipment.UpdateBy = Wtm.LoginUserInfo?.ITCode??"WMS";
|
||||
_unitWork.Update(shipment);
|
||||
|
||||
if (!header.ShipmentDetails.Any(x => x.Status < ShipStatusEnum.拣货完成))
|
||||
var header = _unitWork.Find<ShipmentHeader>(x => x.ID.Equals(shipment.ShipmentHeaderId))
|
||||
.FirstOrDefault();
|
||||
var details = _unitWork.Find<ShipmentDetail>(x => x.ShipmentHeaderId == shipment.ShipmentHeaderId)
|
||||
.ToList();
|
||||
if (details.All(x => x.Status == ShipStatusEnum.拣货完成))
|
||||
{
|
||||
header.FirstStatus = ShipStatusEnum.拣货完成;
|
||||
}
|
||||
@ -124,6 +125,7 @@ public class ShipOutController : BaseController
|
||||
if (inv != null)
|
||||
{
|
||||
//回传MES
|
||||
/*
|
||||
var qr = _unitWork.FindSingle<MaterialQr>(x => x.UniqueCode.Equals(inv.UniqueCode))?.QRCode;
|
||||
|
||||
var bizData = new InStore
|
||||
@ -158,8 +160,9 @@ public class ShipOutController : BaseController
|
||||
};
|
||||
var client = new ServiceReference1.portTypeClient();
|
||||
var result = client.bizOperationV1Async(request).Result;
|
||||
//var result = new bizOperationV1Response();
|
||||
//result.Status = "Y";
|
||||
*/
|
||||
var result = new bizOperationV1Response();
|
||||
result.Status = "Y";
|
||||
if (result.Status == "Y")
|
||||
{
|
||||
// 删除库存,扣账,记录库存交易 todo,根据站台查询是否还有未拣货的物料,如果没有就清空站台占用
|
||||
@ -179,6 +182,9 @@ public class ShipOutController : BaseController
|
||||
CompanyCode = inv.CompanyCode,
|
||||
LocationCode = inv.LocationCode,
|
||||
SupplierCode = inv.SupplierCode,
|
||||
BillCode = header.Code,
|
||||
BillDetailId = shipment.ID,
|
||||
ContainerCode = inv.ContainerCode,
|
||||
Qty = inv.Qty,
|
||||
CreateTime = DateTime.Now
|
||||
};
|
||||
@ -208,14 +214,14 @@ public class ShipOutController : BaseController
|
||||
}
|
||||
}
|
||||
|
||||
Wtm.DoLog("", ActionLogTypesEnum.Normal, "mes", request: JsonConvert.SerializeObject(request), result: "success");
|
||||
// Wtm.DoLog("", ActionLogTypesEnum.Normal, "mes", request: JsonConvert.SerializeObject(request), result: "success");
|
||||
tran.Commit();
|
||||
return JsonMore(null);
|
||||
}
|
||||
else
|
||||
{
|
||||
tran.Rollback();
|
||||
Wtm.DoLog("", ActionLogTypesEnum.Normal, "mes", request: JsonConvert.SerializeObject(request), result: "error");
|
||||
// Wtm.DoLog("", ActionLogTypesEnum.Normal, "mes", request: JsonConvert.SerializeObject(request), result: "error");
|
||||
return JsonMore(null, 500, $"回传MES失败,失败原因{result.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
@ -25,7 +25,7 @@ namespace HHWMS.Web
|
||||
{
|
||||
var _unitwork = new UnitWork(Wtm);
|
||||
List<Inventory> inventories = _unitwork.Find<Inventory>(x => x.Status == "0"
|
||||
&& x.TaskStatus == InventoryTaskStatus.无任务)
|
||||
&& x.TaskStatus == InventoryTaskStatus.无任务)
|
||||
.ToList();
|
||||
var Invs = inventories.Take(20).ToList();
|
||||
|
||||
@ -36,8 +36,8 @@ namespace HHWMS.Web
|
||||
INITEMS = new INITEMS
|
||||
{
|
||||
INITEM = new List<INITEMItem>()
|
||||
{
|
||||
}
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
@ -48,15 +48,16 @@ namespace HHWMS.Web
|
||||
//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",
|
||||
FLAG = "1"
|
||||
});
|
||||
new INITEMItem()
|
||||
{
|
||||
ERPSN = qr,
|
||||
WMSSN = inv?.UniqueCode,
|
||||
QTY = ((int?)inv?.Qty).ToString(),
|
||||
TYPE = "2",
|
||||
FLAG = "1"
|
||||
});
|
||||
}
|
||||
|
||||
var str = JsonConvert.SerializeObject(bizData);
|
||||
var request = new ServiceReference1.bizOperationV1Request
|
||||
{
|
||||
@ -77,32 +78,43 @@ namespace HHWMS.Web
|
||||
UpdateBy = "invjob",
|
||||
UpdateTime = DateTime.Now
|
||||
});
|
||||
Wtm.DoLog("", ActionLogTypesEnum.Normal, "mes", request: JsonConvert.SerializeObject(request), result: "success");
|
||||
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");
|
||||
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);
|
||||
if (job != null)
|
||||
{
|
||||
job.LastFireTime = TimeZoneInfo.ConvertTimeFromUtc(context.FireTimeUtc.DateTime, TimeZoneInfo.Local);
|
||||
job.LastFireTime =
|
||||
TimeZoneInfo.ConvertTimeFromUtc(context.FireTimeUtc.DateTime, TimeZoneInfo.Local);
|
||||
// 只执行一次 没有下次执行时间
|
||||
if (context.NextFireTimeUtc != null)
|
||||
{
|
||||
job.NextFireTime = TimeZoneInfo.ConvertTimeFromUtc(context.NextFireTimeUtc.Value.DateTime, TimeZoneInfo.Local);
|
||||
job.NextFireTime = TimeZoneInfo.ConvertTimeFromUtc(context.NextFireTimeUtc.Value.DateTime,
|
||||
TimeZoneInfo.Local);
|
||||
}
|
||||
|
||||
_unitwork.Update<SysJob>(job);
|
||||
}
|
||||
Wtm.DoLog("任务下发", ActionLogTypesEnum.Job, "SendWcsJob");
|
||||
|
||||
Wtm.DoLog("库存回传", ActionLogTypesEnum.Job, "InvBackJob");
|
||||
|
||||
#endregion 更新时间
|
||||
}
|
||||
catch { }
|
||||
catch
|
||||
{
|
||||
Wtm.DoLog("库存回传", ActionLogTypesEnum.Job, "InvBackJob", result:"error");
|
||||
}
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user