From 290b752cab63b7e813dcb493b5110b09829eff58 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 22 九月 2025 17:11:44 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 76 +++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 38 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 66bfa57..ca9ee75 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -64,28 +64,28 @@
//鏍规嵁鐗╂枡鍙峰拰鎵规鎵惧埌瀵瑰簲鐨勫簱瀛橈紝骞朵笖鎸夌収淇敼鏃堕棿鎺掑簭
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);
+ wapperSetCondition(wrapper, "batch", batch);
+ wapperSetCondition(wrapper, "three_code", csocode);
+ wapperSetCondition(wrapper, "dead_time", isoseq);
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);
+ 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);
@@ -104,11 +104,12 @@
}
+
/*
鏇存柊搴撳瓨鏄庣粏
*/
public void updateStock(String sourceLoc, String targetLoc) {
- this.baseMapper.updateStock(sourceLoc,targetLoc);
+ this.baseMapper.updateStock(sourceLoc, targetLoc);
}
public Page<AgvLocDetl> getStockStatis(Page<AgvLocDetl> page) {
@@ -124,7 +125,7 @@
return this.baseMapper.sum();
}
- public List<AgvLocDetl> getStockStatisExcel(){
+ public List<AgvLocDetl> getStockStatisExcel() {
return this.baseMapper.getStockStatisExcel();
}
@@ -133,20 +134,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 +155,27 @@
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;
+ 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);
+ 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 +183,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 +192,8 @@
@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);
}
@@ -208,7 +209,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 +224,7 @@
try {
if (excelVersion == 2003) {
book = new HSSFWorkbook(inStream);
- }
- else { // 褰� excel 鏄� 2007 鏃�
+ } else { // 褰� excel 鏄� 2007 鏃�
book = new XSSFWorkbook(inStream);
}
} catch (Exception e) {
@@ -244,10 +244,10 @@
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)){
+ if (Cools.isEmpty(agvLocDetls)) {
log.info("搴撲綅鍙凤細" + locNo + "锛屽鍣ㄧ爜锛�" + containerCode + "锛屼笉瀛樺湪鏄庣粏");
}
- if(agvLocDetls.size()>1){
+ if (agvLocDetls.size() > 1) {
//log.info("搴撲綅鍙凤細" + locNo + "锛屽鍣ㄧ爜锛�" + containerCode + "锛屽瓨鍦�1鏉′互涓婅褰�");
}
}
--
Gitblit v1.9.1