From b5b5d66f0cb9705877a60e2214545b566e818dcd Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 21 Dec 2023 15:48:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=AE=E5=BD=95=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mt => mt/dto}/MtReceiveContentDTO.java | 2 +- .../{dto/mt => mt/dto}/MtReceiveDTO.java | 2 +- .../mt => mt/dto}/MtReceiveImagesDTO.java | 2 +- .../{snm => mt}/feign/IMtOrderMainClinet.java | 6 ++---- .../factory/mt/feign/MtOrderMainClinet.java | 5 +---- .../mt/service/IMtFactoryDataService.java | 2 +- .../impl/MtFactoryDataServiceImpl.java | 6 +++--- .../factory/receiver/DealWithDataHandler.java | 20 ++----------------- 8 files changed, 12 insertions(+), 33 deletions(-) rename blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/{dto/mt => mt/dto}/MtReceiveContentDTO.java (94%) rename blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/{dto/mt => mt/dto}/MtReceiveDTO.java (94%) rename blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/{dto/mt => mt/dto}/MtReceiveImagesDTO.java (72%) rename blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/{snm => mt}/feign/IMtOrderMainClinet.java (89%) diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/dto/mt/MtReceiveContentDTO.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/dto/MtReceiveContentDTO.java similarity index 94% rename from blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/dto/mt/MtReceiveContentDTO.java rename to blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/dto/MtReceiveContentDTO.java index de8a2bb95..4a324c686 100644 --- a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/dto/mt/MtReceiveContentDTO.java +++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/dto/MtReceiveContentDTO.java @@ -1,4 +1,4 @@ -package com.logpm.factory.dto.mt; +package com.logpm.factory.mt.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/dto/mt/MtReceiveDTO.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/dto/MtReceiveDTO.java similarity index 94% rename from blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/dto/mt/MtReceiveDTO.java rename to blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/dto/MtReceiveDTO.java index 21fa5c112..9d16de007 100644 --- a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/dto/mt/MtReceiveDTO.java +++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/dto/MtReceiveDTO.java @@ -1,4 +1,4 @@ -package com.logpm.factory.dto.mt; +package com.logpm.factory.mt.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/dto/mt/MtReceiveImagesDTO.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/dto/MtReceiveImagesDTO.java similarity index 72% rename from blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/dto/mt/MtReceiveImagesDTO.java rename to blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/dto/MtReceiveImagesDTO.java index 45b376f6c..efbbf4511 100644 --- a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/dto/mt/MtReceiveImagesDTO.java +++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/dto/MtReceiveImagesDTO.java @@ -1,4 +1,4 @@ -package com.logpm.factory.dto.mt; +package com.logpm.factory.mt.dto; import lombok.Data; diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/feign/IMtOrderMainClinet.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/feign/IMtOrderMainClinet.java similarity index 89% rename from blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/feign/IMtOrderMainClinet.java rename to blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/feign/IMtOrderMainClinet.java index a23d36996..5f5290ac6 100644 --- a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/feign/IMtOrderMainClinet.java +++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/feign/IMtOrderMainClinet.java @@ -1,8 +1,7 @@ -package com.logpm.factory.snm.feign; +package com.logpm.factory.mt.feign; import com.fasterxml.jackson.core.JsonProcessingException; -import com.logpm.factory.dto.mt.MtReceiveDTO; -import com.logpm.factory.snm.vo.MTOrderPackageRelationVO; +import com.logpm.factory.mt.dto.MtReceiveDTO; import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.tool.api.R; import org.springframework.cloud.openfeign.FeignClient; @@ -12,7 +11,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.security.NoSuchAlgorithmException; -import java.util.List; /** * 梦天工厂对外接口 diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/feign/MtOrderMainClinet.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/feign/MtOrderMainClinet.java index c96be08c1..a8f4ef015 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/feign/MtOrderMainClinet.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/feign/MtOrderMainClinet.java @@ -1,11 +1,9 @@ package com.logpm.factory.mt.feign; import com.fasterxml.jackson.core.JsonProcessingException; -import com.logpm.factory.dto.mt.MtReceiveDTO; +import com.logpm.factory.mt.dto.MtReceiveDTO; import com.logpm.factory.mt.service.IMtFactoryDataService; import com.logpm.factory.mt.service.IMtFactoryOrderMainService; -import com.logpm.factory.snm.feign.IMtOrderMainClinet; -import com.logpm.factory.snm.vo.MTOrderPackageRelationVO; import lombok.AllArgsConstructor; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; @@ -15,7 +13,6 @@ import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; import java.security.NoSuchAlgorithmException; -import java.util.List; @NonDS @ApiIgnore diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/IMtFactoryDataService.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/IMtFactoryDataService.java index aa9d3e78a..cf3a5faa9 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/IMtFactoryDataService.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/IMtFactoryDataService.java @@ -5,7 +5,7 @@ import com.logpm.factory.comfac.dto.OrderInfoDTO; import com.logpm.factory.comfac.dto.OrderStatusDTO; import com.logpm.factory.comfac.dto.ReceiveInfoDTO; import com.logpm.factory.mt.dto.MtFactoryDataDTO; -import com.logpm.factory.dto.mt.MtReceiveDTO; +import com.logpm.factory.mt.dto.MtReceiveDTO; import org.springblade.core.tool.api.R; import java.security.NoSuchAlgorithmException; diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java index f7d56f7aa..4132a5be8 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java @@ -13,9 +13,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.json.JsonMapper; import com.logpm.factory.comfac.constant.FactoryConstant; import com.logpm.factory.comfac.dto.*; -import com.logpm.factory.dto.mt.MtReceiveContentDTO; -import com.logpm.factory.dto.mt.MtReceiveDTO; -import com.logpm.factory.dto.mt.MtReceiveImagesDTO; +import com.logpm.factory.mt.dto.MtReceiveContentDTO; +import com.logpm.factory.mt.dto.MtReceiveDTO; +import com.logpm.factory.mt.dto.MtReceiveImagesDTO; import com.logpm.factory.mt.dto.*; import com.logpm.factory.mt.entity.*; import com.logpm.factory.mt.service.*; diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java index f076231b9..7b96d144f 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java @@ -57,26 +57,10 @@ public class DealWithDataHandler { factoryCommonService.extracted(status, unitNo, currentWarehouseId, operationTime, trayId); - extracted(unitNo,currentWarehouseId); + //extracted(unitNo,currentWarehouseId); } - /** - * 更新包件状态 - * @param unitNo - * @param currentWarehouseId - */ - private void extracted(String unitNo, String currentWarehouseId) { - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("unit_no", unitNo); - queryWrapper.eq("warehouse_id", currentWarehouseId); - - List list = orderPackageStatusPushFailLogMapper.selectList(queryWrapper); - - for (OrderPackageStatusPushFailLogEntity orderPackageStatusPushFailLogEntity : list) { - orderPackageStatusPushFailLogEntity.setDataStatus(1); - orderPackageStatusPushFailLogMapper.updateById(orderPackageStatusPushFailLogEntity); - } - } + }