feat: add ERP material issue outbound callback

This commit is contained in:
mtf committed 2026-07-18 13:41:54 +08:00
1 parent 3da4bddb98
commit eda824cea7
13 files changed
+587 -20

No files matched your search

+5 -1
View File
@@ -409,6 +409,10 @@ namespace HHWMS.Web
invTran.Type = task.TaskType == TaskTypeEnum.入库
? InventoryTranType.入库
: InventoryTranType.出库;
if (task.TaskType == TaskTypeEnum.出库)
{
invTran.BillType = InventoryTransaction.ErpOtherOutBillType;
}
invTran.CreateTime = DateTime.Now;
invTrans.Add(invTran);
}
@@ -639,4 +643,4 @@ namespace HHWMS.Web
#endregion
}
}
}
@@ -4,6 +4,8 @@ using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Extensions;
using WalkingTec.Mvvm.Mvc;
using HHWMS.Web;
using HHWMS.Web.Models;
using System.Threading.Tasks;
namespace HHWMS.Web.Controllers
{
@@ -239,5 +241,42 @@ namespace HHWMS.Web.Controllers
}
#endregion Export
#region ERP领料出库补传
[AllRights]
[ActionDescription("补传ERP领料出库")]
public async Task<ActionResult> RetryAddOtherOut(string id)
{
if (!int.TryParse(id, out var transactionId))
{
return FFResult().Alert("库存交易记录参数错误").RefreshGrid();
}
var transaction = _unitwork.FindSingle<InventoryTransaction>(x => x.ID == transactionId);
if (transaction == null)
{
return FFResult().Alert("库存交易记录不存在").RefreshGrid();
}
if (transaction.Type != InventoryTranType.出库
|| transaction.BillType != InventoryTransaction.ErpOtherOutBillType)
{
return FFResult().Alert("只有线边库领料出库记录允许回传ERP").RefreshGrid();
}
if (transaction.UploadErpFlag == 1)
{
return FFResult().Alert("该出库记录已成功回传ERP,无需重复操作").RefreshGrid();
}
var vm = Wtm.CreateVM<InventoryVM>();
var success = await vm.ProcessErpOtherOut(transaction);
return success
? FFResult().Alert("回传ERP成功").RefreshGrid()
: FFResult().Alert("回传ERP失败").RefreshGrid();
}
#endregion ERP领料出库补传
}
}
@@ -37,6 +37,9 @@ namespace HHWMS.Web
this.MakeStandardAction("InventoryTransaction", GridActionStandardTypesEnum.BatchDelete, Localizer["Sys.BatchDelete"], "inventory", dialogWidth: 800),
this.MakeStandardAction("InventoryTransaction", GridActionStandardTypesEnum.Import, Localizer["Sys.Import"], "inventory", dialogWidth: 800),
this.MakeStandardAction("InventoryTransaction", GridActionStandardTypesEnum.ExportExcel, Localizer["Sys.Export"], "inventory"),
this.MakeAction("InventoryTransaction", "RetryAddOtherOut", "补传ERP领料出库", "", GridActionParameterTypesEnum.SingleId, "inventory")
.SetShowDialog(false).SetShowInRow(true).SetHideOnToolBar()
.SetBindVisiableColName(nameof(InventoryTransaction_View.CanRetryOtherOut)),
};
}
@@ -77,6 +80,11 @@ namespace HHWMS.Web
this.MakeGridHeader(x => x.BillCode).SetHide(),
this.MakeGridHeader(x => x.BillDetailId).SetHide(),
this.MakeGridHeader(x => x.Status).SetHide(),
this.MakeGridHeader(x => x.UploadErpFlag)
.SetFormat((a, b) => a.BillType != InventoryTransaction.ErpOtherOutBillType
? "无需回传"
: a.UploadErpFlag == 1 ? "成功" : "失败"),
this.MakeGridHeader(x => x.CanRetryOtherOut).SetHide(),
this.MakeGridHeaderAction(width: 200)
};
}
@@ -124,6 +132,10 @@ namespace HHWMS.Web
BillCode = x.BillCode,
BillDetailId = x.BillDetailId,
Status = x.Status,
UploadErpFlag = x.UploadErpFlag,
CanRetryOtherOut = x.Type == InventoryTranType.出库
&& x.BillType == InventoryTransaction.ErpOtherOutBillType
&& x.UploadErpFlag != 1 ? "true" : "false",
CreateTime = x.CreateTime,
})
.OrderBy(x => x.ID);
@@ -133,5 +145,6 @@ namespace HHWMS.Web
public class InventoryTransaction_View : InventoryTransaction
{
public string CanRetryOtherOut { get; set; }
}
}
@@ -83,6 +83,16 @@ namespace HHWMS.Web
try
{
if (taskType == TaskTypeEnum.出库)
{
var success = await CallAddOtherOut(
inventory.MaterialCode,
inventory.Qty ?? 0,
inventory.CreateBy);
inventory.UploadErpFlag = success ? 1 : 0;
return success;
}
// ERP相关 入库报工
var finishInRequest = new FinishInRequest
{
@@ -112,25 +122,6 @@ namespace HHWMS.Web
Qty = inventory.Qty ?? 0 // 完工数量
});
}
else if (taskType == TaskTypeEnum.出库)
{
finishInRequest.Details.Add(new FinishInDetail
{
MoDetailId = inventory.ZoneId == 1027 ? "" : inventory.ReceiptDetailId, // 生产订单明细(ERP明细ID)
InvCode = inventory.MaterialCode, // 物料号
Qty = inventory.Qty ?? 0 ,// 完工数量
MaterialDetails = new List<MaterialDetail>
{
new MaterialDetail
{
MoDetailId = inventory.ZoneId == 1027 ? "" : inventory.ReceiptDetailId, // 生产订单明细ID
InvCode = inventory.MaterialCode, // 物料号
Qty = (decimal)inventory.Qty // 完工数量(空值兜底为0)
}
}
});
}
// 调用ERP接口
var apiResult = await Wtm.CallAPI<FinishInResponse>("ERP", "FinishIn",
HttpMethodEnum.POST,
@@ -151,6 +142,11 @@ namespace HHWMS.Web
{
// 异常情况下设置标志为失败
inventory.UploadErpFlag = 0;
if (taskType == TaskTypeEnum.出库)
{
Wtm.DoLog("ERP领料出库回传异常", ActionLogTypesEnum.Normal,
"AddOtherOut", request: inventory.ID.ToString(), result: ex.Message);
}
return false;
}
finally
@@ -158,5 +154,76 @@ namespace HHWMS.Web
unitWork.Update(inventory);
}
}
/// <summary>
/// 补传ERP其他出库
/// </summary>
public async Task<bool> ProcessErpOtherOut(InventoryTransaction transaction)
{
if (transaction == null
|| transaction.Type != InventoryTranType.出库
|| transaction.BillType != InventoryTransaction.ErpOtherOutBillType)
{
return false;
}
try
{
var success = await CallAddOtherOut(
transaction.MaterialCode,
transaction.Qty ?? 0,
transaction.CreateBy);
transaction.UploadErpFlag = success ? 1 : 0;
return success;
}
catch (Exception ex)
{
transaction.UploadErpFlag = 0;
Wtm.DoLog("ERP领料出库补传失败", ActionLogTypesEnum.Normal,
"AddOtherOut", request: transaction.ID.ToString(), result: ex.Message);
return false;
}
finally
{
unitWork.Update(transaction);
}
}
private async Task<bool> CallAddOtherOut(string materialCode, decimal qty, string createBy)
{
var maker = unitWork.FindSingle<FrameworkUser>(x => x.ITCode == createBy)?.Name
?? createBy
?? "WMS";
var request = new AddOtherOutRequest
{
Main = new AddOtherOutMain
{
ErpCode = "003",
OutCode = unitWork.GetSerialNumber("CK"),
WhCode = "xb",
Maker = maker
},
Details = new List<AddOtherOutDetail>
{
new AddOtherOutDetail
{
InvCode = materialCode,
OutQty = qty
}
}
};
var apiResult = await Wtm.CallAPI<FinishInResponse>("ERP", "AddOtherOut",
HttpMethodEnum.POST,
request);
var success = apiResult?.Data != null && apiResult.Data.Result;
if (!success)
{
Wtm.DoLog("ERP领料出库回传失败", ActionLogTypesEnum.Normal, "AddOtherOut",
request: $"{request.Main.OutCode}|{materialCode}|{qty}",
result: apiResult?.Data?.Message ?? apiResult?.ErrorMsg ?? "ERP返回失败");
}
return success;
}
}
}
@@ -0,0 +1,56 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using HHWMS.Web.Models;
using Quartz;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Support.Quartz;
namespace HHWMS.Web
{
[PersistJobDataAfterExecution]
[DisallowConcurrentExecution]
public class AddOtherOutJob : WtmJob
{
public override async Task Execute(IJobExecutionContext context)
{
try
{
var unitWork = new UnitWork(Wtm);
var transaction = unitWork.Find<InventoryTransaction>(x =>
x.Type == InventoryTranType.出库
&& x.BillType == InventoryTransaction.ErpOtherOutBillType
&& x.UploadErpFlag != 1
&& x.UploadErpFlag != null)
.OrderBy(x => x.ID)
.FirstOrDefault();
if (transaction != null)
{
var vm = Wtm.CreateVM<InventoryVM>();
await vm.ProcessErpOtherOut(transaction);
}
var job = unitWork.FindSingle<SysJob>(x => x.JobName == context.JobDetail.Key.Name);
if (job != null)
{
job.LastFireTime = TimeZoneInfo.ConvertTimeFromUtc(
context.FireTimeUtc.DateTime,
TimeZoneInfo.Local);
if (context.NextFireTimeUtc != null)
{
job.NextFireTime = TimeZoneInfo.ConvertTimeFromUtc(
context.NextFireTimeUtc.Value.DateTime,
TimeZoneInfo.Local);
}
unitWork.Update(job);
}
}
catch (Exception ex)
{
Wtm.DoLog("ERP领料出库补传失败", ActionLogTypesEnum.Job,
"AddOtherOutJob", request: "error", result: ex.Message);
}
}
}
}
@@ -9,6 +9,8 @@ namespace HHWMS.Web.Models
[Table("InventoryTransaction")]
public class InventoryTransaction : BasePoco
{
public const string ErpOtherOutBillType = "AddOtherOut";
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public new int ID { get; set; }
@@ -94,5 +96,8 @@ namespace HHWMS.Web.Models
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
public string Status { get; set; }
[Display(Name = "ERP回传状态", Description = "0失败,1成功")]
public int? UploadErpFlag { get; set; }
}
}
@@ -0,0 +1,32 @@
using System.Collections.Generic;
namespace HHWMS.Web.Models
{
/// <summary>
/// ERP其他出库请求
/// </summary>
public class AddOtherOutRequest
{
public AddOtherOutMain Main { get; set; }
public List<AddOtherOutDetail> Details { get; set; }
}
public class AddOtherOutMain
{
public string ErpCode { get; set; }
public string OutCode { get; set; }
public string WhCode { get; set; }
public string Maker { get; set; }
}
public class AddOtherOutDetail
{
public string InvCode { get; set; }
public decimal OutQty { get; set; }
}
}