From 21d0e7ab9d5c7316225a3e9eecf465cd37c9bd85 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 六月 2025 14:15:07 +0800
Subject: [PATCH] 123
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 147 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 143 insertions(+), 4 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 b2141f1..98cb2b7 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -2,17 +2,25 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.utils.Utils;
+import com.zy.common.model.QueryStockPreDo;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
@Service("locDetlService")
public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
+
+ @Autowired
+ private LocMastService locMastService;
@Override
public Page<LocDetl> getStockOut(Page<LocDetl> page) {
@@ -26,13 +34,27 @@
if (anfme <= 0) {
return this.baseMapper.deleteItem(locNo, matnr, batch) > 0;
} else {
- return baseMapper.updateAnfme(anfme, locNo, matnr, batch) > 0;
+ return baseMapper.updateAnfme(anfme, locNo, matnr, batch, null, null) > 0;
+ }
+ }
+
+ @Override
+ public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch, String manu, String memo) {
+ if (anfme <= 0) {
+ return this.baseMapper.deleteItem(locNo, matnr, batch) > 0;
+ } else {
+ return baseMapper.updateAnfme(anfme, locNo, matnr, batch, manu, memo) > 0;
}
}
@Override
public boolean updateLocNo(String newLocNo, String oldLocNo) {
return baseMapper.updateLocNo(newLocNo, oldLocNo) > 0;
+ }
+
+ @Override
+ public List<String> getSameDetl(String matnr) {
+ return this.baseMapper.selectSameDetl(matnr);
}
@Override
@@ -45,6 +67,25 @@
public Page<LocDetl> getStockStatis(Page<LocDetl> page) {
page.setRecords(baseMapper.getStockStatis(page.getCondition()));
page.setTotal(baseMapper.getStockStatisCount(page.getCondition()));
+ return page;
+ }
+ @Override
+ public Page<LocDetl> getStockStatis2(Page<LocDetl> page) {
+ page.setRecords(baseMapper.getStockStatis2(page.getCondition()));
+ page.setTotal(baseMapper.getStockStatisCount(page.getCondition()));
+ return page;
+ }
+ @Override
+ public Page<LocDetl> getStockStatisDate(Page<LocDetl> page) {
+ page.setRecords(baseMapper.getStockStatisDate(page.getCondition()));
+ page.setTotal(baseMapper.getStockStatisDateCount(page.getCondition()));
+ return page;
+ }
+
+ @Override
+ public Page<LocDetl> getStockStatisOut(Page<LocDetl> page) {
+ page.setRecords(baseMapper.getStockStatisOut(page.getCondition()));
+ page.setTotal(baseMapper.getStockStatisOutCount(page.getCondition()));
return page;
}
@@ -70,7 +111,13 @@
@Override
public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
- return this.baseMapper.queryStock(matnr, batch, orderNo, locNos);
+ List<LocDetl> result = new ArrayList<>();
+ List<QueryStockPreDo> preDos = this.baseMapper.queryStockPre(matnr, batch);
+ for (QueryStockPreDo preDo : preDos) {
+ List<LocDetl> locDetls = this.baseMapper.queryStock(matnr, batch, preDo.getNo(), preDo.getOrderBy(), preDo.getBay());
+ result.addAll(locDetls);
+ }
+ return result;
}
@Override
@@ -98,9 +145,101 @@
return this.baseMapper.unreason();
}
+ /**
+ * 閫氳繃鐗╂枡浠ｇ爜鑾峰彇搴撳瓨鎬绘暟閲�
+ * @param matnr
+ * @return
+ */
+ @Override
+ public Double selectSumByMatnr(String matnr) {
+ Double aDouble = this.baseMapper.selectSumByMatnr(matnr);
+ if (aDouble == null) {
+ return 0.0;
+ }else {
+ return aDouble;
+
+ }
+ }
+
+ @Override
+ public List<LocDetl> selectGroupPage(Map<String, Object> param, Integer curr, Integer limit) {
+ return this.baseMapper.selectGroupPage(param);
+ }
+
+ @Override
+ public List<LocDetl> selectByLocNo(String locNo) {
+ return this.baseMapper.selectByLocNo(locNo);
+ }
+
+ @Override
+ public List<LocDetl> selectByLocNosAndMatnr(List<String> locNos, String matnr) {
+ return this.baseMapper.selectByLocNosAndMatnr(locNos, matnr);
+ }
@Override
public LocDetl selectItem(String locNo, String matnr, String batch) {
return this.baseMapper.selectItem(locNo, matnr, batch);
}
+
+ @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<LocDetl>();
+ }
+ return this.baseMapper.searchByLike(orderNo, matnr, maktx, specs, locNo);
+ }
+
+ @Override
+ public List<LocDetl> findHighAreaByMatnr(String matnr) {
+ return this.baseMapper.findAreaByMatnr(matnr, 2);
+ }
+
+ @Override
+ public List<LocDetl> findSingleAreaByMatnr(String matnr) {
+ ArrayList<LocDetl> list = new ArrayList<>();
+ List<LocDetl> locDetls = this.baseMapper.findAreaByMatnr(matnr, 1);
+
+ //灏嗘煡鍑烘潵鐨勬暟鎹繘琛屾帓搴忋��1-3锛�8-11锛�15-18row闇�瑕侀鍊掗『搴�
+ for (LocDetl locDetl : locDetls) {
+ if (list.contains(locDetl)) {
+ continue;
+ }
+
+ String locNo = locDetl.getLocNo();
+ List<String> outerSingleLoc = Utils.getGroupLoc(locNo);
+ List<LocMast> locMasts = locMastService.selectByLocNos(outerSingleLoc);
+ int locRow = Utils.getRow(locNo);
+ if (locRow >= 1 && locRow <= 3
+ || locRow >= 8 && locRow <= 11
+ || locRow >= 15 && locRow <= 18) {
+ Collections.reverse(locMasts);
+ }
+
+ for (LocMast locMast : locMasts) {
+ if (!locMast.getLocSts().equals("F")) {
+ continue;
+ }
+
+ if (locMast.getLocType2() != 1) {
+ continue;
+ }
+
+ for (LocDetl detl : this.baseMapper.selectByLocNo(locMast.getLocNo())) {
+ if (detl.getMatnr().equals(locDetl.getMatnr())) {
+ if (!list.contains(detl)) {
+ list.add(detl);
+ }
+ }
+ }
+
+ }
+
+ }
+ return list;
+ }
+
+ @Override
+ public List<LocDetl> findLowAreaByMatnr(String matnr) {
+ return this.baseMapper.findAreaByMatnr(matnr, 3);
+ }
}
--
Gitblit v1.9.1