From 7256640ae2a47cadda81b5475922fcd75b2f4632 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期五, 04 七月 2025 18:11:24 +0800
Subject: [PATCH] 工作历史档明细搜索条件完善
---
src/main/java/com/zy/asrs/controller/OrderController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 820ca6d..4c1bd74 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -104,9 +104,14 @@
DocType docType = docTypeService.selectById(param.getDocType());
if(!Cools.isEmpty(docType)){
prefix = docType.getPakin() == 1 ? "RK" : "CK";
- status = (prefix == "RK" ? 1 : (prefix == "CK" ? 2 : 0));
+ status = (prefix.equals("RK") ? 1 : (prefix.equals("CK") ? 2 : 0));
}
param.setOrderNo(prefix + snowflakeIdWorker.nextId());
+ } else {
+ DocType docType = docTypeService.selectById(param.getDocType());
+ if(!Cools.isEmpty(docType)){
+ status = (docType.getPakin() == 1 ? 1 : 2 );
+ }
}
Order order = orderService.selectByNo(param.getOrderNo());
--
Gitblit v1.9.1