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

根据处方还药时bug修改

This commit is contained in:
马巧 2025-09-28 11:50:17 +08:00
parent 3f2bfb154a
commit 694bbd71dc
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MasaBlazorApp3/DataAccess/Impl/OrderInfoDao.cs
View File

@ -177,7 +177,7 @@ namespace MasaBlazorApp3.DataAccess.Impl
query = query.Where(cs => cs.MachineId.Equals(_setting.machineId)).Where(cs => cs.DrawerType == 1) query = query.Where(cs => cs.MachineId.Equals(_setting.machineId)).Where(cs => cs.DrawerType == 1)
.Where(cs => cs.Quantity > 0)
.Where(cs => cs.DrugId.Equals(DrugId)); .Where(cs => cs.DrugId.Equals(DrugId));
if (quantity > 0) if (quantity > 0)
@ -186,6 +186,7 @@ namespace MasaBlazorApp3.DataAccess.Impl
{ {
query = query.Where(cs => cs.ManuNo.Equals(ManuNo)); query = query.Where(cs => cs.ManuNo.Equals(ManuNo));
} }
query = query.Where(cs => cs.Quantity > 0);
} }
else else
{ {

6
MasaBlazorApp3/appsettings.json
View File

@ -22,7 +22,7 @@
"boxColor": "白,绿" "boxColor": "白,绿"
}, },
"port": { "port": {
"drawerPortPath": "COM10", "drawerPortPath": "COM2",
"drawerProtocol": 485, "drawerProtocol": 485,
"scanCodePortPath": "COM1", "scanCodePortPath": "COM1",
"canBusExsit": true, "canBusExsit": true,
@ -31,14 +31,14 @@
"canBusTwoExsit": true, "canBusTwoExsit": true,
"StorageCan": 1, "StorageCan": 1,
//第二个can总线端口 //第二个can总线端口
"canBusPortPathTwo": "COM11", "canBusPortPathTwo": "COM9",
"doorAddr": 0, "doorAddr": 0,
"storageBoxAddr": 0, "storageBoxAddr": 0,
"fridgePortExist": false, "fridgePortExist": false,
"fridgePortPath": "COM3" "fridgePortPath": "COM3"
}, },
"drawer": { "drawer": {
"single": [ 1 ], "single": [ 1,2 ],
"weigh": [ 4 ], "weigh": [ 4 ],
"box": [ 4 ], "box": [ 4 ],
"label": [ 4 ], "label": [ 4 ],