From 2002142e29ed84ae83d55a9ceedb90d13ef84aaf Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 16 四月 2024 17:05:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 af9589a..00fe50d 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -58,6 +58,11 @@
}
@Override
+ public List<String> getSameLevDetl(String matnr, Integer lev) {
+ return this.baseMapper.selectSameLevDetl(matnr, lev);
+ }
+
+ @Override
public List<String> getSameDetlToday(String matnr, Integer start, Integer end) {
return this.baseMapper.selectSameDetlToday(matnr, start, end);
}
@@ -118,7 +123,13 @@
double anfme = locDetl.getAnfme();
int ioType = anfme > issued ? 103 : 101;
anfme = anfme > issued ? issued : anfme;
- LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderNo, anfme);
+
+ //鐢ㄤ簬鏄剧ず宸ヤ綔鏄庣粏妗ｇ殑璁㈠崟鍙�
+ String orderNoWrkDtel = Utils.getOrderNo(orderNo,anfme);
+ //鏇存柊璁㈠崟鏁伴噺
+ orderNo = Utils.orderMergeUpdate(orderNo,anfme);
+
+ LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderNoWrkDtel, anfme);
List<Integer> outSite = basDevpService.getAvailableOutSite(101);
List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
@@ -244,6 +255,12 @@
}
@Override
+ public List<LocDetl> selectByLocWithoutContainer(String locNo) {
+ return this.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo)
+ .andNew().eq("supp_code", "").or().isNull("supp_code"));
+ }
+
+ @Override
public int updateStockFreeze(String matnr, String locNo, Integer stockFreeze) {
return this.baseMapper.updateStockFreeze(matnr, locNo, stockFreeze);
}
@@ -252,7 +269,7 @@
if(Cools.isEmpty(condition)){
wrapper.andNew().eq(column,"").or().isNull(column);
}else {
- wrapper.eq(column,condition);
+ wrapper.andNew().eq(column,condition);
}
}
--
Gitblit v1.9.1