From 4eb4c418968d7530835f0d3e810aa6b4a1e71a83 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 05 十月 2023 15:29:37 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 724f99d..77634f2 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -62,7 +62,7 @@
}
// 鍏ュ簱 --------------------------------------------------------------------------------
- if (wrkMast.getWrkSts() == 15) {
+ if (wrkMast.getWrkSts() == 10) {
// 鍏ㄦ澘鍏ュ簱
if (wrkMast.getIoType() == 1) {
// 鍏ュ簱閫氱煡鍗�
@@ -92,7 +92,7 @@
}
// 鍑哄簱 --------------------------------------------------------------------------------
- } else if (wrkMast.getWrkSts() == 35) {
+ } else if (wrkMast.getWrkSts() == 30) {
if (!Cools.isEmpty(wrkDetls)) {
if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
@@ -118,7 +118,7 @@
}
// 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
for (WrkDetl wrkDetl : wrkDetlsKeyOrder) {
- if (BaseController.isJSON(wrkDetl.getOrderNo())) {
+ if (!BaseController.isJSON(wrkDetl.getOrderNo())) {
orderService.checkComplete(wrkDetl.getOrderNo());
} else {
// 璁㈠崟鍚堝苟鍑哄簱
--
Gitblit v1.9.1