From cda03cb23bc12f582029ac8d6df103d86e61fc8b Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 02 十月 2023 13:48:57 +0800
Subject: [PATCH] AGV调试更改 工作档自增
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index bf76e41..7353979 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -34,7 +34,7 @@
public void addLocDetlInfo(String locNo, int taskCode) {
List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", taskCode));
- List<AgvLocDetl> agvLocDetlList = agvWrkDetls.stream().map(agvWrkDetl -> {
+ agvWrkDetls.stream().map(agvWrkDetl -> {
AgvLocDetl agvLocDetl = new AgvLocDetl();
BeanUtils.copyProperties(agvWrkDetl, agvLocDetl);
agvLocDetl.setLocNo(locNo);
@@ -69,7 +69,7 @@
LocDto locDto = new LocDto(agvLocDetl.getLocNo(), agvLocDetl.getMatnr(), agvLocDetl.getMaktx(), agvLocDetl.getBatch(), orderNo, anfme);
locDto.setCsocode(csocode);
locDto.setIsoseq(isoseq);
- locDto.setContainerCode(agvLocDetl.getZpallet());
+ locDto.setContainerCode(agvLocDetl.getSuppCode());
//褰撳墠搴撲綅鎵�澶勬ゼ灞�
int floor = Integer.parseInt(agvLocDetl.getLocNo().split("@")[1]);
locDto.setAgvStaNos(queryAgvStaNosByFloor(floor));
@@ -157,7 +157,8 @@
private void wapperSetCondition(Wrapper wrapper,String column, String condition){
if(Cools.isEmpty(condition)){
- wrapper.isNull(column);
+ wrapper.andNew().eq(column,"").or().isNull(column);
+ //wrapper.isNull(column);
}else {
wrapper.eq(column,condition);
}
--
Gitblit v1.9.1