Commit 51a34c9e0a0bf3cd6b371423febfc6acbc26a0f3
1 parent
49191861
库存到达边界值就预警
Showing
2 changed files
with
3 additions
and
3 deletions
ant-design-vue-jeecg/src/views/system/inventory/InventoryLevelAlarmList.vue
... | ... | @@ -74,7 +74,7 @@ |
74 | 74 | </span> |
75 | 75 | |
76 | 76 | <span slot="qtySum" slot-scope="text, record"> |
77 | - <a-tag :key="record" :color="qtySumColor(record)"> | |
77 | + <a-tag :key="record" :color="qtySumColor(record)" style="font-size: 14px;font-weight: normal"> | |
78 | 78 | {{ qtySumStatus(record) }} |
79 | 79 | </a-tag> |
80 | 80 | </span> |
... | ... | @@ -247,7 +247,7 @@ export default { |
247 | 247 | return record.qtySum; |
248 | 248 | }, |
249 | 249 | qtySumColor(record) { |
250 | - if(record.qtySum > record.upper || record.qtySum < record.lower){ | |
250 | + if(record.qtySum >= record.upper || record.qtySum <= record.lower){ | |
251 | 251 | return 'red'; |
252 | 252 | } |
253 | 253 | return ''; |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryLevel/mapper/xml/InventoryLevelAlarmMapper.xml
... | ... | @@ -18,7 +18,7 @@ |
18 | 18 | and w.material_name like #{materialNameLike} |
19 | 19 | </if> |
20 | 20 | <if test="alarmStatus != null and alarmStatus == 'noAlarm'"> |
21 | - and qtySum between lower and upper | |
21 | + and qtySum > lower and qtySum < upper | |
22 | 22 | </if> |
23 | 23 | <if test="alarmStatus != null and alarmStatus == 'isAlarm'"> |
24 | 24 | and (qtySum <= lower or qtySum >= upper or qtySum is null) |
... | ... |