fix:永丰售后修复BUG,
1,物料库存获取不到ERP:重新调整触发查询逻辑 2,工序变更导致物料无法出库:配置旧工序 3,测试出库订单ERP推送,任务下发
This commit is contained in:
1 parent
b2a9a38f38
commit
c76e7bb681
69 files changed
+5510
-157
No files matched your search
@@ -69,6 +69,7 @@ namespace WalkingTec.Mvvm.Mvc.Admin.ViewModels.ActionLogVMs
|
||||
{
|
||||
var query = DC.Set<ActionLog>()
|
||||
.CheckContain(Searcher.ITCode, x=>x.ITCode)
|
||||
.CheckContain(Searcher.ModuleName, x=>x.ModuleName)
|
||||
.CheckContain(Searcher.ActionUrl, x=>x.ActionUrl)
|
||||
.CheckContain(Searcher.LogType, x=>x.LogType)
|
||||
.CheckContain(Searcher.IP, x=>x.IP)
|
||||
|
||||
@@ -12,6 +12,10 @@ namespace WalkingTec.Mvvm.Mvc.Admin.ViewModels.ActionLogVMs
|
||||
[Display(Name = "_Admin.Account")]
|
||||
public string ITCode { get; set; }
|
||||
|
||||
/// <summary>模块名称(模糊匹配,用于按业务模块筛选日志,如「物料」、「AGV」、「mes」)</summary>
|
||||
[Display(Name = "模块")]
|
||||
public string ModuleName { get; set; }
|
||||
|
||||
[Display(Name = "Url")]
|
||||
public string ActionUrl { get; set; }
|
||||
|
||||
|
||||
@@ -4,13 +4,16 @@
|
||||
<wt:searchpanel vm="@Model" reset-btn="true">
|
||||
<wt:row items-per-row=" ItemsPerRowEnum.Three">
|
||||
<wt:combobox field="Searcher.LogType" empty-text="@Localizer["Sys.All"]" />
|
||||
<wt:textbox field="Searcher.ModuleName" />
|
||||
<wt:textbox field="Searcher.ITCode" />
|
||||
</wt:row>
|
||||
<wt:row items-per-row=" ItemsPerRowEnum.Three">
|
||||
<wt:textbox field="Searcher.ActionUrl" />
|
||||
<wt:textbox field="Searcher.IP" />
|
||||
<wt:textbox field="Searcher.Duration" />
|
||||
</wt:row>
|
||||
<wt:row items-per-row=" ItemsPerRowEnum.Three">
|
||||
<wt:datetime field="Searcher.ActionTime" type="DateTime" range="true" />
|
||||
<wt:textbox field="Searcher.IP" />
|
||||
<wt:textbox field="Searcher.Duration" />
|
||||
</wt:row>
|
||||
</wt:searchpanel>
|
||||
|
||||
|
||||
Reference in new issue
Block a user