maqiao
/
SiChuanShengErZhong30
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改交接柜用户同时修改毒麻柜用户

This commit is contained in:
马巧 2025-10-14 11:28:59 +08:00
parent 336ddb3f6f
commit 3554a2e824
8 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MasaBlazorApp3/Pages/DrawerAdd.razor
View File

@ -255,7 +255,6 @@
);
logger.Info($"抽屉打开失败");
RestData();
PortUtil.Operate = false;
stop();
}
@ -277,7 +276,6 @@
await GetWeightQuantity();
}
this.status = 3;
PortUtil.Operate = false;
stop();
}
else
@ -357,7 +355,8 @@
void RestData()
{
PortUtil.Operate = false;
PortUtil.speechSynthesizer.SpeakAsyncCancelAll();
this.status = 0;
this.BeforeQuantity = new int[9];

1
MasaBlazorApp3/Pages/DrawerTake.razor
View File

@ -712,6 +712,7 @@
void RestData()
{
PortUtil.Operate = false;
PortUtil.speechSynthesizer.SpeakAsyncCancelAll();
this.status = 0;
this.BeforeQuantity = new int[9];

13
MasaBlazorApp3/Pages/Home.razor
View File

@ -1,5 +1,7 @@
@page "/"
@using MasaBlazorApp3.Pojo.Config
@using MasaBlazorApp3.Util
@using Microsoft.Extensions.Options
@using log4net
@layout EmptyLayout
@ -189,6 +191,7 @@
Timer timer;
@inject PortUtil _portUtil;
@inject IOptions<DrawerConfig> drawerSetting;
private readonly ILog logger = LogManager.GetLogger(typeof(Home));
@inject Microsoft.Extensions.Options.IOptions<Pojo.Config.SettingConfig> setting;
bool currentPage = true;
@ -321,10 +324,16 @@
}
}
}
void logout()
async void logout()
{
if (globalStateService.Operator != null)
{
{ //查询所有标签抽屉，设置标签灯为灭灯
int[] labels = drawerSetting.Value.label;
for (int i = 0; i < labels.Length; i++)
{
await _portUtil.setOffLight(labels[i]);
}
PortUtil.speechSynthesizer.SpeakAsyncCancelAll();
globalStateService.Operator = null;
globalStateService.Reviewer = null;
}

4
MasaBlazorApp3/Pages/InvoiceAddDialog.razor
View File

@ -189,6 +189,7 @@
async Task CancelOpera()
{
PortUtil.Operate = false;
PortUtil.speechSynthesizer.SpeakAsyncCancelAll();
status = 0;
dialogService.Close(false);
@ -261,6 +262,7 @@
var b = await PortUtil.OpenDrawerStatusForErZhong(drawerNo);
if (b)
{
PortUtil.Operate = true;
PortUtil.speechSynthesizer.SpeakAsyncCancelAll();
PortUtil.SpeakAsync($"{drawerNo}号抽屉已经打开，请，加药");
options._data = 1;
@ -421,7 +423,7 @@
void RestData()
{
PortUtil.Operate = true;
this.status = 0;
_flagList.Clear();
this.ColNos.Clear();

3
MasaBlazorApp3/Pages/InvoiceOutDialog.razor
View File

@ -213,6 +213,7 @@
// }
// }
// }
PortUtil.Operate = true;
var b = await PortUtil.OpenDrawerStatusForErZhong(drawerNo);
if (b)
{
@ -381,7 +382,7 @@
void RestData()
{
PortUtil.Operate=false;
PortUtil.speechSynthesizer.SpeakAsyncCancelAll();
this.status = 0;
this.BeforeQuantity = new int[9];

2
MasaBlazorApp3/Pages/LoginDialog.razor
View File

@ -1,4 +1,4 @@
@page "/loginDialog"
@page "/loginDialog";
@using MasaBlazorApp3.Pojo.Config;
@using MasaBlazorApp3.Pojo.Vo;
@using MasaBlazorApp3.Util;

6
MasaBlazorApp3/Shared/MainLayout.razor
View File

@ -1,9 +1,9 @@
@namespace MasaBlazorApp3
@using MasaBlazorApp3.Pojo.Config
@using MasaBlazorApp3.Util
@using Microsoft.Extensions.Options
@using log4net
@inherits LayoutComponentBase
@using Microsoft.Extensions.Options;
@using log4net;
@inherits LayoutComponentBase;
<style>
.my-tab-menu {

2
MasaBlazorApp3/appsettings.json
View File

@ -24,7 +24,7 @@
//"drawerProtocol": 485,
"scanCodePortPath": "COM1",
"canBusExsit": true,
"canBusPortPath": "COM33",
"canBusPortPath": "COM2",
"totalDrawerCount": 16,
"canBusTwoExsit": true,
"StorageCan": 1,