From 0f3c5510248031f83d37613b06440faec1e58296 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 13 十一月 2023 14:39:33 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 41 +++++++++++++----------------------------
1 files changed, 13 insertions(+), 28 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 ac4939c..da0d56d 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -39,11 +39,11 @@
}
@Override
- public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch) {
+ public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch, String containerCode, String csoCode, String isoCode) {
if (anfme <= 0) {
- return this.baseMapper.deleteItem(locNo, matnr, batch) > 0;
+ return this.baseMapper.deleteItem(locNo, matnr, batch, containerCode, csoCode, isoCode) > 0;
} else {
- return baseMapper.updateAnfme(anfme, locNo, matnr, batch) > 0;
+ return baseMapper.updateAnfme(anfme, locNo, matnr, batch, containerCode, csoCode, isoCode) > 0;
}
}
@@ -121,6 +121,12 @@
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderNo, anfme);
List<Integer> outSite = basDevpService.getAvailableOutSite(101);
+ List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
+ pickOutSite.forEach(site -> {
+ if(!outSite.contains(site)){
+ outSite.add(site);
+ }
+ });
locDto.setStaNos(outSite);
locDto.setCsocode(csocode);
@@ -233,6 +239,10 @@
}
+ public LocDetl selectByContainerCode(String containerCode) {
+ return this.selectOne(new EntityWrapper<LocDetl>().eq("supp_code",containerCode));
+ }
+
@Override
public int updateStockFreeze(String matnr, String locNo, Integer stockFreeze) {
return this.baseMapper.updateStockFreeze(matnr, locNo, stockFreeze);
@@ -279,30 +289,5 @@
}
}
return locDetlsResort;
- }
-
- public static void main(String[] args) {
-
- List<LocDetl> locDetls = new ArrayList<>();
- LocDetl locDetl2 = new LocDetl();
- locDetl2.setLocNo("aaa1");
- LocDetl locDetl3 = new LocDetl();
- locDetl3.setLocNo("aaa2");
- locDetls.add(locDetl2);
- locDetls.add(locDetl3);
- System.out.println(locDetls.size());
-
- Set<LocDetl> set = new LinkedHashSet<>();
- LocDetl locDetl = new LocDetl();
- LocDetl locDetl1 = new LocDetl();
- locDetl.setLocNo("aaa");
- locDetl1.setLocNo("aaa");
-
- set.add(locDetl);
- set.add(locDetl1);
- set.addAll(locDetls);
-
- System.out.println(set);
- System.out.println(set.size());
}
}
--
Gitblit v1.9.1