From 694bbd71dc1dddeb0dd1816f593890c6adb666bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E5=B7=A7?= <625215135@qq.com>
Date: Sun, 28 Sep 2025 11:50:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=A4=84=E6=96=B9=E8=BF=98?=
 =?UTF-8?q?=E8=8D=AF=E6=97=B6bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MasaBlazorApp3/DataAccess/Impl/OrderInfoDao.cs | 3 ++-
 MasaBlazorApp3/appsettings.json                | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/MasaBlazorApp3/DataAccess/Impl/OrderInfoDao.cs b/MasaBlazorApp3/DataAccess/Impl/OrderInfoDao.cs
index b70f9ae..d7b1900 100644
--- a/MasaBlazorApp3/DataAccess/Impl/OrderInfoDao.cs
+++ b/MasaBlazorApp3/DataAccess/Impl/OrderInfoDao.cs
@@ -177,7 +177,7 @@ namespace MasaBlazorApp3.DataAccess.Impl
 
 
             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));
 
             if (quantity > 0)
@@ -186,6 +186,7 @@ namespace MasaBlazorApp3.DataAccess.Impl
                 {
                     query = query.Where(cs => cs.ManuNo.Equals(ManuNo));
                 }
+                query = query.Where(cs => cs.Quantity > 0);
             }
             else
             {
diff --git a/MasaBlazorApp3/appsettings.json b/MasaBlazorApp3/appsettings.json
index e57a1a5..221e09f 100644
--- a/MasaBlazorApp3/appsettings.json
+++ b/MasaBlazorApp3/appsettings.json
@@ -22,7 +22,7 @@
     "boxColor": "白,绿"
   },
   "port": {
-    "drawerPortPath": "COM10",
+    "drawerPortPath": "COM2",
     "drawerProtocol": 485,
     "scanCodePortPath": "COM1",
     "canBusExsit": true,
@@ -31,14 +31,14 @@
     "canBusTwoExsit": true,
     "StorageCan": 1,
     //第二个can总线端口
-    "canBusPortPathTwo": "COM11",
+    "canBusPortPathTwo": "COM9",
     "doorAddr": 0,
     "storageBoxAddr": 0,
     "fridgePortExist": false,
     "fridgePortPath": "COM3"
   },
   "drawer": {
-    "single": [ 1 ],
+    "single": [ 1,2 ],
     "weigh": [ 4 ],
     "box": [ 4 ],
     "label": [ 4 ],