From fc9ebcd99b4cea492a0a04a6df8bf115c0234d27 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 24 四月 2025 13:16:44 +0800
Subject: [PATCH] #order.setmemo(0)
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 3 +++
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 2 ++
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 24 ++++++++++++------------
3 files changed, 17 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 d986120..8fccf93 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -39,6 +39,8 @@
private DocTypeService docTypeService;
@Autowired
private WrkDetlService wrkDetlService;
+ @Autowired
+ private OrderService orderService;
@Override
public Order selectByNo(String orderNo) {
@@ -83,6 +85,7 @@
}
}
order.setMemo("0");
+ orderService.updateById(order);
if (!this.updateSettle(order.getId(), 4L, null)) {
throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
}
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 572840b..1ce05c5 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -42,18 +42,18 @@
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
try {
- List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
- // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
- if (!Cools.isEmpty(wrkDetls)) {
- Iterator<WrkDetl> iterator = wrkDetls.iterator();
- while (iterator.hasNext()) {
- WrkDetl wrkDetl = iterator.next();
- if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
- orderService.checkComplete(wrkDetl.getOrderNo());
- iterator.remove();
- }
- }
- }
+// List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+// // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
+// if (!Cools.isEmpty(wrkDetls)) {
+// Iterator<WrkDetl> iterator = wrkDetls.iterator();
+// while (iterator.hasNext()) {
+// WrkDetl wrkDetl = iterator.next();
+// if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
+// orderService.checkComplete(wrkDetl.getOrderNo());
+// iterator.remove();
+// }
+// }
+// }
// 鍏ュ簱 --------------------------------------------------------------------------------
if (wrkMast.getWrkSts() == 5) {
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 2527b59..c802240 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -469,6 +469,8 @@
if (mastFinished) {
Order order = orderService.selectByNo(wrkDetls101.get(0).getOrderNo());
if (!Cools.isEmpty(order)) {
+ order.setMemo("0");//鐘舵�佽浆鎹㈡垚寮�濮嬩笅鎺�
+ orderService.updateById(order);
orderService.updateSettle(order.getId(),4L,1L);
}
--
Gitblit v1.9.1