From 7d4d4849daf849f2676899a96ceabd8ade703a32 Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期二, 15 四月 2025 14:38:01 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 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 b8f2da8..2e14e9b 100644 --- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.core.common.Cools; import com.core.common.R; import com.zy.asrs.entity.FrozenParam; import com.zy.asrs.entity.LocDetl; @@ -12,6 +13,7 @@ import com.zy.asrs.service.LocDetlService; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; @@ -51,11 +53,12 @@ } @Override - public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch) { + public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch, + String brand,String standby1,String standby2,String standby3,String boxType1,String boxType2,String boxType3) { if (anfme <= 0) { - return this.baseMapper.deleteItem(locNo, matnr, batch) > 0; + return this.baseMapper.deleteItem(locNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3) > 0; } else { - return baseMapper.updateAnfme(anfme, locNo, matnr, batch) > 0; + return baseMapper.updateAnfme(anfme, locNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3) > 0; } } @@ -108,6 +111,13 @@ return this.baseMapper.queryStock(matnr, batch, orderNo, locNos); } + + + @Override + public List<LocDetl> queryStockAll(String orderNo, Set<String> locNos,String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) { + return this.baseMapper.queryStockAll(orderNo,locNos, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3); + } + @Override public Double queryStockAnfme(String matnr, String batch) { return this.baseMapper.queryStockAnfme(matnr, batch); @@ -135,8 +145,8 @@ @Override - public LocDetl selectItem(String locNo, String matnr, String batch) { - return this.baseMapper.selectItem(locNo, matnr, batch); + public LocDetl selectItem(String locNo, String matnr, String batch,String brand,String standby1,String standby2,String standby3,String boxType1,String boxType2,String boxType3) { + return this.baseMapper.selectItem(locNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3); } @Override @@ -166,6 +176,14 @@ } @Override + public List<LocDetl> searchByLike(String orderNo, String matnr, String maktx, String specs, String locNo) { + if (Cools.isEmpty(orderNo) && Cools.isEmpty(matnr) && Cools.isEmpty(maktx) && Cools.isEmpty(specs) && Cools.isEmpty(locNo)) { + return new ArrayList<>(); + } + return this.baseMapper.searchByLike(orderNo, matnr, maktx, specs, locNo); + } + + @Override public R frozenInventory(List<FrozenParam> param) { for(FrozenParam obj : param) { -- Gitblit v1.9.1