From e8eb22e3ab73fabe436b8c24d372e7f48b711b30 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 10 四月 2024 16:52:36 +0800
Subject: [PATCH] 后台检验数量
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 201 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 180 insertions(+), 21 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 736601e..65121a2 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -2,8 +2,10 @@
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.core.exception.CoolException;
import com.zy.asrs.entity.AgvLocDetl;
import com.zy.asrs.entity.AgvLocMast;
import com.zy.asrs.entity.AgvWrkDetl;
@@ -12,16 +14,30 @@
import com.zy.asrs.service.AgvLocDetlService;
import com.zy.asrs.service.AgvLocMastService;
import com.zy.asrs.service.AgvWrkDetlService;
+import com.zy.asrs.utils.Utils;
import com.zy.common.model.LocDto;
+import com.zy.common.model.TaskDto;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.DataFormatter;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@Service
+@Slf4j
public class AgvLocDetlServiceImpl extends ServiceImpl<AgvLocDetlMapper, AgvLocDetl> implements AgvLocDetlService {
@Autowired
@@ -33,8 +49,9 @@
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);
@@ -43,14 +60,14 @@
}
- public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued) {
+ 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");
- if(Cools.isEmpty(batch)){
- wrapper.isNull("batch");
- }else {
- wrapper.eq("batch",batch);
- }
+
+ wapperSetCondition(wrapper,"batch",batch);
+ wapperSetCondition(wrapper,"three_code",csocode);
+ wapperSetCondition(wrapper,"dead_time",isoseq);
+
List<AgvLocDetl> agvLocDetls = this.selectList(wrapper);
for (AgvLocDetl agvLocDetl: agvLocDetls) {
@@ -65,11 +82,18 @@
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);
-
+ //鐢ㄤ簬鏄剧ず宸ヤ綔鏄庣粏妗ｇ殑璁㈠崟鍙�
+ String orderNoWrkDtel = Utils.getOrderNo(orderNo,anfme);
+ //鏇存柊璁㈠崟鏁伴噺
+ orderNo = Utils.orderMergeUpdate(orderNo,anfme);
+ LocDto locDto = new LocDto(agvLocDetl.getLocNo(), agvLocDetl.getMatnr(), agvLocDetl.getMaktx(), agvLocDetl.getBatch(), orderNoWrkDtel, anfme);
+ locDto.setCsocode(csocode);
+ locDto.setIsoseq(isoseq);
+ locDto.setContainerCode(agvLocDetl.getSuppCode());
//褰撳墠搴撲綅鎵�澶勬ゼ灞�
- int floor = Integer.parseInt(agvLocDetl.getLocNo().split("@")[1]);
- locDto.setAgvStaNos(queryAgvStaNosByFloor(floor));
+ int floor = Integer.parseInt(agvLocDetl.getLocNo().split("F")[1]);
+ //locDto.setAgvStaNos(queryAgvStaNosByFloor(floor));
+ locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1()));
locDtoList.add(locDto);
issued -= anfme;
@@ -80,17 +104,152 @@
}
- 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");
+ /*
+ 鏇存柊搴撳瓨鏄庣粏
+ */
+ 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, String csocode, String isocode) {
+ EntityWrapper<AgvLocDetl> wrapper = new EntityWrapper<>();
+ wrapper.eq("loc_no", locNo);
+ Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode);
+ if (anfme <= 0) {
+ return this.baseMapper.deleteLocDetl(locNo,anfme,matnr,batch,csocode,isocode) > 0;
+ } else {
+ AgvLocDetl agvLocDetl = this.selectOne(wrapper);
+ agvLocDetl.setAnfme(anfme);
+ return this.baseMapper.updateAnfme(locNo,anfme,matnr,batch,csocode,isocode) > 0;
+ }
+ }
+
+
+ private void wapperSetCondition(Wrapper wrapper,String column, String condition){
+ if(Cools.isEmpty(condition)){
+ wrapper.andNew().eq(column,"").or().isNull(column);
+ }else {
+ wrapper.andNew().eq(column,condition);
+ }
+ }
+
+ public AgvLocDetl selectByLocNo(String locNo){
+ return this.selectOne(new EntityWrapper<AgvLocDetl>().eq("loc_no",locNo));
+ }
+
+ @Override
+ public List<AgvLocDetl> selectByTaskDto(TaskDto taskDto) {
+ List<AgvLocDetl> agvLocDetls = new ArrayList<>();
+
+ taskDto.getLocDtos().forEach(locDto -> {
+ AgvLocDetl agvLocDetl = this.selectByMatnrAndBatchAndCsocodeAndisoCode(locDto.getLocNo(),locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
+ agvLocDetls.add(agvLocDetl);
+ });
+ return agvLocDetls;
+ }
+
+ @Override
+ public AgvLocDetl selectByMatnrAndBatchAndCsocodeAndisoCode(String locNo, String matnr, String batch, String csocode, String isocode) {
+ EntityWrapper<AgvLocDetl> wrapper = new EntityWrapper<>();
+ wrapper.eq("loc_no",locNo);
+ Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode);
+ return this.selectOne(wrapper);
+ }
+
+ @Override
+ public Double selectSumAnfmeByLocNo(String locNo) {
+ return this.baseMapper.sumByLocNo(locNo);
+ }
+
+ @Override
+ public Double selectSumAnfmeByMatnr(String matnr) {
+ return this.baseMapper.sumByMatnr(matnr);
+ }
+
+ @Override
+ public AgvLocDetl selectLocdetl(String locNo, String matnr, String batch, String csocode, String isocode) {
+ return this.baseMapper.selectLocdetl(locNo,matnr,batch,csocode,isocode);
+ }
+
+ @Override
+ public void compareToEss(MultipartFile file) throws IOException {
+ InputStream inStream = file.getInputStream();
+ String fileMime = file.getContentType();
+ int excelVersion = 2007;
+ if ("application/vnd.ms-excel".equals(fileMime)) {
+ excelVersion = 2003;
+ }
+ Workbook book = null;
+ try {
+ if (excelVersion == 2003) {
+ book = new HSSFWorkbook(inStream);
+ }
+ else { // 褰� excel 鏄� 2007 鏃�
+ book = new XSSFWorkbook(inStream);
+ }
+ } catch (Exception e) {
+ log.error("fail", e);
+ throw new CoolException("瀵煎叆鏂囦欢鏍煎紡閿欒锛岃浣跨敤xls鍚庣紑鐨勬枃浠讹紒");
}
- return agvStaNos;
+ Sheet sheet = book.getSheetAt(0);
+ int totalRows = sheet.getLastRowNum() + 1; // 鎬�
+ Date now = new Date();
+ DataFormatter dataFormatter = new DataFormatter();
+ for (int i = 0; i < totalRows; i++) {
+ Row row = sheet.getRow(i);
+ // 搴撲綅鍙�
+ String locNo = dataFormatter.formatCellValue(row.getCell(0));
+ // 瀹瑰櫒鐮�
+ String containerCode = dataFormatter.formatCellValue(row.getCell(1));
+
+ List<AgvLocDetl> agvLocDetls = this.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo).eq("supp_code", containerCode));
+ if(Cools.isEmpty(agvLocDetls)){
+ log.info("搴撲綅鍙凤細" + locNo + "锛屽鍣ㄧ爜锛�" + containerCode + "锛屼笉瀛樺湪鏄庣粏");
+ }
+ if(agvLocDetls.size()>1){
+ log.info("搴撲綅鍙凤細" + locNo + "锛屽鍣ㄧ爜锛�" + containerCode + "锛屽瓨鍦�1鏉′互涓婅褰�");
+ }
+ }
}
}
--
Gitblit v1.9.1