From f72b0dc0ae80fee81a7a678deb0e3d97f89a0e1b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 21 八月 2024 09:23:46 +0800
Subject: [PATCH] #优化
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 83 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 79 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 2008981..98cb2b7 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -4,19 +4,23 @@
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.ArrayList;
-import java.util.List;
-import java.util.Map;
-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) {
@@ -69,6 +73,19 @@
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;
}
@@ -154,6 +171,10 @@
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) {
@@ -167,4 +188,58 @@
}
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