调整目录结构

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;

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;

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;
 

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.mt.dto.MtReceiveDTO;
-import com.logpm.factory.snm.vo.MTOrderPackageRelationVO;
 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;
 
 /**
  * 梦天工厂对外接口

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

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;

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.mt.dto.MtReceiveContentDTO;
-import com.logpm.factory.dto.mt.MtReceiveDTO;
+import com.logpm.factory.mt.dto.MtReceiveDTO;
-import com.logpm.factory.dto.mt.MtReceiveImagesDTO;
+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.*;

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<OrderPackageStatusPushFailLogEntity> list = orderPackageStatusPushFailLogMapper.selectList(queryWrapper);
-
-		for (OrderPackageStatusPushFailLogEntity orderPackageStatusPushFailLogEntity : list) {
-			orderPackageStatusPushFailLogEntity.setDataStatus(1);
-			orderPackageStatusPushFailLogMapper.updateById(orderPackageStatusPushFailLogEntity);
-		}
-	}
 
 
 }