From fed4c282b7763ec52e4b24e2b6237d5a984dac09 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 30 十一月 2023 16:13:44 +0800
Subject: [PATCH] #盘点出库校验
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 51 +++++++++++++++++++++------------------------------
1 files changed, 21 insertions(+), 30 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..ef94416 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);
@@ -218,10 +224,10 @@
return this.baseMapper.selectLocNo(matnr);
}
- public Set<String> selectLocNo(String matnr, String batch, String csocode, String isocode) {
+ public Set<String> selectLocNos(String matnr) {
Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>().eq("matnr", matnr);
- Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode);
+ //Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode);
List<LocDetl> locDetls = this.selectList(wrapper);
Set<String> locNos = new HashSet<>();
@@ -231,6 +237,16 @@
return locNos;
+ }
+
+ public LocDetl selectByContainerCode(String containerCode) {
+ return this.selectOne(new EntityWrapper<LocDetl>().eq("supp_code",containerCode));
+ }
+
+ @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
@@ -279,30 +295,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