对接ERP2.7
部分页面修改
This commit is contained in:
1 parent
22bfe9d015
commit
59f2af943b
17 files changed
+770
-887
No files matched your search
@@ -72,6 +72,7 @@ namespace HHWMS.Web.Controllers
|
||||
if (apiResult?.Data != null && apiResult.Data.Code == 0)
|
||||
{
|
||||
var materialsList = new List<object>();
|
||||
var oldMaterials = new List<object>();
|
||||
var newMaterials = new List<Material>();
|
||||
|
||||
// 获取接口返回的所有物料编码
|
||||
@@ -125,21 +126,34 @@ namespace HHWMS.Web.Controllers
|
||||
}
|
||||
else
|
||||
{
|
||||
if (existingMaterial.MaterialName != item.InvName
|
||||
|| existingMaterial.MaterialType != item.InvDefine1)
|
||||
{
|
||||
existingMaterial.MaterialName = item.InvName;
|
||||
existingMaterial.MaterialSpec = item.InvStd;
|
||||
existingMaterial.MaterialUnit = item.UnitName;
|
||||
existingMaterial.MaterialType = item.InvDefine1;
|
||||
existingMaterial.SupplierCode = item.InvDefine4;
|
||||
existingMaterial.UpdateTime = DateTime.Now;
|
||||
existingMaterial.UpdateBy = "System";
|
||||
oldMaterials.Add(existingMaterial);
|
||||
}
|
||||
// 物料已存在,添加到返回列表
|
||||
materialsList.Add(new
|
||||
{
|
||||
MaterialCode = existingMaterial.MaterialCode,
|
||||
MaterialName = existingMaterial.MaterialName,
|
||||
MaterialSpec = existingMaterial.MaterialSpec,
|
||||
MaterialUnit = existingMaterial.MaterialUnit,
|
||||
MaterialType = existingMaterial.MaterialType,
|
||||
SupplierCode = existingMaterial.SupplierCode
|
||||
MaterialCode = item.InvCode,
|
||||
MaterialName = item.InvName,
|
||||
MaterialSpec = item.InvStd,
|
||||
MaterialUnit = item.UnitName,
|
||||
MaterialType = item.InvDefine1, // 永丰图号
|
||||
SupplierCode = item.InvDefine4, // 客户图号
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// 保存新增的物料
|
||||
_unitWork.BatchAdd(newMaterials);
|
||||
_unitWork.BatchUpdate(oldMaterials);
|
||||
|
||||
// 返回物料列表到前端
|
||||
return Json(new { Code = 200, Data = materialsList });
|
||||
@@ -235,367 +249,33 @@ namespace HHWMS.Web.Controllers
|
||||
/// <param name="materialCode"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public async Task<IActionResult> GetOrdersByMaterial(string materialCode)
|
||||
public async Task<IActionResult> GetOrdersByMaterial(string materialCode,string batch)
|
||||
{
|
||||
|
||||
// 查询包含这个物料的入库单单号
|
||||
|
||||
var request = new LoadMoDetailListRequest
|
||||
var receiptHeaderVM = Wtm.CreateVM<ReceiptHeaderVM>();
|
||||
var vm = new ReceiptDetailVM()
|
||||
{
|
||||
ErpCode = "003",
|
||||
InvCode = materialCode,
|
||||
Size = 100,
|
||||
Page = 1
|
||||
Entity = new ReceiptDetail()
|
||||
{
|
||||
MaterialCode = materialCode,
|
||||
Batch = batch ?? "32"
|
||||
}
|
||||
};
|
||||
|
||||
var apiResult = await Wtm.CallAPI<LoadMoDetailListResponse>("ERP", "LoadMoDetailList", HttpMethodEnum.POST, request);
|
||||
|
||||
if (apiResult?.Data != null && apiResult.Data.Code == 0 && apiResult.Data.Data?.Count > 0)
|
||||
var result = await receiptHeaderVM.GetReceiptDetailsFromERP(vm);
|
||||
if (result.Data != null)
|
||||
{
|
||||
Wtm.DoLog("获取ERP订单数据", ActionLogTypesEnum.Normal, "GetReceiptDetails",
|
||||
request: $"物料:{materialCode},获取到 {apiResult.Data.Data.Count} 条明细",
|
||||
result: "开始处理订单数据");
|
||||
var orders = result.Data.Select(x => new
|
||||
{
|
||||
value = x.MoDetailId,
|
||||
label = x.MoCode,
|
||||
})
|
||||
.ToList();
|
||||
|
||||
// 使用相同的逻辑处理订单数据
|
||||
await ProcessOrderData(_unitWork, apiResult.Data.Data);
|
||||
|
||||
Wtm.DoLog("获取ERP订单数据", ActionLogTypesEnum.Normal, "GetReceiptDetails",
|
||||
request: $"订单号:{materialCode}",
|
||||
result: "订单数据处理完成");
|
||||
return Json(new { Code = 200, Data = orders });
|
||||
}
|
||||
|
||||
var orders = _unitWork.Find<ReceiptDetail>(x => x.MaterialCode == materialCode)
|
||||
.Select(x => new
|
||||
{
|
||||
value = x.Lot,
|
||||
label = x.SourceCode,
|
||||
})
|
||||
.ToList();
|
||||
|
||||
return Json(new { Code = 200, Data = orders });
|
||||
return Json(new { Code = 200, Data = new List<MoDetailItem>() });
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 处理订单数据并保存到本地数据库(照搬 LoadErpOrderJob)
|
||||
/// </summary>
|
||||
private async Task ProcessOrderData(IUnitWork unitWork, List<MoDetailItem> orderList)
|
||||
{
|
||||
// 按订单号分组
|
||||
var orderGroups = orderList.GroupBy(x => x.MoCode);
|
||||
|
||||
foreach (var group in orderGroups)
|
||||
{
|
||||
var moCode = group.Key;
|
||||
var orderDetails = group.ToList();
|
||||
|
||||
// 检查订单是否已存在
|
||||
var existingHeader = unitWork.FindSingle<ReceiptHeader>(h => h.SourceCode == moCode);
|
||||
|
||||
if (existingHeader == null)
|
||||
{
|
||||
// 创建新的入库单头
|
||||
var header = new ReceiptHeader
|
||||
{
|
||||
SourceCode = moCode, // 生产订单号
|
||||
Code = unitWork.GetSerialNumber("REC", 8), // 生成入库单号
|
||||
BillType = "生产订单",
|
||||
TotalQty = orderDetails.Sum(x => x.Qty),
|
||||
TotalLines = orderDetails.Count,
|
||||
FirstStatus = ReceiptStatusEnum.新建,
|
||||
LastStatus = ReceiptStatusEnum.新建,
|
||||
Remark = orderDetails.First().Memo,
|
||||
CreateTime = DateTime.Now,
|
||||
CreateBy = Wtm.LoginUserInfo?.ITCode ?? "系统",
|
||||
UpdateVersion = 1
|
||||
};
|
||||
|
||||
unitWork.Add(header); // 保存以获取 HeaderId
|
||||
|
||||
// 获取订单明细中的所有物料编码
|
||||
var invCodes = orderDetails
|
||||
.Where(x => !string.IsNullOrWhiteSpace(x.InvCode))
|
||||
.Select(x => x.InvCode)
|
||||
.Distinct()
|
||||
.ToList();
|
||||
|
||||
// 一次性查询本地数据库中已存在的物料(优化性能)
|
||||
var existingMaterials = unitWork.Find<Material>(m => invCodes.Contains(m.MaterialCode))
|
||||
.ToList();
|
||||
|
||||
// 待新增的物料列表
|
||||
var newMaterials = new List<Material>();
|
||||
|
||||
// 创建入库单明细
|
||||
var details = new List<ReceiptDetail>();
|
||||
foreach (var item in orderDetails)
|
||||
{
|
||||
// 判断物料是否存在,不存在则创建
|
||||
if (!string.IsNullOrWhiteSpace(item.InvCode))
|
||||
{
|
||||
var existingMaterial = existingMaterials.FirstOrDefault(m => m.MaterialCode == item.InvCode);
|
||||
if (existingMaterial == null)
|
||||
{
|
||||
// 检查是否已在待新增列表中
|
||||
if (!newMaterials.Any(m => m.MaterialCode == item.InvCode))
|
||||
{
|
||||
// 物料不存在,创建新物料
|
||||
var newMaterial = new Material
|
||||
{
|
||||
MaterialCode = item.InvCode,
|
||||
MaterialName = item.InvName,
|
||||
MaterialSpec = item.InvStd,
|
||||
MaterialType = item.InvDefine1, // 图号
|
||||
Qty = 0,
|
||||
CreateTime = DateTime.Now,
|
||||
CreateBy = Wtm.LoginUserInfo?.ITCode ?? "系统"
|
||||
};
|
||||
newMaterials.Add(newMaterial);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var detail = new ReceiptDetail
|
||||
{
|
||||
HeaderId = header.ID,
|
||||
SourceCode = header.SourceCode,
|
||||
MaterialCode = item.InvCode,
|
||||
MaterialType = item.InvDefine1, // 图号
|
||||
MaterialName = item.InvName,
|
||||
Lot = item.MoDetailId, // 明细id
|
||||
MaterialSpec = item.InvStd,
|
||||
Qty = item.Qty,
|
||||
CompletedQty = 0,
|
||||
Status = ReceiptStatusEnum.新建,
|
||||
CreateTime = DateTime.Now,
|
||||
CreateBy = Wtm.LoginUserInfo?.ITCode ?? "系统",
|
||||
UpdateVersion = 1
|
||||
};
|
||||
|
||||
details.Add(detail);
|
||||
|
||||
// 保存工序路线到 MaterialProcess 表
|
||||
if (item.ProcessRoute != null && item.ProcessRoute.Count > 0)
|
||||
{
|
||||
await SaveProcessRoute(unitWork, item.InvCode, item.ProcessRoute);
|
||||
}
|
||||
}
|
||||
|
||||
// 批量新增物料
|
||||
if (newMaterials.Count > 0)
|
||||
{
|
||||
unitWork.BatchAdd(newMaterials);
|
||||
}
|
||||
|
||||
unitWork.BatchAdd(details);
|
||||
|
||||
Wtm.DoLog("保存订单数据", ActionLogTypesEnum.Normal, "ProcessOrderData",
|
||||
request: $"订单号:{moCode}",
|
||||
result: $"成功创建入库单 {header.Code},明细 {details.Count} 条");
|
||||
}
|
||||
else
|
||||
{
|
||||
// 订单已存在,更新数据
|
||||
existingHeader.TotalQty = orderDetails.Sum(x => x.Qty);
|
||||
existingHeader.TotalLines = orderDetails.Count;
|
||||
existingHeader.Remark = orderDetails.First().Memo;
|
||||
existingHeader.UpdateVersion++;
|
||||
existingHeader.UpdateTime = DateTime.Now;
|
||||
existingHeader.UpdateBy = Wtm.LoginUserInfo?.ITCode ?? "系统";
|
||||
unitWork.Update(existingHeader);
|
||||
|
||||
// 更新明细
|
||||
var oldDetails = unitWork.Find<ReceiptDetail>(d => d.HeaderId == existingHeader.ID).ToList();
|
||||
|
||||
// 获取订单明细中的所有物料编码
|
||||
var invCodes = orderDetails
|
||||
.Where(x => !string.IsNullOrWhiteSpace(x.InvCode))
|
||||
.Select(x => x.InvCode)
|
||||
.Distinct()
|
||||
.ToList();
|
||||
|
||||
// 一次性查询本地数据库中已存在的物料(优化性能)
|
||||
var existingMaterials = unitWork.Find<Material>(m => invCodes.Contains(m.MaterialCode))
|
||||
.ToList();
|
||||
|
||||
// 待新增的物料列表
|
||||
var newMaterials = new List<Material>();
|
||||
|
||||
var newDetails = new List<ReceiptDetail>();
|
||||
foreach (var item in orderDetails)
|
||||
{
|
||||
// 判断明细是否存在 用MoDetailId 判断
|
||||
if (!oldDetails.Any(x => x.Lot == item.MoDetailId))
|
||||
{
|
||||
// 判断物料是否存在,不存在则创建
|
||||
if (!string.IsNullOrWhiteSpace(item.InvCode))
|
||||
{
|
||||
var existingMaterial = existingMaterials.FirstOrDefault(m => m.MaterialCode == item.InvCode);
|
||||
if (existingMaterial == null)
|
||||
{
|
||||
// 检查是否已在待新增列表中
|
||||
if (!newMaterials.Any(m => m.MaterialCode == item.InvCode))
|
||||
{
|
||||
// 物料不存在,创建新物料
|
||||
var newMaterial = new Material
|
||||
{
|
||||
MaterialCode = item.InvCode,
|
||||
MaterialName = item.InvName,
|
||||
MaterialSpec = item.InvStd,
|
||||
MaterialType = item.InvDefine1, // 图号
|
||||
Qty = 0,
|
||||
CreateTime = DateTime.Now,
|
||||
CreateBy = Wtm.LoginUserInfo?.ITCode ?? "系统"
|
||||
};
|
||||
newMaterials.Add(newMaterial);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var detail = new ReceiptDetail
|
||||
{
|
||||
HeaderId = existingHeader.ID,
|
||||
SourceCode = existingHeader.SourceCode,
|
||||
MaterialCode = item.InvCode,
|
||||
MaterialType = item.InvDefine1, // 图号
|
||||
MaterialName = item.InvName,
|
||||
Lot = item.MoDetailId, // 明细id
|
||||
MaterialSpec = item.InvStd,
|
||||
Qty = item.Qty,
|
||||
CompletedQty = 0,
|
||||
Status = ReceiptStatusEnum.新建,
|
||||
Batch = item.Version,
|
||||
CreateTime = DateTime.Now,
|
||||
CreateBy = Wtm.LoginUserInfo?.ITCode ?? "系统",
|
||||
UpdateVersion = 1
|
||||
};
|
||||
|
||||
newDetails.Add(detail);
|
||||
|
||||
// 更新工序路线
|
||||
if (item.ProcessRoute != null && item.ProcessRoute.Count > 0)
|
||||
{
|
||||
await SaveProcessRoute(unitWork, item.InvCode, item.ProcessRoute);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 批量新增物料
|
||||
if (newMaterials.Count > 0)
|
||||
{
|
||||
unitWork.BatchAdd(newMaterials);
|
||||
}
|
||||
|
||||
unitWork.BatchAdd(newDetails);
|
||||
|
||||
Wtm.DoLog("更新订单数据", ActionLogTypesEnum.Normal, "ProcessOrderData",
|
||||
request: $"订单号:{moCode}",
|
||||
result: $"成功更新入库单 {existingHeader.Code},新增明细 {newDetails.Count} 条");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 保存工序路线到 MaterialProcess 表
|
||||
/// </summary>
|
||||
private async Task SaveProcessRoute(IUnitWork unitWork, string materialCode, List<ProcessRouteItem> processRoute)
|
||||
{
|
||||
// 查询已存在的工序路线
|
||||
var existingProcesses = unitWork.Find<MaterialProcess>(p => p.MaterialCode == materialCode).ToList();
|
||||
|
||||
// 待新增的工序
|
||||
var processesToAdd = new List<MaterialProcess>();
|
||||
// 待更新的工序
|
||||
var processesToUpdate = new List<MaterialProcess>();
|
||||
|
||||
var processConfigs = unitWork.Find<ProcessConfig>(x => x.Code != "").ToList();
|
||||
// 遍历新的工序路线
|
||||
foreach (var route in processRoute)
|
||||
{
|
||||
// 检查工艺是否存在于ProcessConfig中,不存在则添加
|
||||
var processConfig = processConfigs.Any(p => p.Code == route.ProcessCode);
|
||||
if (!processConfig)
|
||||
{
|
||||
unitWork.Add(new ProcessConfig
|
||||
{
|
||||
Code = route.ProcessCode,
|
||||
Name = route.ProcessName,
|
||||
Zone = "Zone2",
|
||||
Port = "EnterExit_P2005"
|
||||
});
|
||||
}
|
||||
|
||||
// 查找是否存在相同工序名称的记录
|
||||
var existing = existingProcesses.FirstOrDefault(p =>
|
||||
p.ProcessName == route.ProcessName);
|
||||
|
||||
if (existing != null)
|
||||
{
|
||||
// 已存在,检查是否需要更新
|
||||
bool needUpdate = false;
|
||||
|
||||
if (existing.ProcessCode != route.ProcessCode || existing.ProcessOrder != route.Sort)
|
||||
{
|
||||
existing.ProcessCode = route.ProcessCode;
|
||||
existing.ProcessOrder = route.Sort;
|
||||
needUpdate = true;
|
||||
}
|
||||
|
||||
if (!existing.IsActive)
|
||||
{
|
||||
existing.IsActive = true;
|
||||
needUpdate = true;
|
||||
}
|
||||
|
||||
if (needUpdate)
|
||||
{
|
||||
existing.UpdateTime = DateTime.Now;
|
||||
existing.UpdateBy = Wtm.LoginUserInfo?.ITCode ?? "系统";
|
||||
processesToUpdate.Add(existing);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// 不存在,新增
|
||||
var newProcess = new MaterialProcess
|
||||
{
|
||||
MaterialCode = materialCode,
|
||||
ProcessCode = route.ProcessCode,
|
||||
ProcessName = route.ProcessName,
|
||||
ProcessOrder = route.Sort,
|
||||
Weight = 0,
|
||||
IsActive = true,
|
||||
CreateTime = DateTime.Now,
|
||||
CreateBy = Wtm.LoginUserInfo?.ITCode ?? "系统"
|
||||
};
|
||||
processesToAdd.Add(newProcess);
|
||||
}
|
||||
}
|
||||
|
||||
// 查找需要删除的工序(旧的多余的)
|
||||
var processesToDelete = existingProcesses.Where(existing =>
|
||||
!processRoute.Any(route =>
|
||||
route.ProcessName == existing.ProcessName)
|
||||
).ToList();
|
||||
|
||||
// 执行数据库操作
|
||||
if (processesToAdd.Count > 0)
|
||||
{
|
||||
unitWork.BatchAdd(processesToAdd);
|
||||
}
|
||||
|
||||
if (processesToUpdate.Count > 0)
|
||||
{
|
||||
unitWork.BatchUpdate(processesToUpdate);
|
||||
}
|
||||
|
||||
if (processesToDelete.Count > 0)
|
||||
{
|
||||
unitWork.BatchDelete(processesToDelete);
|
||||
}
|
||||
|
||||
await Task.CompletedTask;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 获取托盘类型信息
|
||||
@@ -735,7 +415,8 @@ namespace HHWMS.Web.Controllers
|
||||
MaterialSpec = material.MaterialSpec,
|
||||
MaterialUnit = material.MaterialUnit,
|
||||
SupplierCode = material.SupplierCode,
|
||||
SourceCode = model.OrderId, // 单号
|
||||
SourceCode = model.BillCode,//客户订单号
|
||||
ProduceCode = model.OrderId, // 单号
|
||||
ReceiptDetailId = model.SourceCode, // erpdetailid 回传使用
|
||||
BatchCode = materialProcess.ProcessCode, //erp回传使用 批次编码
|
||||
Batch = materialProcess.ProcessName,
|
||||
@@ -1004,6 +685,8 @@ namespace HHWMS.Web.Controllers
|
||||
public int Qty { get; set; }
|
||||
public bool IsQualified { get; set; }
|
||||
public string OperatorInfo { get; set; }
|
||||
|
||||
public string BillCode { get; set; }
|
||||
}
|
||||
|
||||
public class LineRange
|
||||
|
||||
Reference in new issue
Block a user