任务添加zoneid

添加物料打印
添加物料工序
添加库存出库
修改状态返回接口
wcs请求添加 重量和入口
This commit is contained in:
zhougf committed 2025-07-09 01:11:10 +08:00
1 parent 42c26b2800
commit b12ed2d5e5
54 files changed
+1442 -393

No files matched your search

@@ -6,6 +6,7 @@ using System.Collections.Generic;
using HHWMS.Web.Models;
using System.Threading.Tasks;
using System.Linq;
using Aliyun.OSS;
using Microsoft.EntityFrameworkCore;
using WalkingTec.Mvvm.Core.Extensions;
@@ -16,10 +17,17 @@ namespace HHWMS.Web.Controllers
public partial class ReceiptInController : BaseController
{
private readonly IUnitWork _unitWork;
private readonly Dictionary<string, LineRange> _materialZones;
public ReceiptInController(IUnitWork unitwork)
{
_unitWork = unitwork;
_materialZones = new Dictionary<string, LineRange>
{
{ "zone1", new LineRange { BeginLine = 1, EndLine = 25 } },
{ "zone2", new LineRange { BeginLine = 26, EndLine = 57 } },
{ "zone3", new LineRange { BeginLine = 58, EndLine = 96 } },
};
}
#region Index
@@ -37,32 +45,68 @@ namespace HHWMS.Web.Controllers
[HttpPost]
public IActionResult GetOperators()
{
// TODO: 从数据库获取操作员列表
var operators = new List<object>
{
new { value = "1", label = "张三" },
new { value = "2", label = "李四" }
};
return Json(new { Code = 200, Data = operators });
var users = _unitWork.Find<FrameworkUser>(x => x.ITCode != "Admin")
.Select(x => new {x.ITCode,x.Name})
.ToList();
return Json(new { Code = 200, Data = users});
}
[HttpPost]
public IActionResult GetProcesses()
{
// TODO: 从数据库获取工序列表
var processes = new List<object>
try
{
new { value = "1", label = "工序1" },
new { value = "2", label = "工序2" }
};
return Json(new { Code = 200, Data = processes });
var processes = _unitWork.Find<MaterialProcess>(x => x.IsActive)
.OrderBy(x => x.ProcessOrder)
.Select(x => new {
value = x.ID.ToString(),
label = x.ProcessName,
processCode = x.ProcessCode,
processName = x.ProcessName
})
.ToList();
return Json(new { Code = 200, Data = processes });
}
catch (Exception ex)
{
return Json(new { Code = 500, Msg = $"获取工序列表失败:{ex.Message}" });
}
}
[HttpPost]
public IActionResult GetProcessesByMaterial(string materialCode)
{
try
{
if (string.IsNullOrWhiteSpace(materialCode))
{
return Json(new { Code = 200, Data = new object[] { } });
}
var processes = _unitWork.Find<MaterialProcess>(x => x.MaterialCode == materialCode && x.IsActive)
.OrderBy(x => x.ProcessOrder)
.Select(x => new {
value = x.ID.ToString(),
label = x.ProcessName,
processCode = x.ProcessCode,
processName = x.ProcessName
})
.ToList();
return Json(new { Code = 200, Data = processes });
}
catch (Exception ex)
{
return Json(new { Code = 500, Msg = $"获取物料工序失败:{ex.Message}" });
}
}
[HttpPost]
public IActionResult GetOperatorInfo()
{
// TODO: 获取当前登录用户信息
return Json(new { Code = 200, Data = "当前操作员:张三" });
var users = _unitWork.Find<FrameworkUser>(x => x.ITCode != "Admin")
.Select(x => new {x.ITCode,x.Name})
.ToList();
return Json(new { Code = 200, Data = users});
}
[HttpPost]
@@ -80,38 +124,13 @@ namespace HHWMS.Web.Controllers
[HttpPost]
public IActionResult SubmitReceipt([FromBody] ReceiptInModel model)
{
// 1. 查找可用库位信息 - 使用LocationVM的GetLocation方法
var locationVM = Wtm.CreateVM<LocationVM>();
// 创建WcsRequest对象,设置巷道号为1
var wcsRequest = new WcsRequest { RoadWay = 1 };
// 调用GetLocation方法获取可用库位
var locationResult = locationVM.GetLocation(wcsRequest);
if (!locationResult.Status)
{
return Json(new { Code = 500, Msg = locationResult.Message });
}
// 获取返回的库位编码
string locationCode = locationResult.Data.LocationCode;
// 根据库位编码获取完整的库位信息,使用AsNoTracking()避免实体跟踪冲突
// var availableLocation = DC.Set<Location>().AsNoTracking().FirstOrDefault(l => l.Code == locationCode);
//
// if (availableLocation == null)
// {
// return Json(new { Code = 500, Msg = "没有可用库位" });
// }
// 获取物料信息
var material = _unitWork.FindSingle<Material>(m => m.MaterialCode == model.MaterialCode);
if (material == null)
{
return Json(new { Code = 500, Msg = "物料不存在" });
}
// 获取容器信息
var container = _unitWork.FindSingle<Container>(c => c.Code == model.PalletCode);
if (container == null)
@@ -119,15 +138,35 @@ namespace HHWMS.Web.Controllers
return Json(new { Code = 500, Msg = "容器不存在" });
}
// 从字典查询工序对应的区域
var processName = _unitWork.FindSingle<SysDictData>(x => x.DictType == "ProcessZone"
&& x.DictLabel == model.ProcessName)?.DictValue;
if (string.IsNullOrEmpty(processName))
{
return Json(new { Code = 500, Msg = "未找到此工序配置" });
}
// 1. 查找可用库位信息
var locationVm = Wtm.CreateVM<LocationVM>();
var locationCode = locationVm.GetEmptyLocationFromXb(_materialZones[processName].BeginLine, _materialZones[processName].EndLine);
if (string.IsNullOrWhiteSpace(locationCode))
{
return Json(new { Code = 500, Msg = "未找到可用的空仓位" });
}
// 使用事务
using (var tran = DC.BeginTransaction())
{
try
{
var zone = _unitWork.FindSingle<LocationZone>(x => x.Name == "线边库");
// 2. 生成入库任务
var taskNo = _unitWork.GetSerialNumber("In", 6);
var taskHeader = new TaskHeader
{
ZoneId = zone.ID,
TaskNo = taskNo,
TaskType = TaskTypeEnum.入库,
FromLocation = "",
@@ -144,13 +183,15 @@ namespace HHWMS.Web.Controllers
// 3. 创建库存信息
var inventory = new Inventory
{
ZoneId = zone.ID,
ContainerCode = model.PalletCode,
LocationCode = locationCode,
MaterialCode = model.MaterialCode,
MaterialName = material.MaterialName,
MaterialSpec = material.MaterialSpec,
MaterialUnit = material.MaterialUnit,
Qty = model.Quantity,
Batch = model.ProcessName,
Lot = model.ProcessId.ToString(),
TaskStatus = InventoryTaskStatusEnum.Locked,
CreateBy = model.OperatorId,
CreateTime = DateTime.Now
@@ -158,33 +199,32 @@ namespace HHWMS.Web.Controllers
_unitWork.Add(inventory);
// 4. 创建库存交易记录
var transaction = new InventoryTransaction
{
Type = InventoryTranType.入库,
ContainerCode = model.PalletCode,
LocationCode = locationCode,
MaterialCode = model.MaterialCode,
MaterialName = material.MaterialName,
MaterialSpec = material.MaterialSpec,
MaterialUnit = material.MaterialUnit,
Qty = model.Quantity,
CreateBy = model.OperatorId,
CreateTime = DateTime.Now
};
_unitWork.Add(transaction);
// 5. 锁定容器和库位
container.IsLock = ContainerLockEnum.任务锁;
container.Status = ContainerStatus.有;
container.LocationCode = locationCode;
_unitWork.Update(container);
// 从数据库中重新获取库位实体,避免实体跟踪冲突
var locationToUpdate = _unitWork.FindSingle<Location>(l => l.Code == locationCode);
locationToUpdate.Status = LocationStatusEnum.Locked;
locationToUpdate.ContainerCode = model.PalletCode;
_unitWork.Update(locationToUpdate);
var resultNum = _unitWork.BatchUpdate<Location>(x => x.Code == locationCode && x.Version == locationToUpdate.Version,
x => new Location()
{
Status = LocationStatusEnum.锁定,
ContainerStatus = LocationStatus.有货,
ContainerCode = model.PalletCode,
UpdateTime = DateTime.Now,
UpdateBy = "WMS",
Version = Guid.NewGuid()
});
if (resultNum == 0)
{
//失败 回滚
tran.Rollback();
return Json(new { Code = 500, Msg = "更新仓位失败!请重新提交!"});
}
// 6. 调用WCS接口下发任务
var wcsTaskModel = new WCSTaskModel
@@ -196,7 +236,7 @@ namespace HHWMS.Web.Controllers
};
// 调用WCS任务下发接口
var wcsResult = Wtm.CallAPI<WCSTaskResponse>("WCS", "TaskAssign", HttpMethodEnum.POST, wcsTaskModel).Result.Data;
var wcsResult = Wtm.CallAPI<WCSTaskResponse>("WCSXB", "TaskAssign", HttpMethodEnum.POST, wcsTaskModel).Result.Data;
if (wcsResult != null && wcsResult.Success)
{
@@ -220,6 +260,115 @@ namespace HHWMS.Web.Controllers
}
}
/// <summary>
/// 空托盘入库
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
public IActionResult SubmitEmptyPallet([FromBody] ReceiptInModel model)
{
// 获取容器信息
var container = _unitWork.FindSingle<Container>(c => c.Code == model.PalletCode);
if (container == null)
{
return Json(new { Code = 500, Msg = "容器不存在" });
}
// 1. 查找可用库位信息
var locationVm = Wtm.CreateVM<LocationVM>();
var locationCode = locationVm.GetEmptyLocationFromXb(_materialZones["zone1"].BeginLine, _materialZones["zone1"].EndLine);
if (string.IsNullOrWhiteSpace(locationCode))
{
return Json(new { Code = 500, Msg = "未找到可用的空仓位" });
}
// 使用事务
using (var tran = DC.BeginTransaction())
{
try
{
var zone = _unitWork.FindSingle<LocationZone>(x => x.Name == "线边库");
// 2. 生成入库任务
var taskNo = _unitWork.GetSerialNumber("In", 6);
var taskHeader = new TaskHeader
{
ZoneId = zone.ID,
TaskNo = taskNo,
TaskType = TaskTypeEnum.入库,
FromLocation = "",
ToLocation = locationCode,
ContainerCode = model.PalletCode,
RoadWay = 1,
Status = TaskStatusEnum.新建,
CreateBy = model.OperatorId,
CreateTime = DateTime.Now
};
_unitWork.Add(taskHeader);
// 5. 锁定容器和库位
container.IsLock = ContainerLockEnum.任务锁;
container.LocationCode = locationCode;
container.Status = ContainerStatus.空;
_unitWork.Update(container);
// 从数据库中重新获取库位实体,避免实体跟踪冲突
var locationToUpdate = _unitWork.FindSingle<Location>(l => l.Code == locationCode);
var resultNum = _unitWork.BatchUpdate<Location>(x => x.Code == locationCode && x.Version == locationToUpdate.Version,
x => new Location()
{
Status = LocationStatusEnum.锁定,
ContainerStatus = LocationStatus.空仓位,
ContainerCode = model.PalletCode,
UpdateTime = DateTime.Now,
UpdateBy = "WMS",
Version = Guid.NewGuid()
});
if (resultNum == 0)
{
//失败 回滚
tran.Rollback();
return Json(new { Code = 500, Msg = "更新仓位失败!请重新提交!"});
}
// 6. 调用WCS接口下发任务
var wcsTaskModel = new WCSTaskModel
{
TaskNo = taskNo,
PalletNo = model.PalletCode,
FromLocation = "", // 入库任务起始位置为空
ToLocation = locationCode,
};
// 调用WCS任务下发接口
var wcsResult = Wtm.CallAPI<WCSTaskResponse>("WCSXB", "TaskAssign", HttpMethodEnum.POST, wcsTaskModel).Result.Data;
if (wcsResult != null && wcsResult.Success)
{
// WCS任务下发成功,提交事务
tran.Commit();
return Json(new { Code = 200, Msg = "入库成功", Data = new { TaskNo = taskNo } });
}
else
{
// WCS任务下发失败,回滚事务
tran.Rollback();
return Json(new { Code = 500, Msg = wcsResult?.Msg ?? "WCS任务下发失败" });
}
}
catch (System.Exception ex)
{
// 发生异常,回滚事务
tran.Rollback();
return Json(new { Code = 500, Msg = ex.Message });
}
}}
/// <summary>
/// 搜索物料
/// </summary>
@@ -260,9 +409,16 @@ namespace HHWMS.Web.Controllers
public string MaterialCode { get; set; }
public string OrderId { get; set; }
public string OperatorId { get; set; }
public string ProcessId { get; set; }
public int Quantity { get; set; }
public int ProcessId { get; set; }
public string ProcessName { get; set; }
public bool IsQualified { get; set; }
public string OperatorInfo { get; set; }
}
public class LineRange
{
public int BeginLine { get; set; }
public int EndLine { get; set; }
}
}