From 1674f2b873da35814f5f1bdd199b0b37d5d04a3b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 23 十月 2025 09:07:31 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java
index 8cc607e..6879864 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Platform;
import com.doumee.dao.business.model.PlatformGroup;
@@ -19,8 +19,10 @@
import com.doumee.service.business.PlatformJobService;
import com.doumee.service.business.PlatformService;
import com.doumee.service.business.PlatformShowParamService;
+import com.doumee.service.business.third.WmsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -47,6 +49,10 @@
@Autowired
private PlatformShowParamService platformShowParamService;
+
+ @Autowired
+ private WmsService wmsService;
+
@PreventRepeat
@ApiOperation("鏂板缓")
@@ -103,7 +109,6 @@
return ApiResponse.success(platformService.platformWorkReportList(platform));
}
-
@ApiOperation("鏍规嵁鏈堝彴缁勮幏鍙栨湀鍙板垪琛ㄤ俊鎭�")
@GetMapping("/listByGroupId")
@CloudRequiredPermission("business:platform:query")
@@ -130,6 +135,12 @@
@PostMapping("/getPlatformGroupList")
@CloudRequiredPermission("business:platform:query")
public ApiResponse<List<PlatformGroup>> getPlatformGroupList (@RequestBody PlatformDataDTO platformDataDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success(platformGroupService.getAllPlatformGroup(platformDataDTO,getLoginUser(token)));
+ }
+ @ApiOperation("鑾峰彇鏈堝彴缁勪俊鎭�(骞冲彴绔級")
+ @PostMapping("/getPlatformGroupListNew")
+ @CloudRequiredPermission("business:platform:query")
+ public ApiResponse<List<PlatformGroup>> getPlatformGroupListNew (@RequestBody PlatformDataDTO platformDataDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(platformGroupService.getAllPlatformGroup(platformDataDTO,getLoginUser(token)));
}
@@ -185,6 +196,11 @@
if(Constants.equalsInteger(oldPlatformJob.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())){
platformJobService.sendInPark(platformJob);
}
+ if(!Constants.equalsInteger(platformJob.getType(),Constants.FOUR)
+ && StringUtils.isNotBlank(platformJob.getBillCode())){
+ //閫氱煡WMS缁戝畾鏈堝彴淇℃伅
+ wmsService.orderPlatformBind(platformJob,1);
+ }
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -203,7 +219,13 @@
@CloudRequiredPermission("business:platform:update")
public ApiResponse platformOverNumber (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
- platformJobService.platformOverNumber(jobOperateDTO);
+ PlatformJob platformJob = platformJobService.platformOverNumber(jobOperateDTO);
+ platformJobService.cancelInPark(platformJob);
+ if(Constants.equalsInteger(platformJob.getOrigin(),Constants.ONE)
+ && StringUtils.isNotBlank(platformJob.getBillCode())){
+ //閫氱煡WMS缁戝畾鏈堝彴淇℃伅
+ wmsService.orderPlatformBind(platformJob,0);
+ }
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -227,6 +249,16 @@
}
+ @ApiOperation("鎭㈠浣滀笟")
+ @PostMapping("/restoreWork")
+ @CloudRequiredPermission("business:platform:update")
+ public ApiResponse restoreWork (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ jobOperateDTO.setLoginUserInfo(getLoginUser(token));
+ PlatformJob platformJob = platformJobService.restoreWork(jobOperateDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
@ApiOperation("瀹屾垚浣滀笟")
@PostMapping("/finishWork")
@CloudRequiredPermission("business:platform:update")
--
Gitblit v1.9.3