渲染标签时查询近效期数据添加设备id条件
This commit is contained in:
parent
f01786971e
commit
384dbc7577
|
@ -565,6 +565,9 @@ namespace DM_Weight.ViewModels
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
//查询绑定库位的最近效期绑定到标签
|
||||||
|
ChannelStock cs = SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs =>cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")&& cs.DrawerNo == item.DrawerNo && cs.ColNo == item.ColNo && cs.Quantity > 0).OrderBy(cs => cs.EffDate).First();
|
||||||
|
|
||||||
DrugInfo drugSelected = item.Drug ?? new DrugInfo();
|
DrugInfo drugSelected = item.Drug ?? new DrugInfo();
|
||||||
_portUtil.WindowName = "BindingChannelDialog";
|
_portUtil.WindowName = "BindingChannelDialog";
|
||||||
// 向显示屏写入库位信息
|
// 向显示屏写入库位信息
|
||||||
|
@ -573,6 +576,10 @@ namespace DM_Weight.ViewModels
|
||||||
_portUtil.WriteChannelInfo(2, drugSelected.DrugSpec ?? "", item.DrawerNo, item.ColNo);
|
_portUtil.WriteChannelInfo(2, drugSelected.DrugSpec ?? "", item.DrawerNo, item.ColNo);
|
||||||
Thread.Sleep(200);
|
Thread.Sleep(200);
|
||||||
_portUtil.WriteChannelInfo(8, drugSelected.Manufactory == null ? "" : drugSelected.Manufactory.Length > 10 ? drugSelected.Manufactory.Substring(0, 10) : drugSelected.Manufactory, item.DrawerNo, item.ColNo);
|
_portUtil.WriteChannelInfo(8, drugSelected.Manufactory == null ? "" : drugSelected.Manufactory.Length > 10 ? drugSelected.Manufactory.Substring(0, 10) : drugSelected.Manufactory, item.DrawerNo, item.ColNo);
|
||||||
|
Thread.Sleep(200);
|
||||||
|
_portUtil.WriteChannelInfo(5, (cs == null || cs.EffDate == null) ? "" : cs.EffDate, item.DrawerNo, item.ColNo);
|
||||||
|
Thread.Sleep(200);
|
||||||
|
_portUtil.WriteChannelInfo(6, (cs == null || cs.ManuNo == null) ? "" : cs.ManuNo, item.DrawerNo, item.ColNo);
|
||||||
Thread.Sleep(200);
|
Thread.Sleep(200);
|
||||||
_portUtil.ShowContent(item.DrawerNo, item.ColNo);
|
_portUtil.ShowContent(item.DrawerNo, item.ColNo);
|
||||||
Thread.Sleep(200);
|
Thread.Sleep(200);
|
||||||
|
|
Loading…
Reference in New Issue