From 67ff8bd1223a488542f2504db84f68d17846d149 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 25 九月 2024 15:48:19 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java
index 8be5af1..73ca495 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java
@@ -55,6 +55,9 @@
@Autowired
private PlatformService platformService;
+ @Autowired
+ private PlatformWmsJobService platformWmsJobService;
+
@ApiOperation("鑾峰彇鏈堝彴缁勪俊鎭�")
@PostMapping("/getPlatformGroupList")
public ApiResponse<List<PlatformGroup>> getPlatformGroupList (@RequestBody PlatformDataDTO platformDataDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
@@ -100,7 +103,8 @@
@PostMapping("/platformInPark")
public ApiResponse platformInPark (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
- platformJobService.platformInPark(jobOperateDTO);
+ PlatformJob platformJob = platformJobService.platformInPark(jobOperateDTO);
+ platformJobService.sendInPark(platformJob);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -108,7 +112,11 @@
@PostMapping("/platformCallNumber")
public ApiResponse platformCallNumber (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
- platformJobService.platformCallNumber(jobOperateDTO);
+ PlatformJob oldPlatformJob = platformJobService.findById(jobOperateDTO.getJobId());
+ PlatformJob platformJob = platformJobService.platformCallNumber(jobOperateDTO);
+ if(Constants.equalsInteger(oldPlatformJob.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())){
+ platformJobService.sendInPark(platformJob);
+ }
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -141,7 +149,8 @@
@PostMapping("/beginWork")
public ApiResponse beginWork (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
- platformJobService.beginWork(jobOperateDTO);
+ PlatformJob platformJob = platformJobService.beginWork(jobOperateDTO);
+ platformJobService.cancelInPark(platformJob);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -150,9 +159,18 @@
@PostMapping("/finishWork")
public ApiResponse finishWork (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
- platformJobService.finishWork(jobOperateDTO);
+ PlatformJob platformJob = platformJobService.finishWork(jobOperateDTO);
+ //涓嬪彂绂诲洯鏉冮檺
+ platformJobService.sendInPark(platformJob);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+ @ApiOperation("WMS杩愯緭鍗曡鎯�")
+ @GetMapping("/wmsJobDetail")
+ public ApiResponse<PlatformWmsJob> wmsJobDetail(@RequestParam Integer id) {
+ return ApiResponse.success(platformWmsJobService.findByDetailId(id));
+ }
+
+
}
--
Gitblit v1.9.3