From 97e9a5ee1a43ce18509554b2da8e1d174abbe0de Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期六, 30 三月 2024 13:21:42 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/LocDetlMapper.xml | 10 +++++++++-
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 5 +++++
2 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 42f3d88..05ae409 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -217,9 +217,14 @@
//agvWrkDetlService.update(agvWrkDetl,new EntityWrapper<AgvWrkDetl>().eq("wrk_no",agvWrkDetl.getWrkNo()));
//淇敼搴撳瓨淇℃伅
agvWrkDetlList.forEach(agvWrkDetl -> {
+ if(agvWrkDetl.getAnfme() <= 0){
+ return;
+ }
+
AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
//AgvLocDetl agvLocDetl = agvLocDetlService.selectLocdetl(agvWrkMast.getLocNo(),agvWrkDetl.getMatnr(),agvWrkDetl.getBatch(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());
+
double updateAnfme = agvLocDetl.getAnfme() - agvWrkDetl.getAnfme();
agvLocDetlService.updateAnfme(updateAnfme,agvLocDetl.getLocNo(),agvLocDetl.getMatnr(),agvLocDetl.getBatch(),agvLocDetl.getThreeCode(),agvLocDetl.getDeadTime());
});
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index b12be7f..859c22a 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -64,7 +64,15 @@
where 1=1
and loc_no = #{locNo}
and matnr = #{matnr}
- and (batch IS NULL OR batch = '')
+-- and (batch IS NULL OR batch = '')
+ <choose>
+ <when test="batch != null and batch != ''">
+ and batch = #{batch}
+ </when>
+ <!-- <otherwise>-->
+ <!-- and (supp_code IS NULL OR supp_code = '')-->
+ <!-- </otherwise>-->
+ </choose>
<choose>
<when test="suppCode != null and suppCode != ''">
and supp_code = #{suppCode}
--
Gitblit v1.9.1