From 330fcece11892289f2936ec8e11e4c8a610d5bab Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 15 十月 2025 10:30:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 7 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 0100842..a993a41 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,10 +1,11 @@
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;
import com.doumee.dao.openapi.request.*;
import com.doumee.dao.openapi.response.*;
import com.doumee.dao.web.reqeust.*;
@@ -35,6 +36,7 @@
* @param id 涓婚敭
*/
void deleteById(Integer id);
+ void deleteById(Integer id,LoginUserInfo user);
void delete(Integer id);
/**
@@ -114,7 +116,7 @@
DriverHomeVO getDriverHome(LoginUserInfo loginUserInfo);
/**
- * 璺濈绛惧埌
+ * 璺濈绛惧埌路
* @param signInDTO
*/
void signIn(SignInDTO signInDTO);
@@ -167,7 +169,7 @@
* 鏈堝彴杩囧彿
* @param jobOperateDTO
*/
- void platformOverNumber(JobOperateDTO jobOperateDTO);
+ PlatformJob platformOverNumber(JobOperateDTO jobOperateDTO);
/**
* 寮傚父鎸傝捣
@@ -194,10 +196,15 @@
PlatformJob finishWork(JobOperateDTO jobOperateDTO);
/**
+ * 鏌ヨ鎵�鏈夊凡瀹屾垚浣滀笟鐢靛瓙閿佷笂閿佺姸鎬�
+ */
+ void checkWmsLockStatus();
+
+ /**
* 鎵嬪姩鎺堟潈杞﹁締绂诲満
* @param jobOperateDTO
*/
- void powerLevel(JobOperateDTO jobOperateDTO);
+ PlatformJob powerLevel(JobOperateDTO jobOperateDTO);
/**
* 鑾峰彇鏈堝彴涓嬬殑浠诲姟淇℃伅
* @param groupId
@@ -215,7 +222,6 @@
*/
PlatformWorkVO getPlatformWorkVOById(Integer platformId);
-
PlatformOrderNumByDateResponse orderNumByDate(PlatformOrderNumByDateRequest param);
List<PlatformDataListResponse> platformWorkingDataList(PlatformDataListRequest param);
@@ -225,4 +231,40 @@
CarNumByStatusResponse carStatusNum(CarNumByStatusRequest param);
PlatformQueuingListResponse queueList(PlatformQueuingListRequest param);
+
+ LargeScreenDataVO getLargeScreenData();
+
+ /**
+ * 瓒呮椂鎶ヨ
+ */
+ void timeOutReport();
+
+ /**
+ * 鑷姩杩囧彿
+ */
+ void timeOutCallIn();
+
+ /**
+ * 浣滀笟瓒呮椂
+ */
+ void timeOutWork();
+
+ PlatformJob getLastWaitJob(String uuid, LoginUserInfo loginUser);
+
+ /**
+ * 浣滀笟鏈畬鎴愬畾鏃堕�氱煡
+ */
+ void sendUnFinishNotice();
+
+
+ void dealJobFinish(List<Integer> jobIdList,LoginUserInfo loginUserInfo);
+
+ /**
+ * 鎭㈠浣滀笟
+ * @param jobOperateDTO
+ * @return
+ */
+ PlatformJob restoreWork(JobOperateDTO jobOperateDTO);
+
+ void changPlatformGroup(PlatformJob param, LoginUserInfo loginUser);
}
--
Gitblit v1.9.3