From ab14726215678ac69adfeafbd845ebc5b0776ea2 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:56:41 +0800
Subject: [PATCH] 优化订单同步逻辑及库位查找
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 205 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 151 insertions(+), 54 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 400261b..18cb689 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -1,19 +1,16 @@
package com.zy.asrs.service.impl;
+import com.alibaba.fastjson.JSON;
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.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.AgvLocDetl;
-import com.zy.asrs.entity.AgvLocMast;
-import com.zy.asrs.entity.AgvWrkDetl;
+import com.zy.asrs.entity.*;
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.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
@@ -46,54 +43,97 @@
AgvBasDevpService agvBasDevpService;
@Autowired
AgvLocMastService agvLocMastService;
+ @Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private FlowLogService flowLogService;
public void addLocDetlInfo(String locNo, int taskCode) {
+ Date now = new Date();
List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", taskCode));
+ long flowId = snowflakeIdWorker.nextId();
agvWrkDetls.stream().map(agvWrkDetl -> {
AgvLocDetl agvLocDetl = new AgvLocDetl();
log.info("agvWrkDetl: " + agvLocDetl.getBarcode());
BeanUtils.copyProperties(agvWrkDetl, agvLocDetl);
agvLocDetl.setLocNo(locNo);
+ log.info("zc娣诲姞搴撳瓨鏃ュ織:{}", JSON.toJSON(agvLocDetl));
this.insert(agvLocDetl);
+ // 娴佹按 -- 鏂板璁㈠崟鏄庣粏
+ OrderDetl orderDetl = orderDetlService.selectItem(agvWrkDetl.getOrderNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode());
+// FlowLog flowLog = new FlowLog();
+// flowLog.setFid(String.valueOf(flowId));
+// flowLog.setSpare2(String.valueOf(taskCode));
+// flowLog.setLocNo(locNo);
+// flowLog.setSpare1(agvWrkDetl.getSuppCode());
+// flowLog.setOpType(101L);
+// flowLog.setOrderNo(agvWrkDetl.getOrderNo());
+// flowLog.setThreeCode(agvWrkDetl.getThreeCode());
+// flowLog.setMatnr(agvWrkDetl.getMatnr());
+// flowLog.setMaktx(agvWrkDetl.getMaktx());
+// flowLog.setOrderPrevious(orderDetl.getAnfme());
+// flowLog.setOrderCurrent(orderDetl.getAnfme());
+// flowLog.setOrderChanged(0.0);
+// flowLog.setQtyPrevious(orderDetl.getQty()-agvWrkDetl.getAnfme());
+// flowLog.setQtyCurrent(orderDetl.getQty());
+// flowLog.setQtyChanged(agvWrkDetl.getAnfme());
+//
+// flowLog.setLocPrevious(0.0D);
+// flowLog.setLocCurrent(agvWrkDetl.getAnfme());
+// flowLog.setLocChanged(agvWrkDetl.getAnfme());
+//
+// flowLog.setAppeTime(now);
+// if (!flowLogService.insert(flowLog)) {
+// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
+// }
return agvLocDetl;
}).collect(Collectors.toList());
}
- public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq) {
+ public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq, String type) {
//鏍规嵁鐗╂枡鍙峰拰鎵规鎵惧埌瀵瑰簲鐨勫簱瀛橈紝骞朵笖鎸夌収淇敼鏃堕棿鎺掑簭
Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).orderBy("modi_time");
+ if (type != null) {
+ wrapper.notLike("loc_no", "F1");
+ }
+ wapperSetCondition(wrapper, "batch", batch);
+ wapperSetCondition(wrapper, "three_code", csocode);
+ wapperSetCondition(wrapper, "dead_time", isoseq);
- wapperSetCondition(wrapper,"batch",batch);
- wapperSetCondition(wrapper,"three_code",csocode);
- wapperSetCondition(wrapper,"dead_time",isoseq);
+ if ("JG".equals(orderNo.substring(0, 2))) {
+ wapperSetCondition(wrapper, "process_sts", "1");
+ }
List<AgvLocDetl> agvLocDetls = this.selectList(wrapper);
- for (AgvLocDetl agvLocDetl: agvLocDetls) {
+ for (AgvLocDetl agvLocDetl : agvLocDetls) {
//鍒ゆ柇褰撳墠搴撲綅璐х墿鏄惁F鍦ㄥ簱
AgvLocMast agvLocMast = agvLocMastService.selectById(agvLocDetl.getLocNo());
- if(!"F".equals(agvLocMast.getLocSts())){
+ if (!"F".equals(agvLocMast.getLocSts())) {
continue;
}
//濡傛灉璁㈠崟鍓╀綑鍑哄簱閲忓ぇ浜�0
- if(issued > 0) {
+ if (issued > 0) {
//褰撳墠搴撲綅鐨勫簱瀛橀噺
double anfme = agvLocDetl.getAnfme();
//int ioType = anfme > issued ? 101 : 103;
anfme = anfme > issued ? issued : anfme;
//鐢ㄤ簬鏄剧ず宸ヤ綔鏄庣粏妗ｇ殑璁㈠崟鍙�
- String orderNoWrkDtel = Utils.getOrderNo(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);
+ orderNo = Utils.orderMergeUpdate(orderNo, anfme);
+ LocDto locDto = new LocDto(agvLocDetl.getLocNo(), agvLocDetl.getMatnr(), agvLocDetl.getMaktx(), agvLocDetl.getBatch(), orderNoWrkDtel, anfme, agvLocDetl.getProcessSts());
locDto.setCsocode(csocode);
locDto.setIsoseq(isoseq);
locDto.setContainerCode(agvLocDetl.getSuppCode());
+ locDto.setProcessSts(agvLocDetl.getProcessSts());
//褰撳墠搴撲綅鎵�澶勬ゼ灞�
- int floor = Integer.parseInt(agvLocDetl.getLocNo().split("@")[1]);
+ int floor = Integer.parseInt(agvLocDetl.getLocNo().split("F")[1]);
//locDto.setAgvStaNos(queryAgvStaNosByFloor(floor));
- locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByFloor(floor));
+ locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1(), floor));
locDtoList.add(locDto);
issued -= anfme;
@@ -108,7 +148,7 @@
鏇存柊搴撳瓨鏄庣粏
*/
public void updateStock(String sourceLoc, String targetLoc) {
- this.baseMapper.updateStock(sourceLoc,targetLoc);
+ this.baseMapper.updateStock(sourceLoc, targetLoc);
}
public Page<AgvLocDetl> getStockStatis(Page<AgvLocDetl> page) {
@@ -117,14 +157,44 @@
return page;
}
+ @Override
+ public Double getSumAnfme(String matnr, String threeCode) {
+ return this.baseMapper.selectSumAnfmeByMatnr(matnr, threeCode);
+ }
+
+ @Override
+ public AgvLocDetl selectItem(String locNo, String matnr, String batch, String csocode, String isoCode) {
+ return this.baseMapper.selectItemByOrderNo(locNo, matnr, batch, csocode, isoCode);
+ }
+
+ @Override
+ public Double getSumAnfmeProcess(String matnr, String threeCode) {
+ return this.baseMapper.selectSumAnfmeByMatnrProcess(matnr, threeCode);
+ }
+
+ @Override
+ public Double getSumAnfmeProcessed(String matnr, String threeCode) {
+ return this.baseMapper.selectSumAnfmeByMatnrProcessed(matnr, threeCode);
+ }
+
+ @Override
+ public Double getSumAnfmeDb(String matnr, String threeCode, Integer floor) {
+ return this.baseMapper.selectSumAnfmeByMatnr2(matnr, threeCode, floor);
+ }
+
+ @Override
+ public Double getSumAnfmeback(String matnr, String threeCode, Integer floor) {
+ return this.baseMapper.getSumAnfmeback(matnr, threeCode, floor);
+ }
+
/*
- 鑾峰彇搴撳瓨鎬绘暟
- */
+ 鑾峰彇搴撳瓨鎬绘暟
+ */
public Integer sum() {
return this.baseMapper.sum();
}
- public List<AgvLocDetl> getStockStatisExcel(){
+ public List<AgvLocDetl> getStockStatisExcel() {
return this.baseMapper.getStockStatisExcel();
}
@@ -133,20 +203,20 @@
return new ArrayList<AgvLocDetl>();
}
EntityWrapper<AgvLocDetl> wrapper = new EntityWrapper<>();
- if(Cools.isEmpty(orderNo)){
- wrapper.like("order_no",orderNo);
+ if (Cools.isEmpty(orderNo)) {
+ wrapper.like("order_no", orderNo);
}
- if(Cools.isEmpty(matnr)){
- wrapper.like("matnr",matnr);
+ if (Cools.isEmpty(matnr)) {
+ wrapper.like("matnr", matnr);
}
- if(Cools.isEmpty(maktx)){
- wrapper.like("maktx",maktx);
+ if (Cools.isEmpty(maktx)) {
+ wrapper.like("maktx", maktx);
}
- if(Cools.isEmpty(specs)){
- wrapper.like("specs",specs);
+ if (Cools.isEmpty(specs)) {
+ wrapper.like("specs", specs);
}
- if(Cools.isEmpty()){
- wrapper.like("loc_no",locNo);
+ if (Cools.isEmpty()) {
+ wrapper.like("loc_no", locNo);
}
return this.selectList(wrapper);
}
@@ -154,27 +224,42 @@
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);
+ Utils.confirmOnlyMat(wrapper, matnr, batch, csocode, isocode);
if (anfme <= 0) {
- return this.baseMapper.deleteLocDetl(locNo,anfme,matnr,batch,csocode,isocode) > 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;
+ agvLocDetl.setModiTime(new Date());
+ return this.baseMapper.updateAnfme(locNo, anfme, matnr, batch, csocode, isocode) > 0;
+ }
+ }
+
+ public boolean updateAnfmeProcess(Double anfme, String locNo, String matnr, String batch, String csocode, String isocode, Integer process) {
+ 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);
+ agvLocDetl.setModiTime(new Date());
+ return this.baseMapper.updateAnfmeProcess(locNo, anfme, matnr, batch, csocode, isocode, process) > 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);
+ 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));
+ public AgvLocDetl selectByLocNo(String locNo) {
+ return this.selectOne(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
}
@Override
@@ -182,7 +267,7 @@
List<AgvLocDetl> agvLocDetls = new ArrayList<>();
taskDto.getLocDtos().forEach(locDto -> {
- AgvLocDetl agvLocDetl = this.selectByMatnrAndBatchAndCsocodeAndisoCode(locDto.getLocNo(),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;
@@ -191,8 +276,16 @@
@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);
+ wrapper.eq("loc_no", locNo);
+ Utils.confirmOnlyMat(wrapper, matnr, batch, csocode, isocode);
+ return this.selectOne(wrapper);
+ }
+
+ @Override
+ public AgvLocDetl selectByMatnrAndBatchAndCsocodeAndisoCode2(String locNo, String orderNo, String matnr, String batch, String csocode, String isocode) {
+ EntityWrapper<AgvLocDetl> wrapper = new EntityWrapper<>();
+ wrapper.eq("loc_no", locNo);
+ Utils.confirmOnlyMat2(wrapper, orderNo, matnr, batch, csocode, isocode);
return this.selectOne(wrapper);
}
@@ -208,7 +301,7 @@
@Override
public AgvLocDetl selectLocdetl(String locNo, String matnr, String batch, String csocode, String isocode) {
- return this.baseMapper.selectLocdetl(locNo,matnr,batch,csocode,isocode);
+ return this.baseMapper.selectLocdetl(locNo, matnr, batch, csocode, isocode);
}
@Override
@@ -223,8 +316,7 @@
try {
if (excelVersion == 2003) {
book = new HSSFWorkbook(inStream);
- }
- else { // 褰� excel 鏄� 2007 鏃�
+ } else { // 褰� excel 鏄� 2007 鏃�
book = new XSSFWorkbook(inStream);
}
} catch (Exception e) {
@@ -240,16 +332,21 @@
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 (Cools.isEmpty(agvLocDetls)) {
+ log.info("搴撲綅鍙凤細" + locNo + "锛岃揣鏋剁爜锛�" + containerCode + "锛屼笉瀛樺湪鏄庣粏");
}
- if(agvLocDetls.size()>1){
- log.info("搴撲綅鍙凤細" + locNo + "锛屽鍣ㄧ爜锛�" + containerCode + "锛屽瓨鍦�1鏉′互涓婅褰�");
+ if (agvLocDetls.size() > 1) {
+ log.info("搴撲綅鍙凤細" + locNo + "锛岃揣鏋剁爜锛�" + containerCode + "锛屽瓨鍦�1鏉′互涓婅褰�");
}
}
}
+
+ @Override
+ public void updateLocNo(String locNo, String sourceLoc, AgvLocDetl agvLocDetl) {
+ this.baseMapper.updateLocNo(locNo, sourceLoc, agvLocDetl.getSuppCode());
+ }
}
--
Gitblit v1.9.1