From cdda258ac9b94edd11aff18da12aac7eb5c940a1 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 25 十月 2024 11:26:52 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 a3ed3c7..f7815d7 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -93,6 +93,11 @@
}
@Override
+ public boolean updateSettle2(Long orderId, Long settle, Integer plt) {
+ return this.baseMapper.updateSettle2(orderId, settle, plt) > 0;
+ }
+
+ @Override
public void checkComplete(String orderNo, String locNo) {
Order order = this.selectByNo(orderNo);
if (Cools.isEmpty(order)) {
@@ -110,11 +115,11 @@
break;
}
}
+ Integer pltType = null;
//浠撳簱缂栫爜
if (Cools.isEmpty(order.getPltType())) {
AgvLocMast locNo1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
- order.setPltType(locNo1.getPltType());
- super.updateById(order);
+ pltType = locNo1.getPltType();
}
// 濡傛灉 浣滀笟鏁伴噺绛変簬鍗曟嵁鎬绘暟閲� && 宸ヤ綔鏄庣粏妗ｄ腑鏃犺鍗曟嵁鐨勬暟鎹� && AGV宸ヤ綔鏄庣粏妗ｄ腑鏃犺鍗曟嵁鐨勬暟鎹�
int count = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", orderNo));
@@ -126,9 +131,15 @@
boolean manPakoutExist = Cools.isEmpty(manPakOut) || (manPakOut.getPayment() != null && manPakOut.getPayment() == 1);
if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {
- if (!this.updateSettle(order.getId(), 4L, null)) {
+ if (!this.updateSettle2(order.getId(), 4L, pltType)) {
throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
}
+ } else {
+ if (!Cools.isEmpty(pltType)) {
+ order.setPltType(pltType);
+ super.updateById(order);
+ }
+
}
--
Gitblit v1.9.1