From cd92182d01a20e85f60f6a5a595506ee8ed31ffc Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 02 十一月 2023 12:05:15 +0800
Subject: [PATCH] 库存统计明细修复
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 142 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 140 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index 6b637b0..7e212d6 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -1,35 +1,173 @@
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.AgvLocDetl;
+import com.zy.asrs.entity.AgvLocMast;
import com.zy.asrs.entity.AgvWrkDetl;
import com.zy.asrs.mapper.AgvLocDetlMapper;
+import com.zy.asrs.service.AgvBasDevpService;
import com.zy.asrs.service.AgvLocDetlService;
+import com.zy.asrs.service.AgvLocMastService;
import com.zy.asrs.service.AgvWrkDetlService;
+import com.zy.common.model.LocDto;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@Service
+@Slf4j
public class AgvLocDetlServiceImpl extends ServiceImpl<AgvLocDetlMapper, AgvLocDetl> implements AgvLocDetlService {
@Autowired
AgvWrkDetlService agvWrkDetlService;
+ @Autowired
+ AgvBasDevpService agvBasDevpService;
+ @Autowired
+ AgvLocMastService agvLocMastService;
public void addLocDetlInfo(String locNo, int taskCode) {
List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", taskCode));
- List<AgvLocDetl> agvLocDetlList = agvWrkDetls.stream().map(agvWrkDetl -> {
+ agvWrkDetls.stream().map(agvWrkDetl -> {
AgvLocDetl agvLocDetl = new AgvLocDetl();
+ log.info("agvWrkDetl: " + agvLocDetl.getBarcode());
BeanUtils.copyProperties(agvWrkDetl, agvLocDetl);
agvLocDetl.setLocNo(locNo);
+ this.insert(agvLocDetl);
return agvLocDetl;
}).collect(Collectors.toList());
- this.insertBatch(agvLocDetlList);
+ }
+ public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq) {
+ //鏍规嵁鐗╂枡鍙峰拰鎵规鎵惧埌瀵瑰簲鐨勫簱瀛橈紝骞朵笖鎸夌収淇敼鏃堕棿鎺掑簭
+ Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).orderBy("modi_time");
+
+ wapperSetCondition(wrapper,"batch",batch);
+ wapperSetCondition(wrapper,"three_code",csocode);
+ wapperSetCondition(wrapper,"dead_time",isoseq);
+
+ List<AgvLocDetl> agvLocDetls = this.selectList(wrapper);
+
+ for (AgvLocDetl agvLocDetl: agvLocDetls) {
+ //鍒ゆ柇褰撳墠搴撲綅璐х墿鏄惁F鍦ㄥ簱
+ AgvLocMast agvLocMast = agvLocMastService.selectById(agvLocDetl.getLocNo());
+ if(!"F".equals(agvLocMast.getLocSts())){
+ continue;
+ }
+ //濡傛灉璁㈠崟鍓╀綑鍑哄簱閲忓ぇ浜�0
+ if(issued > 0) {
+ //褰撳墠搴撲綅鐨勫簱瀛橀噺
+ double anfme = agvLocDetl.getAnfme();
+ //int ioType = anfme > issued ? 101 : 103;
+ anfme = anfme > issued ? issued : anfme;
+ LocDto locDto = new LocDto(agvLocDetl.getLocNo(), agvLocDetl.getMatnr(), agvLocDetl.getMaktx(), agvLocDetl.getBatch(), orderNo, anfme);
+ locDto.setCsocode(csocode);
+ locDto.setIsoseq(isoseq);
+ locDto.setContainerCode(agvLocDetl.getSuppCode());
+ //褰撳墠搴撲綅鎵�澶勬ゼ灞�
+ int floor = Integer.parseInt(agvLocDetl.getLocNo().split("@")[1]);
+ locDto.setAgvStaNos(queryAgvStaNosByFloor(floor));
+ locDtoList.add(locDto);
+
+ issued -= anfme;
+ }
+ }
+
+ return issued;
+
+ }
+
+ /*
+ 鏇存柊搴撳瓨鏄庣粏
+ */
+ public void updateStock(String sourceLoc, String targetLoc) {
+ this.baseMapper.updateStock(sourceLoc,targetLoc);
+ }
+
+ public Page<AgvLocDetl> getStockStatis(Page<AgvLocDetl> page) {
+ page.setRecords(baseMapper.getStockStatis1(page.getCondition()));
+ page.setTotal(baseMapper.getStockStatisCount(page.getCondition()));
+ return page;
+ }
+
+ /*
+ 鑾峰彇搴撳瓨鎬绘暟
+ */
+ public Integer sum() {
+ return this.baseMapper.sum();
+ }
+
+ public List<AgvLocDetl> getStockStatisExcel(){
+ return this.baseMapper.getStockStatisExcel();
+ }
+
+ public List<AgvLocDetl> 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<AgvLocDetl>();
+ }
+ EntityWrapper<AgvLocDetl> wrapper = new EntityWrapper<>();
+ if(Cools.isEmpty(orderNo)){
+ wrapper.like("order_no",orderNo);
+ }
+ if(Cools.isEmpty(matnr)){
+ wrapper.like("matnr",matnr);
+ }
+ if(Cools.isEmpty(maktx)){
+ wrapper.like("maktx",maktx);
+ }
+ if(Cools.isEmpty(specs)){
+ wrapper.like("specs",specs);
+ }
+ if(Cools.isEmpty()){
+ wrapper.like("loc_no",locNo);
+ }
+ return this.selectList(wrapper);
+ }
+
+ public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch) {
+ if (anfme <= 0) {
+ return this.delete(new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).eq("loc_no", locNo));
+ } else {
+ AgvLocDetl agvLocDetl = this.selectOne(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo).eq("matnr", matnr));
+ agvLocDetl.setAnfme(anfme);
+ return this.update(agvLocDetl,new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo).eq("matnr", matnr));
+ //return baseMapper.updateAnfme(anfme, locNo, matnr, batch) > 0;
+ }
+ }
+
+ private List<String> queryAgvStaNosByFloor(int floor){
+ List<String> agvStaNos = new ArrayList<>();
+ if(floor == 1){
+ agvStaNos.add("CS-101");
+ agvStaNos.add("CS-102");
+ }else if(floor ==3){
+ agvStaNos.add("CS-305");
+ agvStaNos.add("CS-306");
+ agvStaNos.add("CS-307");
+ }
+
+ return agvStaNos;
+ }
+
+ private void wapperSetCondition(Wrapper wrapper,String column, String condition){
+ if(Cools.isEmpty(condition)){
+ wrapper.andNew().eq(column,"").or().isNull(column);
+ //wrapper.isNull(column);
+ }else {
+ wrapper.eq(column,condition);
+ }
+ }
+
+ public AgvLocDetl selectByLocNo(String locNo){
+ return this.selectOne(new EntityWrapper<AgvLocDetl>().eq("loc_no",locNo));
}
}
--
Gitblit v1.9.1