From 6c7a7ce93ce6a0978cd5ffd909e6e1780d19b0d7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 19:10:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java | 26 ++++++++++++++++++++++----
1 files changed, 22 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 d70727c..78aa1f9 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;
@@ -12,7 +12,6 @@
import com.doumee.dao.web.response.DriverHomeVO;
import com.doumee.dao.web.response.LineUpVO;
import com.doumee.dao.web.response.PlatformWorkVO;
-import com.doumee.dao.web.response.platformReport.WholeProvinceBoardVO;
import java.util.List;
@@ -37,6 +36,7 @@
* @param id 涓婚敭
*/
void deleteById(Integer id);
+ void deleteById(Integer id,LoginUserInfo user);
void delete(Integer id);
/**
@@ -196,6 +196,11 @@
PlatformJob finishWork(JobOperateDTO jobOperateDTO);
/**
+ * 鏌ヨ鎵�鏈夊凡瀹屾垚浣滀笟鐢靛瓙閿佷笂閿佺姸鎬�
+ */
+ void checkWmsLockStatus();
+
+ /**
* 鎵嬪姩鎺堟潈杞﹁締绂诲満
* @param jobOperateDTO
*/
@@ -246,4 +251,17 @@
PlatformJob getLastWaitJob(String uuid, LoginUserInfo loginUser);
+ /**
+ * 浣滀笟鏈畬鎴愬畾鏃堕�氱煡
+ */
+ void sendUnFinishNotice();
+
+ void dealJobFinish(List<Integer> jobIdList);
+
+ /**
+ * 鎭㈠浣滀笟
+ * @param jobOperateDTO
+ * @return
+ */
+ PlatformJob restoreWork(JobOperateDTO jobOperateDTO);
}
--
Gitblit v1.9.3