From 986b82b0941b98c2d9896214823679e12abffcae Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期二, 31 一月 2023 14:57:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfwcs' into bfwcs
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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..50c1f68 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,24 @@
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;
+ }
+ List<WrkMast> wrkMasts1 = wrkMastMapper.selectWrkStsAndIoType(103);
+ if (wrkMasts1.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;
+ }
+ List<WrkMast> wrkMasts2 = wrkMastMapper.selectWrkStsAndIoType(203);
+ if (wrkMasts2.size()!=0){
continue;
}
break;
@@ -1000,7 +1009,7 @@
if (wrkMast.getWrkSts() == 11 && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107)){
Integer sour = wrkMast.getStaNo();
List<WrkMast> wrkMasts = wrkMastMapper.selectWrkStsAndIoType(sour);
- if (wrkMasts.size()!=0){
+ if (wrkMasts.size() > 0){
continue;
}
}
--
Gitblit v1.9.1