From 0c687cc8f562f096396b664cd9f7717b11faf171 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Sat, 26 Aug 2023 11:10:01 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=AC=A7=E6=B4=BE=E5=B7=A5?= =?UTF-8?q?=E5=8E=82=E6=95=B0=E6=8D=AE=E5=AF=B9=E6=8E=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../comfac/service/impl/AsyncDataServiceImpl.java | 10 ++++------ .../logpm/factory/config/InterceptorAdapterConfig.java | 3 ++- .../oupai/service/impl/OuPaiFactoryServiceImpl.java | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java index 2d6555d5d..ed5f8bc5e 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java @@ -1,6 +1,5 @@ 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.update.UpdateWrapper; 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.IPanPackageListService; 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.ZbPackageInfoEntity; import com.logpm.factory.zb.entity.ZbReceiptEntity; @@ -40,16 +41,13 @@ import com.logpm.oldproject.feign.IDetailProductClient; import com.logpm.oldproject.feign.IServiceNumClient; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; -import org.checkerframework.checker.units.qual.C; import org.jetbrains.annotations.Nullable; 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.StringUtil; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import java.sql.Date; import java.sql.Timestamp; import java.time.LocalDate; import java.util.ArrayList; @@ -543,7 +541,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { advanceDetailEntity.setVolume("");//体积 advanceDetailEntity.setUnitNo(StringUtil.isBlank(factoryPackageEntity.getCode()) ? "" : factoryPackageEntity.getCode());//包条码 advanceDetailEntity.setMctsTruck(advanceEntity.getMctsTruck());//车次号 - advanceDetailEntity.setMctsTruckNo(advanceEntity.getMctsTruckNo());//车牌号 + advanceDetailEntity.setMctsTruckNo(StringUtil.isBlank(advanceEntity.getMctsTruckNo())?"":advanceEntity.getMctsTruckNo());//车牌号 advanceDetailEntity.setDate100(null);//基地发货日期 advanceDetailEntity.setDate2("");//预约到厂时间 advanceDetailEntity.setDate3("");//实际到厂时间 diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java index 8563f8544..693bdf22e 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java @@ -18,7 +18,8 @@ public class InterceptorAdapterConfig implements WebMvcConfigurer { public void addInterceptors(InterceptorRegistry interceptorRegistry) { InterceptorRegistration registry = interceptorRegistry.addInterceptor(new FactoryAccountsInterceptor(factoryTokenService)); registry.addPathPatterns("/factory/**"). - excludePathPatterns("/factory/auth/token") + excludePathPatterns("/factory/auth/token"). + excludePathPatterns("/factory/oupai/**") .excludePathPatterns("/factory/common/**"); } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java index 00e547225..a66ce7d5c 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java @@ -383,7 +383,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { "$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" + "$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=SendWarehouse($select=Name,Code)" + ")&$expand=FromWarehouse($select=Name,Code)&$expand=CurrentWarehouse($select=Name,Code)&$expand=EndWarehouse($select=Name,Code)";