diff --git a/blade-service-api/logpm-report-api/src/main/java/com/logpm/report/entity/LargeScreenDataEntity.java b/blade-service-api/logpm-report-api/src/main/java/com/logpm/report/entity/LargeScreenDataEntity.java index a5504d82a..7184163da 100644 --- a/blade-service-api/logpm-report-api/src/main/java/com/logpm/report/entity/LargeScreenDataEntity.java +++ b/blade-service-api/logpm-report-api/src/main/java/com/logpm/report/entity/LargeScreenDataEntity.java @@ -13,7 +13,6 @@ import java.util.Map; @Data @TableName("logpm_large_screen_data") @EqualsAndHashCode(callSuper = true) -@AllArgsConstructor public class LargeScreenDataEntity extends TenantEntity { /** 预留1 */ @@ -33,9 +32,6 @@ public class LargeScreenDataEntity extends TenantEntity { private String reserve5 ; @ApiModelProperty(name = "数据",notes = "") - private Map data; + private String data; - public LargeScreenDataEntity(Map data) { - this.data = data; - } } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ExportWarehouseWaybillVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ExportWarehouseWaybillVO.java index e44b1dc3e..438736f3a 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ExportWarehouseWaybillVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ExportWarehouseWaybillVO.java @@ -125,6 +125,9 @@ public class ExportWarehouseWaybillVO implements Serializable { @ExcelProperty(value = "仓储操作费") private BigDecimal handlingFee; + @ExcelProperty(value = "安装费") + private BigDecimal installFee; + @ExcelProperty(value = "申明价值") private BigDecimal claimingValue; diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java index 73f1391bb..daf8dcbaa 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java @@ -503,6 +503,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl initWarehouseSeating(String param) throws Exception { + warehouseService.initWarehouseSeating(param); + return ReturnT.SUCCESS; + } + + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.java index 15527f4ac..d9125ca8f 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.java @@ -101,4 +101,5 @@ public interface BasicdataWarehouseMapper extends BaseMapper findBusunessLineList(); + void initWarehouseSeating(@Param("warehouseId") String warehouseId); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml index 74f598e38..744f7bc32 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml @@ -188,4 +188,19 @@ group by business_line + + update logpm_warehouse_warehouse tt + join( + select warehouse_id,count(*) total + from logpm_warehouse_goods_allocation + where is_deleted = 0 + and enable_status = 1 + + and warehouse_id = #{warehouseId} + + group by warehouse_id + ) ttt on tt.id = ttt.warehouse_id + set tt.seating = ttt.total, + tt.single_storage_location_area = case when tt.acreage = null then 0 else case when tt.acreage = 0 or ttt.total = 0 then 0 else tt.acreage/ttt.total end end + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java index 375e33659..f1973072d 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java @@ -137,4 +137,6 @@ public interface IBasicdataWarehouseService extends BaseService findNamesMapByIds(List warehouseIds); R findBusunessLineList(); + + void initWarehouseSeating(String param); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java index 5ee6cca56..e0990133d 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java @@ -425,4 +425,9 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl reportServices; private final IQualityDeliverService qualityDeliverService; + private final IFactoryDataClient factoryDataClient; @RabbitListener(bindings = @QueueBinding( value = @Queue(name = FanoutConstants.DeliveryOfPickup.BillPlan.QUEUE.REPORT, durable = "true"), @@ -251,7 +254,14 @@ public class ReportListener { } if (flag) { try { - selectReportService(PlanReportListener.class).buildReport(msg); + // selectReportService(PlanReportListener.class).buildReport(msg); + // 延迟发送消息 延迟5秒 解决商配任务预约单未处理完的情况 + factoryDataClient.sendMessage(SendMsg.builder() + .exchange(FanoutConstants.distribution.DeliveryAndPlan.EXCHANGE_DELAY) + .routingKey(null) + .message(msg) + .delay(5000) + .build()); } catch (Exception e) { e.printStackTrace(); log.error("配送计划生成明细报表失败: {}", e.getMessage()); diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java index 0e43375f4..da9d8851b 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java @@ -190,7 +190,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl packageList = new ArrayList<>(); TrunklineAdvanceEntity advanceEntity = new TrunklineAdvanceEntity(); - List boxCodes = orderInfoVO.getBoxCodes(); + List boxCodes = ObjectUtil.isNotEmpty(orderInfoVO.getBoxCodes()) ? orderInfoVO.getBoxCodes() : new ArrayList<>(); advanceEntity.setTenantId(tenantId); advanceEntity.setStatus(0); advanceEntity.setIsDeleted(0); diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/aspect/JobAnnotationAspect.java b/blade-service/logpm-report/src/main/java/com/logpm/report/aspect/JobAnnotationAspect.java new file mode 100644 index 000000000..2b1b888cf --- /dev/null +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/aspect/JobAnnotationAspect.java @@ -0,0 +1,79 @@ +package com.logpm.report.aspect; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; +import lombok.AllArgsConstructor; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.springblade.common.cache.CacheNames; +import org.springblade.common.component.MockLoginService; +import org.springblade.core.redis.cache.BladeRedis; +import org.springblade.core.redis.lock.LockType; +import org.springblade.core.redis.lock.RedisLockClient; +import org.springblade.core.tool.utils.ThreadLocalUtil; +import org.springframework.core.env.Environment; +import org.springframework.http.HttpHeaders; +import org.springframework.mock.web.MockHttpServletRequest; +import org.springframework.stereotype.Component; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import java.util.Objects; +import java.util.concurrent.TimeUnit; + +@Aspect +@Component +@AllArgsConstructor +public class JobAnnotationAspect { + private final BladeRedis bladeRedis; + private final Environment environment; + private final RedisLockClient redisLockClient; + private final MockLoginService mockLoginService; + @Around("@annotation(com.xxl.job.core.handler.annotation.XxlJob)") + public Object xxlJobAnnotationMethods(ProceedingJoinPoint joinPoint) throws Throwable { + + + JSONObject jsonObject = mockLogin(); + MockHttpServletRequest mockRequest = new MockHttpServletRequest(); + mockRequest.addHeader("Blade-Auth", "bearer "+jsonObject.get("access_token")); + RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(mockRequest)); + + HttpHeaders httpHeaders = new HttpHeaders(); + httpHeaders.add("Blade-Auth","bearer "+jsonObject.get("access_token") ); + httpHeaders.add( "Authorization", "Basic bG9jYWw6bG9jYWxfc2VjcmV0"); + ThreadLocalUtil.put("bladeContext", httpHeaders); + + DynamicDataSourceContextHolder.push(jsonObject.getString("tenant_id")); + // 执行原方法 + Object result = joinPoint.proceed(); + // 在方法执行后，从数据源上下文中移除租户ID + DynamicDataSourceContextHolder.poll(); + + return result; + + + } + + private JSONObject mockLogin() throws InterruptedException { + String account ="shujutongbu"; + String tenantId ="627683"; + String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account; + String lockKey =key+":lock"; + JSONObject data =bladeRedis.get(key); + if(Objects.isNull(data)){ + boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); + if(flag){ + data =bladeRedis.get(key); + if(Objects.isNull(data)){ + data = mockLoginService.mockToken(tenantId,account); + bladeRedis.setEx(key,data,2591990L); + redisLockClient.unLock(lockKey, LockType.FAIR); + } + } + } + return data; + } + + +} diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/config/InterceptorAdapterConfig.java b/blade-service/logpm-report/src/main/java/com/logpm/report/config/InterceptorAdapterConfig.java new file mode 100644 index 000000000..5e14bc4a0 --- /dev/null +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/config/InterceptorAdapterConfig.java @@ -0,0 +1,33 @@ +package com.logpm.report.config; + + +import com.logpm.report.interceptor.LocalServerLoginAccountsInterceptor; +import lombok.AllArgsConstructor; +import org.springblade.common.component.MockLoginService; +import org.springblade.core.redis.cache.BladeRedis; +import org.springblade.core.redis.lock.RedisLockClient; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +/** + * 为所有的的 + */ +@Configuration +@AllArgsConstructor +public class InterceptorAdapterConfig implements WebMvcConfigurer { + + + private final BladeRedis redis; + + private final RedisLockClient redisLockClient; + private final MockLoginService mockLoginService; + + + @Override + public void addInterceptors(InterceptorRegistry interceptorRegistry) { + + interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis,redisLockClient,mockLoginService)).addPathPatterns("/largeScreen/**").order(1); + + } +} diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/config/XxlJobConfig.java b/blade-service/logpm-report/src/main/java/com/logpm/report/config/XxlJobConfig.java new file mode 100644 index 000000000..4949d6a9d --- /dev/null +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/config/XxlJobConfig.java @@ -0,0 +1,74 @@ +package com.logpm.report.config; + +import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * xxl-job config + * + * @author xuxueli 2017-04-28 + */ +@Configuration(proxyBeanMethods = false) +public class XxlJobConfig { + private final Logger logger = LoggerFactory.getLogger(XxlJobConfig.class); + + @Value("${xxl.job.admin.addresses}") + private String adminAddresses; + + @Value("${xxl.job.executor.appname}") + private String appName; + + @Value("${xxl.job.executor.ip}") + private String ip; + + @Value("${xxl.job.executor.port}") + private int port; + + @Value("${xxl.job.accessToken}") + private String accessToken; + + @Value("${xxl.job.executor.logpath}") + private String logPath; + + @Value("${xxl.job.executor.logretentiondays}") + private int logRetentionDays; + + + @Bean + public XxlJobSpringExecutor xxlJobExecutor() { + logger.info(">>>>>>>>>>> xxl-job config init."); + XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor(); + xxlJobSpringExecutor.setAdminAddresses(adminAddresses); + xxlJobSpringExecutor.setAppName(appName); + xxlJobSpringExecutor.setIp(ip); + xxlJobSpringExecutor.setPort(port); + xxlJobSpringExecutor.setAccessToken(accessToken); + xxlJobSpringExecutor.setLogPath(logPath); + xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays); + + return xxlJobSpringExecutor; + } + + /** + * 针对多网卡、容器内部署等情况，可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP； + * + * 1、引入依赖： + * + * org.springframework.cloud + * spring-cloud-commons + * ${version} + * + * + * 2、配置文件，或者容器启动变量 + * spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.' + * + * 3、获取IP + * String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress(); + */ + + +} diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/controller/LargeScreenController.java b/blade-service/logpm-report/src/main/java/com/logpm/report/controller/LargeScreenController.java index 46f3c33f8..05153bd8d 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/controller/LargeScreenController.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/controller/LargeScreenController.java @@ -37,22 +37,22 @@ public class LargeScreenController{ public LargeScreenController( // 正式使用是使用这个 -// @Qualifier(value = "mapWarehouseServiceHttp") IMapWarehouseService mapWarehouseService, -// @Qualifier(value = "billingDataServiceHttp") IBillingDataService billingDataService, -// @Qualifier(value = "carsLoadDataServiceHttp") ICarsLoadDataService carsLoadDataService, -// @Qualifier(value = "nodeDataServiceHttp") INodeDataService nodeData, -// @Qualifier(value = "binLocationServiceHttp") IBinLocationService binLocation, -// @Qualifier(value = "trunkDataServiceHttp") ITrunkDataService trunkData, -// @Qualifier(value = "deliveryDataServiceHttp") IDeliveryDataService deliveryDataService, -// @Qualifier(value = "businessRationServiceHttp") IBusinessRationService businessRatio - IMapWarehouseService mapWarehouseService, - IBillingDataService billingDataService, - ICarsLoadDataService carsLoadDataService, - INodeDataService nodeData, - IBinLocationService binLocation, - ITrunkDataService trunkData, - IDeliveryDataService deliveryDataService, - IBusinessRationService businessRatio + @Qualifier(value = "mapWarehouseServiceHttp") IMapWarehouseService mapWarehouseService, + @Qualifier(value = "billingDataServiceHttp") IBillingDataService billingDataService, + @Qualifier(value = "carsLoadDataServiceHttp") ICarsLoadDataService carsLoadDataService, + @Qualifier(value = "nodeDataServiceHttp") INodeDataService nodeData, + @Qualifier(value = "binLocationServiceHttp") IBinLocationService binLocation, + @Qualifier(value = "trunkDataServiceHttp") ITrunkDataService trunkData, + @Qualifier(value = "deliveryDataServiceHttp") IDeliveryDataService deliveryDataService, + @Qualifier(value = "businessRationServiceHttp") IBusinessRationService businessRatio +// IMapWarehouseService mapWarehouseService, +// IBillingDataService billingDataService, +// ICarsLoadDataService carsLoadDataService, +// INodeDataService nodeData, +// IBinLocationService binLocation, +// ITrunkDataService trunkData, +// IDeliveryDataService deliveryDataService, +// IBusinessRationService businessRatio ) { this.mapWarehouseService = mapWarehouseService; this.billingDataService = billingDataService; diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/interceptor/LocalServerLoginAccountsInterceptor.java b/blade-service/logpm-report/src/main/java/com/logpm/report/interceptor/LocalServerLoginAccountsInterceptor.java new file mode 100644 index 000000000..3ebef4fcb --- /dev/null +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/interceptor/LocalServerLoginAccountsInterceptor.java @@ -0,0 +1,100 @@ +package com.logpm.report.interceptor; + +import com.alibaba.fastjson.JSONObject; +import lombok.AllArgsConstructor; +import lombok.extern.log4j.Log4j2; +import org.springblade.common.cache.CacheNames; +import org.springblade.common.component.MockLoginService; +import org.springblade.common.exception.CustomerException; +import org.springblade.common.wrapper.CustomHttpServletRequestWrapper; +import org.springblade.core.redis.cache.BladeRedis; +import org.springblade.core.redis.lock.LockType; +import org.springblade.core.redis.lock.RedisLockClient; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.StringUtil; +import org.springblade.core.tool.utils.ThreadLocalUtil; +import org.springframework.http.HttpHeaders; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Objects; +import java.util.concurrent.TimeUnit; + +@Log4j2 +@AllArgsConstructor +public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapter { + + private final BladeRedis bladeRedis; + private final RedisLockClient redisLockClient; + private final MockLoginService mockLoginService; + + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws CustomerException { + + + try { + CustomHttpServletRequestWrapper wrappedRequest = new CustomHttpServletRequestWrapper(request); + String account ="shujutongbu"; + String tenantId = request.getHeader("tenantId"); + tenantId = StringUtil.isBlank(tenantId)?"627683":tenantId; + String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account; + String lockKey =key+":lock"; + JSONObject data =bladeRedis.get(key); + if(Objects.isNull(data)){ + boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); + if(flag){ + data =bladeRedis.get(key); + if(Objects.isNull(data)){ + data = mockLoginService.mockToken(tenantId,account); + bladeRedis.setEx(key,data,2591990L); + redisLockClient.unLock(lockKey, LockType.FAIR); + } + } + } + + // 修改或添加header + + // 发送登录请求 + log.info("##########preHandle: request={}", request); + + wrappedRequest.addHeader("Blade-Auth", "bearer "+data.getString("access_token")); + HttpHeaders httpHeaders = new HttpHeaders(); + httpHeaders.add("Blade-Auth","bearer "+data.get("access_token") ); + httpHeaders.add( "Authorization", "Basic bG9jYWw6bG9jYWxfc2VjcmV0"); + ThreadLocalUtil.put("bladeContext", httpHeaders); + + + // 用包装后的request替换原始request + request = wrappedRequest; + RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request)); + return true; + } catch (Exception e) { + returnJson(response, JSONObject.toJSONString(R.fail(500, "服务异常，请联系管理员"))); + return false; + } + } + + private void returnJson(HttpServletResponse response, String json) { + PrintWriter writer = null; + response.setCharacterEncoding("UTF-8"); + response.setContentType("application/json"); + try { + writer = response.getWriter(); + writer.print(json); + + } catch (IOException e) { + System.out.println(e.getMessage()); + } finally { + if (writer != null) { + writer.close(); + } + } + } + + +} diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/job/LargeScreenQueryXxlJob.java b/blade-service/logpm-report/src/main/java/com/logpm/report/job/LargeScreenQueryXxlJob.java index 39a5bfd99..4ecac78f4 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/job/LargeScreenQueryXxlJob.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/job/LargeScreenQueryXxlJob.java @@ -1,15 +1,19 @@ package com.logpm.report.job; +import com.alibaba.fastjson.JSON; +import com.baomidou.dynamic.datasource.annotation.DS; import com.logpm.report.entity.LargeScreenDataEntity; import com.logpm.report.mapper.largeScreen.LargeScreenDataMapper; import com.logpm.report.service.largeScreen.*; import com.logpm.report.vo.largeScreen.XxlJobQueryVO; +import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.handler.annotation.XxlJob; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.stereotype.Component; +import java.util.Date; import java.util.HashMap; /** @@ -34,9 +38,8 @@ public class LargeScreenQueryXxlJob { /** * 数据查询 */ - @XxlJob("LargeScreenQuery") - public void query() - { + @XxlJob("largeScreenexExcute") + public ReturnT largeScreenexExcute(String param) { XxlJobQueryVO xxlJobQueryVO = new XxlJobQueryVO(); xxlJobQueryVO.setMapWarehouse(mapWarehouseService.list()); xxlJobQueryVO.setBillingData(billingDataService.getBillingData()); @@ -64,7 +67,14 @@ public class LargeScreenQueryXxlJob { data.put("deliveryData", xxlJobQueryVO.getDeliveryData()); data.put("deliveryYearData", xxlJobQueryVO.getDeliveryYearData()); data.put("businessRatio", xxlJobQueryVO.getBusinessRatio()); + LargeScreenDataEntity largeScreenDataEntity = new LargeScreenDataEntity(); + largeScreenDataEntity.setData(JSON.toJSONString(data)); + largeScreenDataEntity.setCreateTime(new Date()); + largeScreenDataEntity.setUpdateTime(new Date()); + largeScreenDataEntity.setIsDeleted(0); + largeScreenDataEntity.setStatus(1); + largeScreenDataMapper.insert(largeScreenDataEntity); - largeScreenDataMapper.insert(new LargeScreenDataEntity(data)); + return ReturnT.SUCCESS; } } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml index 82bc17487..7e6e3eb6e 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml @@ -686,11 +686,11 @@ lww.destination_warehouse_name destinationWarehouseName, ldsa.warehouse warehouseName, ldsa.brand brand, - sum(ldsa.total_number) incomingNum, + sum(ldsa.incoming_num) incomingNum, IFNULL(sum(ltcls.num),0) outNum, - sum(if(ltcll.start_date <= DATE_ADD( ldsa.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0)) outOnTimeNum, - IFNULL(round(sum(if(ltcll.start_date <= DATE_ADD( ldsa.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0))/sum(ltcls.num)*100,2),'0.00') outOnTimeRate, - round(sum(TIMESTAMPDIFF(SECOND, ldsa.create_time, ltcll.start_date))/sum(ltcls.num)/3600,1) avgTime + sum(if(ltcll.start_date <= DATE_ADD( ldsa.create_time, INTERVAL #{param.hoursTime} HOUR ),ltcls.num,0)) outOnTimeNum, + IFNULL(round(sum(if(ltcll.start_date <= DATE_ADD( ldsa.create_time, INTERVAL #{param.hoursTime} HOUR ),ltcls.num,0))/sum(ldsa.incoming_num)*100,2),'0.00') outOnTimeRate, + round(sum(TIMESTAMPDIFF(SECOND, ldsa.create_time, ltcll.start_date)*ltcls.num)/sum(ltcls.num)/3600,1) avgTime from logpm_distribution_stock_article ldsa left join logpm_warehouse_warehouse waw on waw.id = ldsa.warehouse_id left join logpm_warehouse_waybill lww on lww.waybill_no = ldsa.order_code @@ -750,11 +750,11 @@ lww.destination_warehouse_name destinationWarehouseName, ldsa.warehouse warehouseName, ldsa.brand brand, - sum(ldsa.total_number) incomingNum, + sum(ldsa.incoming_num) incomingNum, IFNULL(sum(ltcls.num),0) outNum, - sum(if(ltcll.start_date <= DATE_ADD( ldsa.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0)) outOnTimeNum, - IFNULL(concat(round(sum(if(ltcll.start_date <= DATE_ADD( ldsa.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0))/sum(ltcls.num)*100,2),'%'),'0.00%') outOnTimeRate, - round(sum(TIMESTAMPDIFF(SECOND, ldsa.create_time, ltcll.start_date))/sum(ltcls.num)/3600,1) avgTime + sum(if(ltcll.start_date <= DATE_ADD( ldsa.create_time, INTERVAL #{param.hoursTime} HOUR ),ltcls.num,0)) outOnTimeNum, + IFNULL(concat(round(sum(if(ltcll.start_date <= DATE_ADD( ldsa.create_time, INTERVAL #{param.hoursTime} HOUR ),ltcls.num,0))/sum(ldsa.incoming_num)*100,2),'%'),'0.00%') outOnTimeRate, + round(sum(TIMESTAMPDIFF(SECOND, ldsa.create_time, ltcll.start_date)*ltcls.num)/sum(ltcls.num)/3600,1) avgTime from logpm_distribution_stock_article ldsa left join logpm_warehouse_warehouse waw on waw.id = ldsa.warehouse_id left join logpm_warehouse_waybill lww on lww.waybill_no = ldsa.order_code diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/BillingDataMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/BillingDataMapper.xml index 61ada2f67..5668e02f0 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/BillingDataMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/BillingDataMapper.xml @@ -8,7 +8,7 @@ sum(d.volume) as volume, count(d.id) as value from logpm_platform.logpm_warehouse_waybill as w - INNER JOIN logpm_platform.logpm_trunkline_advance_detail as d on w.waybill_no = d.waybill_no + INNER JOIN logpm_platform.logpm_trunkline_advance_detail as d on w.id = d.waybill_id where w.freeze_status = 0 and w.create_time BETWEEN #{startTime} and #{endTime} diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/BillingDataServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/BillingDataServiceImpl.java index 199f082f7..8ef679eb4 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/BillingDataServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/BillingDataServiceImpl.java @@ -1,6 +1,7 @@ package com.logpm.report.service.largeScreen.httpImpl; import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.report.entity.LargeScreenDataEntity; import com.logpm.report.mapper.largeScreen.BillingDataMapper; @@ -35,7 +36,7 @@ public class BillingDataServiceImpl implements IBillingDataService { LargeScreenDataEntity largeScreenDataEntity = largeScreenDataMapper.selectOne(Wrappers.lambdaQuery().orderByDesc(LargeScreenDataEntity::getCreateTime)); - XxlJobQueryVO init = XxlJobQueryVO.init(largeScreenDataEntity.getData()); + XxlJobQueryVO init = JSON.parseObject(largeScreenDataEntity.getData(), XxlJobQueryVO.class); return init.getBillingData(); } @@ -44,9 +45,15 @@ public class BillingDataServiceImpl implements IBillingDataService { public List getWarehouseBillingData() { LargeScreenDataEntity largeScreenDataEntity = largeScreenDataMapper.selectOne(Wrappers.lambdaQuery().orderByDesc(LargeScreenDataEntity::getCreateTime)); - XxlJobQueryVO init = XxlJobQueryVO.init(largeScreenDataEntity.getData()); + XxlJobQueryVO init = JSON.parseObject(largeScreenDataEntity.getData(), XxlJobQueryVO.class); - return init.getWarehouseBillingData(); + List warehouseBillingData = init.getWarehouseBillingData(); + + // 按照开单件数 倒序排列 + warehouseBillingData.sort((o1, o2) -> o2.getValue() - o1.getValue()); + + + return warehouseBillingData; } @Override @@ -56,7 +63,7 @@ public class BillingDataServiceImpl implements IBillingDataService { if (largeScreenDataEntity == null) { return new ArrayList<>(); } - XxlJobQueryVO init = XxlJobQueryVO.init(largeScreenDataEntity.getData()); + XxlJobQueryVO init = JSON.parseObject(largeScreenDataEntity.getData(), XxlJobQueryVO.class); return init.getMonthBillingData(); } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/BinLocationServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/BinLocationServiceImpl.java index 8ad9f44e8..d17540caf 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/BinLocationServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/BinLocationServiceImpl.java @@ -1,5 +1,6 @@ package com.logpm.report.service.largeScreen.httpImpl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.report.entity.LargeScreenDataEntity; import com.logpm.report.mapper.largeScreen.BinLocationMapper; @@ -25,7 +26,7 @@ public class BinLocationServiceImpl implements IBinLocationService { if (largeScreenDataEntity == null) { return new BinLocationDataVO(); } - XxlJobQueryVO init = XxlJobQueryVO.init(largeScreenDataEntity.getData()); + XxlJobQueryVO init = JSON.parseObject(largeScreenDataEntity.getData(), XxlJobQueryVO.class); return init.getBinLocationData(); } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/BusinessRationServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/BusinessRationServiceImpl.java index d0d58f29b..72a479800 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/BusinessRationServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/BusinessRationServiceImpl.java @@ -1,5 +1,6 @@ package com.logpm.report.service.largeScreen.httpImpl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.report.entity.LargeScreenDataEntity; import com.logpm.report.mapper.largeScreen.BusinessRatioMapper; @@ -27,7 +28,7 @@ public class BusinessRationServiceImpl implements IBusinessRationService { if (largeScreenDataEntity == null) { return new BusinessRatioDataVO(); } - XxlJobQueryVO init = XxlJobQueryVO.init(largeScreenDataEntity.getData()); + XxlJobQueryVO init = JSON.parseObject(largeScreenDataEntity.getData(), XxlJobQueryVO.class); return init.getBusinessRatio(); } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/CarsLoadDataServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/CarsLoadDataServiceImpl.java index 1cf7df6eb..9f12a2688 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/CarsLoadDataServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/CarsLoadDataServiceImpl.java @@ -1,5 +1,6 @@ package com.logpm.report.service.largeScreen.httpImpl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.report.entity.LargeScreenDataEntity; import com.logpm.report.mapper.largeScreen.CarsLoadDataMapper; @@ -39,7 +40,7 @@ public class CarsLoadDataServiceImpl implements ICarsLoadDataService { return new ArrayList<>(); } - XxlJobQueryVO init = XxlJobQueryVO.init(largeScreenDataEntity.getData()); + XxlJobQueryVO init = JSON.parseObject(largeScreenDataEntity.getData(), XxlJobQueryVO.class); return isDelivery.equals(1) ? init.getCareerLineDeliveryData() diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/DeliveryDataServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/DeliveryDataServiceImpl.java index 262f30952..f69f4b7e1 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/DeliveryDataServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/DeliveryDataServiceImpl.java @@ -1,5 +1,6 @@ package com.logpm.report.service.largeScreen.httpImpl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.report.entity.LargeScreenDataEntity; import com.logpm.report.mapper.largeScreen.DeliveryDataMapper; @@ -29,7 +30,7 @@ public class DeliveryDataServiceImpl implements IDeliveryDataService { return new DeliveryDataVO(); } - XxlJobQueryVO init = XxlJobQueryVO.init(largeScreenDataEntity.getData()); + XxlJobQueryVO init = JSON.parseObject(largeScreenDataEntity.getData(), XxlJobQueryVO.class); return isYear.equals(1) ? init.getDeliveryYearData() diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/MapWarehouseServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/MapWarehouseServiceImpl.java index a6e2fb633..f7ca72970 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/MapWarehouseServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/MapWarehouseServiceImpl.java @@ -1,6 +1,7 @@ package com.logpm.report.service.largeScreen.httpImpl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.report.entity.LargeScreenDataEntity; import com.logpm.report.mapper.largeScreen.LargeScreenDataMapper; @@ -35,7 +36,7 @@ public class MapWarehouseServiceImpl implements IMapWarehouseService { if (largeScreenDataEntity == null) { return new ArrayList<>(); } - XxlJobQueryVO init = XxlJobQueryVO.init(largeScreenDataEntity.getData()); + XxlJobQueryVO init = JSON.parseObject(largeScreenDataEntity.getData(), XxlJobQueryVO.class); return init.getMapWarehouse(); } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/NodeDataServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/NodeDataServiceImpl.java index d25bfd48d..1c77d8e43 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/NodeDataServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/NodeDataServiceImpl.java @@ -1,5 +1,6 @@ package com.logpm.report.service.largeScreen.httpImpl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.report.entity.LargeScreenDataEntity; import com.logpm.report.mapper.largeScreen.LargeScreenDataMapper; @@ -25,7 +26,7 @@ public class NodeDataServiceImpl implements INodeDataService { if (largeScreenDataEntity == null) { return new NodeDataVO(); } - XxlJobQueryVO init = XxlJobQueryVO.init(largeScreenDataEntity.getData()); + XxlJobQueryVO init = JSON.parseObject(largeScreenDataEntity.getData(), XxlJobQueryVO.class); return init.getNodeData(); } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/TrunkDataServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/TrunkDataServiceImpl.java index badb6a50a..4bc3357b3 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/TrunkDataServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/TrunkDataServiceImpl.java @@ -1,5 +1,6 @@ package com.logpm.report.service.largeScreen.httpImpl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.report.entity.LargeScreenDataEntity; import com.logpm.report.mapper.largeScreen.LargeScreenDataMapper; @@ -30,7 +31,7 @@ public class TrunkDataServiceImpl implements ITrunkDataService { return new TrunkDataVO(); } - XxlJobQueryVO init = XxlJobQueryVO.init(largeScreenDataEntity.getData()); + XxlJobQueryVO init = JSON.parseObject(largeScreenDataEntity.getData(), XxlJobQueryVO.class); return init.getTrunkData(); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java index d16f466c5..5310cf3b3 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java @@ -1094,6 +1094,14 @@ public class CarsLoadController { // } carsLoadService.unloadByLoadId(loadCarsDTO); + try{ + + carsLoadService.sendStationArrivedEnter(loadCarsDTO); + + }catch (Exception e){ + log.error("############sendOrders: 发送卸车数据异常",e); + } + return R.success("操作成功"); } catch (CustomerException e) { log.error(e.message, e); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java index 7690c94e9..464d31bd8 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java @@ -285,4 +285,5 @@ public interface ITrunklineCarsLoadService extends BaseService updateAdvanceDetailList = openOrderDTO.getUpdateAdvanceDetailList(); WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId); @@ -2986,6 +2989,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String updateMsg = verifyUpdateData(openOrderDTO, waybillEntity); + waybillEntity.setUpdateStatus(1); + warehouseWaybillClient.updateEntity(waybillEntity); if (CollUtil.isNotEmpty(updateAdvanceDetailList)) { diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java index bc94ee765..631f6e4cd 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java @@ -13,11 +13,7 @@ import com.logpm.basicdata.entity.BasicdataBrandEntity; import com.logpm.basicdata.entity.BasicdataClientEntity; import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; -import com.logpm.basicdata.feign.IBasicdataBrandClient; -import com.logpm.basicdata.feign.IBasicdataClientClient; -import com.logpm.basicdata.feign.IBasicdataStoreBusinessClient; -import com.logpm.basicdata.feign.IBasicdataTripartiteMallClient; -import com.logpm.basicdata.feign.IBasicdataWarehouseClient; +import com.logpm.basicdata.feign.*; import com.logpm.distribution.dto.FindParamterDTO; import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.entity.DistributionStockArticleEntity; @@ -31,8 +27,6 @@ import com.logpm.trunkline.entity.TrunklineAdvanceEntity; import com.logpm.trunkline.mapper.TrunklineAdvanceMapper; import com.logpm.trunkline.service.ITrunklineAdvanceDetailService; import com.logpm.trunkline.service.ITrunklineAdvanceService; -import com.logpm.trunkline.service.ITrunklineCarsLoadService; -import com.logpm.trunkline.service.ITrunklineDetailProductService; import com.logpm.trunkline.vo.CustomerInfoVO; import com.logpm.trunkline.vo.OpenOrderVO; import com.logpm.trunkline.vo.TrunklineAdvanceVO; @@ -51,14 +45,7 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -635,7 +622,13 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl= totalCount){ + waybillEntity.setStockCount(totalCount); + }else{ + waybillEntity.setStockCount(stockCount + 1); + } + } parcelList.setConditions(1); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLinePhotoEntityServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLinePhotoEntityServiceImpl.java index 07fe76776..487587a3d 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLinePhotoEntityServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLinePhotoEntityServiceImpl.java @@ -1,5 +1,6 @@ package com.logpm.trunkline.service.impl; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.logpm.trunkline.entity.TrunklineCarsLoadLinePhotoEntity; import com.logpm.trunkline.mapper.TrunklineCarsLoadLinePhotoMapper; @@ -9,6 +10,7 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; @Service @@ -29,10 +31,14 @@ public class TrunklineCarsLoadLinePhotoEntityServiceImpl extends BaseServiceImpl @Override public List findListByLoadIdListAndWarehouseId(List idList, Long warehouseId) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("load_id",idList) - .eq("warehouse_id",warehouseId); - List trunklineCarsLoadLinePhotoEntities = baseMapper.selectList(queryWrapper); - return trunklineCarsLoadLinePhotoEntities; + List ls = new ArrayList<>(); + if(CollUtil.isNotEmpty(idList)){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("load_id",idList) + .eq("warehouse_id",warehouseId); + ls = baseMapper.selectList(queryWrapper); + } + + return ls; } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 06d15d25a..d95e375b8 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -1527,9 +1527,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl