From c590106e1e4d08aa83b08d6e8d083aac38df6aec Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 05 十月 2023 10:21:32 +0800
Subject: [PATCH] #设备命令下发增加设备工作号
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
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 a6f231a..10265ee 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -124,6 +124,7 @@
anfme = anfme > issued ? issued : anfme;
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderNo, anfme);
List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ioType);
+
locDto.setStaNos(staNos);
locDto.setCsocode(csocode);
locDto.setIsoseq(isoseq);
@@ -187,7 +188,7 @@
private void wapperSetCondition(Wrapper wrapper,String column, String condition){
if(Cools.isEmpty(condition)){
- wrapper.isNull(column);
+ wrapper.andNew().eq(column,"").or().isNull(column);
}else {
wrapper.eq(column,condition);
}
--
Gitblit v1.9.1