From c51ab886ca899243f36cffe6c1a86d19057d44f5 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:38 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
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 15b1c83..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());
+ orderService.checkComplete(wrkDetl.getOrderNo(),wrkMast.getPltType());
} else {
// 璁㈠崟鍚堝苟鍑哄簱
List<OrderDto> orderDtoList = JSON.parseArray(wrkDetl.getOrderNo(), OrderDto.class);
for (OrderDto one : orderDtoList) {
- orderService.checkComplete(one.getOrderNo());
+ orderService.checkComplete(one.getOrderNo(),wrkMast.getPltType());
}
}
}
--
Gitblit v1.9.1