From 45d827fd5d00bb62462669e8b4e9434309d542ab Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 01 四月 2024 16:45:36 +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 | 6 +++++-
src/main/resources/mapper/LocDetlMapper.xml | 12 ++++++++++++
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 5 +++++
5 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index bc2cd84..9ac1300 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -28,4 +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);
+
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 737a98c..dde40e2 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -24,4 +24,6 @@
*/
List<String> getSameDetlToday(String matnr, Integer start, Integer end);
+ Double 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 57f3645..ff9267c 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -40,4 +40,9 @@
return this.baseMapper.selectSameDetlToday(matnr, start, end);
}
+ @Override
+ public Double 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 f5a33ad..7fc9f50 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1608,7 +1608,11 @@
// ledCommand.setSourceStaNo(wrkMast.getSourceStaNo());
if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
- wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(),wrkDetl.getSpecs())));
+ for (WrkDetl wrkDetl : wrkDetls){
+ Double aDouble = locDetlService.selectMatnrSpecs(wrkDetl.getMatnr(), wrkDetl.getSpecs(), wrkMast.getSourceLocNo());
+ wrkDetl.setWeight(aDouble);
+ }
+ wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(),wrkDetl.getWeight(),wrkDetl.getSpecs())));
}
commands.add(ledCommand);
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 4fb3cbf..94b45c0 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -90,4 +90,16 @@
and b.loc_sts = 'F'
<include refid="stockOutCondition"></include>
</select>
+
+ <select id="selectMatnrSpecs" resultType="java.lang.Ddouble">
+ select
+ a.anfme
+ 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