From 9877679062815a39739c8ca0c02a70acc282f68c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 12 九月 2025 11:38:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java |   78 ++++++++++++++++++++++++++++++++++-----
 1 files changed, 68 insertions(+), 10 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 483569a..0ac5a7d 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,7 +36,9 @@
      * @param id 涓婚敭
      */
     void deleteById(Integer id);
+    void deleteById(Integer id,LoginUserInfo user);
 
+    void delete(Integer id);
     /**
      * 鍒犻櫎
      *
@@ -113,7 +116,7 @@
     DriverHomeVO getDriverHome(LoginUserInfo loginUserInfo);
 
     /**
-     * 璺濈绛惧埌
+     * 璺濈绛惧埌路
      * @param signInDTO
      */
     void signIn(SignInDTO signInDTO);
@@ -136,13 +139,25 @@
      * 閫氱煡鍏ュ洯
      * @param jobOperateDTO
      */
-    void platformInPark(JobOperateDTO jobOperateDTO);
+    PlatformJob platformInPark(JobOperateDTO jobOperateDTO);
+
+    /**
+     * 涓嬪彂鍏ュ洯鏉冮檺
+     * @param platformJob
+     */
+    void sendInPark(PlatformJob platformJob);
+
+    /**
+     * 鍙栨秷鍏ュ洯鏉冮檺
+     * @param platformJob
+     */
+    void cancelInPark(PlatformJob platformJob);
 
     /**
      * 鏈堝彴鍙彿
      * @param jobOperateDTO
      */
-    void platformCallNumber(JobOperateDTO jobOperateDTO);
+    PlatformJob platformCallNumber(JobOperateDTO jobOperateDTO);
 
     /**
      * 杞Щ鏈堝彴
@@ -154,7 +169,7 @@
      * 鏈堝彴杩囧彿
      * @param jobOperateDTO
      */
-    void platformOverNumber(JobOperateDTO jobOperateDTO);
+    PlatformJob platformOverNumber(JobOperateDTO jobOperateDTO);
 
     /**
      * 寮傚父鎸傝捣
@@ -166,7 +181,7 @@
      * 鎵嬪姩寮�濮嬩綔涓�
      * @param jobOperateDTO
      */
-    void beginWork(JobOperateDTO jobOperateDTO);
+    PlatformJob beginWork(JobOperateDTO jobOperateDTO);
 
     /**
      * 鏈堝彴鐩告満 寮�濮嬩綔涓�
@@ -178,8 +193,18 @@
      * 瀹屾垚浣滀笟
      * @param jobOperateDTO
      */
-    void finishWork(JobOperateDTO jobOperateDTO);
+    PlatformJob finishWork(JobOperateDTO jobOperateDTO);
 
+    /**
+     * 鏌ヨ鎵�鏈夊凡瀹屾垚浣滀笟鐢靛瓙閿佷笂閿佺姸鎬�
+     */
+    void checkWmsLockStatus();
+
+    /**
+     * 鎵嬪姩鎺堟潈杞﹁締绂诲満
+     * @param jobOperateDTO
+     */
+    PlatformJob powerLevel(JobOperateDTO jobOperateDTO);
     /**
      * 鑾峰彇鏈堝彴涓嬬殑浠诲姟淇℃伅
      * @param groupId
@@ -197,7 +222,6 @@
      */
     PlatformWorkVO getPlatformWorkVOById(Integer platformId);
 
-
     PlatformOrderNumByDateResponse orderNumByDate(PlatformOrderNumByDateRequest param);
 
     List<PlatformDataListResponse> platformWorkingDataList(PlatformDataListRequest param);
@@ -207,4 +231,38 @@
     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);
 }

--
Gitblit v1.9.3