From abcbc1657792026dbb9db86689141544e8d86b77 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 19 十月 2023 11:42:48 +0800
Subject: [PATCH] 补货单流程更新
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 198 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 192 insertions(+), 6 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 139c1d3..ee8b387 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -1,17 +1,38 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
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.BasDevpService;
import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.StaDescService;
+import com.zy.asrs.utils.Utils;
+import com.zy.common.model.LocDto;
+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.HashSet;
import java.util.List;
+import java.util.Set;
@Service("locDetlService")
public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
+
+ @Autowired
+ private StaDescService staDescService;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private BasDevpService basDevpService;
@Override
public Page<LocDetl> getStockOut(Page<LocDetl> page) {
@@ -21,18 +42,22 @@
}
@Override
- public boolean updateAnfme(Double anfme, String locNo, String matnr) {
+ public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch) {
if (anfme <= 0) {
- return delete(new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("matnr", matnr));
+ return this.baseMapper.deleteItem(locNo, matnr, batch) > 0;
} else {
- int res = baseMapper.updateAnfme(anfme, locNo, matnr);
- return res > 0;
+ return baseMapper.updateAnfme(anfme, locNo, matnr, batch) > 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
@@ -69,7 +94,168 @@
}
@Override
- public List<LocDetl> queryStock(String matnr, String batch, String orderNo) {
- return this.baseMapper.queryStock(matnr, batch, orderNo);
+ public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
+ List<LocDetl> result = new ArrayList<>();
+ List<QueryStockPreDo> preDos = this.baseMapper.queryStockPre(matnr);
+ for (QueryStockPreDo preDo : preDos) {
+ List<LocDetl> locDetls = this.baseMapper.queryStock(matnr, preDo.getNo(), preDo.getOrderBy(), preDo.getBay());
+ result.addAll(locDetls);
+ }
+ return result;
+ }
+
+ //鍑哄簱
+ public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq) {
+ Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>().eq("matnr", matnr).orderBy("modi_time");
+ wapperSetCondition(wrapper,"batch",batch);
+ wapperSetCondition(wrapper,"three_code",csocode);
+ wapperSetCondition(wrapper,"dead_time",isoseq);
+// if(Cools.isEmpty(batch)){
+// wrapper.isNull("batch");
+// }else {
+// wrapper.eq("batch",batch);
+// }
+
+ List<LocDetl> locDetlList = this.selectList(wrapper);
+ for (LocDetl locDetl : locDetlList) {
+ //鍒ゆ柇褰撳墠搴撲綅璐х墿鏄惁F鍦ㄥ簱
+ LocMast locMast = locMastService.selectById(locDetl.getLocNo());
+ if(!"F".equals(locMast.getLocSts())){
+ continue;
+ }
+ if (issued > 0) {
+ double anfme = locDetl.getAnfme();
+ int ioType = anfme > issued ? 103 : 101;
+ anfme = anfme > issued ? issued : anfme;
+ LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderNo, anfme);
+ //List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ioType);
+ List<Integer> outSite = basDevpService.getAvailableOutSite(101);
+
+ locDto.setStaNos(outSite);
+ locDto.setCsocode(csocode);
+ locDto.setIsoseq(isoseq);
+ locDto.setContainerCode(locDetl.getSuppCode());
+ locDtoList.add(locDto);
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl.getAnfme();
+ }
+ }
+ return issued;
+ }
+
+ //琛ヨ揣鍑哄簱
+ public double queryStockAndSetLocDto1(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq) {
+ Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>().eq("matnr", matnr).orderBy("modi_time");
+ wapperSetCondition(wrapper,"batch",batch);
+ wapperSetCondition(wrapper,"three_code",csocode);
+ wapperSetCondition(wrapper,"dead_time",isoseq);
+// if(Cools.isEmpty(batch)){
+// wrapper.isNull("batch");
+// }else {
+// wrapper.eq("batch",batch);
+// }
+
+ List<LocDetl> locDetlList = this.selectList(wrapper);
+ for (LocDetl locDetl : locDetlList) {
+ //鍒ゆ柇褰撳墠搴撲綅璐х墿鏄惁F鍦ㄥ簱
+ LocMast locMast = locMastService.selectById(locDetl.getLocNo());
+ if(!"F".equals(locMast.getLocSts())){
+ continue;
+ }
+ if (issued > 0) {
+ double anfme = locDetl.getAnfme();
+ int ioType = anfme > issued ? 103 : 101;
+ //anfme = anfme > issued ? issued : anfme;
+ LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderNo, anfme);
+ //List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ioType);
+ List<Integer> outSite = basDevpService.getAvailableOutSite(101);
+
+ locDto.setStaNos(outSite);
+ locDto.setCsocode(csocode);
+ locDto.setIsoseq(isoseq);
+ locDto.setContainerCode(locDetl.getSuppCode());
+ locDtoList.add(locDto);
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl.getAnfme();
+ }
+ }
+ return issued;
+ }
+
+ @Override
+ public Double queryStockAnfme(String matnr, String batch) {
+ return this.baseMapper.queryStockAnfme(matnr, batch);
+ }
+
+ @Override
+ public List<StockVo> queryStockTotal() {
+ return this.baseMapper.queryStockTotal();
+ }
+
+ /**
+ * 鑾峰彇搴撳瓨鎬绘暟
+ * @return
+ */
+ @Override
+ public Integer sum() {
+
+ return this.baseMapper.sum();
+ }
+
+ @Override
+ public List<LocDetl> unreason() {
+ return this.baseMapper.unreason();
+ }
+
+
+ @Override
+ public LocDetl selectItem(String locNo, String matnr, String batch,String suppCode) {
+ return this.baseMapper.selectItem(locNo, matnr, batch,suppCode);
+ }
+
+ @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> selectByLocNo(String locNo) {
+ return this.baseMapper.selectByLocNo(locNo);
+ }
+
+ @Override
+ public List<String> selectLocNo(String matnr) {
+ return this.baseMapper.selectLocNo(matnr);
+ }
+
+ public Set<String> selectLocNo(String matnr, String batch, String csocode, String isocode) {
+
+ Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>().eq("matnr", matnr);
+ Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode);
+ List<LocDetl> locDetls = this.selectList(wrapper);
+
+ Set<String> locNos = new HashSet<>();
+ locDetls.forEach(locDetl -> {
+ locNos.add(locDetl.getLocNo());
+ });
+
+ return locNos;
+
+ }
+
+ @Override
+ public int updateStockFreeze(String matnr, String locNo, Integer stockFreeze) {
+ return this.baseMapper.updateStockFreeze(matnr, locNo, stockFreeze);
+ }
+
+ private void wapperSetCondition(Wrapper wrapper,String column, String condition){
+ if(Cools.isEmpty(condition)){
+ wrapper.andNew().eq(column,"").or().isNull(column);
+ }else {
+ wrapper.eq(column,condition);
+ }
}
}
--
Gitblit v1.9.1