From 59f80df1e377e8775969ca4acadfa2eadd6e37ae Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期一, 04 十一月 2024 19:01:38 +0800
Subject: [PATCH] excel导出优化
---
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 69 +++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index 1a97b91..3d635a7 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -150,8 +150,9 @@
agvWrkDetlService.insert(wrkDetl);
} else {
Double anfme = agvWrkDetl.getAnfme() + pick.getCount();
+ agvWrkDetl.setIoTime(agvWrkMast.getIoTime());
agvWrkDetl.setAnfme(anfme);
- agvWrkDetl.setModiTime(new Date());
+ agvWrkDetl.setModiTime(now);
agvWrkDetlService.update(agvWrkDetl,new EntityWrapper<AgvWrkDetl>().eq("matnr",agvWrkDetl.getMatnr()).eq("three_code",agvWrkDetl.getThreeCode()).eq("supp_code",pick.getSuppCode()));
}
@@ -165,23 +166,21 @@
}
}
// 纭鏄惁鍏ㄩ儴鍑哄簱
- int sameNumber = 0;
+ double totleWrkdetl = 0.0;
+ double totleLocdetl = 0.0;
List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", pickParams.getWrkNo()));
for (AgvLocDetl agvLocDetl : agvLocDetls) {
- for (AgvWrkDetl agvWrkDetl : agvWrkDetls) {
- if (agvLocDetl.getMatnr().equals(agvWrkDetl.getMatnr())
- && agvLocDetl.getThreeCode().equals(agvWrkDetl.getThreeCode())
- && agvLocDetl.getSuppCode().equals(agvWrkDetl.getSuppCode())
- && agvLocDetl.getAnfme().equals(agvWrkDetl.getAnfme())) {
- sameNumber++;
- }
- }
+ totleLocdetl = totleLocdetl + agvLocDetl.getAnfme();
}
- if (agvLocDetls.size() == sameNumber) {
+ for (AgvWrkDetl agvWrkDetl : agvWrkDetls) {
+ totleWrkdetl = totleWrkdetl + agvWrkDetl.getAnfme();
+ }
+ if (totleWrkdetl >= totleLocdetl) {
agvWrkMast.setIoType(101);
- agvWrkMast.setModiTime(new Date());
agvWrkMastService.update(agvWrkMast,new EntityWrapper<AgvWrkMast>().eq("wrk_no", pickParams.getWrkNo()));
+
}
+// agvLocDetls.size() == 1
return "缁勬墭鎴愬姛锛岀粦瀹氱珯鐐规垚鍔�";
@@ -423,6 +422,8 @@
if (agvLocMast.getFloor() != floor) {
if (agvLocMast.getFloor() == 1 && (floor == 2 || floor == 3)) {
throw new CoolException("褰撳墠搴撲綅璇烽�夋嫨璋冩嫧鍗曡皟鎷紒");
+ } else if ((agvLocMast.getFloor() == 2 || agvLocMast.getFloor() == 3) && (floor == 1 || floor == 4)) {
+ throw new CoolException("褰撳墠搴撲綅璇烽�夋嫨璋冩嫧鍥炴祦鍗曞洖閫�锛�");
} else {
ioType = 12;
}
@@ -513,17 +514,29 @@
});
}
- // 濡傛灉褰撳墠浠诲姟鏄澹充簩涓夋ゼ鍥為��涓�妤肩殑 鍥炴粴璋冩嫧鍗�
- if (ioType == 12 && locMast.getFloor() == 1 && floor != 4 && agvLocMast.getFloor() != 1) {
- List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvLocMast.getLocNo()));
- for (AgvLocDetl agvLocDetl : agvLocDetls) {
- OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("three_code", agvLocDetl.getThreeCode()).eq("matnr", agvLocDetl.getMatnr()).eq("order_no", "DB" + agvLocDetl.getOrderNo()));
- orderDetl.setQty(orderDetl.getQty() - agvLocDetl.getAnfme());
- if (!orderDetlService.updateById(orderDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
- }
- }
- }
+// // 濡傛灉褰撳墠浠诲姟鏄澹充簩涓夋ゼ鍥為��涓�妤肩殑 鍥炴粴璋冩嫧鍗�
+// if (ioType == 12 && locMast.getFloor() == 1 && floor != 4 && agvLocMast.getFloor() != 1) {
+// List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvLocMast.getLocNo()));
+// for (AgvLocDetl agvLocDetl : agvLocDetls) {
+// OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("three_code", agvLocDetl.getThreeCode()).eq("matnr", agvLocDetl.getMatnr()).eq("source", 33));
+// if (Cools.isEmpty(orderDetl)) {
+// throw new CoolException("褰撳墠鐗╂枡鐨勮皟鎷ㄥ崟涓嶅瓨鍦紒");
+// }
+// Order order = orderService.selectByNo(orderDetl.getOrderNo());
+// if (Cools.isEmpty(order)) {
+// throw new CoolException("褰撳墠鐗╂枡鐨勮皟鎷ㄥ崟涓嶅瓨鍦紒");
+// }
+// if (order.getSettle() == 4L) {
+// if (!orderService.updateSettle(order.getId(),2L,userId)) {
+// throw new CoolException("璋冩嫧鍗曞洖婊氬紓甯�!");
+// }
+// }
+// orderDetl.setQty(orderDetl.getQty() - agvLocDetl.getAnfme());
+// if (!orderDetlService.updateById(orderDetl)) {
+// throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+// }
+// }
+// }
//鏇存柊鐩爣搴撲綅鐘舵��
updateAgvLocMast(agvLocMast,"P");
updateAgvLocMast(locMast,"Q");
@@ -571,8 +584,6 @@
//鏇存柊鐩爣搴撲綅鏄庣粏 101.鍑哄簱 鍒犻櫎婧愬簱浣嶅簱瀛樻槑缁�
agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no",agvWrkMast.getSourceLocNo()));
}
-
- agvWrkMast.setSourceLocNo("");
}
//鐢熸垚AGV宸ヤ綔鍘嗗彶妗� + 鐢熸垚AGV宸ヤ綔鏄庣粏鍘嗗彶妗�
@@ -590,14 +601,15 @@
agvWrkDetl.setWrkNo(wrkMast.getWrkNo());
agvWrkDetl.setModiUser(userId);
agvWrkDetl.setModiTime(now);
+ agvWrkDetl.setIoTime(now);
if (!agvWrkDetlService.insert(agvWrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
}
// 鏇存柊绔欑偣鐘舵��
- agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null);
+// agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null);
// 鏇存柊婧愬簱浣嶇姸鎬�
-// agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"O","",agvWrkMast.getWhsType().shortValue());
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"O","",agvWrkMast.getWhsType().shortValue());
//鍒犻櫎AGV宸ヤ綔鏄庣粏妗�
agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",oldWrkNo));
@@ -744,6 +756,7 @@
agvWrkMast.setWrkSts(201L);
agvWrkMast.setModiUser(userId);
agvWrkMast.setModiTime(now);
+ agvWrkMast.setIoTime(now);
@@ -769,6 +782,7 @@
agvWrkDetl.setOrderNo(agvWrkDetl.getOrderNo().substring(2));
agvWrkDetl.setModiUser(userId);
agvWrkDetl.setModiTime(now);
+ agvWrkDetl.setIoTime(now);
if (!agvWrkDetlService.update(agvWrkDetl,new EntityWrapper<AgvWrkDetl>()
.eq("matnr",agvWrkDetl.getMatnr())
.eq("three_code",agvWrkDetl.getThreeCode())
@@ -817,6 +831,7 @@
agvWrkDetl.setWrkNo(wrkMast.getWrkNo());
// 淇濇寔宸ヤ綔妗ｆ槑缁�
agvWrkDetl.setWrkNo(wrkMast.getWrkNo());
+ agvWrkDetl.setIoTime(now);
agvWrkDetl.setModiUser(userId);
agvWrkDetl.setModiTime(now);
if (!agvWrkDetlService.insert(agvWrkDetl)) {
--
Gitblit v1.9.1