From 52f2306fe8e8f0760b32f33371adf4037e031bcf Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期二, 29 十月 2024 13:28:27 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/OrderService.java | 2
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 12 +++---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 9 +---
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 19 +++++----
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 4 +-
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 3 +
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 10 ++--
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 4 +-
8 files changed, 30 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index e48f8b2..e56af79 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -17,7 +17,7 @@
boolean updateSettle2(Long orderId, Long settle, Integer pltType);
- void checkComplete(String orderNo, String locNo);
+ void checkComplete(String orderNo, Integer pltType);
boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls);
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index c512623..e70c16b 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -98,7 +98,7 @@
//妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
AgvLocMast agvLocMast = agvCommonService.getLocNo(agvBasDevp.getLocType1(),agvBasDevp.getFloor(),false,false);
//鐢熸垚宸ヤ綔妗�
- AgvWrkMast wrkMast = createWrkMast(1,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),agvBasDevp.getBarcode(),now,userId, agvBasDevp.getLocType2());
+ AgvWrkMast wrkMast = createWrkMast(1,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),agvBasDevp.getBarcode(),now,userId, agvBasDevp.getLocType2(),agvLocMast.getPltType());
//鏍囪鏄惁涓鸿緭閫佺嚎鍏ュ簱
wrkMast.setMk(isConveyor ? "Y" : "N");
//鐢熸垚宸ヤ綔妗ｆ槑缁�
@@ -141,7 +141,7 @@
//鍒ゆ柇鏄惁鍏ㄦ澘鍑哄簱
int ioType = isPakOut(sourceLocNo,taskDto) ? 101 : 103;
//鐢熸垚宸ヤ綔妗�
- AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)));
+ AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)),null);
//鐢熸垚宸ヤ綔妗ｆ槑缁�
taskDto.getLocDtos().forEach(locDto -> {
if (!BaseController.isJSON(locDto.getOrderNo())) {
@@ -215,7 +215,7 @@
//鍒ゆ柇鏄惁鍏ㄦ澘鍑哄簱
int ioType = 107;
//鐢熸垚宸ヤ綔妗�
- AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)));
+ AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)),null);
//鐢熸垚宸ヤ綔妗ｆ槑缁�
taskDto.getLocDtos().forEach(locDto -> {
if (!BaseController.isJSON(locDto.getOrderNo())) {
@@ -346,7 +346,7 @@
int containerType = getContainerTypeByloc(taskDto.getLocNo());
//鐢熸垚宸ヤ綔妗�
- AgvWrkMast wrkMast = createWrkMast(107, 21L,taskDto.getLocNo(),taskDto.getAgvStaNo(),taskDto.getLocDtos().get(0).getContainerCode(),now,userId,containerType);
+ AgvWrkMast wrkMast = createWrkMast(107, 21L,taskDto.getLocNo(),taskDto.getAgvStaNo(),taskDto.getLocDtos().get(0).getContainerCode(),now,userId,containerType,null);
//鐢熸垚宸ヤ綔妗ｆ槑缁�
taskDto.getLocDtos().forEach(locDto -> {
//鏄庣粏妗ｆ墍闇�鍙傛暟
@@ -389,7 +389,7 @@
Date now = new Date();
//鐢熸垚绉诲簱宸ヤ綔妗�
- AgvWrkMast wrkMast = createWrkMast(11, 21L, sourceLocNo, targetLocNo, sourceLocDetl.getSuppCode(), now, userId,getContainerTypeByloc(sourceLocNo));
+ AgvWrkMast wrkMast = createWrkMast(11, 21L, sourceLocNo, targetLocNo, sourceLocDetl.getSuppCode(), now, userId,getContainerTypeByloc(sourceLocNo),targetLocMast.getPltType());
//鐢熸垚宸ヤ綔鍏氭槑缁�
createWrkDetlReWrite(
sourceLocDetl.getMatnr(),
@@ -520,7 +520,7 @@
String locNo = agvLocMast.getLocNo();
//鐢熸垚宸ヤ綔妗�
- AgvWrkMast wrkMast = createWrkMast(1,201L,devNo,locNo,containerCode,now,userId, containerType);
+ AgvWrkMast wrkMast = createWrkMast(1,201L,devNo,locNo,containerCode,now,userId, containerType,agvLocMast.getPltType());
//鐢熸垚宸ヤ綔妗ｆ槑缁�
agvWaitPakinList.forEach(wp -> {
createWrkDetlReWrite(wp.getMatnr(),wrkMast.getWrkNo(),wp.getOrderNo(),wp.getBatch(),wp.getAnfme(),wp.getSuppCode(),now,userId,wp.getThreeCode(),wp.getDeadTime(),wp.getProcessSts());
@@ -537,7 +537,7 @@
}
agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),true,true);
// 鐢熸垚宸ヤ綔妗� 10.绌烘澘鍏ュ簱
- createWrkMast(10,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),containerCode,now,userId,containerType);
+ createWrkMast(10,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),containerCode,now,userId,containerType,agvLocMast.getPltType());
//鏇存柊婧愮珯鐐圭姸鎬�
updateAgvBasDevp(agvBasDevp,"R",containerType,containerCode);
}
@@ -572,7 +572,7 @@
throw new CoolException("鏆傛棤褰撳墠鍑哄簱绔欑偣绫诲瀷鐨勭┖璐ф灦锛�");
}
//鐢熸垚宸ヤ綔妗�
- createWrkMast(110,21L,agvLocMast.getLocNo(),agvBasDevp.getDevNo(),agvLocMast.getBarcode(),now,userId,containerType);
+ createWrkMast(110,21L,agvLocMast.getLocNo(),agvBasDevp.getDevNo(),agvLocMast.getBarcode(),now,userId,containerType,agvLocMast.getPltType());
//淇敼婧愬簱浣嶇姸鎬�
updateAgvLocMast(agvLocMast,"R");
@@ -1109,7 +1109,7 @@
/*
鐢熸垚宸ヤ綔妗�
*/
- private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode, Date now, Long userId, int containerType){
+ private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode, Date now, Long userId, int containerType,Integer pltType){
AgvWrkMast wrkMast = new AgvWrkMast();
//宸ヤ綔鐘舵��
wrkMast.setWrkSts(wrkSts);
@@ -1131,6 +1131,7 @@
wrkMast.setAppeTime(now);
wrkMast.setModiUser(userId);
wrkMast.setModiTime(now);
+ wrkMast.setPltType(pltType);
wrkMast.setLogErrMemo("createWaitPainWrkMastStart");
if (!agvWrkMastService.insertByIncrease(wrkMast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index da6cbe8..b8cc2a2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -526,7 +526,7 @@
//鍒犻櫎鍏ュ簱閫氱煡妗�
waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", zpallet));
- orderService.checkComplete(waitPakinList.get(0).getOrderNo(),locNo);
+ orderService.checkComplete(waitPakinList.get(0).getOrderNo(),null);
}
@@ -596,7 +596,7 @@
manLocDetlService.update(manLocDetl,manLocDetlWrapper);
//妫�娴嬭鍗曟槸鍚﹀畬鎴�
- orderService.checkComplete(param.getOrderNo(),param.getLocNo());
+ orderService.checkComplete(param.getOrderNo(),null);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index f87f60d..53936a5 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -98,7 +98,7 @@
}
@Override
- public void checkComplete(String orderNo, String locNo) {
+ public void checkComplete(String orderNo, Integer pltType) {
Order order = this.selectByNo(orderNo);
if (Cools.isEmpty(order)) {
return;
@@ -115,12 +115,7 @@
break;
}
}
- Integer pltType = null;
- //浠撳簱缂栫爜
- if (Cools.isEmpty(order.getPltType()) && !Cools.isEmpty(locNo)) {
- AgvLocMast locNo1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
- pltType = locNo1.getPltType();
- }
+
// 濡傛灉 浣滀笟鏁伴噺绛変簬鍗曟嵁鎬绘暟閲� && 宸ヤ綔鏄庣粏妗ｄ腑鏃犺鍗曟嵁鐨勬暟鎹� && AGV宸ヤ綔鏄庣粏妗ｄ腑鏃犺鍗曟嵁鐨勬暟鎹�
int count = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", orderNo));
boolean wrkDeltExist = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().like("order_no", orderNo)) < 1;
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 8cc81d7..67082b5 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -80,7 +80,8 @@
}
}
- @Scheduled(cron = "* 0/5 * * * ? ")
+ //@Scheduled(cron = "* 0/5 * * * ? ")
+ @Scheduled(cron = "0/5 * * * * ? ")
@Async("orderThreadPool")
public void reportOrder() {
List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().in("settle", 2, 4));
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index 4f5abc1..b226a86 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -297,12 +297,12 @@
if (!isJSON(orderNo)) {
//妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚
- orderService.checkComplete(orderNo, agvWrkMast.getLocNo());
+ orderService.checkComplete(orderNo, agvWrkMast.getPltType());
} else {
List<Map> maps = JSONArray.parseArray(orderNo, Map.class);
maps.forEach(map -> {
String o = map.get("orderNo").toString();
- orderService.checkComplete(o, agvWrkMast.getLocNo());
+ orderService.checkComplete(o, agvWrkMast.getPltType());
});
}
@@ -404,12 +404,12 @@
agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkNo));
if (!isJSON(orderNo)) {
//妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚
- orderService.checkComplete(orderNo, agvWrkMast.getLocNo());
+ orderService.checkComplete(orderNo, agvWrkMast.getPltType());
} else {
List<Map> maps = JSONArray.parseArray(orderNo, Map.class);
maps.forEach(map -> {
String o = map.get("orderNo").toString();
- orderService.checkComplete(o, agvWrkMast.getLocNo());
+ orderService.checkComplete(o, agvWrkMast.getPltType());
});
}
@@ -461,12 +461,12 @@
agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkNo));
if (!isJSON(orderNo)) {
//妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚
- orderService.checkComplete(orderNo, agvWrkMast.getLocNo());
+ orderService.checkComplete(orderNo, agvWrkMast.getPltType());
} else {
List<Map> maps = JSONArray.parseArray(orderNo, Map.class);
maps.forEach(map -> {
String o = map.get("orderNo").toString();
- orderService.checkComplete(o, agvWrkMast.getLocNo());
+ orderService.checkComplete(o, agvWrkMast.getPltType());
});
}
//涓婃姤mes
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 98ff7af..0a9d2c6 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -103,19 +103,19 @@
report.add(orderDetl);
}
}
+ if (Cools.isEmpty(order.getPltType())) {
+ return;
+ }
if (!Cools.isEmpty(report)) {
ReportErpParam param = new ReportErpParam();
mappingParam(order, param);
mappingParamChildren(report, param);
- if (Cools.isEmpty(order.getPltType())) {
- return;
- }
int code = doHttpRequest(param, "鍗曟嵁瀹℃牳", url, orderReportPath, null, "127.0.0.1");
if (code == 0) {
- for (OrderDetl orderDetl : orderDetlList) {
- orderDetl.setReportQty(orderDetl.getQty());
+ for (OrderDetl orderDetl : report) {
log.info("{}鍗曟嵁瀹℃牳涓婃姤浜嗭細{}", order.getOrderNo(), orderDetl.getQty() - (orderDetl.getReportQty() == null ? 0D : orderDetl.getReportQty()));
+ orderDetl.setReportQty(orderDetl.getQty());
orderDetlService.updateById(orderDetl);
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index a98cf91..4fe6f38 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -120,12 +120,12 @@
// 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
for (WrkDetl wrkDetl : wrkDetlsKeyOrder) {
if (!BaseController.isJSON(wrkDetl.getOrderNo())) {
- orderService.checkComplete(wrkDetl.getOrderNo(),wrkMast.getLocNo());
+ orderService.checkComplete(wrkDetl.getOrderNo(),wrkMast.getPltType());
} else {
// 璁㈠崟鍚堝苟鍑哄簱
List<OrderDto> orderDtoList = JSON.parseArray(wrkDetl.getOrderNo(), OrderDto.class);
for (OrderDto one : orderDtoList) {
- orderService.checkComplete(one.getOrderNo(),wrkMast.getLocNo());
+ orderService.checkComplete(one.getOrderNo(),wrkMast.getPltType());
}
}
}
--
Gitblit v1.9.1