From b3059e1a596b4fb05a708f3c3ac0ff3bc369d06b Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 12 十二月 2024 16:03:27 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
index 2678112..e2d96a3 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
@@ -2,6 +2,7 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
+import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
@@ -12,6 +13,7 @@
import com.doumee.dao.web.reqeust.JobDetailDTO;
import com.doumee.dao.web.reqeust.SignInDTO;
import com.doumee.service.business.PlatformJobService;
+import com.doumee.service.business.third.WmsService;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -32,6 +34,8 @@
@Autowired
private PlatformJobService platformJobService;
+ @Autowired
+ private WmsService wmsService;
@PreventRepeat
@ApiOperation("鏂板缓")
@@ -49,6 +53,13 @@
return ApiResponse.success(null);
}
+ @ApiOperation("鑾峰彇褰撳墠鐢ㄦ埛鐨勬渶杩戜竴鏉″緟绛惧埌鐨勪綔涓氫俊鎭�")
+ @GetMapping("/getLastWaitJob")
+ @LoginNoRequired
+ public ApiResponse<PlatformJob> getLastWaitJob(@RequestParam String uuid,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success( platformJobService.getLastWaitJob(uuid,this.getLoginUser(token)));
+ }
+
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
@CloudRequiredPermission("business:platformjob:delete")
@@ -56,6 +67,13 @@
platformJobService.deleteByIdInBatch(this.getIdList(ids));
return ApiResponse.success(null);
}
+ @ApiOperation("鎵归噺鏇存柊wms鍚堝悓鎬昏繍杈撻噺")
+ @GetMapping("/updateTotalNum")
+ @CloudRequiredPermission("business:platformjob:update")
+ public ApiResponse updateTotalNum(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ wmsService.computjobTotalNum(this.getIdList(ids));
+ return ApiResponse.success(null);
+ }
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
--
Gitblit v1.9.3