From bf79a36667124868583fcbf47af0e709e088b5e9 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期六, 12 十月 2024 09:09:32 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 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 5b7db0f..ca0f84e 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 @@ -15,11 +15,13 @@ 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.*; @@ -58,6 +60,9 @@ @Autowired private PlatformWmsJobService platformWmsJobService; + + @Autowired + private WmsService wmsService; @ApiOperation("鑾峰彇鏈堝彴缁勪俊鎭�") @PostMapping("/getPlatformGroupList") @@ -126,6 +131,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("鎿嶄綔鎴愬姛"); } -- Gitblit v1.9.3