From 63b6ae940687d2de076ff74bff9aaa187d843d5d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 13 六月 2020 10:22:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 1 +
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 4 ++++
src/main/resources/mapper/LocMastMapper.xml | 3 +++
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 2 --
src/main/java/com/zy/common/service/CommonService.java | 1 +
5 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 5c8122e..8ece97a 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -147,6 +147,7 @@
for (List<Integer> node : shelves.nodes){
if (node.contains(r)) {
crnNo = shelves.nodes.indexOf(node) + 1;
+ break;
}
}
LocMast locMast = new LocMast();
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 5c690f8..6f84c0d 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -4,14 +4,12 @@
import com.zy.asrs.entity.LocMast;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface LocMastMapper extends BaseMapper<LocMast> {
- @Select("select top 1 * from asr_loc_mast where row1=#{row} and loc_type='O' order by loc_type desc ,lev1 asc,bay1 asc")
LocMast queryFreeLocMast(@Param("row") Integer row);
}
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 3dcdf3d..536b2ea 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -39,6 +39,10 @@
wrkDetl.setIoTime(new Date());
wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
wrkDetl.setAnfme((double) dto.getCount()); // 鏁伴噺
+ wrkDetl.setLgnum("寰呭畾"); // todo
+ wrkDetl.setTbnum(0); // todo
+ wrkDetl.setTbpos(0); // todo
+ wrkDetl.setZmatid("寰呭畾"); // todo
wrkDetl.setAppeUser(userId);
wrkDetl.setAppeTime(new Date());
wrkDetl.setModiUser(userId);
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 117d794..8eae96c 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -100,6 +100,7 @@
for (List<Integer> node : shelves.nodes){
if (node.contains(curRow)) {
crnNo = shelves.nodes.indexOf(node) + 1;
+ break;
}
}
BasCrnp crnp = basCrnpService.selectById(crnNo);
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 3664a87..64b64b7 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -35,4 +35,7 @@
</resultMap>
+ <select id="queryFreeLocMast" resultMap="BaseResultMap">
+ select top 1 * from asr_loc_mast where row1=#{row} and loc_type='O' order by loc_type desc ,lev1 asc,bay1 asc
+ </select>
</mapper>
--
Gitblit v1.9.1