From 304b8a05be8ec2b6d281fec83ddde9add1a53622 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 23 十月 2025 17:40:13 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 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 7553e6a..0415341 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
@@ -109,7 +109,6 @@
         return ApiResponse.success(platformService.platformWorkReportList(platform));
     }
 
-
     @ApiOperation("鏍规嵁鏈堝彴缁勮幏鍙栨湀鍙板垪琛ㄤ俊鎭�")
     @GetMapping("/listByGroupId")
     @CloudRequiredPermission("business:platform:query")
@@ -200,7 +199,7 @@
         if(!Constants.equalsInteger(platformJob.getType(),Constants.FOUR)
                 && StringUtils.isNotBlank(platformJob.getBillCode())){
             //閫氱煡WMS缁戝畾鏈堝彴淇℃伅
-            wmsService.orderPlatformBind(platformJob);
+            wmsService.orderPlatformBind(platformJob,1);
         }
         return ApiResponse.success("鎿嶄綔鎴愬姛");
     }
@@ -222,6 +221,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("鎿嶄綔鎴愬姛");
     }
 
@@ -251,7 +255,6 @@
     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("鎿嶄綔鎴愬姛");
     }
 

--
Gitblit v1.9.3