From d3de307cf336c75c284f9211f30b0e95d411d248 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 25 十一月 2024 14:11:16 +0800
Subject: [PATCH] 移除AgvWrkMastScheduler日志输出优化
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
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..2f2b286 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -28,7 +28,9 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import java.util.concurrent.TimeUnit;
@Slf4j
@Service("orderService")
@@ -93,12 +95,12 @@
}
@Override
- public boolean updateSettle2(Long orderId, Long settle, Integer plt) {
- return this.baseMapper.updateSettle2(orderId, settle, plt) > 0;
+ public boolean updateSettle2(Long orderId, Long settle, Integer plt, String inTime) {
+ return this.baseMapper.updateSettle2(orderId, settle, plt, inTime) > 0;
}
@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 +117,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;
@@ -131,14 +128,15 @@
boolean manPakoutExist = Cools.isEmpty(manPakOut) || (manPakOut.getPayment() != null && manPakOut.getPayment() == 1);
if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {
- if (!this.updateSettle2(order.getId(), 4L, pltType)) {
+ if (!this.updateSettle2(order.getId(), 4L, pltType, DateUtils.convert(new Date(), DateUtils.yyyyMMdd))) {
throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
}
} else {
- if (!Cools.isEmpty(pltType)) {
+ if (pltType != null && pltType > 0) {
order.setPltType(pltType);
- super.updateById(order);
}
+ order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
+ super.updateById(order);
}
@@ -293,6 +291,7 @@
response = new HttpHandler.Builder()
.setUri(url)
.setPath(path)
+ .setTimeout(30, TimeUnit.SECONDS)
.setJson(JSONObject.toJSONString(requestParam))
.build()
.doPost();
--
Gitblit v1.9.1