diff --git a/blade-biz-common/src/main/java/org/springblade/common/cache/CacheNames.java b/blade-biz-common/src/main/java/org/springblade/common/cache/CacheNames.java index 42f732c9b..8fd2da967 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/cache/CacheNames.java +++ b/blade-biz-common/src/main/java/org/springblade/common/cache/CacheNames.java @@ -74,4 +74,8 @@ public interface CacheNames { * 用户选择仓库的key */ String USER_WAREHOUSE_KEY = "logpm:user:warehouse:select:"; + /** + * 用户能操作的仓库 + */ + String USER_WAREHOUSE_OWN = "logpm:user:warehouse:own:"; } diff --git a/blade-biz-common/src/main/java/org/springblade/common/utils/PhoneCheckUtil.java b/blade-biz-common/src/main/java/org/springblade/common/utils/PhoneCheckUtil.java new file mode 100644 index 000000000..e319e7837 --- /dev/null +++ b/blade-biz-common/src/main/java/org/springblade/common/utils/PhoneCheckUtil.java @@ -0,0 +1,13 @@ +package org.springblade.common.utils; + +/** + * 电话校验 + */ +public class PhoneCheckUtil { + + public static boolean checkPhone(String phone){ + String regex = "^1[3-9]\\d{9}$"; + return phone.matches(regex); + } + +} diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java index 8bdcbece8..c3bec83c8 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Date; import java.util.List; @@ -47,6 +48,12 @@ public class WarehouseScanRecordVO extends WarehouseScanRecordEntity { @ApiModelProperty(value = "扫描详情") private String scanNodeType; + /** + * 二级扫描类型(扫描详情) + */ + @ApiModelProperty(value = "扫描详情") + private Date date; + /** * 仓库List diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml index d7d92b6ab..194b86605 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml @@ -107,9 +107,6 @@ and lawo.first like concat('%', #{param.first },'%') and lawo.secondary like concat('%', #{param.secondary },'%') and lawo.vehicle_route like concat('%', #{param.vehicleRoute },'%') - and lawo.brand_name like concat('%', #{param.brandName },'%') and date_format(from_unixtime( lawo.deliver_goods_time),'%Y-%m-%d') = date_format(#{param.deliverGoodsTime },'%Y-%m-%d') and date_format(from_unixtime(lawo.discovery_time),'%Y-%m-%d') = date_format( #{param.discoveryTime},'%Y-%m-%d') @@ -125,12 +122,12 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d and lawo.work_order_status in ('20') and lawo.work_order_status in ('30') and lawo.work_order_status in ('30') - and lawo.work_order_status in ('70','80') + and lawo.work_order_status in ('70','80','100') and lawo.customer_service_id = #{param.customerServiceId } and lawo.customer_service_name like concat('%', #{param.customerServiceName },'%') and lawo.waybill_mall_id = #{param.waybillMallId } and lawo.problem_description = #{param.problemDescription} - and lawo.warehouse_id = #{param.warehouseId} + and (lap.warehouse_id = #{param.warehouseId} OR lap.business_id = #{param.warehouseId}) and lawo.person_responsible = #{param.personResponsible } and lawo.process_number = #{param.processNumber } and lawo.reviewed_by = #{param.reviewedBy } @@ -143,7 +140,11 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d and lawo.work_order_status IN ( '10', '20', '21', '30', '40', '50', '60', '70', '80', '90' ,'100','110') - or 1=1 + and lawo.work_order_status in ('10') and lap.types_of = '2' and lap.processing_status in ('1') + and lawo.work_order_status in ('20') and lap.types_of = '2' + and lawo.work_order_status in (21,30) and lap.processing_status = '4' + and lap.types_of = '2' + and ((lawo.work_order_status in (80,100,70) OR lacr.warehouse_id=#{param.warehouseId}) AND lawo.warehouse_id =#{param.warehouseId} ) and lawo.work_order_type = #{param.workOrderType } and lawo.discovery_node = #{param.discoveryNode } and lawo.work_order_number like concat('%',#{param.workOrderNumber },'%') @@ -153,15 +154,8 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d and lawo.first like concat('%', #{param.first },'%') and lawo.secondary like concat('%', #{param.secondary },'%') and lawo.vehicle_route like concat('%', #{param.vehicleRoute },'%') - and lap.business_id = #{param.warehouseId} and lawo.work_order_status in ( #{param.workOrderStatus }) - - and lawo.work_order_status in ('10') and lap.types_of = '2' and lap.processing_status in ('1') - and lawo.work_order_status in ('20') and lap.types_of = '2' - and lap.types_of = '2' - and lawo.work_order_status in (21,30) and lap.processing_status = '4' - and lawo.work_order_status in (80,100,70) and lacr.warehouse_id=#{param.warehouseId} - and lawo.work_order_status in ('10') + and lawo.work_order_status in ('10') ORDER BY lawo.create_time DESC diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java index bea029bf1..220fa6585 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java @@ -89,6 +89,7 @@ public class BasicMaterialController extends BladeController { return R.data(pages); } + /** * 物料基础信息 自定义分页 */ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java index efa88aa0e..aabd86583 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java @@ -16,6 +16,7 @@ */ package com.logpm.basicdata.controller; +import com.alibaba.excel.util.DateUtils; import com.alibaba.nacos.common.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -23,7 +24,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.basicdata.dto.BasicdataVehicleDTO; import com.logpm.basicdata.dto.BasicdataVehiclePhotoDTO; import com.logpm.basicdata.entity.BasicdataVehicleEntity; -import com.logpm.basicdata.excel.BasicdataVehicleExcel; +import com.logpm.basicdata.excel.*; import com.logpm.basicdata.service.IBasicdataDriverArteryService; import com.logpm.basicdata.service.IBasicdataVehiclePhotoService; import com.logpm.basicdata.service.IBasicdataVehicleService; @@ -45,10 +46,14 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import springfox.documentation.annotations.ApiIgnore; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; @@ -201,14 +206,81 @@ public class BasicdataVehicleController extends BladeController { @GetMapping("/export-basicdataVehicle") @ApiOperationSupport(order = 9) @ApiOperation(value = "导出数据", notes = "传入basicdataVehicle") - public void exportBasicdataVehicle(@ApiIgnore @RequestParam Map basicdataVehicle, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(basicdataVehicle, BasicdataVehicleEntity.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(BasicdataVehicle::getTenantId, bladeUser.getTenantId()); - //} - queryWrapper.lambda().eq(BasicdataVehicleEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = basicdataVehicleService.exportBasicdataVehicle(queryWrapper); + public void exportBasicdataVehicle(@ApiIgnore @RequestParam String ids, HttpServletResponse response) { + + List list = basicdataVehicleService.exportBasicdataVehicle(ids); ExcelUtil.export(response, "车辆信息表数据" + DateUtil.time(), "车辆信息表数据表", list, BasicdataVehicleExcel.class); } + + /** + * 导出数据 + */ + @GetMapping("/export-vehicleTemplate") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "下载导出模板", notes = "传入basicdataVehicle") + public void exportVehicleTemplate(HttpServletResponse response) { + List list = new ArrayList<>(); + BasicdataVehicleImportExcel basicdataVehicleImportExcel = new BasicdataVehicleImportExcel(); +// basicdataVehicleImportExcel.setVehicleNub("鄂HG40Q9"); +// basicdataVehicleImportExcel.setVehicleSource("1"); +// basicdataVehicleImportExcel.setIsHead("1"); +// basicdataVehicleImportExcel.setTrailerType("1"); +// basicdataVehicleImportExcel.setVehicleModel("1"); +// basicdataVehicleImportExcel.setCarType("1"); +// basicdataVehicleImportExcel.setVehicleCommander(new BigDecimal(70.0)); +// basicdataVehicleImportExcel.setVehicleHeight(new BigDecimal(70.0)); +// basicdataVehicleImportExcel.setApprovedVolume(new BigDecimal(500.0)); +// basicdataVehicleImportExcel.setPaymentMethod("1"); +// basicdataVehicleImportExcel.setLicensePlateColor("1"); +// basicdataVehicleImportExcel.setVehicleCode("代号"); +// basicdataVehicleImportExcel.setVehicleColor("1"); +// basicdataVehicleImportExcel.setLicensePlateType("1"); +// basicdataVehicleImportExcel.setNotes("备注"); +// basicdataVehicleImportExcel.setVehicleOwner("如需绑定司机填写司机名称"); +// basicdataVehicleImportExcel.setVehicleBrand("车辆品牌"); +// basicdataVehicleImportExcel.setEngineCode("B48"); +// basicdataVehicleImportExcel.setVehicleQuality(new BigDecimal(500.0)); +// basicdataVehicleImportExcel.setLoadMass(new BigDecimal(500.0)); +// basicdataVehicleImportExcel.setOuterWidth(new BigDecimal(500.0)); +// basicdataVehicleImportExcel.setExpirationTime(DateUtils.format(new Date(),"dd/MM/yyyy")); +// basicdataVehicleImportExcel.setInsuranceStartTime(DateUtils.format(new Date(),"dd/MM/yyyy")); +// basicdataVehicleImportExcel.setInsuranceEndTime(DateUtils.format(new Date(),"dd/MM/yyyy")); +// basicdataVehicleImportExcel.setAdvertisementsNewTimes(DateUtils.format(new Date(),"dd/MM/yyyy")); +// basicdataVehicleImportExcel.setReviewTime(DateUtils.format(new Date(),"dd/MM/yyyy")); +// basicdataVehicleImportExcel.setRoadTransport("420303001532"); +// basicdataVehicleImportExcel.setBusinessLicense("420303001532"); +// basicdataVehicleImportExcel.setVehicleUnit("个人"); +// basicdataVehicleImportExcel.setVehicleUnitPhone("15678923467"); +// basicdataVehicleImportExcel.setVehicleOwnerPhone("如需绑定司机填写司机手机号码"); +// basicdataVehicleImportExcel.setVehicleOwnerCard("车辆所属人身份证号"); +// basicdataVehicleImportExcel.setCarrierName("汇通运输"); +// basicdataVehicleImportExcel.setReviewValidity(24); +// basicdataVehicleImportExcel.setBodyAdvertising("有"); +// basicdataVehicleImportExcel.setBodyAdvertising("有"); +// basicdataVehicleImportExcel.setVehicleParkingCompany("XXX挂靠公司"); +// basicdataVehicleImportExcel.setWithGps("1"); +// basicdataVehicleImportExcel.setGpsServiceProvider("XXX服务商"); +// basicdataVehicleImportExcel.setGpsModel("VT77M"); +// basicdataVehicleImportExcel.setDemonstrate("是"); + list.add(basicdataVehicleImportExcel); + + ExcelUtil.export(response, "车辆信息表数据" + DateUtil.time(), "车辆信息表数据表", list, BasicdataVehicleImportExcel.class); + } + + + + /** + * 导入司机信息 + */ + @PostMapping("import-basicdataVehicle") + @ApiOperationSupport(order = 12) + @ApiOperation(value = "导入车辆信息", notes = "传入excel") + public R importBasicdataVehicle(MultipartFile file) { + log.info("传入>>>>>>>{}",file); + BasicdataVehicleImporter basicdataDriverArteryImporter = new BasicdataVehicleImporter(basicdataVehicleService); + ExcelUtil.save(file,basicdataDriverArteryImporter, BasicdataVehicleImportExcel.class); + return R.success("操作成功"); + } + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java index 0a3dad131..48cf0b0ec 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java @@ -291,13 +291,8 @@ public class BasicdataWarehouseController extends BladeController { @GetMapping("/getMyWarehouseList") @ApiOperationSupport(order = 3) public R> getMyWarehouseList() { - BladeUser user = AuthUtil.getUser(); - List basicdataGoodsShelfVOList = CacheUtil.get(CacheObjNames.basic_data_warehourse_list.getCacheName(), CacheObjNames.basic_data_warehourse_list.getKeyPrefix(), user.getUserId(),List.class); - if(ObjectUtils.isNull(basicdataGoodsShelfVOList)){ - basicdataGoodsShelfVOList = warehouseService.getMyWarehouseList(); - CacheUtil.put(CacheObjNames.basic_data_warehourse_list.getCacheName(), CacheObjNames.basic_data_warehourse_list.getKeyPrefix(),user.getUserId(),basicdataGoodsShelfVOList); - } - return R.data(basicdataGoodsShelfVOList); + List myWarehouseList = warehouseService.getMyWarehouseList(); + return R.data(myWarehouseList); } /** diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehicleExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehicleExcel.java index 4ea6f7ba4..fc3287e1d 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehicleExcel.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehicleExcel.java @@ -42,18 +42,18 @@ public class BasicdataVehicleExcel implements Serializable { private static final long serialVersionUID = 1L; - /** - * 租户号 - */ - @ColumnWidth(20) - @ExcelProperty("租户号") - private String tenantId; - /** - * 是否已删除;1-未删除，2-已删除 - */ - @ColumnWidth(20) - @ExcelProperty("是否已删除;1-未删除，2-已删除") - private Integer isDeleted; +// /** +// * 租户号 +// */ +// @ColumnWidth(20) +// @ExcelProperty("租户号") +// private String tenantId; +// /** +// * 是否已删除;1-未删除，2-已删除 +// */ +// @ColumnWidth(20) +// @ExcelProperty("是否已删除;1-未删除，2-已删除") +// private Integer isDeleted; /** * 车牌号 */ @@ -282,12 +282,18 @@ public class BasicdataVehicleExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("保险卡照片") private String insuranceCardPhoto; +// /** +// * 关联承运商Id +// */ +// @ColumnWidth(20) +// @ExcelProperty("关联承运商Id") +// private String carrierId; /** - * 关联承运商Id + * 关联承运商名称 */ @ColumnWidth(20) - @ExcelProperty("关联承运商Id") - private String carrierId; + @ExcelProperty("关联承运商名称") + private String carrierName; /** * 车辆年审时间 */ @@ -348,35 +354,35 @@ public class BasicdataVehicleExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("GPS型号") private String gpsModel; - /** - * 预留1 - */ - @ColumnWidth(20) - @ExcelProperty("预留1") - private String reserve1; - /** - * 预留2 - */ - @ColumnWidth(20) - @ExcelProperty("预留2") - private String reserve2; - /** - * 预留3 - */ - @ColumnWidth(20) - @ExcelProperty("预留3") - private String reserve3; - /** - * 预留4 - */ - @ColumnWidth(20) - @ExcelProperty("预留4") - private String reserve4; - /** - * 预留5 - */ - @ColumnWidth(20) - @ExcelProperty("预留5") - private String reserve5; +// /** +// * 预留1 +// */ +// @ColumnWidth(20) +// @ExcelProperty("预留1") +// private String reserve1; +// /** +// * 预留2 +// */ +// @ColumnWidth(20) +// @ExcelProperty("预留2") +// private String reserve2; +// /** +// * 预留3 +// */ +// @ColumnWidth(20) +// @ExcelProperty("预留3") +// private String reserve3; +// /** +// * 预留4 +// */ +// @ColumnWidth(20) +// @ExcelProperty("预留4") +// private String reserve4; +// /** +// * 预留5 +// */ +// @ColumnWidth(20) +// @ExcelProperty("预留5") +// private String reserve5; } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehicleImportExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehicleImportExcel.java new file mode 100644 index 000000000..0f23e41c6 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehicleImportExcel.java @@ -0,0 +1,332 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.excel; + + +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + + +/** + * 车辆信息表 Excel实体类 + * + * @author lmy + * @since 2023-05-16 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicdataVehicleImportExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + + /** + * 车牌号 + */ + @ColumnWidth(45) + @ExcelProperty(index = 0,value = "车牌号,必填项:{示例:川A12345}") + private String vehicleNub; + /** + * 车辆来源;1-自有,2-承包,3-外请 + */ + @ColumnWidth(45) + @ExcelProperty(index = 1,value ="车辆来源;1-自有,2-承包,3-外请") + private String vehicleSource; + /** + * 是否车头;1-车头,2-挂车 + */ + @ColumnWidth(35) + @ExcelProperty(index = 2,value ="是否车头;1-车头,2-挂车") + private String isHead; + /** + * 挂车类型;1-独享,2-共享 + */ + @ColumnWidth(32) + @ExcelProperty(index = 3,value ="挂车类型;1-独享,2-共享") + private String trailerType; + /** + * 车辆类型;1-挂车,2-普通货车 + */ + @ColumnWidth(150) + @ExcelProperty(index = 4,value ="车辆类型;1-厢式货车;2-箱式挂车;3-平板货车;4-平板挂车;5-高栏车;6-高栏挂车;7-城配面包车;8-城配金杯车") + private String vehicleModel; + /** + * 车厢类型;1-高栏,2-平板,3-箱车 + */ + @ColumnWidth(45) + @ExcelProperty(index = 5,value ="车厢类型;1-高栏,2-平板,3-箱车") + private String carType; + /** + * 车长;单位（M） + */ + @ColumnWidth(25) + @ExcelProperty(index = 6,value ="车长;单位（M）") + private BigDecimal vehicleCommander; + /** + * 外廓高 + */ + @ColumnWidth(25) + @ExcelProperty(index = 7,value ="外廓高;单位（M）") + private BigDecimal vehicleHeight; + /** + * 车牌颜色;1-黄色,2-蓝色,3-绿色,4-蓝绿色,5-其他 + */ + @ColumnWidth(60) + @ExcelProperty("车牌颜色;1-黄色,2-蓝色,3-绿色,4-蓝绿色,5-其他") + private String licensePlateColor; + /** + * 车身颜色;1-红,2-黄,3-蓝,4-黑,5-白,6-银 + */ + @ColumnWidth(55) + @ExcelProperty("车身颜色;1-红,2-黄,3-蓝,4-黑,5-白,6-银") + private String vehicleColor; + /** + * 能源类型;1-汽油,2-柴油,3-电,4-天然气,5-混合油,6-燃化石油气,7-甲醇 + */ + @ColumnWidth(90) + @ExcelProperty("能源类型;1-汽油,2-柴油,3-电,4-天然气,5-混合油,6-燃化石油气,7-甲醇") + private String energyType; + /** + * 车牌类型;1-大型汽车号牌,2-小型汽车号牌 + */ + @ColumnWidth(50) + @ExcelProperty("车牌类型;1-大型汽车号牌,2-小型汽车号牌") + private String licensePlateType; + /** + * 车辆总质量;单位（T） + */ + @ColumnWidth(30) + @ExcelProperty("车辆总质量;单位（T）") + private BigDecimal vehicleQuality; + /** + * 整备质量;单位（T） + */ + @ColumnWidth(30) + @ExcelProperty("整备质量;单位（T）") + private BigDecimal curbWeight; + /** + * 载荷质量;单位（T） + */ + @ColumnWidth(30) + @ExcelProperty("载荷质量;单位（T）") + private BigDecimal loadMass; + /** + * 外廓宽;单位（M） + */ + @ColumnWidth(30) + @ExcelProperty("外廓宽;单位（M）") + private BigDecimal outerWidth; + /** + * 核定体积 + */ + @ColumnWidth(30) + @ExcelProperty("核定体积;单位（方）") + private BigDecimal approvedVolume; + /** + * 付款方式;1-现付,2-月付,3-到付 + */ + @ColumnWidth(45) + @ExcelProperty(index = 8,value ="付款方式;1-现付,2-月付,3-到付") + private String paymentMethod; + + /** + * 车辆所属人 + */ + @ColumnWidth(100) + @ExcelProperty("车辆所属人:{示例:张三(绑定司机需先建立司机,司机名称与手机号码保持一致)}") + private String vehicleOwner; + /** + * 车辆所属人手机号 + */ + @ColumnWidth(100) + @ExcelProperty(value = "车辆所属人手机号:{示例:156xxxxxxxxx(绑定司机需与司机手机号一致)}") + private String vehicleOwnerPhone; + /** + * 车辆所属人身份证号 + */ + @ColumnWidth(65) + @ExcelProperty("车辆所属人身份证号::{示例:510100xxxxxxxxxxxx}") + private String vehicleOwnerCard; + /** + * 品牌型号 + */ + @ColumnWidth(20) + @ExcelProperty("品牌型号") + private String vehicleBrand; + /** + * 车辆代号 + */ + @ColumnWidth(20) + @ExcelProperty("车辆代号") + private String vehicleCode; + /** + * 发动机型号 + */ + @ColumnWidth(20) + @ExcelProperty("发动机型号") + private String engineCode; + + /** + * 到期时间 + */ + @ColumnWidth(38) + @ExcelProperty(value = "到期时间:{示例:2023/2/28}") + private String expirationTime; + /** + * 道路运输证号 + */ + @ColumnWidth(20) + @ExcelProperty("道路运输证号") + private String roadTransport; + /** + * 经营许可证号 + */ + @ColumnWidth(20) + @ExcelProperty("经营许可证号") + private String businessLicense; + /** + * 车辆所属单位 + */ + @ColumnWidth(40) + @ExcelProperty(value = "车辆所属单位") + private String vehicleUnit; + /** + * 车辆所属单位电话 + */ + @ColumnWidth(55) + @ExcelProperty(value = "车辆所属单位电话:{示例:156xxxxxxxxx}") + private String vehicleUnitPhone; + + /** + * 关联承运商Id + */ + @ColumnWidth(20) + @ExcelProperty("关联承运商Id") + @ExcelIgnore + private Long carrierId; + + /** + * 关联承运商Id + */ + @ColumnWidth(50) + @ExcelProperty("承运商名称") + private String carrierName; + /** + * 车辆年审时间 + */ + @ColumnWidth(50) + @ExcelProperty("车辆年审时间:{示例:2023/2/28}") + private String reviewTime; + /** + * 车辆年审有效期 + */ + @ColumnWidth(20) + @ExcelProperty("车辆年审有效期") + private Integer reviewValidity; + /** + * 车辆保险开始时间 + */ + @ColumnWidth(50) + @ExcelProperty("车辆保险开始时间:{示例:2023/2/28}") + private String insuranceStartTime; + /** + * 车辆保险结束时间 + */ + @ColumnWidth(50) + @ExcelProperty("车辆保险结束时间:{示例:2023/2/28}") + private String insuranceEndTime; + /** + * 有无车身广告 + */ + @ColumnWidth(20) + @ExcelProperty("有无车身广告") + private String bodyAdvertising; + /** + * 车身广告跟新时间 + */ + @ColumnWidth(50) + @ExcelProperty("车身广告更新时间:{示例:2023/2/28}") + private String advertisementsNewTimes; + /** + * 是否有GPS;1-没有,2-有 + */ + @ColumnWidth(35) + @ExcelProperty("是否有GPS;1-没有,2-有") + private String withGps; + /** + * GPS服务商 + */ + @ColumnWidth(20) + @ExcelProperty("GPS服务商") + private String gpsServiceProvider; + /** + * GPS型号 + */ + @ColumnWidth(20) + @ExcelProperty("GPS型号") + private String gpsModel; + /** + * 备注 + */ + @ColumnWidth(100) + @ExcelProperty("备注") + private String notes; + + + +// /** +// * 预留1 +// */ +// @ColumnWidth(20) +// @ExcelProperty("预留1") +// private String reserve1; +// /** +// * 预留2 +// */ +// @ColumnWidth(20) +// @ExcelProperty("预留2") +// private String reserve2; +// /** +// * 预留3 +// */ +// @ColumnWidth(20) +// @ExcelProperty("预留3") +// private String reserve3; +// /** +// * 预留4 +// */ +// @ColumnWidth(20) +// @ExcelProperty("预留4") +// private String reserve4; +// /** +// * 预留5 +// */ +// @ColumnWidth(20) +// @ExcelProperty("预留5") +// private String reserve5; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehicleImporter.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehicleImporter.java new file mode 100644 index 000000000..848070a55 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehicleImporter.java @@ -0,0 +1,35 @@ +package com.logpm.basicdata.excel; + + + +import com.logpm.basicdata.service.IBasicdataDriverArteryService; +import com.logpm.basicdata.service.IBasicdataVehicleService; +import lombok.RequiredArgsConstructor; +import org.springblade.core.excel.support.ExcelImporter; + +import java.util.List; + + +/** + * @program: LogisticsPlatform-Service + * @description: + * @author: lmy + * @create: 2023-08-09 10:26 + **/ +@RequiredArgsConstructor +public class BasicdataVehicleImporter implements ExcelImporter { + + private final IBasicdataVehicleService service; + + + + + + /** + * @param data + */ + @Override + public void save(List data) { + service.importDriverArtery(data); + } +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.java index 9dd03c15f..21fdfef19 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.java @@ -60,4 +60,13 @@ public interface BasicdataDriverArteryMapper extends BaseMapper findDriverListByName(@Param("driverName") String driverName); void updateIsdeletedByPhone(@Param("phone") String phone); + + /** + * 查询司机信息 + * @param vehicleOwner + * @param vehicleOwnerPhone + * @return + */ + BasicdataDriverArteryEntity findDriverListByPhone(@Param("name") String vehicleOwner,@Param("phone") String vehicleOwnerPhone); + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml index a1812ff46..a955116e6 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml @@ -163,6 +163,10 @@ where `name` like concat('%',#{driverName},'%') limit 10 + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java index 03a894a10..e4a68f1fc 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java @@ -51,7 +51,7 @@ public interface BasicdataVehicleMapper extends BaseMapper exportBasicdataVehicle(@Param("ew") Wrapper queryWrapper); + List exportBasicdataVehicle(@Param("ids") List ids); List selectPhotoBymasterId(Long id); /** diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml index f2a470fc5..9cf648ff0 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml @@ -159,7 +159,72 @@ - select vsr.* from view_scan_record vsr + SELECT + `ldpl`.`id` AS `id`, + `ldpl`.`tenant_id` AS `tenant_id`, + `ldpl`.`create_user` AS `create_user`, + `ldpl`.`create_time` AS `create_time`, + `ldpl`.`update_user` AS `update_user`, + `ldpl`.`update_time` AS `update_time`, + `ldpl`.`status` AS `status`, + `ldpl`.`is_deleted` AS `is_deleted`, + `ldpl`.`create_dept` AS `create_dept`, + `ldpl`.`reserve1` AS `reserve1`, + `ldpl`.`reserve2` AS `reserve2`, + `ldpl`.`reserve3` AS `reserve3`, + `ldpl`.`reserve4` AS `reserve4`, + `ldpl`.`reserve5` AS `reserve5`, + `ldpl`.`warehouse_id` AS `warehouse_id`, + `ldpl`.`warehouse` AS `warehouse`, + `ldpl`.`conditions` AS `conditions`, + `ldpl`.`order_package_code` AS `order_package_code`, + `ldpl`.`cargo_title` AS `cargo_title`, + `ldpl`.`shelf_title` AS `shelf_title`, + `ldpl`.`goods_allocation` AS `goods_allocation`, + `ldpl`.`pallet` AS `pallet`, + `ldpl`.`firsts` AS `firsts`, + `ldpl`.`second` AS `second`, + `ldpl`.`third_product` AS `third_product`, + `ldpl`.`quantity` AS `quantity`, + `ldpl`.`train_number` AS `train_number`, + `ldpl`.`stock_article_id` AS `stock_article_id`, + `ldpl`.`order_code` AS `order_code`, + `ldpl`.`service_number` AS `service_number`, + `ldpl`.`material_id` AS `material_id`, + `ldpl`.`material_name` AS `material_name`, + `ldpl`.`material_code` AS `material_code`, + `ldpl`.`material_unit` AS `material_unit`, + `ldpl`.`brand_id` AS `brand_id`, + `ldpl`.`brand_name` AS `brand_name`, + `ldpl`.`order_package_status` AS `order_package_status`, + `ldpl`.`order_package_freeze_status` AS `order_package_freeze_status`, + `ldpl`.`order_package_grounding_status` AS `order_package_grounding_status`, + `ldpl`.`order_package_stockup_status` AS `order_package_stockup_status`, + `ldpl`.`order_package_reservation_status` AS `order_package_reservation_status`, + `ldpl`.`order_package_loading_status` AS `order_package_loading_status`, + `ldpl`.`waybill_number` AS `waybill_number`, + `ldpl`.`waybill_id` AS `waybill_id`, + `ldpl`.`warehouse_entry_time_end` AS `warehouse_entry_time_end`, + `ldpl`.`dealer_name` AS `dealer_name`, + `ldpl`.`dealer_code` AS `dealer_code`, + `ldpl`.`send_warehouse_id` AS `send_warehouse_id`, + `ldpl`.`send_warehouse_name` AS `send_warehouse_name`, + `ldpl`.`accept_warehouse_id` AS `accept_warehouse_id`, + `ldpl`.`accept_warehouse_name` AS `accept_warehouse_name`, + `ldpl`.`order_package_delivery_status` AS `order_package_delivery_status`, + `ldl`.`update_time` AS `operatorTime`, + `ldl`.`create_user` AS `operatorId`, + '取消装车' AS `scanNodeType`, + '配送' AS `nodeName` + FROM + + `logpm_distribution_parcel_list` `ldpl` + JOIN `logpm_distribution_loadscan` `ldl` ON + `ldpl`.`id` = `ldl`.`package_id` + AND `ldl`.`scan_status` = 1 + + ldpl.is_deleted =0 and ldl.is_deleted =0 + + and ldpl.warehouse_id in + + #{item} + + + + and ldpl.order_code like concat('%',#{param.orderCode},'%') + + + and ldpl.order_package_code like concat('%',#{param.orderPackageCode},'%') + + + and ldpl.service_number like concat('%',#{param.serviceNumber},'%') + + + and ldpl.brand_name like concat('%',#{param.brandName},'%') + + + and ldpl.material_code like concat('%',#{param.materialCode},'%') + + + and ldpl.material_name like concat('%',#{param.materialName},'%') + + + and ldpl.firsts like concat('%',#{param.firsts},'%') + + + and ldpl.second like concat('%',#{param.second},'%') + + + and ldpl.third_product like concat('%',#{param.thirdProduct},'%') + + + and ldl.update_time like concat(#{param.date},'%') + + + UNION ALL + SELECT + `ldpl`.`id` AS `id`, + `ldpl`.`tenant_id` AS `tenant_id`, + `ldpl`.`create_user` AS `create_user`, + `ldpl`.`create_time` AS `create_time`, + `ldpl`.`update_user` AS `update_user`, + `ldpl`.`update_time` AS `update_time`, + `ldpl`.`status` AS `status`, + `ldpl`.`is_deleted` AS `is_deleted`, + `ldpl`.`create_dept` AS `create_dept`, + `ldpl`.`reserve1` AS `reserve1`, + `ldpl`.`reserve2` AS `reserve2`, + `ldpl`.`reserve3` AS `reserve3`, + `ldpl`.`reserve4` AS `reserve4`, + `ldpl`.`reserve5` AS `reserve5`, + `ldpl`.`warehouse_id` AS `warehouse_id`, + `ldpl`.`warehouse` AS `warehouse`, + `ldpl`.`conditions` AS `conditions`, + `ldpl`.`order_package_code` AS `order_package_code`, + `ldpl`.`cargo_title` AS `cargo_title`, + `ldpl`.`shelf_title` AS `shelf_title`, + `ldpl`.`goods_allocation` AS `goods_allocation`, + `ldpl`.`pallet` AS `pallet`, + `ldpl`.`firsts` AS `firsts`, + `ldpl`.`second` AS `second`, + `ldpl`.`third_product` AS `third_product`, + `ldpl`.`quantity` AS `quantity`, + `ldpl`.`train_number` AS `train_number`, + `ldpl`.`stock_article_id` AS `stock_article_id`, + `ldpl`.`order_code` AS `order_code`, + `ldpl`.`service_number` AS `service_number`, + `ldpl`.`material_id` AS `material_id`, + `ldpl`.`material_name` AS `material_name`, + `ldpl`.`material_code` AS `material_code`, + `ldpl`.`material_unit` AS `material_unit`, + `ldpl`.`brand_id` AS `brand_id`, + `ldpl`.`brand_name` AS `brand_name`, + `ldpl`.`order_package_status` AS `order_package_status`, + `ldpl`.`order_package_freeze_status` AS `order_package_freeze_status`, + `ldpl`.`order_package_grounding_status` AS `order_package_grounding_status`, + `ldpl`.`order_package_stockup_status` AS `order_package_stockup_status`, + `ldpl`.`order_package_reservation_status` AS `order_package_reservation_status`, + `ldpl`.`order_package_loading_status` AS `order_package_loading_status`, + `ldpl`.`waybill_number` AS `waybill_number`, + `ldpl`.`waybill_id` AS `waybill_id`, + `ldpl`.`warehouse_entry_time_end` AS `warehouse_entry_time_end`, + `ldpl`.`dealer_name` AS `dealer_name`, + `ldpl`.`dealer_code` AS `dealer_code`, + `ldpl`.`send_warehouse_id` AS `send_warehouse_id`, + `ldpl`.`send_warehouse_name` AS `send_warehouse_name`, + `ldpl`.`accept_warehouse_id` AS `accept_warehouse_id`, + `ldpl`.`accept_warehouse_name` AS `accept_warehouse_name`, + `ldpl`.`order_package_delivery_status` AS `order_package_delivery_status`, + `ldl`.`create_time` AS `operatorTime`, + `ldl`.`create_user` AS `operatorId`, + '装车' AS `scanNodeType`, + '配送' AS `nodeName` + FROM + `logpm_distribution_parcel_list` `ldpl` + JOIN `logpm_distribution_loadscan` `ldl` ON + `ldpl`.`id` = `ldl`.`package_id` + AND `ldl`.`scan_status` != 1 + + + and ldpl.warehouse_id in + + #{item} + + + + and ldpl.order_code like concat('%',#{param.orderCode},'%') + + + and ldpl.order_package_code like concat('%',#{param.orderPackageCode},'%') + + + and ldpl.service_number like concat('%',#{param.serviceNumber},'%') + + + and ldpl.brand_name like concat('%',#{param.brandName},'%') + + + and ldpl.material_code like concat('%',#{param.materialCode},'%') + + + and ldpl.material_name like concat('%',#{param.materialName},'%') + + + and ldpl.firsts like concat('%',#{param.firsts},'%') + + + and ldpl.second like concat('%',#{param.second},'%') + + + and ldpl.third_product like concat('%',#{param.thirdProduct},'%') + + + and ldl.create_time like concat(#{param.date},'%') + + + UNION ALL + SELECT + `ldpl`.`id` AS `id`, + `ldpl`.`tenant_id` AS `tenant_id`, + `ldpl`.`create_user` AS `create_user`, + `ldpl`.`create_time` AS `create_time`, + `ldpl`.`update_user` AS `update_user`, + `ldpl`.`update_time` AS `update_time`, + `ldpl`.`status` AS `status`, + `ldpl`.`is_deleted` AS `is_deleted`, + `ldpl`.`create_dept` AS `create_dept`, + `ldpl`.`reserve1` AS `reserve1`, + `ldpl`.`reserve2` AS `reserve2`, + `ldpl`.`reserve3` AS `reserve3`, + `ldpl`.`reserve4` AS `reserve4`, + `ldpl`.`reserve5` AS `reserve5`, + `ldpl`.`warehouse_id` AS `warehouse_id`, + `ldpl`.`warehouse` AS `warehouse`, + `ldpl`.`conditions` AS `conditions`, + `ldpl`.`order_package_code` AS `order_package_code`, + `ldpl`.`cargo_title` AS `cargo_title`, + `ldpl`.`shelf_title` AS `shelf_title`, + `ldpl`.`goods_allocation` AS `goods_allocation`, + `ldpl`.`pallet` AS `pallet`, + `ldpl`.`firsts` AS `firsts`, + `ldpl`.`second` AS `second`, + `ldpl`.`third_product` AS `third_product`, + `ldpl`.`quantity` AS `quantity`, + `ldpl`.`train_number` AS `train_number`, + `ldpl`.`stock_article_id` AS `stock_article_id`, + `ldpl`.`order_code` AS `order_code`, + `ldpl`.`service_number` AS `service_number`, + `ldpl`.`material_id` AS `material_id`, + `ldpl`.`material_name` AS `material_name`, + `ldpl`.`material_code` AS `material_code`, + `ldpl`.`material_unit` AS `material_unit`, + `ldpl`.`brand_id` AS `brand_id`, + `ldpl`.`brand_name` AS `brand_name`, + `ldpl`.`order_package_status` AS `order_package_status`, + `ldpl`.`order_package_freeze_status` AS `order_package_freeze_status`, + `ldpl`.`order_package_grounding_status` AS `order_package_grounding_status`, + `ldpl`.`order_package_stockup_status` AS `order_package_stockup_status`, + `ldpl`.`order_package_reservation_status` AS `order_package_reservation_status`, + `ldpl`.`order_package_loading_status` AS `order_package_loading_status`, + `ldpl`.`waybill_number` AS `waybill_number`, + `ldpl`.`waybill_id` AS `waybill_id`, + `ldpl`.`warehouse_entry_time_end` AS `warehouse_entry_time_end`, + `ldpl`.`dealer_name` AS `dealer_name`, + `ldpl`.`dealer_code` AS `dealer_code`, + `ldpl`.`send_warehouse_id` AS `send_warehouse_id`, + `ldpl`.`send_warehouse_name` AS `send_warehouse_name`, + `ldpl`.`accept_warehouse_id` AS `accept_warehouse_id`, + `ldpl`.`accept_warehouse_name` AS `accept_warehouse_name`, + `ldpl`.`order_package_delivery_status` AS `order_package_delivery_status`, + `ldl`.`update_time` AS `operatorTime`, + `ldl`.`create_user` AS `operatorId`, + '签收' AS `scanNodeType`, + '配送' AS `nodeName` + FROM + `logpm_distribution_parcel_list` `ldpl` + JOIN `logpm_distribution_loadscan` `ldl` ON + `ldpl`.`id` = `ldl`.`package_id` + AND `ldl`.`signfor_state` = 2 + + + and ldpl.warehouse_id in + + #{item} + + + + and ldpl.order_code like concat('%',#{param.orderCode},'%') + + + and ldpl.order_package_code like concat('%',#{param.orderPackageCode},'%') + + + and ldpl.service_number like concat('%',#{param.serviceNumber},'%') + + + and ldpl.brand_name like concat('%',#{param.brandName},'%') + + + and ldpl.material_code like concat('%',#{param.materialCode},'%') + + + and ldpl.material_name like concat('%',#{param.materialName},'%') + + + and ldpl.firsts like concat('%',#{param.firsts},'%') + + + and ldpl.second like concat('%',#{param.second},'%') + + + and ldpl.third_product like concat('%',#{param.thirdProduct},'%') + + + and ldl.update_time like concat(#{param.date},'%') + + + UNION ALL + SELECT + `ldpl`.`id` AS `id`, + `ldpl`.`tenant_id` AS `tenant_id`, + `ldpl`.`create_user` AS `create_user`, + `ldpl`.`create_time` AS `create_time`, + `ldpl`.`update_user` AS `update_user`, + `ldpl`.`update_time` AS `update_time`, + `ldpl`.`status` AS `status`, + `ldpl`.`is_deleted` AS `is_deleted`, + `ldpl`.`create_dept` AS `create_dept`, + `ldpl`.`reserve1` AS `reserve1`, + `ldpl`.`reserve2` AS `reserve2`, + `ldpl`.`reserve3` AS `reserve3`, + `ldpl`.`reserve4` AS `reserve4`, + `ldpl`.`reserve5` AS `reserve5`, + `ldpl`.`warehouse_id` AS `warehouse_id`, + `ldpl`.`warehouse` AS `warehouse`, + `ldpl`.`conditions` AS `conditions`, + `ldpl`.`order_package_code` AS `order_package_code`, + `ldpl`.`cargo_title` AS `cargo_title`, + `ldpl`.`shelf_title` AS `shelf_title`, + `ldpl`.`goods_allocation` AS `goods_allocation`, + `ldpl`.`pallet` AS `pallet`, + `ldpl`.`firsts` AS `firsts`, + `ldpl`.`second` AS `second`, + `ldpl`.`third_product` AS `third_product`, + `ldpl`.`quantity` AS `quantity`, + `ldpl`.`train_number` AS `train_number`, + `ldpl`.`stock_article_id` AS `stock_article_id`, + `ldpl`.`order_code` AS `order_code`, + `ldpl`.`service_number` AS `service_number`, + `ldpl`.`material_id` AS `material_id`, + `ldpl`.`material_name` AS `material_name`, + `ldpl`.`material_code` AS `material_code`, + `ldpl`.`material_unit` AS `material_unit`, + `ldpl`.`brand_id` AS `brand_id`, + `ldpl`.`brand_name` AS `brand_name`, + `ldpl`.`order_package_status` AS `order_package_status`, + `ldpl`.`order_package_freeze_status` AS `order_package_freeze_status`, + `ldpl`.`order_package_grounding_status` AS `order_package_grounding_status`, + `ldpl`.`order_package_stockup_status` AS `order_package_stockup_status`, + `ldpl`.`order_package_reservation_status` AS `order_package_reservation_status`, + `ldpl`.`order_package_loading_status` AS `order_package_loading_status`, + `ldpl`.`waybill_number` AS `waybill_number`, + `ldpl`.`waybill_id` AS `waybill_id`, + `ldpl`.`warehouse_entry_time_end` AS `warehouse_entry_time_end`, + `ldpl`.`dealer_name` AS `dealer_name`, + `ldpl`.`dealer_code` AS `dealer_code`, + `ldpl`.`send_warehouse_id` AS `send_warehouse_id`, + `ldpl`.`send_warehouse_name` AS `send_warehouse_name`, + `ldpl`.`accept_warehouse_id` AS `accept_warehouse_id`, + `ldpl`.`accept_warehouse_name` AS `accept_warehouse_name`, + `ldpl`.`order_package_delivery_status` AS `order_package_delivery_status`, + `lds`.`create_time` AS `operatorTime`, + `lds`.`create_user` AS `operatorId`,( + CASE + + WHEN ( `lds`.`conditions` = 1 ) THEN + '配送备货' + WHEN ( `lds`.`conditions` = 2 ) THEN + '自提备货' + END + ) AS `scanNodeType`, + '备货' AS `nodeName` + FROM + `logpm_distribution_parcel_list` `ldpl` + JOIN `logpm_distribution_stock` `lds` ON + `ldpl`.`id` = `lds`.`parcel_list_id` - vsr.is_deleted =0 - - and vsr.nodeName like concat('%',#{param.nodeName},'%') + + and ldpl.warehouse_id in + + #{item} + + + + and ldpl.order_code like concat('%',#{param.orderCode},'%') + + + and ldpl.order_package_code like concat('%',#{param.orderPackageCode},'%') + + + and ldpl.service_number like concat('%',#{param.serviceNumber},'%') + + + and ldpl.brand_name like concat('%',#{param.brandName},'%') + + + and ldpl.material_code like concat('%',#{param.materialCode},'%') + + + and ldpl.material_name like concat('%',#{param.materialName},'%') + + + and ldpl.firsts like concat('%',#{param.firsts},'%') + + + and ldpl.second like concat('%',#{param.second},'%') + + + and ldpl.third_product like concat('%',#{param.thirdProduct},'%') + + and lds.create_time like concat(#{param.date},'%') + + + UNION ALL + SELECT + `ldpl`.`id` AS `id`, + `ldpl`.`tenant_id` AS `tenant_id`, + `ldpl`.`create_user` AS `create_user`, + `ldpl`.`create_time` AS `create_time`, + `ldpl`.`update_user` AS `update_user`, + `ldpl`.`update_time` AS `update_time`, + `ldpl`.`status` AS `status`, + `ldpl`.`is_deleted` AS `is_deleted`, + `ldpl`.`create_dept` AS `create_dept`, + `ldpl`.`reserve1` AS `reserve1`, + `ldpl`.`reserve2` AS `reserve2`, + `ldpl`.`reserve3` AS `reserve3`, + `ldpl`.`reserve4` AS `reserve4`, + `ldpl`.`reserve5` AS `reserve5`, + `ldpl`.`warehouse_id` AS `warehouse_id`, + `ldpl`.`warehouse` AS `warehouse`, + `ldpl`.`conditions` AS `conditions`, + `ldpl`.`order_package_code` AS `order_package_code`, + `ldpl`.`cargo_title` AS `cargo_title`, + `ldpl`.`shelf_title` AS `shelf_title`, + `ldpl`.`goods_allocation` AS `goods_allocation`, + `ldpl`.`pallet` AS `pallet`, + `ldpl`.`firsts` AS `firsts`, + `ldpl`.`second` AS `second`, + `ldpl`.`third_product` AS `third_product`, + `ldpl`.`quantity` AS `quantity`, + `ldpl`.`train_number` AS `train_number`, + `ldpl`.`stock_article_id` AS `stock_article_id`, + `ldpl`.`order_code` AS `order_code`, + `ldpl`.`service_number` AS `service_number`, + `ldpl`.`material_id` AS `material_id`, + `ldpl`.`material_name` AS `material_name`, + `ldpl`.`material_code` AS `material_code`, + `ldpl`.`material_unit` AS `material_unit`, + `ldpl`.`brand_id` AS `brand_id`, + `ldpl`.`brand_name` AS `brand_name`, + `ldpl`.`order_package_status` AS `order_package_status`, + `ldpl`.`order_package_freeze_status` AS `order_package_freeze_status`, + `ldpl`.`order_package_grounding_status` AS `order_package_grounding_status`, + `ldpl`.`order_package_stockup_status` AS `order_package_stockup_status`, + `ldpl`.`order_package_reservation_status` AS `order_package_reservation_status`, + `ldpl`.`order_package_loading_status` AS `order_package_loading_status`, + `ldpl`.`waybill_number` AS `waybill_number`, + `ldpl`.`waybill_id` AS `waybill_id`, + `ldpl`.`warehouse_entry_time_end` AS `warehouse_entry_time_end`, + `ldpl`.`dealer_name` AS `dealer_name`, + `ldpl`.`dealer_code` AS `dealer_code`, + `ldpl`.`send_warehouse_id` AS `send_warehouse_id`, + `ldpl`.`send_warehouse_name` AS `send_warehouse_name`, + `ldpl`.`accept_warehouse_id` AS `accept_warehouse_id`, + `ldpl`.`accept_warehouse_name` AS `accept_warehouse_name`, + `ldpl`.`order_package_delivery_status` AS `order_package_delivery_status`, + `lwug`.`create_time` AS `operatorTime`, + `lwug`.`create_user` AS `operatorId`, + `lwug`.`remark` AS `scanNodeType`, + '上下架' AS `nodeName` + FROM + `logpm_distribution_parcel_list` `ldpl` + JOIN `logpm_warehouse_updown_goods_log` `lwug` ON + `ldpl`.`id` = `lwug`.`association_id` + - and vsr.warehouse_id in + and ldpl.warehouse_id in #{item} - - and vsr.scanNodeType like concat('%',#{param.scanNodeType},'%') + + and ldpl.order_code like concat('%',#{param.orderCode},'%') + + + and ldpl.order_package_code like concat('%',#{param.orderPackageCode},'%') + + + and ldpl.service_number like concat('%',#{param.serviceNumber},'%') + + + and ldpl.brand_name like concat('%',#{param.brandName},'%') + + + and ldpl.material_code like concat('%',#{param.materialCode},'%') + + + and ldpl.material_name like concat('%',#{param.materialName},'%') + + + and ldpl.firsts like concat('%',#{param.firsts},'%') + + + and ldpl.second like concat('%',#{param.second},'%') + + + and ldpl.third_product like concat('%',#{param.thirdProduct},'%') + + + and lwug.create_time like concat(#{param.date},'%') + + + UNION ALL + SELECT + `ldpl`.`id` AS `id`, + `ldpl`.`tenant_id` AS `tenant_id`, + `ldpl`.`create_user` AS `create_user`, + `ldpl`.`create_time` AS `create_time`, + `ldpl`.`update_user` AS `update_user`, + `ldpl`.`update_time` AS `update_time`, + `ldpl`.`status` AS `status`, + `ldpl`.`is_deleted` AS `is_deleted`, + `ldpl`.`create_dept` AS `create_dept`, + `ldpl`.`reserve1` AS `reserve1`, + `ldpl`.`reserve2` AS `reserve2`, + `ldpl`.`reserve3` AS `reserve3`, + `ldpl`.`reserve4` AS `reserve4`, + `ldpl`.`reserve5` AS `reserve5`, + `ldpl`.`warehouse_id` AS `warehouse_id`, + `ldpl`.`warehouse` AS `warehouse`, + `ldpl`.`conditions` AS `conditions`, + `ldpl`.`order_package_code` AS `order_package_code`, + `ldpl`.`cargo_title` AS `cargo_title`, + `ldpl`.`shelf_title` AS `shelf_title`, + `ldpl`.`goods_allocation` AS `goods_allocation`, + `ldpl`.`pallet` AS `pallet`, + `ldpl`.`firsts` AS `firsts`, + `ldpl`.`second` AS `second`, + `ldpl`.`third_product` AS `third_product`, + `ldpl`.`quantity` AS `quantity`, + `ldpl`.`train_number` AS `train_number`, + `ldpl`.`stock_article_id` AS `stock_article_id`, + `ldpl`.`order_code` AS `order_code`, + `ldpl`.`service_number` AS `service_number`, + `ldpl`.`material_id` AS `material_id`, + `ldpl`.`material_name` AS `material_name`, + `ldpl`.`material_code` AS `material_code`, + `ldpl`.`material_unit` AS `material_unit`, + `ldpl`.`brand_id` AS `brand_id`, + `ldpl`.`brand_name` AS `brand_name`, + `ldpl`.`order_package_status` AS `order_package_status`, + `ldpl`.`order_package_freeze_status` AS `order_package_freeze_status`, + `ldpl`.`order_package_grounding_status` AS `order_package_grounding_status`, + `ldpl`.`order_package_stockup_status` AS `order_package_stockup_status`, + `ldpl`.`order_package_reservation_status` AS `order_package_reservation_status`, + `ldpl`.`order_package_loading_status` AS `order_package_loading_status`, + `ldpl`.`waybill_number` AS `waybill_number`, + `ldpl`.`waybill_id` AS `waybill_id`, + `ldpl`.`warehouse_entry_time_end` AS `warehouse_entry_time_end`, + `ldpl`.`dealer_name` AS `dealer_name`, + `ldpl`.`dealer_code` AS `dealer_code`, + `ldpl`.`send_warehouse_id` AS `send_warehouse_id`, + `ldpl`.`send_warehouse_name` AS `send_warehouse_name`, + `ldpl`.`accept_warehouse_id` AS `accept_warehouse_id`, + `ldpl`.`accept_warehouse_name` AS `accept_warehouse_name`, + `ldpl`.`order_package_delivery_status` AS `order_package_delivery_status`, + `lwtg`.`create_time` AS `operatorTime`, + `lwtg`.`create_user` AS `operatorId`, + `lwtg`.`remark` AS `scanNodeType`, + '打托' AS `nodeName` + FROM + `logpm_distribution_parcel_list` `ldpl` + JOIN `logpm_warehouse_tray_goods_log` `lwtg` ON + `ldpl`.`id` = `lwtg`.`association_id` + + + and ldpl.warehouse_id in + + #{item} + - and vsr.order_code like concat('%',#{param.orderCode},'%') + and ldpl.order_code like concat('%',#{param.orderCode},'%') - and vsr.order_package_code like concat('%',#{param.orderPackageCode},'%') + and ldpl.order_package_code like concat('%',#{param.orderPackageCode},'%') - and vsr.service_number like concat('%',#{param.serviceNumber},'%') + and ldpl.service_number like concat('%',#{param.serviceNumber},'%') - and vsr.brand_name like concat('%',#{param.brandName},'%') + and ldpl.brand_name like concat('%',#{param.brandName},'%') - and vsr.material_code like concat('%',#{param.materialCode},'%') + and ldpl.material_code like concat('%',#{param.materialCode},'%') - and vsr.material_name like concat('%',#{param.materialName},'%') + and ldpl.material_name like concat('%',#{param.materialName},'%') - and vsr.firsts like concat('%',#{param.firsts},'%') + and ldpl.firsts like concat('%',#{param.firsts},'%') - and vsr.second like concat('%',#{param.second},'%') + and ldpl.second like concat('%',#{param.second},'%') - and vsr.third_product like concat('%',#{param.thirdProduct},'%') + and ldpl.third_product like concat('%',#{param.thirdProduct},'%') + + + and lwtg.create_time like concat(#{param.date},'%') + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java index bbc1da23d..687ab921b 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java @@ -34,16 +34,18 @@ import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.SpringUtil; import org.springblade.system.cache.DictBizCache; import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 备货扫描记录 服务实现类 @@ -63,12 +65,42 @@ public class WarehouseStockServiceImpl extends BaseServiceImpl selectWarehouseStockPage(IPage page, WarehouseScanRecordVO warehouseScanRecordVO) { warehouseScanRecordVO.setWarehouseIdList(this.loginPerson()); + BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse(); + + try { + if (Func.isEmpty(myCurrentWarehouse)){ + return null; + } + if (Func.isEmpty(warehouseScanRecordVO.getOperatorTime())){ + log.error("################查询扫描记录没有填写操作时间"); + return null; + } + String operatorTime = warehouseScanRecordVO.getOperatorTime(); + SimpleDateFormat sf = new SimpleDateFormat(DateUtil.PATTERN_DATE); + Date parse = sf.parse(operatorTime); + warehouseScanRecordVO.setDate(parse); + } catch (ParseException e) { + throw new RuntimeException(e); + } + List result = new ArrayList<>(); + warehouseScanRecordVO.setWarehouseId(myCurrentWarehouse.getId()); List warehouseScanRecordVOS = baseMapper.selectWarehouseStockPage(page, warehouseScanRecordVO); -// IUserClient userCliient = SpringUtil.getBean(IUserClient.class); -// for (WarehouseScanRecordVO warehouseScanRecordVOData : warehouseScanRecordVOS) { -// warehouseScanRecordVOData.setOperatorName(userCliient.userInfoById(warehouseScanRecordVOData.getOperatorId()).getData().getName()); -// } - return page.setRecords(warehouseScanRecordVOS); + if (Func.isNotBlank(warehouseScanRecordVO.getNodeName())){ + List collect = warehouseScanRecordVOS.stream().filter(s -> warehouseScanRecordVO.getNodeName().equals(s.getNodeName())).collect(Collectors.toList()); + if (collect.size()>0){ + result.addAll(collect); + } + } + if (Func.isNotBlank(warehouseScanRecordVO.getScanNodeType())){ + List collect = warehouseScanRecordVOS.stream().filter(s -> warehouseScanRecordVO.getScanNodeType().equals(s.getNodeName())).collect(Collectors.toList()); + if (collect.size()>0){ + result.addAll(collect); + } + } + if (result.size() == 0){ + result = warehouseScanRecordVOS; + } + return page.setRecords(result); } @Override