feat: add ERP material issue outbound callback
This commit is contained in:
1 parent
3da4bddb98
commit
eda824cea7
13 files changed
+586
-19
No files matched your search
@@ -409,6 +409,10 @@ namespace HHWMS.Web
|
|||||||
invTran.Type = task.TaskType == TaskTypeEnum.入库
|
invTran.Type = task.TaskType == TaskTypeEnum.入库
|
||||||
? InventoryTranType.入库
|
? InventoryTranType.入库
|
||||||
: InventoryTranType.出库;
|
: InventoryTranType.出库;
|
||||||
|
if (task.TaskType == TaskTypeEnum.出库)
|
||||||
|
{
|
||||||
|
invTran.BillType = InventoryTransaction.ErpOtherOutBillType;
|
||||||
|
}
|
||||||
invTran.CreateTime = DateTime.Now;
|
invTran.CreateTime = DateTime.Now;
|
||||||
invTrans.Add(invTran);
|
invTrans.Add(invTran);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ using WalkingTec.Mvvm.Core;
|
|||||||
using WalkingTec.Mvvm.Core.Extensions;
|
using WalkingTec.Mvvm.Core.Extensions;
|
||||||
using WalkingTec.Mvvm.Mvc;
|
using WalkingTec.Mvvm.Mvc;
|
||||||
using HHWMS.Web;
|
using HHWMS.Web;
|
||||||
|
using HHWMS.Web.Models;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace HHWMS.Web.Controllers
|
namespace HHWMS.Web.Controllers
|
||||||
{
|
{
|
||||||
@@ -239,5 +241,42 @@ namespace HHWMS.Web.Controllers
|
|||||||
}
|
}
|
||||||
|
|
||||||
#endregion Export
|
#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领料出库补传
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+13
@@ -37,6 +37,9 @@ namespace HHWMS.Web
|
|||||||
this.MakeStandardAction("InventoryTransaction", GridActionStandardTypesEnum.BatchDelete, Localizer["Sys.BatchDelete"], "inventory", dialogWidth: 800),
|
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.Import, Localizer["Sys.Import"], "inventory", dialogWidth: 800),
|
||||||
this.MakeStandardAction("InventoryTransaction", GridActionStandardTypesEnum.ExportExcel, Localizer["Sys.Export"], "inventory"),
|
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.BillCode).SetHide(),
|
||||||
this.MakeGridHeader(x => x.BillDetailId).SetHide(),
|
this.MakeGridHeader(x => x.BillDetailId).SetHide(),
|
||||||
this.MakeGridHeader(x => x.Status).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)
|
this.MakeGridHeaderAction(width: 200)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -124,6 +132,10 @@ namespace HHWMS.Web
|
|||||||
BillCode = x.BillCode,
|
BillCode = x.BillCode,
|
||||||
BillDetailId = x.BillDetailId,
|
BillDetailId = x.BillDetailId,
|
||||||
Status = x.Status,
|
Status = x.Status,
|
||||||
|
UploadErpFlag = x.UploadErpFlag,
|
||||||
|
CanRetryOtherOut = x.Type == InventoryTranType.出库
|
||||||
|
&& x.BillType == InventoryTransaction.ErpOtherOutBillType
|
||||||
|
&& x.UploadErpFlag != 1 ? "true" : "false",
|
||||||
CreateTime = x.CreateTime,
|
CreateTime = x.CreateTime,
|
||||||
})
|
})
|
||||||
.OrderBy(x => x.ID);
|
.OrderBy(x => x.ID);
|
||||||
@@ -133,5 +145,6 @@ namespace HHWMS.Web
|
|||||||
|
|
||||||
public class InventoryTransaction_View : InventoryTransaction
|
public class InventoryTransaction_View : InventoryTransaction
|
||||||
{
|
{
|
||||||
|
public string CanRetryOtherOut { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -83,6 +83,16 @@ namespace HHWMS.Web
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
if (taskType == TaskTypeEnum.出库)
|
||||||
|
{
|
||||||
|
var success = await CallAddOtherOut(
|
||||||
|
inventory.MaterialCode,
|
||||||
|
inventory.Qty ?? 0,
|
||||||
|
inventory.CreateBy);
|
||||||
|
inventory.UploadErpFlag = success ? 1 : 0;
|
||||||
|
return success;
|
||||||
|
}
|
||||||
|
|
||||||
// ERP相关 入库报工
|
// ERP相关 入库报工
|
||||||
var finishInRequest = new FinishInRequest
|
var finishInRequest = new FinishInRequest
|
||||||
{
|
{
|
||||||
@@ -112,25 +122,6 @@ namespace HHWMS.Web
|
|||||||
Qty = inventory.Qty ?? 0 // 完工数量
|
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接口
|
// 调用ERP接口
|
||||||
var apiResult = await Wtm.CallAPI<FinishInResponse>("ERP", "FinishIn",
|
var apiResult = await Wtm.CallAPI<FinishInResponse>("ERP", "FinishIn",
|
||||||
HttpMethodEnum.POST,
|
HttpMethodEnum.POST,
|
||||||
@@ -151,6 +142,11 @@ namespace HHWMS.Web
|
|||||||
{
|
{
|
||||||
// 异常情况下设置标志为失败
|
// 异常情况下设置标志为失败
|
||||||
inventory.UploadErpFlag = 0;
|
inventory.UploadErpFlag = 0;
|
||||||
|
if (taskType == TaskTypeEnum.出库)
|
||||||
|
{
|
||||||
|
Wtm.DoLog("ERP领料出库回传异常", ActionLogTypesEnum.Normal,
|
||||||
|
"AddOtherOut", request: inventory.ID.ToString(), result: ex.Message);
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
@@ -158,5 +154,76 @@ namespace HHWMS.Web
|
|||||||
unitWork.Update(inventory);
|
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")]
|
[Table("InventoryTransaction")]
|
||||||
public class InventoryTransaction : BasePoco
|
public class InventoryTransaction : BasePoco
|
||||||
{
|
{
|
||||||
|
public const string ErpOtherOutBillType = "AddOtherOut";
|
||||||
|
|
||||||
[Key]
|
[Key]
|
||||||
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
|
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
|
||||||
public new int ID { get; set; }
|
public new int ID { get; set; }
|
||||||
@@ -94,5 +96,8 @@ namespace HHWMS.Web.Models
|
|||||||
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
|
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||||
public string Status { get; set; }
|
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; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
# ERP事项一:新增领料出库接口——实施方案
|
||||||
|
|
||||||
|
## 1. 范围与结论
|
||||||
|
|
||||||
|
- 需求范围:PDF前三项中的“ERP事项一:新增领料出库接口”。
|
||||||
|
- 数据源:`default` 为线边库,`cp` 为成品库;本次业务只在线边库发生。
|
||||||
|
- 方案:保留现有WCS、页面和Job入口,仅在 `ProcessErpFinishIn` 内按任务类型分流。
|
||||||
|
- 操作方式:线边库领料出库仍是一键完成,不增加操作步骤。
|
||||||
|
|
||||||
|
## 2. 最小修改方案
|
||||||
|
|
||||||
|
1. 线边库入库继续调用 `FinishIn`,原逻辑不变。
|
||||||
|
2. 线边库出库由 `ProcessErpFinishIn(inventory, taskType)` 内部分流到 `AddOtherOut`。
|
||||||
|
3. WCS任务完成、页面手动补传和Job自动补传共用同一套请求构造逻辑。
|
||||||
|
4. 每次首次回传或补传都使用 `unitWork.GetSerialNumber("CK")` 生成新的 `OutCode`。
|
||||||
|
5. 实际出库交易写入 `Type=out`、`BillType=AddOtherOut`、`UploadErpFlag=0/1`,页面和Job只处理这种交易,避免误传入库、移库或成品出库。
|
||||||
|
6. ERP失败不阻断既有WCS完成流程;失败交易留在库存交易记录中,由人工或Job补传。
|
||||||
|
|
||||||
|
## 3. 请求字段
|
||||||
|
|
||||||
|
| ERP字段 | WMS取值 |
|
||||||
|
| --- | --- |
|
||||||
|
| `ErpCode` | `003`,保持现有ERP账套逻辑 |
|
||||||
|
| `OutCode` | 每次调用生成新的 `CK` |
|
||||||
|
| `WhCode` | `xb` |
|
||||||
|
| `Maker` | 创建人姓名;无姓名时用账号,最后兜底 `WMS` |
|
||||||
|
| `InvCode` | 库存/交易记录的物料号 |
|
||||||
|
| `OutQty` | 实际领料出库数量 |
|
||||||
|
|
||||||
|
接口文档未给出响应模型,按已确认方案复用 `FinishInResponse`,以 `Result=true` 判定成功。
|
||||||
|
|
||||||
|
## 4. 业务流程
|
||||||
|
|
||||||
|
```text
|
||||||
|
WCS回调线边库任务完成
|
||||||
|
→ 复用ProcessErpFinishIn
|
||||||
|
→ taskType=入库:原FinishIn
|
||||||
|
→ taskType=出库:AddOtherOut(生成新CK)
|
||||||
|
→ 生成AddOtherOut库存交易记录
|
||||||
|
→ 成功标记1;失败标记0
|
||||||
|
→ 失败记录可在库存交易页面补传,也可由AddOtherOutJob补传
|
||||||
|
```
|
||||||
|
|
||||||
|
人工补传只能选择失败的 `AddOtherOut` 出库交易;已成功记录、入库记录和普通出库记录都会被拦截。Job一次处理一条失败记录并禁止并发,失败后保留待下次重试。
|
||||||
|
|
||||||
|
## 5. 代码影响
|
||||||
|
|
||||||
|
- `InventoryVM.ProcessErpFinishIn`:增加出库分流。
|
||||||
|
- `InventoryVM.ProcessErpOtherOut` / `CallAddOtherOut`:统一首次回传、人工补传和Job补传。
|
||||||
|
- `IWCSController`:领料出库交易增加 `AddOtherOut` 标记。
|
||||||
|
- `InventoryTransactionController` / `InventoryTransactionListVM`:增加状态显示和人工补传入口,并做单据类型校验。
|
||||||
|
- `AddOtherOutJob`:增加失败自动补传。
|
||||||
|
- `InventoryTransaction` / `AddOtherOutRequest`:增加状态字段、单据类型和请求模型。
|
||||||
|
|
||||||
|
未修改WCS回调入口、线边库一键出库页面、原入库报工流程和数据库连接配置。
|
||||||
|
|
||||||
|
## 6. 上线SQL
|
||||||
|
|
||||||
|
执行顺序:
|
||||||
|
|
||||||
|
1. 在 `default` 和 `cp` 两个数据库分别执行 [20260717_add_other_out.sql](../sql/20260717_add_other_out.sql),同步共享模型字段 `InventoryTransaction.UploadErpFlag`。
|
||||||
|
2. 只在 `default` 线边库数据库执行 [20260717_add_other_out_job.sql](../sql/20260717_add_other_out_job.sql),新增默认暂停的 `AddOtherOutJob`。
|
||||||
|
3. 两个脚本均可重复执行。先保持Job暂停,真实ERP联调通过后再启用。
|
||||||
|
|
||||||
|
## 7. 发布与回退
|
||||||
|
|
||||||
|
发布前确认正式ERP地址、`ErpCode=003`、`WhCode=xb`及响应 `Result` 字段。发布后先用一笔可识别的领料业务核对ERP,再启用Job。
|
||||||
|
|
||||||
|
回退时先暂停 `AddOtherOutJob`,再回退代码。`UploadErpFlag` 为可空兼容字段,可以保留;不建议在仍有新代码实例运行时删除字段。
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
# ERP事项一:新增领料出库接口——测试报告
|
||||||
|
|
||||||
|
## 1. 测试信息
|
||||||
|
|
||||||
|
- 日期:2026-07-17
|
||||||
|
- 最终代码分支:`yfwms`
|
||||||
|
- 数据库:本地 `wms_yongfeng_xb`、`wms_yongfeng_cp`
|
||||||
|
- ERP:本机Mock,只验证请求报文和响应处理,未写入真实ERP
|
||||||
|
- 测试账号:`xb1`
|
||||||
|
|
||||||
|
## 2. 测试结果
|
||||||
|
|
||||||
|
| 编号 | 场景 | 实际结果 |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| T01 | 项目最终构建 | 通过;0错误,15个现有编译警告(含.NET 6停止支持提示) |
|
||||||
|
| T02 | 共享SQL在两库各连续执行2次 | 通过;字段各1个,无重复、无报错 |
|
||||||
|
| T03 | Job SQL在线边库连续执行2次 | 通过;只有1个 `AddOtherOutJob`,`Status=0` |
|
||||||
|
| T04 | WCS完成线边库出库任务 | 通过;自动请求 `AddOtherOut` |
|
||||||
|
| T05 | WCS请求字段 | 通过;`ErpCode=003`、`WhCode=xb`、`Maker=线边1`、物料 `3000572`、数量7、新CK |
|
||||||
|
| T06 | WCS完成后的本地事务 | 通过;库存删除、活动任务删除、任务历史状态100、源库位和托盘解锁 |
|
||||||
|
| T07 | 出库交易记录 | 通过;`Type=out`、`BillType=AddOtherOut`、`UploadErpFlag=1`、数量7 |
|
||||||
|
| T08 | WCS重复回调 | 通过;返回“未找到对应的任务”,未重复生成交易 |
|
||||||
|
| T09 | 入库交易点击领料补传 | 通过;拦截,不调用ERP |
|
||||||
|
| T10 | 未标记的普通出库点击领料补传 | 通过;拦截,不调用ERP |
|
||||||
|
| T11 | 合法失败交易人工补传 | 通过;生成新CK,成功后标记1 |
|
||||||
|
| T12 | 已成功交易再次补传 | 通过;拦截,不重复调用ERP |
|
||||||
|
| T13 | 手工执行暂停的Job | 通过;只补传合法失败记录并生成另一个新CK |
|
||||||
|
| T14 | 库存交易列表补传按钮 | 通过;临时失败 `AddOtherOut` 行只显示领料补传,入库和普通出库均不显示ERP补传按钮;测试记录已清理为0条 |
|
||||||
|
|
||||||
|
WCS自动完成实测的关键数据库结果:
|
||||||
|
|
||||||
|
```text
|
||||||
|
Inventory(source=CODEX-TEST-ITEM1-WCS) = 0条
|
||||||
|
TaskHeader(task=CODEX-ITEM1-WCS-OUT) = 0条
|
||||||
|
TaskHeaderHistory.Status = 100
|
||||||
|
InventoryTransaction.Qty = 7
|
||||||
|
InventoryTransaction.BillType = AddOtherOut
|
||||||
|
InventoryTransaction.UploadErpFlag = 1
|
||||||
|
```
|
||||||
|
|
||||||
|
## 3. 兼容性与清理
|
||||||
|
|
||||||
|
- 原 `FinishIn` 入库分支没有改变。
|
||||||
|
- 页面和Job只认 `Type=out + BillType=AddOtherOut + UploadErpFlag!=1`,历史普通出库和已成功记录不会显示或进入补传。
|
||||||
|
- `default`、`cp` 两个数据库模型字段保持一致。
|
||||||
|
- 所有 `CODEX-TEST-ITEM1*` 测试交易、临时库存、托盘、库位及任务历史均已精确删除,复查剩余0条。
|
||||||
|
- `AddOtherOutJob` 保持暂停,不会在本地继续执行。
|
||||||
|
|
||||||
|
## 4. 测试结论与上线门槛
|
||||||
|
|
||||||
|
代码、SQL、WCS自动回调、人工补传和Job补传均通过本地闭环测试,具备发布条件。
|
||||||
|
|
||||||
|
正式上线前仍必须用真实ERP完成一笔联调,确认正式地址及响应确实为 `Result=true/false`。这是外部系统契约校验,无法由本机Mock替代;联调通过前不要启用 `AddOtherOutJob`。
|
||||||
@@ -0,0 +1,87 @@
|
|||||||
|
# ERP事项一:领料出库补传按钮问题修复
|
||||||
|
|
||||||
|
## 问题现象
|
||||||
|
|
||||||
|
领料出库调用 ERP 失败后,库存交易记录已生成,但库存交易页面没有显示“补传ERP领料出库”按钮。
|
||||||
|
|
||||||
|
问题记录示例满足业务条件:
|
||||||
|
|
||||||
|
- `Type = out`
|
||||||
|
- `BillType = AddOtherOut`
|
||||||
|
- `UploadErpFlag = 0`
|
||||||
|
|
||||||
|
## 原因
|
||||||
|
|
||||||
|
按钮代码和补传接口已经存在,逐行显示条件也正确;但是新增的控制器方法
|
||||||
|
`InventoryTransaction/RetryAddOtherOut` 没有注册到 WTM 的 `frameworkmenus` 页面功能表中。
|
||||||
|
|
||||||
|
WTM 会先按页面功能权限过滤按钮。按钮在进入逐行显示条件判断前已被移除,因此符合条件的失败记录也看不到补传按钮。仅补菜单SQL仍会受到角色授权方式和旧登录缓存影响。
|
||||||
|
|
||||||
|
另外,原实现只在ERP回传失败后写入 `UploadErpFlag = 0`。当ERP正常返回
|
||||||
|
`Result = false` 时,没有保存响应中的 `Message/ErrorMsg`,因此已经发生的这次失败无法从WMS历史数据反推出具体ERP拒绝原因。
|
||||||
|
|
||||||
|
## 修复方案
|
||||||
|
|
||||||
|
不修改领料出库请求报文、WCS完成回调、库存扣减和重试规则。补传Action增加 `[AllRights]`,不再依赖新增功能权限记录。页面仍只在符合条件的失败交易行显示按钮,服务端也继续严格校验交易类型、单据类型和回传状态。
|
||||||
|
|
||||||
|
保留以下幂等SQL用于完整登记WTM页面功能,但按钮显示不再依赖该SQL或角色授权缓存:
|
||||||
|
|
||||||
|
`sql/20260718_fix_add_other_out_retry_permission.sql`
|
||||||
|
|
||||||
|
脚本会:
|
||||||
|
|
||||||
|
1. 在“库存交易”页面下注册 `RetryAddOtherOut` 页面功能。
|
||||||
|
2. 只给原本已有“库存交易”页面权限的角色增加该功能权限。
|
||||||
|
3. 重复执行不会重复增加菜单或权限记录。
|
||||||
|
|
||||||
|
代码同时补充了领料出库失败日志,后续失败会在 `actionlogs` 中记录:
|
||||||
|
|
||||||
|
- ERP返回失败时的 `Message/ErrorMsg`。
|
||||||
|
- 自动回传发生异常时的异常信息。
|
||||||
|
- 请求标识包含新生成的CK号、物料编码和数量,不改变原接口报文。
|
||||||
|
|
||||||
|
## 上线操作
|
||||||
|
|
||||||
|
1. 在线边库 `default` 数据库执行修复SQL。
|
||||||
|
2. 重启WMS服务,或在菜单管理执行“刷新菜单”。
|
||||||
|
3. 操作人员退出后重新登录,清除当前登录会话中的旧权限缓存。
|
||||||
|
4. 打开库存交易页面,确认失败记录显示“补传ERP领料出库”。
|
||||||
|
5. 点击按钮,确认ERP成功后 `UploadErpFlag` 更新为 `1`,按钮消失。
|
||||||
|
6. 如果仍然失败,查询 `actionlogs` 中 `ActionName = 'AddOtherOut'` 的最新记录,查看ERP返回原因。
|
||||||
|
|
||||||
|
## 本地验证结果
|
||||||
|
|
||||||
|
- 修复SQL在线边库本地数据库连续执行2次,均成功。
|
||||||
|
- 最终 `RetryAddOtherOut` 菜单记录为1条,没有重复数据。
|
||||||
|
- 最终权限记录为1条,授予本地原有库存交易页面角色 `001`。
|
||||||
|
- `dotnet build WMS.sln --no-restore` 通过:0错误,14个项目原有警告。
|
||||||
|
- 没有修改ERP请求字段、库存数量、任务完成或补传生成新CK的规则。
|
||||||
|
- 本次历史失败发生时没有保存ERP响应,无法还原其具体拒绝原因;发布日志修复并执行补传后可取得原因。
|
||||||
|
|
||||||
|
## 验证SQL
|
||||||
|
|
||||||
|
```sql
|
||||||
|
SELECT
|
||||||
|
ID, Type, MaterialCode, Qty, BillType, UploadErpFlag, CreateTime
|
||||||
|
FROM InventoryTransaction
|
||||||
|
WHERE Type = 'out'
|
||||||
|
AND BillType = 'AddOtherOut'
|
||||||
|
ORDER BY ID DESC;
|
||||||
|
```
|
||||||
|
|
||||||
|
需要显示按钮的记录必须满足:
|
||||||
|
|
||||||
|
```text
|
||||||
|
Type = out
|
||||||
|
BillType = AddOtherOut
|
||||||
|
UploadErpFlag != 1
|
||||||
|
```
|
||||||
|
|
||||||
|
失败原因查询:
|
||||||
|
|
||||||
|
```sql
|
||||||
|
SELECT ActionTime, Request, Result
|
||||||
|
FROM actionlogs
|
||||||
|
WHERE ActionName = 'AddOtherOut'
|
||||||
|
ORDER BY ID DESC;
|
||||||
|
```
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
-- ERP事项一:领料出库接口
|
||||||
|
-- 执行范围:default(线边库)和 cp(成品库)都执行。
|
||||||
|
-- 原因:InventoryTransaction 是两套数据库共用的实体模型。
|
||||||
|
-- 脚本可重复执行。
|
||||||
|
|
||||||
|
SET @column_exists = (
|
||||||
|
SELECT COUNT(*)
|
||||||
|
FROM information_schema.COLUMNS
|
||||||
|
WHERE TABLE_SCHEMA = DATABASE()
|
||||||
|
AND TABLE_NAME = 'InventoryTransaction'
|
||||||
|
AND COLUMN_NAME = 'UploadErpFlag'
|
||||||
|
);
|
||||||
|
|
||||||
|
SET @ddl = IF(
|
||||||
|
@column_exists = 0,
|
||||||
|
'ALTER TABLE `InventoryTransaction` ADD COLUMN `UploadErpFlag` INT NULL COMMENT ''ERP回传状态:0失败,1成功''',
|
||||||
|
'SELECT ''InventoryTransaction.UploadErpFlag already exists'' AS Message'
|
||||||
|
);
|
||||||
|
|
||||||
|
PREPARE stmt FROM @ddl;
|
||||||
|
EXECUTE stmt;
|
||||||
|
DEALLOCATE PREPARE stmt;
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
-- ERP事项一:领料出库失败自动补传Job
|
||||||
|
-- 执行范围:仅 default(线边库)执行。
|
||||||
|
-- 默认暂停;真实ERP联调通过后再启用。
|
||||||
|
-- 脚本可重复执行。
|
||||||
|
|
||||||
|
INSERT INTO `SysJob`
|
||||||
|
(`JobName`, `JobGroup`, `MethodName`, `MethodParams`, `CronExpression`,
|
||||||
|
`LastFireTime`, `NextFireTime`, `MisfirePolicy`, `Status`, `Remark`,
|
||||||
|
`CreateTime`, `CreateBy`, `UpdateTime`, `UpdateBy`)
|
||||||
|
SELECT
|
||||||
|
'AddOtherOutJob', 'AddOtherOutJob', NULL, NULL, '0 */1 * * * ?',
|
||||||
|
NULL, NULL, NULL, 0, 'ERP领料出库失败自动补传',
|
||||||
|
NOW(), 'system', NULL, NULL
|
||||||
|
WHERE NOT EXISTS (
|
||||||
|
SELECT 1 FROM `SysJob` WHERE `JobName` = 'AddOtherOutJob'
|
||||||
|
);
|
||||||
@@ -0,0 +1,104 @@
|
|||||||
|
/*
|
||||||
|
ERP事项一:修复库存交易页面不显示“补传ERP领料出库”按钮
|
||||||
|
执行范围:仅 default(线边库)数据库。
|
||||||
|
原因:RetryAddOtherOut 已在代码中实现,但未注册到 WTM 页面功能权限。
|
||||||
|
脚本可重复执行。
|
||||||
|
*/
|
||||||
|
|
||||||
|
SET @inventory_transaction_page_id = (
|
||||||
|
SELECT `ID`
|
||||||
|
FROM `frameworkmenus`
|
||||||
|
WHERE `ClassName` = 'HHWMS.Web.Controllers,InventoryTransaction'
|
||||||
|
AND (`MethodName` IS NULL OR `MethodName` = '')
|
||||||
|
ORDER BY `ShowOnMenu` DESC, `DisplayOrder`
|
||||||
|
LIMIT 1
|
||||||
|
);
|
||||||
|
|
||||||
|
INSERT INTO `frameworkmenus`
|
||||||
|
(`ID`, `PageName`, `ActionName`, `ModuleName`, `FolderOnly`, `IsInherit`,
|
||||||
|
`ClassName`, `MethodName`, `Domain`, `ShowOnMenu`, `IsPublic`, `DisplayOrder`,
|
||||||
|
`IsInside`, `TenantAllowed`, `Url`, `Icon`, `ParentId`)
|
||||||
|
SELECT
|
||||||
|
UUID(),
|
||||||
|
'补传ERP领料出库',
|
||||||
|
'补传ERP领料出库',
|
||||||
|
`ModuleName`,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
`ClassName`,
|
||||||
|
'RetryAddOtherOut',
|
||||||
|
`Domain`,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
(
|
||||||
|
SELECT COALESCE(MAX(child.`DisplayOrder`), 0) + 1
|
||||||
|
FROM `frameworkmenus` child
|
||||||
|
WHERE child.`ParentId` = @inventory_transaction_page_id
|
||||||
|
),
|
||||||
|
1,
|
||||||
|
`TenantAllowed`,
|
||||||
|
'/inventory/InventoryTransaction/RetryAddOtherOut',
|
||||||
|
NULL,
|
||||||
|
`ID`
|
||||||
|
FROM `frameworkmenus`
|
||||||
|
WHERE `ID` = @inventory_transaction_page_id
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1
|
||||||
|
FROM `frameworkmenus`
|
||||||
|
WHERE `ClassName` = 'HHWMS.Web.Controllers,InventoryTransaction'
|
||||||
|
AND `MethodName` = 'RetryAddOtherOut'
|
||||||
|
);
|
||||||
|
|
||||||
|
UPDATE `frameworkmenus`
|
||||||
|
SET `PageName` = '补传ERP领料出库',
|
||||||
|
`ActionName` = '补传ERP领料出库',
|
||||||
|
`Url` = '/inventory/InventoryTransaction/RetryAddOtherOut'
|
||||||
|
WHERE `ClassName` = 'HHWMS.Web.Controllers,InventoryTransaction'
|
||||||
|
AND `MethodName` = 'RetryAddOtherOut';
|
||||||
|
|
||||||
|
SET @retry_add_other_out_menu_id = (
|
||||||
|
SELECT `ID`
|
||||||
|
FROM `frameworkmenus`
|
||||||
|
WHERE `ClassName` = 'HHWMS.Web.Controllers,InventoryTransaction'
|
||||||
|
AND `MethodName` = 'RetryAddOtherOut'
|
||||||
|
LIMIT 1
|
||||||
|
);
|
||||||
|
|
||||||
|
/* 只给原本已经有“库存交易”页面权限的角色增加补传权限。 */
|
||||||
|
INSERT INTO `functionprivileges`
|
||||||
|
(`ID`, `RoleCode`, `MenuItemId`, `Allowed`, `TenantCode`,
|
||||||
|
`CreateTime`, `CreateBy`, `UpdateTime`, `UpdateBy`)
|
||||||
|
SELECT
|
||||||
|
UUID(),
|
||||||
|
page_privilege.`RoleCode`,
|
||||||
|
@retry_add_other_out_menu_id,
|
||||||
|
1,
|
||||||
|
page_privilege.`TenantCode`,
|
||||||
|
NOW(),
|
||||||
|
'system',
|
||||||
|
NULL,
|
||||||
|
NULL
|
||||||
|
FROM `functionprivileges` page_privilege
|
||||||
|
WHERE page_privilege.`MenuItemId` = @inventory_transaction_page_id
|
||||||
|
AND page_privilege.`Allowed` = 1
|
||||||
|
AND @retry_add_other_out_menu_id IS NOT NULL
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1
|
||||||
|
FROM `functionprivileges` existing_privilege
|
||||||
|
WHERE existing_privilege.`RoleCode` = page_privilege.`RoleCode`
|
||||||
|
AND existing_privilege.`MenuItemId` = @retry_add_other_out_menu_id
|
||||||
|
AND (existing_privilege.`TenantCode` <=> page_privilege.`TenantCode`)
|
||||||
|
);
|
||||||
|
|
||||||
|
SELECT
|
||||||
|
menu.`ID`,
|
||||||
|
menu.`PageName`,
|
||||||
|
menu.`MethodName`,
|
||||||
|
menu.`Url`,
|
||||||
|
privilege.`RoleCode`,
|
||||||
|
privilege.`Allowed`
|
||||||
|
FROM `frameworkmenus` menu
|
||||||
|
LEFT JOIN `functionprivileges` privilege ON privilege.`MenuItemId` = menu.`ID`
|
||||||
|
WHERE menu.`ClassName` = 'HHWMS.Web.Controllers,InventoryTransaction'
|
||||||
|
AND menu.`MethodName` = 'RetryAddOtherOut'
|
||||||
|
ORDER BY privilege.`RoleCode`;
|
||||||
Reference in new issue
Block a user