From f78cdcd32b1b872efce68e6a45aba7181df1f9fb Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 29 五月 2024 10:30:53 +0800
Subject: [PATCH] # 组托入库取消任务回退入库单作业数量，更新作业站点为空接驳位
---
src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
index 733612b..d39cf02 100644
--- a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
@@ -7,7 +7,11 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.StaDesc;
import com.zy.asrs.mapper.StaDescMapper;
+import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.StaDescService;
+import com.zy.asrs.utils.Utils;
+import com.zy.common.service.CommonService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -15,22 +19,52 @@
@Service("staDescService")
public class StaDescServiceImpl extends ServiceImpl<StaDescMapper, StaDesc> implements StaDescService {
+ @Autowired
+ private LocMastService locMastService;
+
@Override
public List<Integer> queryOutStaNosByLocNo(String locNo, Integer typeNo) {
- return this.baseMapper.queryOutStaNosByLocNo(locNo, typeNo);
+ int crnNo = 0;
+ int row = Utils.getRow(locNo);
+ if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
+ crnNo = 1;
+ }
+ if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
+ crnNo = 3;
+ }
+ if (row == 1) {
+ crnNo = 1;
+ }
+ if (row == 31 || row == 32) {
+ crnNo = 3;
+ }
+ return this.baseMapper.queryOutStation();
+ //return this.baseMapper.queryOutStaNosByCrnNo(crnNo, typeNo);
}
@Override
public StaDesc queryCrnStn(Integer typeNo, Integer crnNo, Integer stnNo) {
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", typeNo)
- .eq("stn_no", stnNo)
- .eq("crn_no", crnNo);
+ .eq("stn_no", stnNo);
+ StaDesc staDesc = this.selectOne(wrapper);
+ if (staDesc == null) {
+ throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
+ }
+ return staDesc;
+ }
+
+ @Override
+ public StaDesc queryCrnStnAuto(Integer typeNo, Integer crnNo, Integer stnNo) {
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", typeNo)
+ .eq("stn_no", stnNo);
+ //.eq("crn_no", crnNo);
StaDesc staDesc = this.selectOne(wrapper);
if (staDesc == null) {
wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", typeNo)
- .eq("crn_no", crnNo);
+ .eq("type_no", typeNo);
+ //.eq("crn_no", crnNo);
List<StaDesc> staDescs = this.selectList(wrapper);
if (Cools.isEmpty(staDescs)) {
throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
@@ -41,4 +75,9 @@
return staDesc;
}
+ @Override
+ public StaDesc queryCrnStn(Integer crnNo) {
+ return this.baseMapper.queryCrnStn(crnNo);
+ }
+
}
--
Gitblit v1.9.1