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

1.修复欧派工厂数据对接问题

training
zhenghaoyu 1 year ago
parent
f98bfe026b
commit
0c687cc8f5
3 changed files with 7 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java
  2. 3
      blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java
  3. 2
      blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java

10
blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java
Unescape View File

@ -1,6 +1,5 @@
package com.logpm.factory.comfac.service.impl; package com.logpm.factory.comfac.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@ -23,7 +22,9 @@ import com.logpm.factory.pan.service.IPanFactoryOrderService;
import com.logpm.factory.pan.service.IPanPackageInfoService; import com.logpm.factory.pan.service.IPanPackageInfoService;
import com.logpm.factory.pan.service.IPanPackageListService; import com.logpm.factory.pan.service.IPanPackageListService;
import com.logpm.factory.snm.constant.PanFactoryEnum; import com.logpm.factory.snm.constant.PanFactoryEnum;
import com.logpm.factory.snm.entity.*; import com.logpm.factory.snm.entity.PanFactoryOrder;
import com.logpm.factory.snm.entity.PanPackageInfo;
import com.logpm.factory.snm.entity.PanPackageList;
import com.logpm.factory.zb.entity.ZbOrderPackageEntity; import com.logpm.factory.zb.entity.ZbOrderPackageEntity;
import com.logpm.factory.zb.entity.ZbPackageInfoEntity; import com.logpm.factory.zb.entity.ZbPackageInfoEntity;
import com.logpm.factory.zb.entity.ZbReceiptEntity; import com.logpm.factory.zb.entity.ZbReceiptEntity;
@ -40,16 +41,13 @@ import com.logpm.oldproject.feign.IDetailProductClient;
import com.logpm.oldproject.feign.IServiceNumClient; import com.logpm.oldproject.feign.IServiceNumClient;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.checkerframework.checker.units.qual.C;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.springblade.core.redis.cache.BladeRedis; import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.core.tool.utils.ObjectUtil;
import org.springblade.core.tool.utils.StringUtil; import org.springblade.core.tool.utils.StringUtil;
import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.sql.Date;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.ArrayList; import java.util.ArrayList;
@ -543,7 +541,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
advanceDetailEntity.setVolume("");//体积 advanceDetailEntity.setVolume("");//体积
advanceDetailEntity.setUnitNo(StringUtil.isBlank(factoryPackageEntity.getCode()) ? "" : factoryPackageEntity.getCode());//包条码 advanceDetailEntity.setUnitNo(StringUtil.isBlank(factoryPackageEntity.getCode()) ? "" : factoryPackageEntity.getCode());//包条码
advanceDetailEntity.setMctsTruck(advanceEntity.getMctsTruck());//车次号 advanceDetailEntity.setMctsTruck(advanceEntity.getMctsTruck());//车次号
advanceDetailEntity.setMctsTruckNo(advanceEntity.getMctsTruckNo());//车牌号 advanceDetailEntity.setMctsTruckNo(StringUtil.isBlank(advanceEntity.getMctsTruckNo())?"":advanceEntity.getMctsTruckNo());//车牌号
advanceDetailEntity.setDate100(null);//基地发货日期 advanceDetailEntity.setDate100(null);//基地发货日期
advanceDetailEntity.setDate2("");//预约到厂时间 advanceDetailEntity.setDate2("");//预约到厂时间
advanceDetailEntity.setDate3("");//实际到厂时间 advanceDetailEntity.setDate3("");//实际到厂时间

3
blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java
Unescape View File

@ -18,7 +18,8 @@ public class InterceptorAdapterConfig implements WebMvcConfigurer {
public void addInterceptors(InterceptorRegistry interceptorRegistry) { public void addInterceptors(InterceptorRegistry interceptorRegistry) {
InterceptorRegistration registry = interceptorRegistry.addInterceptor(new FactoryAccountsInterceptor(factoryTokenService)); InterceptorRegistration registry = interceptorRegistry.addInterceptor(new FactoryAccountsInterceptor(factoryTokenService));
registry.addPathPatterns("/factory/**"). registry.addPathPatterns("/factory/**").
excludePathPatterns("/factory/auth/token") excludePathPatterns("/factory/auth/token").
excludePathPatterns("/factory/oupai/**")
.excludePathPatterns("/factory/common/**"); .excludePathPatterns("/factory/common/**");
} }
} }

2
blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
Unescape View File

@ -383,7 +383,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
"$expand=Order($select=" + "$expand=Order($select=" +
"Code,SelfCode,ContractNumber,ServiceNumber,OrderClass,OrderType,Status,FactoryShipStatus,FactorySendQty,WarehouseReceiveStatus,WarehouseReceiveQty,ReservationStatus,Store,MatingCode,IsMating,FirstClassCode,Leave,Customer,Province,City,CustomerAddress,CustomerPhone,ShopReceiver,BrandCode,BrandName,From,OutGoingTime,CreateTime,Freeze,FirstShipTime,MatingShipTime,FirstReceiveTime,MatingReceiveTime;\n" + "Code,SelfCode,ContractNumber,ServiceNumber,OrderClass,OrderType,Status,FactoryShipStatus,FactorySendQty,WarehouseReceiveStatus,WarehouseReceiveQty,ReservationStatus,Store,MatingCode,IsMating,FirstClassCode,Leave,Customer,Province,City,CustomerAddress,CustomerPhone,ShopReceiver,BrandCode,BrandName,From,OutGoingTime,CreateTime,Freeze,FirstShipTime,MatingShipTime,FirstReceiveTime,MatingReceiveTime;\n" +
"$expand=Store($select=Name,Code))" + "$expand=Store($select=Name,Code))" +
"&$expand=PackageDetails($select=Code,Name,OrgCode,OrgCode)" + "&$expand=PackageDetails($select=Code,Name,Type,Unit,OrgCode)" +
"&$expand=CurrentWarehouse($select=Name,Code)" + "&$expand=CurrentWarehouse($select=Name,Code)" +
"&$expand=SendWarehouse($select=Name,Code)" + "&$expand=SendWarehouse($select=Name,Code)" +
")&$expand=FromWarehouse($select=Name,Code)&$expand=CurrentWarehouse($select=Name,Code)&$expand=EndWarehouse($select=Name,Code)"; ")&$expand=FromWarehouse($select=Name,Code)&$expand=CurrentWarehouse($select=Name,Code)&$expand=EndWarehouse($select=Name,Code)";

Write Preview
Loading…
Cancel
Save