From 757a5a1373c96d216be9eb5d6b5cd6374ce95deb Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 04 二月 2026 14:19:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
index e5a5103..d1cb0cf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
@@ -251,7 +251,7 @@
throw new CoolException("搴撳彛涓嶄负绌猴紒锛�");
}
locItems.forEach(locItem -> {
- locItem.setSite(deviceSite.getSite());
+ locItem.setSiteNo(deviceSite.getSite());
});
}
return R.ok().add(locItems);
@@ -296,7 +296,7 @@
.setTargSite(checkItem.getSiteNo())
.setResource(TaskResouceType.TASK_RESOUCE_CHECK_TYPE.val)
.setTaskType(TaskType.TASK_TYPE_CHECK_OUT.type)
- .setTaskStatus(TaskStsType.GENERATE_OUT.id)
+ .setTaskStatus(TaskStsType.MISSION_INITIAL.id)
.setCreateTime(new Date())
.setUpdateBy(loginUserId)
.setUpdateTime(new Date())
--
Gitblit v1.9.1