java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge remote-tracking branch 'origin/fix_bug_20231220' into fix_bug_20231220

single_db
汤建军 1 year ago
parent
d15a3fcacc 9dd96e9f82
commit
e82c1f35c0
8 changed files with 12 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/dto/MtReceiveContentDTO.java
  2. 2
      blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/dto/MtReceiveDTO.java
  3. 2
      blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/dto/MtReceiveImagesDTO.java
  4. 6
      blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/feign/IMtOrderMainClinet.java
  5. 5
      blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/feign/MtOrderMainClinet.java
  6. 2
      blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/IMtFactoryDataService.java
  7. 6
      blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java
  8. 19
      blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java

2
blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/dto/mt/MtReceiveContentDTO.java → blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/dto/MtReceiveContentDTO.java
Unescape View File

@ -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;

2
blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/dto/mt/MtReceiveDTO.java → blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/dto/MtReceiveDTO.java
Unescape View File

@ -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;

2
blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/dto/mt/MtReceiveImagesDTO.java → blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/dto/MtReceiveImagesDTO.java
Unescape View File

@ -1,4 +1,4 @@
package com.logpm.factory.dto.mt;
package com.logpm.factory.mt.dto;
import lombok.Data;

6
blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/feign/IMtOrderMainClinet.java → blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/feign/IMtOrderMainClinet.java
Unescape View File

@ -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;
/**
* 梦天工厂对外接口

5
blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/feign/MtOrderMainClinet.java
Unescape View File

@ -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

2
blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/IMtFactoryDataService.java
Unescape View File

@ -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;

6
blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java
Unescape View File

@ -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.*;

19
blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java
Unescape View File

@ -52,25 +52,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);
}
}
}

Write Preview
Loading…
Cancel
Save