From c35602749d47a56b5c20783b82f9df49c00840db Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 06 七月 2020 10:10:48 +0800
Subject: [PATCH] #任务中心————拣料入库
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 4 ++++
src/main/java/com/zy/asrs/service/LocDetlService.java | 2 ++
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 11 ++++-------
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 3 +--
src/main/resources/mapper/WrkMastMapper.xml | 4 ++++
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 6 ++++++
src/main/java/com/zy/asrs/task/WcsDispatcher.java | 3 +--
8 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index a1c4763..73176e2 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.LocDetl;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Update;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -16,4 +17,7 @@
Integer getStockOutPageCount(Map<String, Object> map);
+ @Update("update asr_loc_detl set anfme=#{anfme}, modi_time = getDate() where loc_no = #{locNo} and matnr = #{matnr}")
+ int updateAnfme(Double anfme, String locNo, String matnr);
+
}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 2465f1c..8a62ed9 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.WrkMast;
import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -12,7 +11,7 @@
@Repository
public interface WrkMastMapper extends BaseMapper<WrkMast> {
- @Select("select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type <> 103 and io_type <> 104 and io_type <> 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no")
+// @Select("select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type <> 103 and io_type <> 104 and io_type <> 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no")
List<WrkMast> selectToBeCompleteData();
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 23e1a37..f9d29c7 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -8,4 +8,6 @@
Page<LocDetl> getStockOut(Page<LocDetl> page);
+ boolean updateAnfme(Double anfme, String locNo, String matnr);
+
}
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 593daa5..a7ec5d2 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -17,4 +17,10 @@
return page;
}
+ @Override
+ public boolean updateAnfme(Double anfme, String locNo, String matnr) {
+ int res = baseMapper.updateAnfme(anfme, locNo, matnr);
+ return res > 0;
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index 542452e..98efce8 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -19,6 +19,6 @@
@Override
public List<WrkMast> selectToBeCompleteData() {
- return this.selectToBeCompleteData();
+ return this.baseMapper.selectToBeCompleteData();
}
}
diff --git a/src/main/java/com/zy/asrs/task/WcsDispatcher.java b/src/main/java/com/zy/asrs/task/WcsDispatcher.java
index 455bd03..4c64198 100644
--- a/src/main/java/com/zy/asrs/task/WcsDispatcher.java
+++ b/src/main/java/com/zy/asrs/task/WcsDispatcher.java
@@ -4,7 +4,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
@@ -13,7 +12,7 @@
* 浠诲姟涓績璋冨害鍣�
* Created by vincent on 2020/7/4
*/
-@Component
+//@Component
public class WcsDispatcher {
private static Logger log = LoggerFactory.getLogger(WcsDispatcher.class);
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index a26d91d..d43ee82 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -81,9 +81,8 @@
for (WrkDetl wrkDetl : wrkDetls) {
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getLocNo()).eq("matnr", wrkDetl.getMatnr()));
if (null != locDetl) {
- locDetl.setAnfme(wrkDetl.getAnfme());
- locDetl.setModiTime(now);
- if (!locDetlService.updateById(locDetl)) {
+ boolean res = locDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getLocNo(), wrkDetl.getMatnr());
+ if (!res) {
exceptionHandle(""); // todo
}
} else {
@@ -144,13 +143,11 @@
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()).eq("matnr", wrkDetl.getMatnr()));
if (null != locDetl) {
if (wrkDetl.getAnfme() == 0) {
- if (!locDetlService.deleteById(locDetl)) {
+ if (!locDetlService.delete(new EntityWrapper<>(locDetl))) {
exceptionHandle(""); // todo
}
} else {
- locDetl.setAnfme(wrkDetl.getAnfme());
- locDetl.setModiTime(now);
- if (!locDetlService.updateById(locDetl)) {
+ if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr())) {
exceptionHandle(""); // todo
}
}
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index b3905fc..d2852af 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -62,4 +62,8 @@
</resultMap>
+ <select id="selectToBeCompleteData" resultMap="BaseResultMap">
+ select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type != 103 and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no
+ </select>
+
</mapper>
--
Gitblit v1.9.1