From 1fef790b451d19e6ea0555222e343abd47cfaa3d Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 01 四月 2024 17:07:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 2 +-
src/main/java/com/zy/asrs/service/LocDetlService.java | 2 +-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 ++--
src/main/resources/mapper/LocDetlMapper.xml | 5 ++---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 2 +-
5 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 9ac1300..c56db4c 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -28,6 +28,6 @@
@Select("SELECT ld.loc_no FROM asr_loc_detl ld LEFT JOIN asr_loc_mast lm ON ld.loc_no = lm.loc_no WHERE (1 = 1 AND ld.matnr = #{matnr} AND (lm.row1 >= #{start} AND lm.row1 <= #{end}) AND lm.loc_sts = 'F' AND DateDiff(dd, lm.modi_time, getdate()) = 0) ORDER BY lm.modi_time ASC")
List<String> selectSameDetlToday(@Param("matnr") String matnr, @Param("start") Integer start, @Param("end") Integer end);
- Double selectMatnrSpecs(@Param("matnr") String matnr, @Param("specs") String specs, @Param("locNo") String locNo);
+ LocDetl selectMatnrSpecs(@Param("matnr") String matnr, @Param("specs") String specs, @Param("locNo") String locNo);
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index dde40e2..c40aee5 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -24,6 +24,6 @@
*/
List<String> getSameDetlToday(String matnr, Integer start, Integer end);
- Double selectMatnrSpecs(String matnr, String specs, String locNo);
+ LocDetl selectMatnrSpecs(String matnr, String specs, String locNo);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index ff9267c..800bb1b 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -41,7 +41,7 @@
}
@Override
- public Double selectMatnrSpecs(String matnr, String specs, String locNo) {
+ public LocDetl selectMatnrSpecs(String matnr, String specs, String locNo) {
return this.baseMapper.selectMatnrSpecs(matnr, specs, locNo);
}
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 7fc9f50..4184656 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1609,8 +1609,8 @@
if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
for (WrkDetl wrkDetl : wrkDetls){
- Double aDouble = locDetlService.selectMatnrSpecs(wrkDetl.getMatnr(), wrkDetl.getSpecs(), wrkMast.getSourceLocNo());
- wrkDetl.setWeight(aDouble);
+ LocDetl locDetl = locDetlService.selectMatnrSpecs(wrkDetl.getMatnr(), wrkDetl.getSpecs(), wrkMast.getSourceLocNo());
+ wrkDetl.setWeight(locDetl.getAnfme());
}
wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(),wrkDetl.getWeight(),wrkDetl.getSpecs())));
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 94b45c0..36979f8 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -91,15 +91,14 @@
<include refid="stockOutCondition"></include>
</select>
- <select id="selectMatnrSpecs" resultType="java.lang.Ddouble">
+ <select id="selectMatnrSpecs" resultMap="BaseResultMap">
select
- a.anfme
+ top 1 *
from asr_loc_detl a
left join asr_loc_mast b on a.loc_no = b.loc_no
where 1=1
and b.loc_no = #{locNo}
and a.matnr = #{matnr}
and a.specs = #{specs}
- <include refid="stockOutCondition"></include>
</select>
</mapper>
--
Gitblit v1.9.1