From 815e2cda769751dec5c1a1a71d0ff61b0d051d76 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 24 十月 2025 14:58:22 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 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 ca0f84e..83e2ae8 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
@@ -4,30 +4,22 @@
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.trace.Trace;
-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.core.utils.DateUtil;
import com.doumee.dao.business.model.*;
import com.doumee.dao.web.reqeust.*;
-import com.doumee.dao.web.response.DriverHomeVO;
-import com.doumee.dao.web.response.LineUpVO;
import com.doumee.dao.web.response.PlatformWorkVO;
import com.doumee.service.business.*;
import com.doumee.service.business.third.WmsService;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.math.BigDecimal;
-import java.util.Date;
import java.util.List;
/**
@@ -42,7 +34,7 @@
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/pdaPlatform")
@Slf4j
-@LoginNoRequired
+//@LoginNoRequired
public class PdaPlatformController extends BaseController {
@@ -134,12 +126,26 @@
if(!Constants.equalsInteger(platformJob.getType(),Constants.FOUR)
&& StringUtils.isNotBlank(platformJob.getBillCode())){
//閫氱煡WMS缁戝畾鏈堝彴淇℃伅
- wmsService.orderPlatformBind(platformJob);
+ wmsService.orderPlatformBind(platformJob,1);
}
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+ @ApiOperation("浠诲姟鍔犳��")
+ @PostMapping("/jobUrge")
+ @CloudRequiredPermission("business:platform:update")
+ public ApiResponse jobUrge (@RequestBody PlatformJob platformJob, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ platformJobService.jobUrge(platformJob.getId(),getLoginUser(token));
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+ @ApiOperation("绉婚櫎杞﹁締鎺掗槦闃熷垪锛堝洖鍒板緟绛惧埌锛�")
+ @PostMapping("/backToWatiSign")
+ @CloudRequiredPermission("business:platform:update")
+ public ApiResponse backToWatiSign (@RequestBody PlatformJob platformJob,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ platformJobService.backToWatiSign(platformJob.getId(),getLoginUser(token));
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
@ApiOperation("杞Щ鏈堝彴")
@PostMapping("/platformMove")
@CloudRequiredPermission("business:platform:update")
@@ -156,6 +162,11 @@
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
PlatformJob platformJob = platformJobService.platformOverNumber(jobOperateDTO);
platformJobService.cancelInPark(platformJob);
+ if(!Constants.equalsInteger(platformJob.getType(),Constants.FOUR)
+ && StringUtils.isNotBlank(platformJob.getBillCode())){
+ //閫氱煡WMS缁戝畾鏈堝彴淇℃伅
+ wmsService.orderPlatformBind(platformJob,0);
+ }
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -179,6 +190,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);
+ platformJobService.cancelInPark(platformJob);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
@ApiOperation("瀹屾垚浣滀笟")
@PostMapping("/finishWork")
@CloudRequiredPermission("business:platform:update")
--
Gitblit v1.9.3