From c5a0ff2661fe362dddbe88c6a28d19c48c24c39b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 21 十月 2024 20:39:32 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 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..6fc1041 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
@@ -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("鏂板缓")
@@ -185,6 +191,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);
+        }
         return ApiResponse.success("鎿嶄綔鎴愬姛");
     }
 
@@ -203,7 +214,8 @@
     @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);
         return ApiResponse.success("鎿嶄綔鎴愬姛");
     }
 

--
Gitblit v1.9.3