From 7b51c9e1abc198a501f7858599da9c116130fd6f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 三月 2025 16:47:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java
index 195779b..6b2b9b2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java
@@ -1,8 +1,8 @@
package com.doumee.service.business;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.Platform;
import com.doumee.dao.business.model.PlatformJob;
import com.doumee.dao.business.vo.LargeScreenDataVO;
@@ -36,6 +36,7 @@
* @param id 涓婚敭
*/
void deleteById(Integer id);
+ void deleteById(Integer id,LoginUserInfo user);
void delete(Integer id);
/**
@@ -115,7 +116,7 @@
DriverHomeVO getDriverHome(LoginUserInfo loginUserInfo);
/**
- * 璺濈绛惧埌
+ * 璺濈绛惧埌路
* @param signInDTO
*/
void signIn(SignInDTO signInDTO);
@@ -195,6 +196,11 @@
PlatformJob finishWork(JobOperateDTO jobOperateDTO);
/**
+ * 鏌ヨ鎵�鏈夊凡瀹屾垚浣滀笟鐢靛瓙閿佷笂閿佺姸鎬�
+ */
+ void checkWmsLockStatus();
+
+ /**
* 鎵嬪姩鎺堟潈杞﹁締绂诲満
* @param jobOperateDTO
*/
@@ -243,4 +249,12 @@
*/
void timeOutWork();
+ PlatformJob getLastWaitJob(String uuid, LoginUserInfo loginUser);
+
+ /**
+ * 浣滀笟鏈畬鎴愬畾鏃堕�氱煡
+ */
+ void sendUnFinishNotice();
+
+ void dealJobFinish(List<Integer> jobIdList);
}
--
Gitblit v1.9.3