From 34f587564c9a34515e7deda4dcd02eb748480e1f Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期一, 13 一月 2025 18:05:24 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java | 37 +++++++++++++++++++++++++++++++------ 1 files changed, 31 insertions(+), 6 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 0ea961a..644d624 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.*; @@ -114,7 +115,7 @@ DriverHomeVO getDriverHome(LoginUserInfo loginUserInfo); /** - * 璺濈绛惧埌 + * 璺濈绛惧埌路 * @param signInDTO */ void signIn(SignInDTO signInDTO); @@ -167,7 +168,7 @@ * 鏈堝彴杩囧彿 * @param jobOperateDTO */ - void platformOverNumber(JobOperateDTO jobOperateDTO); + PlatformJob platformOverNumber(JobOperateDTO jobOperateDTO); /** * 寮傚父鎸傝捣 @@ -194,6 +195,11 @@ PlatformJob finishWork(JobOperateDTO jobOperateDTO); /** + * 鏌ヨ鎵�鏈夊凡瀹屾垚浣滀笟鐢靛瓙閿佷笂閿佺姸鎬� + */ + void checkWmsLockStatus(); + + /** * 鎵嬪姩鎺堟潈杞﹁締绂诲満 * @param jobOperateDTO */ @@ -215,7 +221,6 @@ */ PlatformWorkVO getPlatformWorkVOById(Integer platformId); - PlatformOrderNumByDateResponse orderNumByDate(PlatformOrderNumByDateRequest param); List<PlatformDataListResponse> platformWorkingDataList(PlatformDataListRequest param); @@ -225,4 +230,24 @@ CarNumByStatusResponse carStatusNum(CarNumByStatusRequest param); PlatformQueuingListResponse queueList(PlatformQueuingListRequest param); + + LargeScreenDataVO getLargeScreenData(); + + /** + * 瓒呮椂鎶ヨ + */ + void timeOutReport(); + + /** + * 鑷姩杩囧彿 + */ + void timeOutCallIn(); + + /** + * 浣滀笟瓒呮椂 + */ + void timeOutWork(); + + PlatformJob getLastWaitJob(String uuid, LoginUserInfo loginUser); + } -- Gitblit v1.9.3