From 506eef53323dddf4fefd2873be1c65942dac19b2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 09 九月 2025 09:48:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 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 1b995a3..efe6217 100644
--- a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
@@ -7,14 +7,18 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.StaDesc;
import com.zy.asrs.mapper.StaDescMapper;
+import com.zy.asrs.mapper.WrkMastStaMapper;
+import com.zy.asrs.service.MatService;
import com.zy.asrs.service.StaDescService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service("staDescService")
public class StaDescServiceImpl extends ServiceImpl<StaDescMapper, StaDesc> implements StaDescService {
-
+ @Autowired
+ private WrkMastStaMapper wrkMastStaMapper;
@Override
public List<Integer> queryOutStaNosByLocNo(String locNo, Integer typeNo) {
return this.baseMapper.queryOutStaNosByLocNo(locNo, typeNo);
@@ -34,6 +38,33 @@
}
@Override
+ public StaDesc queryCrnStnCheck(Integer typeNo, Integer crnNo, Integer stnNo) {
+ Integer wrkRgv1 = wrkMastStaMapper.wrkCount1();
+ Integer wrkRgv2 = wrkMastStaMapper.wrkCount2();
+
+ Wrapper<StaDesc> wrapper = new EntityWrapper<>();
+
+ // 鉁� 濡傛灉 wrkRgv1 < wrkRgv2锛屽垯澶氬姞涓�涓潯浠�
+ if (wrkRgv1 < wrkRgv2) {
+ wrapper.eq("type_no", typeNo)
+ .eq("stn_no", stnNo)
+ .eq("crn_no", crnNo)
+ .lt("crn_stn", 2000);
+ }else{
+ wrapper.eq("type_no", typeNo)
+ .eq("stn_no", stnNo)
+ .eq("crn_no", crnNo)
+ .gt("crn_stn", 2000);
+ }
+ 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)
--
Gitblit v1.9.1