From 4cdcf7b4165fdcbaff1c96f85ec53c5f944fd038 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 22 十一月 2024 10:56:44 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 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 0ee71d8..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())) {
- 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,9 +128,16 @@
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 (pltType != null && pltType > 0) {
+ order.setPltType(pltType);
+ }
+ order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
+ super.updateById(order);
+
}
@@ -224,6 +228,7 @@
int code = doHttpRequest(reportErpParam, "鍗曟嵁瀹℃牳", url, orderReportPath, null, "127.0.0.1");
//int code = doHttpRequest(param, "鍗曟嵁瀹℃牳", "localhost:8080", "/test/report", null, "127.0.0.1");
if (code == 0) {
+ log.info("鍗曟嵁瀹℃牳,{}", order);
order.setSettle(6L);
this.updateById(order);
}
@@ -286,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