From 51a34c9e0a0bf3cd6b371423febfc6acbc26a0f3 Mon Sep 17 00:00:00 2001
From: zf <27208084@qq.com>
Date: Wed, 1 Nov 2023 16:32:01 +0800
Subject: [PATCH] 库存到达边界值就预警

---
 ant-design-vue-jeecg/src/views/system/inventory/InventoryLevelAlarmList.vue                                            | 4 ++--
 huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryLevel/mapper/xml/InventoryLevelAlarmMapper.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/system/inventory/InventoryLevelAlarmList.vue b/ant-design-vue-jeecg/src/views/system/inventory/InventoryLevelAlarmList.vue
index 2905e81..043726e 100644
--- a/ant-design-vue-jeecg/src/views/system/inventory/InventoryLevelAlarmList.vue
+++ b/ant-design-vue-jeecg/src/views/system/inventory/InventoryLevelAlarmList.vue
@@ -74,7 +74,7 @@
         </span>
 
         <span slot="qtySum" slot-scope="text, record">
-          <a-tag :key="record" :color="qtySumColor(record)">
+          <a-tag :key="record" :color="qtySumColor(record)" style="font-size: 14px;font-weight: normal">
             {{ qtySumStatus(record) }}
           </a-tag>
         </span>
@@ -247,7 +247,7 @@ export default {
       return record.qtySum;
     },
     qtySumColor(record) {
-      if(record.qtySum > record.upper || record.qtySum < record.lower){
+      if(record.qtySum >= record.upper || record.qtySum <= record.lower){
         return 'red';
       }
       return '';
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryLevel/mapper/xml/InventoryLevelAlarmMapper.xml b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryLevel/mapper/xml/InventoryLevelAlarmMapper.xml
index 0d7e36a..090dec6 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryLevel/mapper/xml/InventoryLevelAlarmMapper.xml
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryLevel/mapper/xml/InventoryLevelAlarmMapper.xml
@@ -18,7 +18,7 @@
                 and w.material_name like #{materialNameLike}
             </if>
             <if test="alarmStatus != null and alarmStatus == 'noAlarm'">
-                and qtySum between lower and upper
+                and qtySum &gt; lower and qtySum &lt; upper
             </if>
             <if test="alarmStatus != null and alarmStatus == 'isAlarm'">
                 and (qtySum &lt;= lower or qtySum &gt;= upper or qtySum is null)
--
libgit2 0.22.2