feat: 接入ERP成品发货出库流程

This commit is contained in:
mtf committed 2026-07-18 13:41:54 +08:00
1 parent 66a1f60428
commit 7c2722c88d
25 files changed
+2547 -22

No files matched your search

@@ -44,6 +44,8 @@ namespace HHWMS.Web
this.MakeGridHeader(x => x.MaterialCode),
this.MakeGridHeader(x => x.Batch),
this.MakeGridHeader(x => x.Qty),
this.MakeGridHeader(x => x.DividedQty),
this.MakeGridHeader(x => x.CompletedQty),
this.MakeGridHeader(x => x.Status)
};
}
@@ -59,6 +61,7 @@ namespace HHWMS.Web
else
return new List<GridColumn<ShipmentDetail_View>>{
this.MakeGridHeader(x => x.Code_view),
this.MakeGridHeader(x => x.DLsID),
this.MakeGridHeader(x => x.ZoneCode),
this.MakeGridHeader(x => x.MaterialCode),
this.MakeGridHeader(x => x.MaterialType),
@@ -115,6 +118,7 @@ namespace HHWMS.Web
.Select(x => new ShipmentDetail_View
{
ID = x.ID,
DLsID = x.DLsID,
Code_view = x.HeaderId.ToString(),
ZoneCode = x.ZoneCode,
MaterialCode = x.MaterialCode,
@@ -18,8 +18,16 @@ namespace HHWMS.Web
{
return new List<GridAction>
{
this.MakeAction("ShipmentHeader","StartOut",Localizer["ShipmentHeader.StartOut"],"",GridActionParameterTypesEnum.SingleId,"shipment"),
this.MakeAction("ShipmentHeader", "GetShipmentDetails", "获取ERP发货通知单", "",
GridActionParameterTypesEnum.NoId, "shipment")
.SetSize(500, 260),
this.MakeAction("ShipmentHeader", "Allocate", "分配/下发", "",
GridActionParameterTypesEnum.SingleId, "shipment")
.SetSize(1250, 820)
.SetBindVisiableColName(nameof(ShipmentHeader_View.CanAllocateErp)),
this.MakeAction("ShipmentHeader", "StartOut", Localizer["ShipmentHeader.StartOut"], "",
GridActionParameterTypesEnum.SingleId, "shipment")
.SetBindVisiableColName(nameof(ShipmentHeader_View.CanStartLegacyOut)),
this.MakeStandardAction("ShipmentHeader", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"shipment", dialogWidth: 800),
this.MakeStandardAction("ShipmentHeader", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "shipment", dialogWidth: 800),
this.MakeStandardAction("ShipmentHeader", GridActionStandardTypesEnum.Delete, Localizer["Sys.Delete"], "shipment", dialogWidth: 800),
@@ -37,6 +45,7 @@ namespace HHWMS.Web
return new List<GridColumn<ShipmentHeader_View>>{
//this.MakeGridHeader(x => x.SourceCode),
this.MakeGridHeader(x => x.Code),
this.MakeGridHeader(x => x.SourceCode),
this.MakeGridHeader(x => x.BillType)
.SetFormat((a, b) =>
{
@@ -50,12 +59,17 @@ namespace HHWMS.Web
this.MakeGridHeader(x => x.FirstStatus),
//this.MakeGridHeader(x => x.LastStatus),
this.MakeGridHeader(x => x.Remark),
this.MakeGridHeaderAction(width: 300)
this.MakeGridHeader(x => x.CanAllocateErp).SetHide(),
this.MakeGridHeader(x => x.CanStartLegacyOut).SetHide(),
this.MakeGridHeaderAction(width: 360)
};
}
public override IOrderedQueryable<ShipmentHeader_View> GetSearchQuery()
{
var erpHeaderIds = DC.Set<ShipmentDetail>()
.Where(x => x.DLsID.HasValue)
.Select(x => x.HeaderId);
var query = DC.Set<ShipmentHeader>()
.CheckContain(Searcher.SourceCode, x => x.SourceCode)
.CheckContain(Searcher.Code, x => x.Code)
@@ -74,6 +88,8 @@ namespace HHWMS.Web
FirstStatus = x.FirstStatus,
LastStatus = x.LastStatus,
Remark = x.Remark,
CanAllocateErp = erpHeaderIds.Contains(x.ID) ? "true" : "false",
CanStartLegacyOut = erpHeaderIds.Contains(x.ID) ? "false" : "true",
})
.OrderByDescending(x => x.ID);
return query;
@@ -82,5 +98,8 @@ namespace HHWMS.Web
public class ShipmentHeader_View : ShipmentHeader
{
public string CanAllocateErp { get; set; }
public string CanStartLegacyOut { get; set; }
}
}