feat: 新增库存批次和Lot查询功能,优化入库界面和报表处理
refactor: 重构SimpleReceiptIn界面,增加历史记录和自动完成功能 fix: 修复报表参数处理和SQL解码问题 perf: 优化WCS接口调用和库存计算逻辑 style: 清理无用代码和调整格式 chore: 更新数据库连接配置和调试模式设置
This commit is contained in:
1 parent
5a04ca9d59
commit
48c63bb15d
13 files changed
+361
-199
No files matched your search
@@ -13,6 +13,30 @@ namespace HHWMS.Web
|
||||
{
|
||||
public partial class InventoryListVM : BasePagedListVM<Inventory_View, InventorySearcher>
|
||||
{
|
||||
public List<ComboSelectListItem> CurrentProcessList { get; set; }
|
||||
public List<ComboSelectListItem> NextProcessList { get; set; }
|
||||
|
||||
protected override void InitVM()
|
||||
{
|
||||
var vm = Wtm.CreateVM<InventoryVM>();
|
||||
CurrentProcessList = DC.Set<Inventory>()
|
||||
.Where(x => !string.IsNullOrEmpty(x.Batch))
|
||||
.Distinct(x => x.Batch)
|
||||
.Select(x => new ComboSelectListItem
|
||||
{
|
||||
Text = x.Batch,
|
||||
Value = x.Batch
|
||||
}).ToList();
|
||||
NextProcessList = DC.Set<Inventory>()
|
||||
.Where(x => !string.IsNullOrEmpty(x.Lot))
|
||||
.Distinct(x => x.Lot)
|
||||
.Select(x => new ComboSelectListItem
|
||||
{
|
||||
Text = x.Lot,
|
||||
Value = x.Lot
|
||||
}).ToList();
|
||||
}
|
||||
|
||||
protected override List<GridAction> InitGridAction()
|
||||
{
|
||||
return new List<GridAction>
|
||||
@@ -42,6 +66,11 @@ namespace HHWMS.Web
|
||||
this.MakeGridHeader(x => x.LocationCode).SetWidth(130),
|
||||
this.MakeGridHeader(x => x.MaterialCode).SetWidth(90),
|
||||
this.MakeGridHeader(x => x.MaterialType).SetWidth(100),
|
||||
this.MakeGridHeader(x => x.Qty).SetWidth(100)
|
||||
.SetFormat((a, b) =>
|
||||
{
|
||||
return (int?)a.Qty ?? 0;
|
||||
}),
|
||||
this.MakeGridHeader(x => x.SupplierCode).SetWidth(100),
|
||||
this.MakeGridHeader(x => x.Batch).SetWidth(100),
|
||||
this.MakeGridHeader(x => x.Lot).SetWidth(100),
|
||||
@@ -59,11 +88,6 @@ namespace HHWMS.Web
|
||||
this.MakeGridHeader(x => x.MaterialSpec).SetHide().SetWidth(150),
|
||||
this.MakeGridHeader(x => x.MaterialUnit).SetHide(),
|
||||
this.MakeGridHeader(x => x.TaskQty).SetHide(),
|
||||
this.MakeGridHeader(x => x.Qty).SetWidth(100)
|
||||
.SetFormat((a, b) =>
|
||||
{
|
||||
return (int?)a.Qty ?? 0;
|
||||
}),
|
||||
this.MakeGridHeader(x => x.ManufactureDate).SetHide(),
|
||||
this.MakeGridHeader(x => x.ExpirationDate).SetHide(),
|
||||
this.MakeGridHeader(x => x.ReceiptCode).SetHide(),
|
||||
|
||||
@@ -27,6 +27,8 @@ namespace HHWMS.Web
|
||||
public String MaterialName { get; set; }
|
||||
[Display(Name = "Inventory.Batch")]
|
||||
public String Batch { get; set; }
|
||||
[Display(Name = "Inventory.Lot")]
|
||||
public String Lot { get; set; }
|
||||
[Display(Name = "Inventory.ReceiptCode")]
|
||||
public String ReceiptCode { get; set; }
|
||||
[Display(Name = "Inventory.SourceCode")]
|
||||
|
||||
Reference in new issue
Block a user