入库操作

This commit is contained in:
zgf committed 2023-08-28 23:30:38 +08:00
1 parent 8de4bc26cd
commit 2459d4664a
17 files changed
+159 -52

No files matched your search

@@ -54,6 +54,7 @@ namespace HHWMS.Web
var query = DC.Set<ReceiptDetail>()
.CheckEqual(Searcher.ReceiptHeaderId, x => x.ReceiptHeaderId)
.CheckContain(Searcher.ZoneCode, x => x.ZoneCode)
.CheckContain(Searcher.UniqueCode, x => x.UniqueCode)
.CheckContain(Searcher.MaterialCode, x => x.MaterialCode)
.CheckContain(Searcher.MaterialType, x => x.MaterialType)
.CheckContain(Searcher.MaterialName, x => x.MaterialName)
@@ -68,6 +69,7 @@ namespace HHWMS.Web
ID = x.ID,
Code_view = x.ReceiptHeader.Code,
ZoneCode = x.ZoneCode,
UniqueCode = x.UniqueCode,
MaterialCode = x.MaterialCode,
MaterialType = x.MaterialType,
MaterialName = x.MaterialName,
@@ -13,7 +13,6 @@ namespace HHWMS.Web
{
return new List<GridAction>
{
//this.MakeStandardAction("ReceiptDetail", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"receipt", dialogWidth: 800),
this.MakeAction("ReceiptDetail","Create2",Localizer["Sys.Create"],Localizer["Sys.Create"],GridActionParameterTypesEnum.NoId,"receipt").SetOnClickScript("CreateDetail"),
this.MakeAction("ReceiptDetail","CreateDetail",Localizer["Sys.CreateDetails"],Localizer["Sys.CreateDetails"],GridActionParameterTypesEnum.NoId,"receipt").SetOnClickScript("CreateDetails"),
@@ -31,22 +30,23 @@ namespace HHWMS.Web
protected override IEnumerable<IGridColumn<ReceiptDetail_View>> InitGridHeader()
{
var result = new List<GridColumn<ReceiptDetail_View>>{
this.MakeGridHeader(x => x.Code_view),
this.MakeGridHeader(x => x.ZoneCode),
//this.MakeGridHeader(x => x.Code_view),
//this.MakeGridHeader(x => x.ZoneCode),
this.MakeGridHeader(x => x.UniqueCode).SetWidth(230),
this.MakeGridHeader(x => x.MaterialCode),
this.MakeGridHeader(x => x.MaterialType),
this.MakeGridHeader(x => x.MaterialName),
this.MakeGridHeader(x => x.MaterialSpec),
this.MakeGridHeader(x => x.MaterialUnit),
this.MakeGridHeader(x => x.Batch),
this.MakeGridHeader(x => x.Lot),
this.MakeGridHeader(x => x.ManufactureDate),
this.MakeGridHeader(x => x.ExpirationDate),
this.MakeGridHeader(x => x.CompanyCode),
this.MakeGridHeader(x => x.Lot).SetHide(),
//this.MakeGridHeader(x => x.ManufactureDate),
//this.MakeGridHeader(x => x.ExpirationDate),
//this.MakeGridHeader(x => x.CompanyCode),
this.MakeGridHeader(x => x.SupplierCode),
this.MakeGridHeader(x => x.CompletedQty),
this.MakeGridHeader(x => x.Qty),
this.MakeGridHeader(x => x.InventoryStatus),
//this.MakeGridHeader(x => x.InventoryStatus),
this.MakeGridHeader(x => x.Status)
};
@@ -66,6 +66,7 @@ namespace HHWMS.Web
ID = x.ID,
Code_view = x.ReceiptHeader.Code,
ZoneCode = x.ZoneCode,
UniqueCode = x.UniqueCode,
MaterialCode = x.MaterialCode,
MaterialType = x.MaterialType,
MaterialName = x.MaterialName,
@@ -16,6 +16,9 @@ namespace HHWMS.Web
[Display(Name = "Task.ZoneCode")]
public String ZoneCode { get; set; }
[Display(Name = "Inventory.UniqueCode")]
public String UniqueCode { get; set; }
[Display(Name = "Inventory.MaterialCode")]
public String MaterialCode { get; set; }
@@ -32,19 +32,19 @@ namespace HHWMS.Web
protected override IEnumerable<IGridColumn<ReceiptHeader_View>> InitGridHeader()
{
return new List<GridColumn<ReceiptHeader_View>>{
this.MakeGridHeader(x => x.SourceCode),
//this.MakeGridHeader(x => x.SourceCode),
this.MakeGridHeader(x => x.Code).SetFormat((a,b) =>
{
string rv = UIService.MakeScriptButton(ButtonTypesEnum.Link,a.Code,$"details('{a.ID}')");
return rv;
}),
this.MakeGridHeader(x => x.BillType),
this.MakeGridHeader(x => x.CompanyCode),
this.MakeGridHeader(x => x.SupplierCode),
this.MakeGridHeader(x => x.TotalQty),
this.MakeGridHeader(x => x.TotalLines),
//this.MakeGridHeader(x => x.CompanyCode),
//this.MakeGridHeader(x => x.SupplierCode),
//this.MakeGridHeader(x => x.TotalQty),
//this.MakeGridHeader(x => x.TotalLines),
this.MakeGridHeader(x => x.FirstStatus),
this.MakeGridHeader(x => x.LastStatus),
//this.MakeGridHeader(x => x.LastStatus),
this.MakeGridHeader(x => x.AppointmentTime),
this.MakeGridHeader(x => x.Remark),
this.MakeGridHeaderAction(width: 200)