fix:永丰售后修复BUG,

1,物料库存获取不到ERP:重新调整触发查询逻辑
2,工序变更导致物料无法出库:配置旧工序
3,测试出库订单ERP推送,任务下发
This commit is contained in:
sunwang committed 2026-10-29 13:12:11 +08:00
1 parent b2a9a38f38
commit c76e7bb681
69 files changed
+5510 -157

No files matched your search

@@ -1,3 +1,4 @@
using System.Linq;
using HHWMS.Web.Models;
using WalkingTec.Mvvm.Core;
@@ -10,6 +11,31 @@ namespace HHWMS.Web
ListVM = new ShipmentHeaderListVM();
LinkedVM = new ShipmentHeader_BatchEdit();
}
/// <summary>
/// 批量删除:先删除所选出库单的明细,再删除表头,避免残留明细导致后续单据下发报错
/// </summary>
public override bool DoBatchDelete()
{
var headerIds = (Ids ?? new string[0])
.Select(x => int.TryParse(x, out var id) ? id : -1)
.Where(x => x > 0)
.ToList();
if (headerIds.Count > 0)
{
var details = DC.Set<ShipmentDetail>()
.Where(x => headerIds.Contains(x.HeaderId))
.ToList();
if (details.Count > 0)
{
DC.Set<ShipmentDetail>().RemoveRange(details);
}
}
// base.DoBatchDelete 内部会统一 SaveChanges,明细与表头一并删除
return base.DoBatchDelete();
}
}
/// <summary>
@@ -18,9 +18,10 @@ namespace HHWMS.Web
{
return new List<GridAction>
{
this.MakeAction("ShipmentHeader", "GetShipmentDetails", "获取ERP发货通知单", "",
GridActionParameterTypesEnum.NoId, "shipment")
.SetSize(500, 260),
// 暂时不需要“获取ERP发货通知单”,按钮先注释掉
//this.MakeAction("ShipmentHeader", "GetShipmentDetails", "获取ERP发货通知单", "",
// GridActionParameterTypesEnum.NoId, "shipment")
// .SetSize(500, 260),
this.MakeAction("ShipmentHeader", "Allocate", "分配/下发", "",
GridActionParameterTypesEnum.SingleId, "shipment")
.SetSize(1250, 820)
@@ -75,6 +76,7 @@ namespace HHWMS.Web
.CheckContain(Searcher.Code, x => x.Code)
.CheckContain(Searcher.BillType, x => x.BillType)
.CheckEqual(Searcher.FirstStatus, x => x.FirstStatus)
.CheckContain(Searcher.Remark, x => x.Remark)
.Select(x => new ShipmentHeader_View
{
ID = x.ID,
@@ -22,6 +22,10 @@ namespace HHWMS.Web
[Display(Name = "Receipt.LastStatus")]
public ShipStatusEnum? LastStatus { get; set; }
/// <summary>备注(模糊查询)</summary>
[Display(Name = "_Admin.Remark")]
public String Remark { get; set; }
protected override void InitVM()
{
}
@@ -47,6 +47,13 @@ namespace HHWMS.Web
public override void DoDelete()
{
// 先删除该出库单下的明细,避免表头删除后残留明细导致后续单据下发报错
var details = DC.Set<ShipmentDetail>().Where(x => x.HeaderId == Entity.ID).ToList();
if (details.Count > 0)
{
DC.Set<ShipmentDetail>().RemoveRange(details);
}
// base.DoDelete 内部会统一 SaveChanges,明细与表头一并删除
base.DoDelete();
}
}