From fc80e4040d6bf39b8657f94df1f957732bae26fe Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 22 四月 2026 22:02:31 +0800
Subject: [PATCH] 电视机入库出库显示耗时、托数功能修改： 1.入库耗时改成当前订单第一托入库任务创建时间到后续入库的创建时间相减转换成分钟 2.出库耗时改成当前订订单任务创建时间减去到达出库口的耗时时间 3.入库托数改成当前入库订单号累计入库数量
---
src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 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 c92d7e8..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);
@@ -32,6 +36,33 @@
}
return staDesc;
}
+
+ @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) {
@@ -54,4 +85,9 @@
return staDesc;
}
+ @Override
+ public StaDesc queryCrnStn(Integer crnNo) {
+ return this.baseMapper.queryCrnStn(crnNo);
+ }
+
}
--
Gitblit v1.9.1