From 337f6d74c6b80fdb60f23103f1a8e902628cd978 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期二, 31 一月 2023 14:43:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index c81e106..9a993f5 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -7,6 +7,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasCrnErrorMapper;
+import com.zy.asrs.mapper.BasDevpMapper;
import com.zy.asrs.mapper.WrkChargeMapper;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
@@ -91,6 +92,8 @@
private CommonService commonService;
@Autowired
private WrkChargeMapper wrkChargeMapper;
+ @Autowired
+ private BasDevpMapper basDevpMapper;
/**
* 缁勬墭
@@ -304,18 +307,16 @@
case 104:
case 108:
staNo = 103;
- BasDevp basDevp1 = basDevpService.selectOne(new EntityWrapper<BasDevp>()
- .eq("dev_no", 104).or().eq("dev_no", 108).or().eq("dev_no", 109).eq("loading", "Y"));
- if (!Cools.isEmpty(basDevp1)){
+ List<BasDevp> basDevps1 = basDevpMapper.getLoading(103);
+ if (basDevps1.size()!=0){
continue;
}
break;
case 204:
case 208:
staNo = 203;
- BasDevp basDevp2 = basDevpService.selectOne(new EntityWrapper<BasDevp>()
- .eq("dev_no", 204).or().eq("dev_no", 208).or().eq("dev_no", 209).eq("loading", "Y"));
- if (!Cools.isEmpty(basDevp2)){
+ List<BasDevp> basDevps2 = basDevpMapper.getLoading(203);
+ if (basDevps2.size()!=0){
continue;
}
break;
--
Gitblit v1.9.1