From a1794b0884e26fb05a4cc22e346676a081f393b5 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 06 九月 2023 15:43:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 687ec72..af59cb4 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -817,7 +817,8 @@
@Override
@Transactional
public List<LocMast> packTestBasicInformation() {
- List<LocMast> locMasts=locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_type1", 1).and().ne("loc_sts","O"));
+ List<LocMast> locMasts=locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_type1", 1).and().ne("loc_sts","O")
+ .and().ne("loc_sts","X"));
for (LocMast locMast:locMasts) {
LocDetl locDetl=locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
if(Cools.isEmpty(locDetl)){
@@ -835,7 +836,7 @@
@Transactional
public List<PackUsageRate> packUsageRate() {
ArrayList<PackUsageRate> packUsageRates = new ArrayList<>();
- for (int i = 0 ;i<5;i++){
+ for (int i = 1 ;i<5;i++){
PackUsageRate packUsageRate = new PackUsageRate();
packUsageRate.setTotal(locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_type1", i)));
packUsageRate.setCurrentQuantity(locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_type1", i).and().ne("loc_sts","O")));
--
Gitblit v1.9.1