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 |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 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 880978b..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,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;
@@ -195,6 +195,11 @@
     PlatformJob finishWork(JobOperateDTO jobOperateDTO);
 
     /**
+     * 鏌ヨ鎵�鏈夊凡瀹屾垚浣滀笟鐢靛瓙閿佷笂閿佺姸鎬�
+     */
+    void checkWmsLockStatus();
+
+    /**
      * 鎵嬪姩鎺堟潈杞﹁締绂诲満
      * @param jobOperateDTO
      */
@@ -243,4 +248,6 @@
      */
     void timeOutWork();
 
+    PlatformJob getLastWaitJob(String uuid, LoginUserInfo loginUser);
+
 }

--
Gitblit v1.9.3