添加库存查询接口参数和线边库存的生产单据不显示的问题
This commit is contained in:
parent
1896f7c15e
commit
d156650264
@ -572,7 +572,9 @@ namespace HHWMS.Web.Controllers
|
||||
StepCode = inv.BatchCode, // 工序(批次编码)
|
||||
WorkerCode = inv.CreateBy, // 工人编码(创建人)
|
||||
Maker = _unitWork.FindSingle<FrameworkUser>(x =>
|
||||
x.ITCode == inv.CreateBy).Name // 制单人(校验员)
|
||||
x.ITCode == inv.CreateBy).Name, // 制单人(校验员)
|
||||
Type = inv.ZoneId == 1027 ? 1: 2,
|
||||
WhCode = inv.ZoneId == 1027 ? "xb": "cp",
|
||||
},
|
||||
Details = new List<FinishInDetail>()
|
||||
};
|
||||
|
||||
@ -23,12 +23,14 @@ namespace HHWMS.Web
|
||||
this.MakeGridHeader(x => x.MaterialName),
|
||||
this.MakeGridHeader(x => x.MaterialSpec),
|
||||
this.MakeGridHeader(x => x.BatchCode),
|
||||
this.MakeGridHeader(x => x.NextBatch),
|
||||
this.MakeGridHeader(x => x.SuFigureNo),
|
||||
this.MakeGridHeader(x => x.Company),
|
||||
this.MakeGridHeader(x => x.Remark),
|
||||
this.MakeGridHeader(x => x.LocationCode),
|
||||
this.MakeGridHeader(x => x.SourceCode),
|
||||
this.MakeGridHeader(x => x.Qty),
|
||||
this.MakeGridHeader(x => x.Createtime),
|
||||
this.MakeGridHeaderAction(width: 200)
|
||||
};
|
||||
}
|
||||
@ -42,6 +44,7 @@ namespace HHWMS.Web
|
||||
.CheckContain(Searcher.MaterialName, x=>x.MaterialName)
|
||||
.CheckContain(Searcher.MaterialSpec, x=>x.MaterialSpec)
|
||||
.CheckContain(Searcher.BatchCode, x=>x.BatchCode)
|
||||
.CheckContain(Searcher.NextBatch, x=>x.Lot)
|
||||
.CheckContain(Searcher.SuFigureNo, x=>x.SupplierCode)
|
||||
.Select(x => new InventoryApi_View
|
||||
{
|
||||
@ -57,6 +60,8 @@ namespace HHWMS.Web
|
||||
SuFigureNo = x.SupplierCode,
|
||||
LocationCode = x.LocationCode,
|
||||
Qty = x.Qty,
|
||||
Createtime = x.CreateTime,
|
||||
NextBatch = x.Lot
|
||||
}).OrderBy(x => x.MaterialCode);
|
||||
return query;
|
||||
}
|
||||
@ -69,6 +74,7 @@ namespace HHWMS.Web
|
||||
public string MaterialName { get; set; }
|
||||
public string MaterialSpec { get; set; }
|
||||
public string BatchCode { get; set; }
|
||||
public string NextBatch { get; set; }
|
||||
public string SuFigureNo { get; set; }
|
||||
public string Remark { get; set; }
|
||||
public string SourceCode { get; set; }
|
||||
@ -76,5 +82,6 @@ namespace HHWMS.Web
|
||||
public string FigureNo { get; set; }
|
||||
public string LocationCode { get; set; }
|
||||
public decimal? Qty { get; set; }
|
||||
public DateTime? Createtime { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@ -27,6 +27,7 @@ namespace HHWMS.Web
|
||||
public String SuFigureNo { get; set; }
|
||||
public String WareHouse { get; set; }
|
||||
|
||||
public string NextBatch { get; set; }
|
||||
protected override void InitVM()
|
||||
{
|
||||
}
|
||||
|
||||
@ -44,7 +44,7 @@
|
||||
<a-option v-for="item in orderOptions"
|
||||
:key="item.value"
|
||||
:value="item.value">
|
||||
{{ item.label }}
|
||||
{{ item.value }}
|
||||
</a-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
|
||||
@ -22,7 +22,7 @@ namespace HHWMS.Web
|
||||
|
||||
var inv = _unitwork.FindSingle<Inventory>(x => x.UploadErpFlag == 0
|
||||
&& x.TaskStatus != InventoryTaskStatusEnum.Locked
|
||||
&& !string.IsNullOrEmpty(x.SourceCode)
|
||||
&& !string.IsNullOrEmpty(x.ReceiptDetailId)
|
||||
);
|
||||
|
||||
var request = new FinishInRequest
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
"ASPNETCORE_ENVIRONMENT": "Development",
|
||||
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation"
|
||||
},
|
||||
"applicationUrl": "http://0.0.0.0:5000/"
|
||||
"applicationUrl": "http://0.0.0.0:5001/"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user