From edbf54064b70a6311a98eeefc7516a35287e6b44 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期日, 08 五月 2022 15:28:00 +0800
Subject: [PATCH] Merge branch 'jkasrs' of http://47.97.1.152:5880/r/zy-asrs into jkasrs
---
src/main/resources/mapper/WrkDetlMapper.xml | 12 ++++++++++++
src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java | 1 +
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 5 +++++
src/main/java/com/zy/asrs/controller/MobileController.java | 10 +++-------
src/main/java/com/zy/asrs/service/WrkDetlService.java | 2 ++
5 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 79d5a80..4b690b8 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -121,12 +121,8 @@
}
if (!Cools.isEmpty(matnr)) {
if (!Cools.isEmpty(staNo)) {
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("sta_no", staNo).eq("wrk_sts", 14L));
- if (!Cools.isEmpty(wrkMasts)) {
- WrkMast wrkMast = wrkMasts.get(0);
- List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
- return R.ok().add(wrkDetls);
- }
+ List<WrkDetl> wrkDetls = wrkDetlService.selectPakoutQuery(staNo, matnr);
+ return R.ok().add(wrkDetls);
}
}
return R.ok();
@@ -164,7 +160,7 @@
}
}
}
- return R.ok();
+ return R.ok("瀹屾垚纭");
}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
index 6f9c479..97d48d8 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
@@ -22,4 +22,5 @@
int updateInspect( @Param("wrkNo")Integer wrkNo, @Param("matnr")String matnr, @Param("batch")String batch);
+ List<WrkDetl> selectPakoutQuery(@Param("staNo")Integer staNo, @Param("matnr")String matnr);
}
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlService.java b/src/main/java/com/zy/asrs/service/WrkDetlService.java
index 045d88e..5e0de95 100644
--- a/src/main/java/com/zy/asrs/service/WrkDetlService.java
+++ b/src/main/java/com/zy/asrs/service/WrkDetlService.java
@@ -18,4 +18,6 @@
boolean updateInspect(Integer wrkNo, String matnr, String batch);
+ List<WrkDetl> selectPakoutQuery(Integer staNo, String matnr);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index e107f79..a911107 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -75,4 +75,9 @@
public boolean updateInspect(Integer wrkNo, String matnr, String batch) {
return this.baseMapper.updateInspect(wrkNo, matnr, batch) > 0;
}
+
+ @Override
+ public List<WrkDetl> selectPakoutQuery(Integer staNo, String matnr) {
+ return this.baseMapper.selectPakoutQuery(staNo, matnr);
+ }
}
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 6bb6870..225f31e 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -96,4 +96,16 @@
<include refid="batchSeq"></include>
</update>
+ <select id="selectPakoutQuery" resultMap="BaseResultMap">
+ select
+ awd.*
+ from asr_wrk_detl awd
+ left join asr_wrk_mast awm on awd.wrk_no = awm.wrk_no
+ where 1=1
+ and awm.wrk_sts = 14
+ and (awd.inspect is null or awd.inspect = 0)
+ and awm.sta_no = #{staNo}
+ and awd.matnr + '-' + awd.batch = #{matnr}
+ </select>
+
</mapper>
--
Gitblit v1.9.1