From aea629d098bdab0918d90e0c51af9d7b099bca12 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 31 五月 2024 20:45:51 +0800
Subject: [PATCH] #新旧物料更新接口
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 103 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 80 insertions(+), 23 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 6b13866..66bfa57 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -5,6 +5,7 @@
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;
@@ -17,11 +18,21 @@
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;
@@ -71,13 +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));
+ //locDto.setAgvStaNos(queryAgvStaNosByFloor(floor));
+ locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByFloor(floor));
locDtoList.add(locDto);
issued -= anfme;
@@ -137,38 +153,23 @@
public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch, String csocode, String isocode) {
EntityWrapper<AgvLocDetl> wrapper = new EntityWrapper<>();
- Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode);
wrapper.eq("loc_no", locNo);
+ Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode);
if (anfme <= 0) {
- return this.delete(wrapper);
+ return this.baseMapper.deleteLocDetl(locNo,anfme,matnr,batch,csocode,isocode) > 0;
} else {
AgvLocDetl agvLocDetl = this.selectOne(wrapper);
agvLocDetl.setAnfme(anfme);
- return this.update(agvLocDetl,wrapper);
- //return baseMapper.updateAnfme(anfme, locNo, matnr, batch) > 0;
+ return this.baseMapper.updateAnfme(locNo,anfme,matnr,batch,csocode,isocode) > 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);
+ wrapper.andNew().eq(column,condition);
}
}
@@ -181,15 +182,16 @@
List<AgvLocDetl> agvLocDetls = new ArrayList<>();
taskDto.getLocDtos().forEach(locDto -> {
- AgvLocDetl agvLocDetl = this.selectByMatnrAndBatchAndCsocodeAndisoCode(locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
+ AgvLocDetl agvLocDetl = this.selectByMatnrAndBatchAndCsocodeAndisoCode(locDto.getLocNo(),locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
agvLocDetls.add(agvLocDetl);
});
return agvLocDetls;
}
@Override
- public AgvLocDetl selectByMatnrAndBatchAndCsocodeAndisoCode(String matnr, String batch, String csocode, String isocode) {
+ 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);
}
@@ -199,5 +201,60 @@
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鍚庣紑鐨勬枃浠讹紒");
+ }
+
+ 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鏉′互涓婅褰�");
+ }
+ }
+ }
+
+ @Override
+ public int updateNewMatnr(String matnrOld, String matnrNew) {
+ return this.baseMapper.updateNewMatnr(matnrOld, matnrNew);
+ }
}
--
Gitblit v1.9.1