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

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

dev
pref_mail@163.com 3 weeks ago
parent
418a8375dc f863bbb222
commit
1711ed72f5
38 changed files with 3192 additions and 179 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCodeClient.java
  2. 2
      blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingEntity.java
  3. 5
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataCodeClient.java
  4. 2
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCodeService.java
  5. 44
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java
  6. 28
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java
  7. 39
      blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportIncomingController.java
  8. 7
      blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportQualityController.java
  9. 238
      blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportTimeController.java
  10. 54
      blade-service/logpm-report/src/main/java/com/logpm/report/dto/AllTrunklineTimeDetailDTO.java
  11. 6
      blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportCheckTimeDetailDTO.java
  12. 100
      blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportIncomingDetailDTO.java
  13. 53
      blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportStartTimeDetailDTO.java
  14. 1
      blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportTimeDTO.java
  15. 16
      blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.java
  16. 842
      blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.xml
  17. 32
      blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportQuallityMapper.xml
  18. 14
      blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.java
  19. 738
      blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml
  20. 9
      blade-service/logpm-report/src/main/java/com/logpm/report/service/IReportIncomingService.java
  21. 14
      blade-service/logpm-report/src/main/java/com/logpm/report/service/IReportTimeService.java
  22. 269
      blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportIncomingServiceImpl.java
  23. 153
      blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportTimeServiceImpl.java
  24. 3
      blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportDeptIncomingVO.java
  25. 224
      blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportIncomingDetailExportVO.java
  26. 116
      blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportIncomingDetailVO.java
  27. 98
      blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportPackgeAllTrunklineTimeDetailVO.java
  28. 5
      blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportPackgeAllTrunklineTimeVO.java
  29. 102
      blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportPackgeStartTimeDetailVO.java
  30. 5
      blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportPackgeStartTimeVO.java
  31. 7
      blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportPackgeTransferTimeVO.java
  32. 1
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderAsyncService.java
  33. 50
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderAsyncServiceImpl.java
  34. 5
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingWaybillServiceImpl.java
  35. 51
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
  36. 3
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillPackageServiceImpl.java
  37. 4
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java
  38. 14
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java

3
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCodeClient.java
Unescape View File

@ -21,4 +21,7 @@ public interface IBasicdataCodeClient {
@GetMapping(API_PREFIX+"/getBatchPackageCodeByType")
List<String> getBatchPackageCodeByType(@RequestParam String warehouseCode, @RequestParam String orderCode,@RequestParam Integer num);
@GetMapping(API_PREFIX+"/getBatchTrayCode")
List<String> getBatchTrayCode(@RequestParam String warehouseCode, @RequestParam String orderCode,@RequestParam Integer num);
}

2
blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingEntity.java
Unescape View File

@ -75,7 +75,7 @@ public class TrunklineBillladingEntity extends TenantEntity {
private BigDecimal planVolume ;
/** 实际件数 */
@ApiModelProperty(name = "实际件数",notes = "")
private int realNum ;
private Integer realNum ;
/** 实际重量 */
@ApiModelProperty(name = "实际重量",notes = "")
private BigDecimal realWeight ;

5
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataCodeClient.java
Unescape View File

@ -24,4 +24,9 @@ public class BasicdataCodeClient implements IBasicdataCodeClient {
return basicdataCodeService.getBatchPackageCodeByType(warehouseCode,orderCode,num);
}
@Override
public List<String> getBatchTrayCode(String warehouseCode, String orderCode, Integer num) {
return basicdataCodeService.getBatchTrayCode(warehouseCode,orderCode,num);
}
}

2
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCodeService.java
Unescape View File

@ -7,4 +7,6 @@ public interface IBasicdataCodeService {
String getCodeByType(Integer type,String warehouseCode,String orderCode);
List<String> getBatchPackageCodeByType(String warehouseCode, String orderCode, Integer num) ;
List<String> getBatchTrayCode(String warehouseCode, String orderCode, Integer num);
}

44
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java
Unescape View File

@ -161,6 +161,50 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService {
return packageCodes;
}
@Override
public List<String> getBatchTrayCode(String warehouseCode, String orderCode, Integer num) {
BasicTenantCodeEntity basicTenantCode = tenantCodeClient.findBasicTenantCodeByCodeAndShowType(BasicCodeTypeConstant.TRAY_CODE.getValue(), BasicCodeShowConstant.QR_CODE.getValue());
if (Objects.isNull(basicTenantCode)) {
log.warn("############generateTraysCode: 租户信息不存在basicTenantCode={}", basicTenantCode);
return null;
}
String desName = basicTenantCode.getDesName();
String code = basicTenantCode.getCode();
if (!StringUtil.hasLength(warehouseCode)) {
log.warn("############generateTraysCode: 仓库编码为空warehouseCode={}", warehouseCode);
return null;
}
//托盘 HT+仓库拼音+ 年月 +【当前仓库总数+1（五位数 不足补零）】
BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseService.getWarehouseEntityByWarehouseCode(warehouseCode);
if (Objects.isNull(basicdataWarehouseEntity)) {
log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}", warehouseCode);
return null;
}
String abbreviation = basicdataWarehouseEntity.getAbbreviation();
BasicdataCodeRecordEntity basicdataCodeRecordEntity = getBasicdataCodeRecordEntity(CodeNumConstant.TRAYS, basicdataWarehouseEntity);
Integer inrc = basicdataCodeRecordEntity.getNum();
List<String> trayCodes = new ArrayList<>();
for (int i = 0; i < num; i++) {
inrc = inrc + 1;
String trayCode = code + warehouseCode + (Integer.parseInt(basicdataCodeRecordEntity.getYear()) % 100) + inrc;
String trayName = desName + abbreviation + inrc;
trayCodes.add(trayCode + "&&" + trayName);
}
basicdataCodeRecordEntity.setNum(inrc);
basicdataCodeRecordService.updateById(basicdataCodeRecordEntity);
return trayCodes;
}
private String generateTrunklineLoadSignCode(Integer type, String warehouseCode, String orderCode) {
if (!StringUtil.hasLength(warehouseCode)) {

28
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java
Unescape View File

@ -41,7 +41,6 @@ import com.logpm.basicdata.feign.IBasicdataCodeClient;
import com.logpm.basicdata.mapper.BasicdataTrayMapper;
import com.logpm.basicdata.mapper.BasicdataWarehouseMapper;
import com.logpm.basicdata.service.IBasicdataTrayService;
import com.logpm.basicdata.service.IBasicdataWarehouseService;
import com.logpm.basicdata.vo.*;
import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient;
import com.logpm.warehouse.vo.WarehouseTrayQRCode;
@ -49,7 +48,6 @@ import com.logpm.warehouse.vo.WarehouseTraybarCode;
import lombok.AllArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.io.IOUtils;
import org.springblade.common.constant.CodeNumConstant;
import org.springblade.common.utils.QRCodeUtil;
import org.springblade.common.utils.TemplateUtil;
import org.springblade.core.log.exception.ServiceException;
@ -59,7 +57,6 @@ import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.system.entity.User;
import org.springblade.system.feign.ISysClient;
import org.springblade.system.feign.IUserClient;
import org.springframework.beans.BeanUtils;
import org.springframework.data.repository.init.ResourceReader;
@ -121,7 +118,6 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
@Transactional
public boolean insertTray(BasicdataTrayDTO basicdataTrayDTO) {
//托盘新增需要添加托盘码
BasicdataTrayEntity basicdataTrayEntity = null;
boolean result = false;
if (Func.isEmpty(basicdataTrayDTO)) {
log.warn("无参数");
@ -131,27 +127,17 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
//查询仓库编号
BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseMapper.selectById(basicdataTrayDTO.getWarehouseId());
ArrayList<BasicdataTrayEntity> basicdataTrayEntities = new ArrayList<>();
for (Integer i = 0; i < number; i++) {
basicdataTrayEntity = new BasicdataTrayEntity();
List<String> trayCodes = basicdataCodeClient.getBatchTrayCode(basicdataWarehouseEntity.getWarehouseCode(), "465897", number);
trayCodes.forEach(trayCode -> {
BasicdataTrayEntity basicdataTrayEntity = new BasicdataTrayEntity();
BeanUtils.copyProperties(basicdataTrayDTO, basicdataTrayEntity);
//String trayCode = tenantCodeClient.shelfCode(AuthUtil.getTenantId(), "6");
String trayInfo = basicdataCodeClient.getCodeByType(CodeNumConstant.TRAYS, basicdataWarehouseEntity.getWarehouseCode(), "465897");
// basicdataTrayEntity.setTrayStatus("1");
//String uuid = "1" + Func.random(18, RandomType.INT).trim();
//long id = Long.parseLong(uuid);
// BladeUser user = AuthUtil.getUser();
// basicdataTrayEntity.setCreateUser(user.getUserId());
// basicdataTrayEntity.setCreateTime(new Date());
// basicdataTrayEntity.setCreateDept(Long.valueOf(user.getDeptId()));
// basicdataTrayEntity.setTenantId(user.getTenantId());
// basicdataTrayEntity.setIsDeleted(0);
// basicdataTrayEntity.setStatus(1);
// basicdataTrayEntity.setId(id);
String[] split = trayInfo.split("&&");
String[] split = trayCode.split("&&");
basicdataTrayEntity.setPalletCode(split[0]);
basicdataTrayEntity.setPalletName(split[1]);
basicdataTrayEntities.add(basicdataTrayEntity);
}
});
result = this.saveBatch(basicdataTrayEntities);
}
return result;

39
blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportIncomingController.java
Unescape View File

@ -2,16 +2,19 @@ package com.logpm.report.controller;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.logpm.report.dto.ReportIncomingDTO;
import com.logpm.report.dto.ReportIncomingDetailDTO;
import com.logpm.report.service.IReportIncomingService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@Slf4j
@RestController
@AllArgsConstructor
@RequestMapping("/reportIncoming")
@ -50,4 +53,40 @@ public class ReportIncomingController extends BladeController {
}
@PostMapping("/incomingDetailPage")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "收入明细报表", notes = "收入明细报表")
public R incomingDetailPage(@RequestBody ReportIncomingDetailDTO reportIncomingDetailDTO) {
String method = "##############incomingDetailPage: ";
try{
return reportIncomingService.incomingDetailPage(reportIncomingDetailDTO);
}catch (Exception e){
log.error(method+"系统异常",e);
return R.fail(500,"系统异常");
}
}
@PostMapping("/incomingDetailExport")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "收入明细报表导出", notes = "收入明细报表导出")
public void incomingDetailExport(@RequestBody ReportIncomingDetailDTO reportIncomingDetailDTO, HttpServletResponse response) {
reportIncomingService.incomingDetailExport(reportIncomingDetailDTO,response);
}
@PostMapping("/deptIncomingPageNew")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "营业部收入报表-新", notes = "营业部收入报表-新")
public R deptIncomingPageNew(@RequestBody ReportIncomingDTO reportIncomingDTO) {
return reportIncomingService.deptIncomingPageNew(reportIncomingDTO);
}
@PostMapping("/deptIncomingExportNew")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "营业部收入报表导出-新", notes = "营业部收入报表导出-新")
public void deptIncomingExportNew(@RequestBody ReportIncomingDTO reportIncomingDTO, HttpServletResponse response) {
reportIncomingService.deptIncomingExportNew(reportIncomingDTO,response);
}
}

7
blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportQualityController.java
Unescape View File

@ -73,7 +73,14 @@ public class ReportQualityController {
return R.fail(405,"目的仓id不能为空");
}
try{
return reportQualityService.updateWaybillQualityDetailPage(reportQualityDTO);
}catch (Exception e){
log.error(method+"系统异常",e);
return R.fail(500,"系统异常");
}
}

238
blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportTimeController.java
Unescape View File

@ -1,7 +1,9 @@
package com.logpm.report.controller;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.logpm.report.dto.AllTrunklineTimeDetailDTO;
import com.logpm.report.dto.ReportCheckTimeDetailDTO;
import com.logpm.report.dto.ReportStartTimeDetailDTO;
import com.logpm.report.dto.ReportTimeDTO;
import com.logpm.report.service.IReportTimeService;
import io.swagger.annotations.Api;
@ -67,7 +69,12 @@ public class ReportTimeController extends BladeController {
log.warn(method+"仓库id不能为空 {}",warehouseId);
return R.fail(405,"仓库id不能为空");
}
try{
return reportTimeService.openTimeDetailPage(reportTimeDTO);
}catch (Exception e){
log.error(method+"系统异常",e);
return R.fail(500,"系统异常");
}
}
@PostMapping("/openTimeDetailExport")
@ -142,7 +149,13 @@ public class ReportTimeController extends BladeController {
return R.fail(405,"目的仓id不能为空");
}
try{
return reportTimeService.checkWaybillTimeDetailPage(reportCheckTimeDetailDTO);
}catch (Exception e){
log.error(method+"系统异常",e);
return R.fail(500,"系统异常");
}
}
@PostMapping("/checkWaybillTimeDetailExport")
@ -194,6 +207,80 @@ public class ReportTimeController extends BladeController {
reportTimeService.packageStartTimeExport(reportTimeDTO,response);
}
@PostMapping("/packageStartTimeDetailPage")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "订制品发运时效明细报表", notes = "订制品发运时效明细报表")
public R packageStartTimeDetailPage(@RequestBody ReportStartTimeDetailDTO reportStartTimeDetailDTO) {
String method = "###########packageStartTimeDetailPage: ";
String brand = reportStartTimeDetailDTO.getBrand();
String businessLine = reportStartTimeDetailDTO.getBusinessLine();
Long departureWarehouseId = reportStartTimeDetailDTO.getDepartureWarehouseId();
Long destinationWarehouseId = reportStartTimeDetailDTO.getDestinationWarehouseId();
if(StringUtil.isBlank(brand)){
log.warn(method+"品牌不能为空 {}",brand);
return R.fail(405,"品牌不能为空");
}
if(StringUtil.isBlank(businessLine)){
log.warn(method+"事业线不能为空 {}",businessLine);
return R.fail(405,"事业线不能为空");
}
if(Objects.isNull(departureWarehouseId)){
log.warn(method+"始发仓id不能为空 {}",departureWarehouseId);
return R.fail(405,"始发仓id不能为空");
}
if(Objects.isNull(destinationWarehouseId)){
log.warn(method+"目的仓id不能为空 {}",destinationWarehouseId);
return R.fail(405,"目的仓id不能为空");
}
try{
return reportTimeService.packageStartTimeDetailPage(reportStartTimeDetailDTO);
}catch (Exception e){
log.error(method+"系统异常",e);
return R.fail(500,"系统异常");
}
}
@PostMapping("/packageStartTimeDetailExport")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "订制品发运时效明细报表导出", notes = "订制品发运时效明细报表导出")
public void packageStartTimeDetailExport(@RequestBody ReportStartTimeDetailDTO reportStartTimeDetailDTO, HttpServletResponse response) {
String method = "###########packageStartTimeDetailExport: ";
String brand = reportStartTimeDetailDTO.getBrand();
String businessLine = reportStartTimeDetailDTO.getBusinessLine();
Long departureWarehouseId = reportStartTimeDetailDTO.getDepartureWarehouseId();
Long destinationWarehouseId = reportStartTimeDetailDTO.getDestinationWarehouseId();
if(StringUtil.isBlank(brand)){
log.warn(method+"品牌不能为空 {}",brand);
throw new CustomerException(405,"品牌不能为空");
}
if(StringUtil.isBlank(businessLine)){
log.warn(method+"事业线不能为空 {}",businessLine);
throw new CustomerException(405,"事业线不能为空");
}
if(Objects.isNull(departureWarehouseId)){
log.warn(method+"始发仓id不能为空 {}",departureWarehouseId);
throw new CustomerException(405,"始发仓id不能为空");
}
if(Objects.isNull(destinationWarehouseId)){
log.warn(method+"目的仓id不能为空 {}",destinationWarehouseId);
throw new CustomerException(405,"目的仓id不能为空");
}
reportTimeService.packageStartTimeDetailExport(reportStartTimeDetailDTO,response);
}
//-----------------------零担发运时效------------------------
@PostMapping("/zeroStartTimePage")
@ -226,6 +313,85 @@ public class ReportTimeController extends BladeController {
reportTimeService.packageTransferTimeExport(reportTimeDTO,response);
}
@PostMapping("/packageTransferTimeDetailPage")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "订制品中转时效明细报表", notes = "订制品中转时效明细报表")
public R packageTransferTimeDetailPage(@RequestBody ReportStartTimeDetailDTO reportStartTimeDetailDTO) {
String method = "###########packageTransferTimeDetailPage: ";
String brand = reportStartTimeDetailDTO.getBrand();
String businessLine = reportStartTimeDetailDTO.getBusinessLine();
Long warehouseId = reportStartTimeDetailDTO.getWarehouseId();
Long departureWarehouseId = reportStartTimeDetailDTO.getDepartureWarehouseId();
Long destinationWarehouseId = reportStartTimeDetailDTO.getDestinationWarehouseId();
if(StringUtil.isBlank(brand)){
log.warn(method+"品牌不能为空 {}",brand);
return R.fail(405,"品牌不能为空");
}
if(StringUtil.isBlank(businessLine)){
log.warn(method+"事业线不能为空 {}",businessLine);
return R.fail(405,"事业线不能为空");
}
if(Objects.isNull(warehouseId)){
log.warn(method+"中转仓id不能为空 {}",warehouseId);
return R.fail(405,"中转仓id不能为空");
}
if(Objects.isNull(departureWarehouseId)){
log.warn(method+"始发仓id不能为空 {}",departureWarehouseId);
return R.fail(405,"始发仓id不能为空");
}
if(Objects.isNull(destinationWarehouseId)){
log.warn(method+"目的仓id不能为空 {}",destinationWarehouseId);
return R.fail(405,"目的仓id不能为空");
}
return reportTimeService.packageTransferTimeDetailPage(reportStartTimeDetailDTO);
}
@PostMapping("/packageTransferTimeDetailExport")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "订制品中转时效明细报表导出", notes = "订制品中转时效明细报表导出")
public void packageTransferTimeDetailExport(@RequestBody ReportStartTimeDetailDTO reportStartTimeDetailDTO, HttpServletResponse response) {
String method = "###########packageTransferTimeDetailExport: ";
String brand = reportStartTimeDetailDTO.getBrand();
String businessLine = reportStartTimeDetailDTO.getBusinessLine();
Long warehouseId = reportStartTimeDetailDTO.getWarehouseId();
Long departureWarehouseId = reportStartTimeDetailDTO.getDepartureWarehouseId();
Long destinationWarehouseId = reportStartTimeDetailDTO.getDestinationWarehouseId();
if(StringUtil.isBlank(brand)){
log.warn(method+"品牌不能为空 {}",brand);
throw new CustomerException(405,"品牌不能为空");
}
if(StringUtil.isBlank(businessLine)){
log.warn(method+"事业线不能为空 {}",businessLine);
throw new CustomerException(405,"事业线不能为空");
}
if(Objects.isNull(warehouseId)){
log.warn(method+"中转仓id不能为空 {}",warehouseId);
throw new CustomerException(405,"中转仓id不能为空");
}
if(Objects.isNull(departureWarehouseId)){
log.warn(method+"始发仓id不能为空 {}",departureWarehouseId);
throw new CustomerException(405,"始发仓id不能为空");
}
if(Objects.isNull(destinationWarehouseId)){
log.warn(method+"目的仓id不能为空 {}",destinationWarehouseId);
throw new CustomerException(405,"目的仓id不能为空");
}
reportTimeService.packageTransferTimeDetailExport(reportStartTimeDetailDTO,response);
}
//-----------------------零担中转时效------------------------
@PostMapping("/zeroTransferTimePage")
@ -258,6 +424,78 @@ public class ReportTimeController extends BladeController {
reportTimeService.packageAllTrunklineTimeExport(reportTimeDTO,response);
}
@PostMapping("/packageAllTrunklineTimeDetailPage")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "订制品干线时效明细报表", notes = "订制品干线时效明细报表")
public R packageAllTrunklineTimeDetailPage(@RequestBody AllTrunklineTimeDetailDTO allTrunklineTimeDetailDTO) {
String method = "#####################packageAllTrunklineTimeDetailPage: ";
String brand = allTrunklineTimeDetailDTO.getBrand();
Long departureWarehouseId = allTrunklineTimeDetailDTO.getDepartureWarehouseId();
Long destinationWarehouseId = allTrunklineTimeDetailDTO.getDestinationWarehouseId();
String businessLine = allTrunklineTimeDetailDTO.getBusinessLine();
if(StringUtil.isBlank(brand)){
log.warn(method+"品牌不能为空 {}",brand);
return R.fail(405,"品牌不能为空");
}
if(StringUtil.isBlank(businessLine)){
log.warn(method+"事业线不能为空 {}",businessLine);
return R.fail(405,"事业线不能为空");
}
if(Objects.isNull(departureWarehouseId)){
log.warn(method+"始发仓id不能为空 {}",departureWarehouseId);
return R.fail(405,"始发仓id不能为空");
}
if(Objects.isNull(destinationWarehouseId)){
log.warn(method+"目的仓id不能为空 {}",destinationWarehouseId);
return R.fail(405,"目的仓id不能为空");
}
try{
return reportTimeService.packageAllTrunklineTimeDetailPage(allTrunklineTimeDetailDTO);
}catch (Exception e){
log.error(method+"系统异常",e);
return R.fail(500,"系统异常");
}
}
@PostMapping("/packageAllTrunklineTimeDetailExport")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "订制品干线时效明细报表导出", notes = "订制品干线时效明细报表导出")
public void packageAllTrunklineTimeDetailExport(@RequestBody AllTrunklineTimeDetailDTO allTrunklineTimeDetailDTO, HttpServletResponse response) {
String method = "#####################packageAllTrunklineTimeDetailExport: ";
String brand = allTrunklineTimeDetailDTO.getBrand();
Long departureWarehouseId = allTrunklineTimeDetailDTO.getDepartureWarehouseId();
Long destinationWarehouseId = allTrunklineTimeDetailDTO.getDestinationWarehouseId();
String businessLine = allTrunklineTimeDetailDTO.getBusinessLine();
if(StringUtil.isBlank(brand)){
log.warn(method+"品牌不能为空 {}",brand);
throw new CustomerException(405,"品牌不能为空");
}
if(StringUtil.isBlank(businessLine)){
log.warn(method+"事业线不能为空 {}",businessLine);
throw new CustomerException(405,"事业线不能为空");
}
if(Objects.isNull(departureWarehouseId)){
log.warn(method+"始发仓id不能为空 {}",departureWarehouseId);
throw new CustomerException(405,"始发仓id不能为空");
}
if(Objects.isNull(destinationWarehouseId)){
log.warn(method+"目的仓id不能为空 {}",destinationWarehouseId);
throw new CustomerException(405,"目的仓id不能为空");
}
reportTimeService.packageAllTrunklineTimeDetailExport(allTrunklineTimeDetailDTO,response);
}
//-----------------------零担干线整体时效------------------------
@PostMapping("/zeroAllTrunklineTimePage")

54
blade-service/logpm-report/src/main/java/com/logpm/report/dto/AllTrunklineTimeDetailDTO.java
Unescape View File

@ -0,0 +1,54 @@
package com.logpm.report.dto;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
public class AllTrunklineTimeDetailDTO implements Serializable {
private Integer pageNum;
private Integer pageSize;
private String brand;
private String businessLine;
private Long warehouseId;
private Long departureWarehouseId;
private Long destinationWarehouseId;
private Integer hoursTime;
private String startTimeStr;
private String endTimeStr;
private Date startTime;
private Date endTime;
// 开单件数 1
// 目的仓到仓件数 2
// 目的仓未到仓件数 3
// 准时到仓件数 4
private Integer allTrunklineTimeDetailType;
private String createTimeStartStr;
private String createTimeEndStr;
private Date createTimeStartTime;
private Date createTimeEndTime;
private String orderCode;
private String waybillNo;
private String departureWarehouseName;
private String destinationWarehouseName;
private String orderPackageCode;
private String serviceNum;
private String trainNumber;
private Integer isDesIncomging;
private Integer isOverTime; // 未超时 0 超时1
}

6
blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportCheckTimeDetailDTO.java
Unescape View File

@ -27,6 +27,12 @@ public class ReportCheckTimeDetailDTO implements Serializable {
private List<String> waybillNoList;
private String startTimeStr;
private String endTimeStr;
private Date startTime;
private Date endTime;
private String documentMakingTimeStartStr;
private String documentMakingTimeEndStr;

100
blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportIncomingDetailDTO.java
Unescape View File

@ -0,0 +1,100 @@
package com.logpm.report.dto;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
@Data
public class ReportIncomingDetailDTO implements Serializable {
private Integer pageNum;
private Integer pageSize;
private String startTimeStr;
private String endTimeStr;
private Date startTime;
private Date endTime;
private String year;
private String month;
private String businessLine;
private Long departureWarehouseId;
private Long destinationWarehouseId;
private String brand;
private Long consigneeId;
private String documentMakingTimeStartStr;
private String documentMakingTimeEndStr;
private Date documentMakingTimeStartDate;
private Date documentMakingTimeEndDate;
private String createTimeStartStr;
private String createTimeEndStr;
private Date createTimeStartDate;
private Date createTimeEndDate;
private String abolishTimeStartStr;
private String abolishTimeEndStr;
private Date abolishTimeStartDate;
private Date abolishTimeEndDate;
private String freezeTimeStartStr;
private String freezeTimeEndStr;
private Date freezeTimeStartDate;
private Date freezeTimeEndDate;
private String checkTimeStartStr;
private String checkTimeEndStr;
private Date checkTimeStartDate;
private Date checkTimeEndDate;
private List<String> waybillNos;
private List<String> waybillNoList;
private List<Long> destinationWarehouseIds;
private String waybillNo;
private String orderNo;
private String destinationWarehouseName;
private String departureWarehouseName;
private String customerTrain;
private String shipper;
private String shipperName;
private String shipperMobile;
private String consignee;
private String consigneeName;
private String consigneeMobile;
private String destination;
private String completeDestination;
private String departure;
private String completeDeparture;
private Integer payType;
private Integer payWay;
private Integer deliveryWay;
private Integer urgency;
private Integer serviceType;
private Integer transportType;
private Integer waybillStatus;
private Integer checkStatus;
private Integer pickupCompleteOrNot;
private Integer trunklineCompleteOrNot;
private String agent;
private String goodsName;
private Integer freezeStatus;
private Integer abolishStatus;
private String remark;
private String consigneeAddress;
private Integer payStatus;
private String signUserName;
private Integer settlementStatus;
}

53
blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportStartTimeDetailDTO.java
Unescape View File

@ -0,0 +1,53 @@
package com.logpm.report.dto;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
public class ReportStartTimeDetailDTO implements Serializable {
private Integer pageNum;
private Integer pageSize;
private String createStartTimeStr;
private String createEndTimeStr;
private Date createStartTime;
private Date createEndTime;
private String startTimeStr;
private String endTimeStr;
private Date startTime;
private Date endTime;
private String businessLine;
private Long departureWarehouseId;
private Long warehouseId;
private Long destinationWarehouseId;
private String brand;
private Integer hoursTime;
private String orderCode;
private String waybillNo;
private String departureWarehouseName;
private String nowWarehouseName;
private String destinationWarehouseName;
private String orderPackageCode;
private String serviceNum;
private String trainNumber;
private Integer isDesIncomging;
private Integer isOverTime; // 未超时 0 超时1
//开单件数 1
//发运件数 2
//为发运件数 3
//未发运超时件数 4
private Integer startDetailType;
}

1
blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportTimeDTO.java
Unescape View File

@ -30,6 +30,7 @@ public class ReportTimeDTO implements Serializable {
private String orderCode;
private String waybillCode;
private String waybillNo;
private String brand;
private String businessLine;

16
blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.java
Unescape View File

@ -2,10 +2,8 @@ package com.logpm.report.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.report.dto.ReportIncomingDTO;
import com.logpm.report.vo.ReportConsigneeIncomingExportVO;
import com.logpm.report.vo.ReportDeptIncomingExportVO;
import com.logpm.report.vo.ReportDeptIncomingNumVO;
import com.logpm.report.vo.ReportDeptIncomingVO;
import com.logpm.report.dto.ReportIncomingDetailDTO;
import com.logpm.report.vo.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -26,4 +24,14 @@ public interface ReportIncomingMapper {
List<ReportDeptIncomingNumVO> findIncomingNumByConsiginee(@Param("param") ReportIncomingDTO reportIncomingDTO);
List<ReportConsigneeIncomingExportVO> consigneeIncomingExport(@Param("param") ReportIncomingDTO reportIncomingDTO);
IPage<ReportIncomingDetailVO> incomingDetailPage(IPage<Object> page, @Param("param") ReportIncomingDetailDTO reportIncomingDetailDTO);
List<ReportIncomingDetailExportVO> incomingDetailExport(@Param("param") ReportIncomingDetailDTO reportIncomingDetailDTO);
IPage<ReportDeptIncomingVO> deptIncomingPageNew(IPage<Object> page, @Param("param") ReportIncomingDTO reportIncomingDTO);
List<ReportDeptIncomingNumVO> findIncomingNumNew(@Param("param") ReportIncomingDTO reportIncomingDTO);
List<ReportDeptIncomingExportVO> deptIncomingExportNew(@Param("param") ReportIncomingDTO reportIncomingDTO);
}

842
blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.xml
Unescape View File

@ -5,7 +5,9 @@
<select id="deptIncomingPage" resultType="com.logpm.report.vo.ReportDeptIncomingVO">
select waw.business_line businessLine,
lww.departure_warehouse_id departureWarehouseId,
lww.departure_warehouse_name departureWarehouseName,
lww.destination_warehouse_id destinationWarehouseId,
lww.destination_warehouse_name destinationWarehouseName,
lww.brand brand,
YEAR(lww.document_making_time) nian,
@ -58,13 +60,115 @@
<if test="param.endTime != null ">
and lww.document_making_time &lt;= #{param.endTime}
</if>
group by waw.business_line,lww.departure_warehouse_name,
group by waw.business_line,
lww.departure_warehouse_id,
lww.departure_warehouse_name,
lww.destination_warehouse_id,
lww.destination_warehouse_name,
lww.brand,YEAR(lww.document_making_time),
lww.brand,
YEAR(lww.document_making_time),
MONTH(lww.document_making_time)
</select>
<select id="deptIncomingPageNew" resultType="com.logpm.report.vo.ReportDeptIncomingVO">
select
<if test="param.businessLines != null and param.businessLines.size() > 0 ">
waw.business_line businessLine,
</if>
<if test="param.businessLines == null or param.businessLines.size() == 0 ">
'全部' businessLine,
</if>
<if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0 ">
lww.departure_warehouse_id departureWarehouseId,
lww.departure_warehouse_name departureWarehouseName,
</if>
<if test="param.departureWarehouseIds == null or param.departureWarehouseIds.size() == 0 ">
'全部' departureWarehouseName,
</if>
<if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0 ">
lww.destination_warehouse_id destinationWarehouseId,
lww.destination_warehouse_name destinationWarehouseName,
</if>
<if test="param.destinationWarehouseIds == null or param.destinationWarehouseIds.size() == 0 ">
'全部' destinationWarehouseName,
</if>
<if test="param.brands != null and param.brands.size() > 0 ">
lww.brand brand,
</if>
<if test="param.brands == null or param.brands.size() == 0 ">
'全部' brand,
</if>
YEAR(lww.document_making_time) nian,
MONTH(lww.document_making_time) yue,
count(lww.id) waybillNum,
sum(lww.total_count) num,
sum(IFNULL(lww.total_weight,0)) weight,
sum(IFNULL(lww.total_volume,0)) volume,
sum(IFNULL(lww.pickup_fee,0)) pickupFee,
sum(IFNULL(lww.total_freight,0)) freightFee,
sum(IFNULL(lww.delivery_fee,0)) deliveryFee,
sum(IFNULL(lww.warehouse_management_fee,0)) warehouseManagementFee,
sum(IFNULL(lww.storage_fee,0)) storageFee,
sum(IFNULL(lww.handling_fee,0)) handlingFee,
sum(IFNULL(lww.sorting_fee,0)) sortingFee,
sum(IFNULL(lww.install_fee,0)) installFee,
sum(IFNULL(lww.other_fee,0)) otherFee,
sum(IFNULL(lww.pickup_fee,0))+sum(IFNULL(lww.total_freight,0))+sum(IFNULL(lww.delivery_fee,0))+sum(IFNULL(lww.warehouse_management_fee,0))+sum(IFNULL(lww.storage_fee,0))+sum(IFNULL(lww.handling_fee,0))+sum(IFNULL(lww.sorting_fee,0))+sum(IFNULL(lww.install_fee,0))+sum(IFNULL(lww.other_fee,0)) totalFee
from logpm_warehouse_waybill lww
left join logpm_warehouse_warehouse waw on waw.id = lww.destination_warehouse_id
where lww.document_making_time &gt; '2024-10-22 00:00:00'
and lww.departure_warehouse_id != 1847456188105195522
<if test="param.businessLines != null and param.businessLines.size() > 0 ">
and waw.business_line in
<foreach collection="param.businessLines" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0 ">
and lww.departure_warehouse_id in
<foreach collection="param.departureWarehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0 ">
and lww.destination_warehouse_id in
<foreach collection="param.destinationWarehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.brands != null and param.brands.size() > 0 ">
and lww.brand in
<foreach collection="param.brands" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.startTime != null ">
and lww.document_making_time &gt;= #{param.startTime}
</if>
<if test="param.endTime != null ">
and lww.document_making_time &lt;= #{param.endTime}
</if>
group by YEAR(lww.document_making_time),
<if test="param.businessLines != null and param.businessLines.size() > 0 ">
waw.business_line,
</if>
<if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0 ">
lww.departure_warehouse_id,
lww.departure_warehouse_name,
</if>
<if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0 ">
lww.destination_warehouse_id,
lww.destination_warehouse_name,
</if>
<if test="param.brands != null and param.brands.size() > 0 ">
lww.brand,
</if>
MONTH(lww.document_making_time)
</select>
<select id="findIncomingNum" resultType="com.logpm.report.vo.ReportDeptIncomingNumVO">
select waw.business_line businessLine,
lww.departure_warehouse_name departureWarehouseName,
@ -112,9 +216,96 @@
<if test="param.endTime != null ">
and lww.document_making_time &lt;= #{param.endTime}
</if>
group by waw.business_line,lww.departure_warehouse_name,
group by YEAR(lww.document_making_time),
waw.business_line,
lww.departure_warehouse_name,
lww.destination_warehouse_name,
lww.brand,YEAR(lww.document_making_time),
lww.brand,
MONTH(lww.document_making_time)
</select>
<select id="findIncomingNumNew" resultType="com.logpm.report.vo.ReportDeptIncomingNumVO">
select
<if test="param.businessLines != null and param.businessLines.size() > 0 ">
waw.business_line businessLine,
</if>
<if test="param.businessLines == null or param.businessLines.size() == 0 ">
'全部' businessLine,
</if>
<if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0 ">
lww.departure_warehouse_name departureWarehouseName,
</if>
<if test="param.departureWarehouseIds == null or param.departureWarehouseIds.size() == 0 ">
'全部' departureWarehouseName,
</if>
<if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0 ">
lww.destination_warehouse_name destinationWarehouseName,
</if>
<if test="param.destinationWarehouseIds == null or param.destinationWarehouseIds.size() == 0 ">
'全部' destinationWarehouseName,
</if>
<if test="param.brands != null and param.brands.size() > 0 ">
lww.brand brand,
</if>
<if test="param.brands == null or param.brands.size() == 0 ">
'全部' brand,
</if>
YEAR(lww.document_making_time) nian,
MONTH(lww.document_making_time) yue,
case when lww.waybill_type = '1' then count(ldpl.id)
when lww.waybill_type = '2' then sum(ldpn.quantity) end stockNum,
case when lww.waybill_type = '1' then sum(IF(ldpl.order_package_status='70',1,0))
when lww.waybill_type = '2' then sum(ldpn.signin_quantity) end signNum
from logpm_warehouse_waybill lww
left join logpm_warehouse_warehouse waw on waw.id = lww.destination_warehouse_id
left join logpm_distribution_parcel_list ldpl on ldpl.waybill_id = lww.id
left join logpm_distribution_parcel_number ldpn on ldpn.parcel_list_id = ldpl.id
where lww.document_making_time &gt; '2024-10-22 00:00:00'
and lww.departure_warehouse_id != 1847456188105195522
<if test="param.businessLines != null and param.businessLines.size() > 0 ">
and waw.business_line in
<foreach collection="param.businessLines" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0 ">
and lww.departure_warehouse_id in
<foreach collection="param.departureWarehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0 ">
and lww.destination_warehouse_id in
<foreach collection="param.destinationWarehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.brands != null and param.brands.size() > 0 ">
and lww.brand in
<foreach collection="param.brands" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.startTime != null ">
and lww.document_making_time &gt;= #{param.startTime}
</if>
<if test="param.endTime != null ">
and lww.document_making_time &lt;= #{param.endTime}
</if>
group by YEAR(lww.document_making_time),
<if test="param.businessLines != null and param.businessLines.size() > 0 ">
waw.business_line,
</if>
<if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0 ">
lww.departure_warehouse_name,
</if>
<if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0 ">
lww.destination_warehouse_name,
</if>
<if test="param.brands != null and param.brands.size() > 0 ">
lww.brand,
</if>
MONTH(lww.document_making_time)
</select>
@ -180,10 +371,109 @@
MONTH(lww.document_making_time)
</select>
<select id="deptIncomingExportNew" resultType="com.logpm.report.vo.ReportDeptIncomingVO">
select
<if test="param.businessLines != null and param.businessLines.size() > 0 ">
waw.business_line businessLine,
</if>
<if test="param.businessLines == null or param.businessLines.size() == 0 ">
'全部' businessLine,
</if>
<if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0 ">
lww.departure_warehouse_id departureWarehouseId,
lww.departure_warehouse_name departureWarehouseName,
</if>
<if test="param.departureWarehouseIds == null or param.departureWarehouseIds.size() == 0 ">
'全部' departureWarehouseName,
</if>
<if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0 ">
lww.destination_warehouse_id destinationWarehouseId,
lww.destination_warehouse_name destinationWarehouseName,
</if>
<if test="param.destinationWarehouseIds == null or param.destinationWarehouseIds.size() == 0 ">
'全部' destinationWarehouseName,
</if>
<if test="param.brands != null and param.brands.size() > 0 ">
lww.brand brand,
</if>
<if test="param.brands == null or param.brands.size() == 0 ">
'全部' brand,
</if>
YEAR(lww.document_making_time) nian,
MONTH(lww.document_making_time) yue,
count(lww.id) waybillNum,
sum(lww.total_count) num,
sum(IFNULL(lww.total_weight,0)) weight,
sum(IFNULL(lww.total_volume,0)) volume,
sum(IFNULL(lww.pickup_fee,0)) pickupFee,
sum(IFNULL(lww.total_freight,0)) freightFee,
sum(IFNULL(lww.delivery_fee,0)) deliveryFee,
sum(IFNULL(lww.warehouse_management_fee,0)) warehouseManagementFee,
sum(IFNULL(lww.storage_fee,0)) storageFee,
sum(IFNULL(lww.handling_fee,0)) handlingFee,
sum(IFNULL(lww.sorting_fee,0)) sortingFee,
sum(IFNULL(lww.install_fee,0)) installFee,
sum(IFNULL(lww.other_fee,0)) otherFee,
sum(IFNULL(lww.pickup_fee,0))+sum(IFNULL(lww.total_freight,0))+sum(IFNULL(lww.delivery_fee,0))+sum(IFNULL(lww.warehouse_management_fee,0))+sum(IFNULL(lww.storage_fee,0))+sum(IFNULL(lww.handling_fee,0))+sum(IFNULL(lww.sorting_fee,0))+sum(IFNULL(lww.install_fee,0))+sum(IFNULL(lww.other_fee,0)) totalFee
from logpm_warehouse_waybill lww
left join logpm_warehouse_warehouse waw on waw.id = lww.destination_warehouse_id
where lww.document_making_time &gt; '2024-10-22 00:00:00'
and lww.departure_warehouse_id != 1847456188105195522
<if test="param.businessLines != null and param.businessLines.size() > 0 ">
and waw.business_line in
<foreach collection="param.businessLines" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0 ">
and lww.departure_warehouse_id in
<foreach collection="param.departureWarehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0 ">
and lww.destination_warehouse_id in
<foreach collection="param.destinationWarehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.brands != null and param.brands.size() > 0 ">
and lww.brand in
<foreach collection="param.brands" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.startTime != null ">
and lww.document_making_time &gt;= #{param.startTime}
</if>
<if test="param.endTime != null ">
and lww.document_making_time &lt;= #{param.endTime}
</if>
group by YEAR(lww.document_making_time),
<if test="param.businessLines != null and param.businessLines.size() > 0 ">
waw.business_line,
</if>
<if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0 ">
lww.departure_warehouse_id,
lww.departure_warehouse_name,
</if>
<if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0 ">
lww.destination_warehouse_id,
lww.destination_warehouse_name,
</if>
<if test="param.brands != null and param.brands.size() > 0 ">
lww.brand,
</if>
MONTH(lww.document_making_time)
</select>
<select id="consigineeIncomingPage" resultType="com.logpm.report.vo.ReportDeptIncomingVO">
select waw.business_line businessLine,
lww.departure_warehouse_id departureWarehouseId,
lww.departure_warehouse_name departureWarehouseName,
lww.destination_warehouse_id destinationWarehouseId,
lww.destination_warehouse_name destinationWarehouseName,
lww.consignee_id consigneeId,
lww.consignee consignee,
lww.brand brand,
YEAR(lww.document_making_time) nian,
@ -239,8 +529,8 @@
<if test="param.endTime != null ">
and lww.document_making_time &lt;= #{param.endTime}
</if>
group by waw.business_line,lww.departure_warehouse_name,
lww.destination_warehouse_name,lww.consignee,
group by waw.business_line,lww.departure_warehouse_id,lww.departure_warehouse_name,
lww.destination_warehouse_id,lww.destination_warehouse_name,lww.consignee_id,lww.consignee,
lww.brand,YEAR(lww.document_making_time),
MONTH(lww.document_making_time)
</select>
@ -368,4 +658,544 @@
MONTH(lww.document_making_time)
</select>
<select id="incomingDetailPage" resultType="com.logpm.report.vo.ReportIncomingDetailVO">
select lww.id waybillId,
lww.brand brand,
lww.waybill_no waybillNo,
lww.order_no orderNo,
lww.consignee consignee,
lbc.client_code consigneeCode,
lww.consignee_name consigneeName,
lww.consignee_mobile consigneeMobile,
lww.consignee_address consigneeAddress,
lww.shipper shipper,
lww.shipper_name shipperName,
lww.shipper_mobile shipperMobile,
lww.shipper_address shipperAddress,
lww.destination destination,
lww.complete_destination completeDestination,
lww.departure departure,
lww.complete_departure completeDeparture,
lww.departure_warehouse_name departureWarehouseName,
lww.destination_warehouse_name destinationWarehouseName,
lww.delivery_way deliveryWay,
lww.customer_train customerTrain,
IFNULL(lww.return_status,0) returnStatus,
lww.remark remark,
lbc.clean_obj_type cleanObjType,
lww.pay_type payType,
lww.pay_way payWay,
lww.x_pay nowPay,
lww.d_pay arrivePay,
lww.h_pay backPay,
lww.y_pay monthPay,
lbc.type_service serviceType,
IFNULL(lww.update_status,0) updateStatus,
IFNULL(lww.check_status,0) checkStatus,
lww.check_reson checkReson,
lww.check_remark checkRemark,
lww.check_user_name checkUserName,
lww.check_time checkTime,
lww.cancle_check_remark cancleCheckRemark,
lww.cancle_check_user_name cancleCheckUserName,
lww.cancle_check_time cancleCheckTime,
lww.waybill_status waybillStatus,
lww.waybill_type waybillType,
lww.document_making_time openTime,
lww.total_count totalCount,
sum(lwwd.weight) totalWeight,
sum(lwwd.volume) totalVolume,
lww.x_pay+lww.d_pay+lww.h_pay+lww.y_pay totalFee,
sum(IFNULL(lwwd.freight_price,0)*lwwd.num+IF(lww.pickup_complete_or_not=1,IFNULL(lwwd.pickup_price,0)*lwwd.num,0)+IFNULL(lwwd.delivery_price,0)*lwwd.num) systemTotalFee,
lww.pickup_fee pickupFee,
lww.total_freight freightFee,
lww.storage_fee+lww.warehouse_management_fee+lww.sorting_fee+lww.handling_fee warehouseServiceFee,
lww.storage_fee warehouseFee,
lww.warehouse_management_fee warehouseManagementFee,
lww.sorting_fee warehouseSortingFee,
lww.handling_fee warehouseOprationFee,
lww.delivery_fee deliveryServiceFee,
lww.delivery_fee deliveryFee,
0.00 deliveryHandlingFee,
0.00 deliverySortingFee,
0.00 deliveryUpfloorFee,
0.00 deliveryMoveFee,
0.00 deliveryLine,
0.00 deliveryLineFee,
lww.other_fee otherFee,
lww.install_fee installFee,
lww.insurance_fee insuranceFee,
lww.claiming_value claimingValue,
lww.third_operation_fee thirdOperationFee,
lww.rebate rebate,
group_concat(concat(lwwd.product_name )) AS goodsName,
GROUP_CONCAT(concat(lwwd.num)) goodsTypeNum,
GROUP_CONCAT(concat(lwwd.price)) goodsTypePrice,
GROUP_CONCAT(concat(lwwd.product_name,'(',IFNULL(lwwd.delivery_price,0),')')) goodsTypeDeliveryPrice,
GROUP_CONCAT(concat(lwwd.product_name,'(',IFNULL(lwwd.pickup_price,0),')')) goodsTypePickupPrice,
GROUP_CONCAT(concat(lwwd.product_name,'(',IFNULL(lwwd.freight_price,0),')')) goodsTypeFreightPrice,
count(lwwd.id) goodsTypeCount,
lww.pay_status,
lww.settlement_status,
lww.sign_num as signCount,
lww.sign_user_name as signUserName,
lww.sign_time as signTime,
lww.delivery_time as deliveryTime,
lww.delivery_driver_name as deliveryDriverName
from logpm_warehouse_waybill lww
left join logpm_warehouse_warehouse waw on waw.id = lww.destination_warehouse_id
left join logpm_basicdata_client lbc on lbc.id = lww.consignee_id
left join logpm_warehouse_waybill_detail lwwd on lwwd.waybill_id = lww.id and lwwd.is_deleted = 0
where lww.is_deleted = 0
and lww.abolish_status = 0
and waw.business_line = #{param.businessLine}
and lww.departure_warehouse_id = #{param.departureWarehouseId}
and lww.destination_warehouse_id = #{param.destinationWarehouseId}
and lww.brand = #{param.brand}
<if test="param.consigneeId != null ">
and lww.consignee_id = #{param.consigneeId}
</if>
<if test="param.waybillNoList != null">
and lww.waybill_no in
<foreach collection="param.waybillNoList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.destinationWarehouseIds != null">
and lww.destination_warehouse_id in
<foreach collection="param.destinationWarehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.waybillNo != null and param.waybillNo != ''">
and Locate(#{param.waybillNo},lww.waybill_no) > 0
</if>
<if test="param.orderNo != null and param.orderNo != ''">
and Locate(#{param.orderNo},lww.order_no) > 0
</if>
<if test="param.destinationWarehouseName != null and param.destinationWarehouseName != ''">
and Locate(#{param.destinationWarehouseName},lww.destination_warehouse_name) > 0
</if>
<if test="param.departureWarehouseName != null and param.departureWarehouseName != ''">
and Locate(#{param.departureWarehouseName},lww.departure_warehouse_name) > 0
</if>
<if test="param.customerTrain != null and param.customerTrain != ''">
and Locate(#{param.customerTrain},lww.customer_train) > 0
</if>
<if test="param.shipper != null and param.shipper != ''">
and Locate(#{param.shipper},lww.shipper) > 0
</if>
<if test="param.shipperName != null and param.shipperName != ''">
and Locate(#{param.shipperName},lww.shipper_name) > 0
</if>
<if test="param.shipperMobile != null and param.shipperMobile != ''">
and Locate(#{param.shipperMobile},lww.shipper_mobile) > 0
</if>
<if test="param.consignee != null and param.consignee != ''">
and Locate(#{param.consignee},lww.consignee) > 0
</if>
<if test="param.consigneeName != null and param.consigneeName != ''">
and Locate(#{param.consigneeName},lww.consignee_name) > 0
</if>
<if test="param.consigneeMobile != null and param.consigneeMobile != ''">
and Locate(#{param.consigneeMobile},lww.consignee_mobile) > 0
</if>
<if test="param.destination != null and param.destination != ''">
and Locate(#{param.destination},lww.destination) > 0
</if>
<if test="param.completeDestination != null and param.completeDestination != ''">
and Locate(#{param.completeDestination},lww.complete_destination) > 0
</if>
<if test="param.departure != null and param.departure != ''">
and Locate(#{param.departure},lww.departure) > 0
</if>
<if test="param.completeDeparture != null and param.completeDeparture != ''">
and Locate(#{param.completeDeparture},lww.complete_departure) > 0
</if>
<if test="param.payType != null">
and lww.pay_type = #{param.payType}
</if>
<if test="param.payWay != null">
and lww.pay_way = #{param.payWay}
</if>
<if test="param.deliveryWay != null">
and lww.delivery_way = #{param.deliveryWay}
</if>
<if test="param.urgency != null">
and lww.urgency = #{param.urgency}
</if>
<if test="param.serviceType != null">
and lww.service_type = #{param.serviceType}
</if>
<if test="param.transportType != null">
and lww.transport_type = #{param.transportType}
</if>
<if test="param.waybillStatus != null">
and lww.waybill_status = #{param.waybillStatus}
</if>
<if test="param.checkStatus != null">
and IFNULL(lww.check_status,0) = #{param.checkStatus}
</if>
<if test="param.pickupCompleteOrNot != null">
and lww.pickup_complete_or_not = #{param.pickupCompleteOrNot}
</if>
<if test="param.trunklineCompleteOrNot != null">
and lww.trunkline_complete_or_not = #{param.trunklineCompleteOrNot}
</if>
<if test="param.documentMakingTimeStartDate != null">
and lww.document_making_time &gt;= #{param.documentMakingTimeStartDate}
</if>
<if test="param.documentMakingTimeEndDate != null">
and lww.document_making_time &lt;= #{param.documentMakingTimeEndDate}
</if>
<if test="param.createTimeStartDate != null">
and lww.document_making_time &gt;= #{param.createTimeStartDate}
</if>
<if test="param.createTimeEndDate != null">
and lww.document_making_time &lt;= #{param.createTimeEndDate}
</if>
<if test="param.checkTimeStartDate != null">
and lww.check_time &gt;= #{param.checkTimeStartDate}
</if>
<if test="param.checkTimeEndDate != null">
and lww.check_time &lt;= #{param.checkTimeEndDate}
</if>
<if test="param.agent != null and param.agent != ''">
and Locate(#{param.agent},agent) > 0
</if>
<if test="param.goodsName != null and param.goodsName != ''">
and Locate(#{param.goodsName},goods_name) > 0
</if>
<if test="param.freezeStatus != null">
and lww.freeze_status = #{param.freezeStatus}
</if>
<if test="param.abolishStatus != null">
and lww.abolish_status = #{param.abolishStatus}
</if>
<if test="param.remark != null and param.reamrk != ''">
and Locate(#{param.remark},lww.remark) > 0
</if>
<if test="param.consigneeAddress != null and param.consigneeAddress != ''">
and Locate(#{param.consigneeAddress},lww.consignee_address) > 0
</if>
<if test="param.abolishTimeStartDate != null">
and lww.abolish_time &gt;= #{param.abolishTimeStartDate}
</if>
<if test="param.abolishTimeEndDate != null">
and lww.abolish_time &lt;= #{param.abolishTimeEndDate}
</if>
<if test="param.freezeTimeStartDate != null">
and lww.freeze_time &gt;= #{param.freezeTimeStartDate}
</if>
<if test="param.freezeTimeEndDate != null">
and lww.freeze_time &lt;= #{param.freezeTimeEndDate}
</if>
<if test="param.payStatus != null">
and lww.pay_status = #{param.payStatus}
</if>
<if test="param.signUserName != null">
and lww.sign_user_name = #{param.signUserName}
</if>
<if test="param.settlementStatus != null">
and lww.settlement_status = #{param.settlementStatus}
</if>
GROUP BY lww.id
order by lww.create_time desc
</select>
<select id="incomingDetailExport" resultType="com.logpm.report.vo.ReportIncomingDetailExportVO">
select lww.id waybillId,
lww.brand brand,
lww.waybill_no waybillNo,
lww.order_no orderNo,
lww.consignee consignee,
lbc.client_code consigneeCode,
lww.consignee_name consigneeName,
lww.consignee_mobile consigneeMobile,
lww.consignee_address consigneeAddress,
lww.shipper shipper,
lww.shipper_name shipperName,
lww.shipper_mobile shipperMobile,
lww.shipper_address shipperAddress,
lww.destination destination,
lww.complete_destination completeDestination,
lww.departure departure,
lww.complete_departure completeDeparture,
lww.departure_warehouse_name departureWarehouseName,
lww.destination_warehouse_name destinationWarehouseName,
case when lww.delivery_way='1' then '自提'
when lww.delivery_way='2' then '送货'
when lww.delivery_way='3' then '送货上门'
when lww.delivery_way='4' then '送货上门(有电梯)'
when lww.delivery_way='5' then '送货上门(无电梯)'
when lww.delivery_way='6' then '送货卸货'
when lww.delivery_way='7' then '送货安装'
ELSE '未知' END deliveryWay,
lww.customer_train customerTrain,
CASE WHEN IFNULL(lww.return_status,0)=0 THEN '未回单'
WHEN IFNULL(lww.return_status,0)=1 THEN '已回单'
ELSE '未知' END returnStatus,
lww.remark remark,
case when lbc.clean_obj_type='1' THEN '工厂'
when lbc.clean_obj_type='2' THEN '商场'
when lbc.clean_obj_type='3' THEN '个人'
else '未知' end cleanObjType,
case when lww.pay_type='1' then '现金'
when lww.pay_type='2' then '银行卡'
when lww.pay_type='3' then '微信'
when lww.pay_type='4' then '支付宝'
when lww.pay_type='5' then '支票'
when lww.pay_type='6' then '账本'
else '未知' end payType,
case when lww.pay_way='1' then '现付'
when lww.pay_way='2' then '到付'
when lww.pay_way='3' then '月结'
when lww.pay_way='4' then '回付'
when lww.pay_way='5' then '内部结算'
when lww.pay_way='6' then '多笔付'
else '未知' end payWay,
lww.x_pay nowPay,
lww.d_pay arrivePay,
lww.h_pay backPay,
lww.y_pay monthPay,
case when lbc.type_service='1' then '商配'
when lbc.type_service='2' then '市配'
when lbc.type_service='3' then '自提'
when lbc.type_service='4' then '三方中转'
else '未知' end serviceType,
CASE WHEN IFNULL(lww.update_status,0)=0 THEN '未改单'
WHEN IFNULL(lww.update_status,0)=1 THEN '已改单'
ELSE '未知' END updateStatus,
CASE WHEN IFNULL(lww.check_status,0)=0 THEN '未审核'
WHEN IFNULL(lww.check_status,0)=1 THEN '已审核'
ELSE '未知' END checkStatus,
lww.check_reson checkReson,
lww.check_remark checkRemark,
lww.check_user_name checkUserName,
lww.check_time checkTime,
lww.cancle_check_remark cancleCheckRemark,
lww.cancle_check_user_name cancleCheckUserName,
lww.cancle_check_time cancleCheckTime,
case when lww.waybill_status='10' then '部分入库'
when lww.waybill_status='20' then '入库'
when lww.waybill_status='30' then '部分中转'
when lww.waybill_status='40' then '中转'
when lww.waybill_status='50' then '目的仓部分到达'
when lww.waybill_status='60' then '目的仓到达'
when lww.waybill_status='70' then '配送部分装车'
when lww.waybill_status='80' then '配送装车'
when lww.waybill_status='90' then '部分签收'
when lww.waybill_status='100' then '已签收'
else '未知' end waybillStatus,
lww.document_making_time openTime,
lww.goods_name goodsName,
lww.total_count totalCount,
sum(lwwd.weight) totalWeight,
sum(lwwd.volume) totalVolume,
lww.x_pay+lww.d_pay+lww.h_pay+lww.y_pay totalFee,
sum(IFNULL(lwwd.freight_price,0)*lwwd.num+IF(lww.pickup_complete_or_not=1,IFNULL(lwwd.pickup_price,0)*lwwd.num,0)+IFNULL(lwwd.delivery_price,0)*lwwd.num) systemTotalFee,
lww.pickup_fee pickupFee,
lww.total_freight freightFee,
lww.storage_fee+lww.warehouse_management_fee+lww.sorting_fee+lww.handling_fee warehouseServiceFee,
lww.storage_fee warehouseFee,
lww.warehouse_management_fee warehouseManagementFee,
lww.sorting_fee warehouseSortingFee,
lww.handling_fee warehouseOprationFee,
lww.delivery_fee deliveryServiceFee,
lww.delivery_fee deliveryFee,
0.00 deliveryHandlingFee,
0.00 deliverySortingFee,
0.00 deliveryUpfloorFee,
0.00 deliveryMoveFee,
0.00 deliveryLine,
0.00 deliveryLineFee,
lww.other_fee otherFee,
lww.install_fee installFee,
lww.insurance_fee insuranceFee,
lww.claiming_value claimingValue,
lww.third_operation_fee thirdOperationFee,
lww.rebate rebate,
CASE WHEN lww.pay_status='10' THEN '未付款'
WHEN lww.pay_status='20' THEN '部分付款'
WHEN lww.pay_status='30' THEN '已付款'
ELSE '未知' END payStatus,
CASE WHEN lww.settlement_status='10' THEN '未结算'
WHEN lww.settlement_status='20' THEN '部分结算'
WHEN lww.settlement_status='30' THEN '已结算'
ELSE '未知' END settlementStatus,
lww.sign_num signNum,
lww.sign_time signTime,
lww.delivery_time deliveryTime,
lww.sign_user_name signUserName,
lww.delivery_driver_name deliveryDriverName,
GROUP_CONCAT(concat(lwwd.product_name,'(',lwwd.num,')')) goodsTypeNum,
GROUP_CONCAT(concat(lwwd.product_name,'(',lwwd.price,')')) goodsTypePrice,
GROUP_CONCAT(concat(lwwd.product_name,'(',IFNULL(lwwd.delivery_price,0),')')) goodsTypeDeliveryPrice,
GROUP_CONCAT(concat(lwwd.product_name,'(',IFNULL(lwwd.pickup_price,0),')')) goodsTypePickupPrice,
GROUP_CONCAT(concat(lwwd.product_name,'(',IFNULL(lwwd.freight_price,0),')')) goodsTypeFreightPrice,
count(lwwd.id) goodsTypeCount
from logpm_warehouse_waybill lww
left join logpm_warehouse_warehouse waw on waw.id = lww.destination_warehouse_id
left join logpm_basicdata_client lbc on lbc.id = lww.consignee_id
left join logpm_warehouse_waybill_detail lwwd on lwwd.waybill_id = lww.id and lwwd.is_deleted = 0
where lww.is_deleted = 0
and lww.abolish_status = 0
and waw.business_line = #{param.businessLine}
and lww.departure_warehouse_id = #{param.departureWarehouseId}
and lww.destination_warehouse_id = #{param.destinationWarehouseId}
and lww.brand = #{param.brand}
<if test="param.consigneeId != null ">
and lww.consignee_id = #{param.consigneeId}
</if>
<if test="param.waybillNoList != null">
and lww.waybill_no in
<foreach collection="param.waybillNoList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.destinationWarehouseIds != null">
and lww.destination_warehouse_id in
<foreach collection="param.destinationWarehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.waybillNo != null and param.waybillNo != ''">
and Locate(#{param.waybillNo},lww.waybill_no) > 0
</if>
<if test="param.orderNo != null and param.orderNo != ''">
and Locate(#{param.orderNo},lww.order_no) > 0
</if>
<if test="param.destinationWarehouseName != null and param.destinationWarehouseName != ''">
and Locate(#{param.destinationWarehouseName},lww.destination_warehouse_name) > 0
</if>
<if test="param.departureWarehouseName != null and param.departureWarehouseName != ''">
and Locate(#{param.departureWarehouseName},lww.departure_warehouse_name) > 0
</if>
<if test="param.customerTrain != null and param.customerTrain != ''">
and Locate(#{param.customerTrain},lww.customer_train) > 0
</if>
<if test="param.shipper != null and param.shipper != ''">
and Locate(#{param.shipper},lww.shipper) > 0
</if>
<if test="param.shipperName != null and param.shipperName != ''">
and Locate(#{param.shipperName},lww.shipper_name) > 0
</if>
<if test="param.shipperMobile != null and param.shipperMobile != ''">
and Locate(#{param.shipperMobile},lww.shipper_mobile) > 0
</if>
<if test="param.consignee != null and param.consignee != ''">
and Locate(#{param.consignee},lww.consignee) > 0
</if>
<if test="param.consigneeName != null and param.consigneeName != ''">
and Locate(#{param.consigneeName},lww.consignee_name) > 0
</if>
<if test="param.consigneeMobile != null and param.consigneeMobile != ''">
and Locate(#{param.consigneeMobile},lww.consignee_mobile) > 0
</if>
<if test="param.destination != null and param.destination != ''">
and Locate(#{param.destination},lww.destination) > 0
</if>
<if test="param.completeDestination != null and param.completeDestination != ''">
and Locate(#{param.completeDestination},lww.complete_destination) > 0
</if>
<if test="param.departure != null and param.departure != ''">
and Locate(#{param.departure},lww.departure) > 0
</if>
<if test="param.completeDeparture != null and param.completeDeparture != ''">
and Locate(#{param.completeDeparture},lww.complete_departure) > 0
</if>
<if test="param.payType != null">
and lww.pay_type = #{param.payType}
</if>
<if test="param.payWay != null">
and lww.pay_way = #{param.payWay}
</if>
<if test="param.deliveryWay != null">
and lww.delivery_way = #{param.deliveryWay}
</if>
<if test="param.urgency != null">
and lww.urgency = #{param.urgency}
</if>
<if test="param.serviceType != null">
and lww.service_type = #{param.serviceType}
</if>
<if test="param.transportType != null">
and lww.transport_type = #{param.transportType}
</if>
<if test="param.waybillStatus != null">
and lww.waybill_status = #{param.waybillStatus}
</if>
<if test="param.checkStatus != null">
and IFNULL(lww.check_status,0) = #{param.checkStatus}
</if>
<if test="param.pickupCompleteOrNot != null">
and lww.pickup_complete_or_not = #{param.pickupCompleteOrNot}
</if>
<if test="param.trunklineCompleteOrNot != null">
and lww.trunkline_complete_or_not = #{param.trunklineCompleteOrNot}
</if>
<if test="param.documentMakingTimeStartDate != null">
and lww.document_making_time &gt;= #{param.documentMakingTimeStartDate}
</if>
<if test="param.documentMakingTimeEndDate != null">
and lww.document_making_time &lt;= #{param.documentMakingTimeEndDate}
</if>
<if test="param.createTimeStartDate != null">
and lww.document_making_time &gt;= #{param.createTimeStartDate}
</if>
<if test="param.createTimeEndDate != null">
and lww.document_making_time &lt;= #{param.createTimeEndDate}
</if>
<if test="param.checkTimeStartDate != null">
and lww.check_time &gt;= #{param.checkTimeStartDate}
</if>
<if test="param.checkTimeEndDate != null">
and lww.check_time &lt;= #{param.checkTimeEndDate}
</if>
<if test="param.agent != null and param.agent != ''">
and Locate(#{param.agent},agent) > 0
</if>
<if test="param.goodsName != null and param.goodsName != ''">
and Locate(#{param.goodsName},goods_name) > 0
</if>
<if test="param.freezeStatus != null">
and lww.freeze_status = #{param.freezeStatus}
</if>
<if test="param.abolishStatus != null">
and lww.abolish_status = #{param.abolishStatus}
</if>
<if test="param.remark != null and param.reamrk != ''">
and Locate(#{param.remark},lww.remark) > 0
</if>
<if test="param.consigneeAddress != null and param.consigneeAddress != ''">
and Locate(#{param.consigneeAddress},lww.consignee_address) > 0
</if>
<if test="param.abolishTimeStartDate != null">
and lww.abolish_time &gt;= #{param.abolishTimeStartDate}
</if>
<if test="param.abolishTimeEndDate != null">
and lww.abolish_time &lt;= #{param.abolishTimeEndDate}
</if>
<if test="param.freezeTimeStartDate != null">
and lww.freeze_time &gt;= #{param.freezeTimeStartDate}
</if>
<if test="param.freezeTimeEndDate != null">
and lww.freeze_time &lt;= #{param.freezeTimeEndDate}
</if>
<if test="param.payStatus != null">
and lww.pay_status = #{param.payStatus}
</if>
<if test="param.signUserName != null">
and lww.sign_user_name = #{param.signUserName}
</if>
<if test="param.settlementStatus != null">
and lww.settlement_status = #{param.settlementStatus}
</if>
GROUP BY lww.id
order by lww.create_time desc
</select>
</mapper>

32
blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportQuallityMapper.xml
Unescape View File

@ -151,29 +151,33 @@
left join logpm_trunkline_waybill_track ltwt on ltwt.waybill_id = lww.id and ltwt.track_type = '888'
where 1=1
and lww.create_time > '2024-10-22 00:00:00'
and ltwt.id is not null
and waw.business_line is not null
and waw.business_line = #{param.businessLine}
and lww.departure_warehouse_id = #{param.departureWarehouseId}
and lww.destination_warehouse_id = #{param.destinationWarehouseId}
and lww.brand = #{param.brand}
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType != 3">
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType == 3">
and ltwt.refer = '发车前修改'
</if>
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType != 4">
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType == 4">
and ltwt.refer = '人为操作错误'
</if>
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType != 5">
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType == 5">
and ltwt.refer = '财务修改'
</if>
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType != 6">
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType == 6">
and ltwt.refer = '商家要求'
</if>
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType != 7">
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType == 7">
and ltwt.refer = '业务调整'
</if>
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType != 2">
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType == 1">
group by lww.id
</if>
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType == 2">
</if>
</select>
@ -199,28 +203,32 @@
where 1=1
and lww.create_time > '2024-10-22 00:00:00'
and waw.business_line is not null
and ltwt.id is not null
and waw.business_line = #{param.businessLine}
and lww.departure_warehouse_id = #{param.departureWarehouseId}
and lww.destination_warehouse_id = #{param.destinationWarehouseId}
and lww.brand = #{param.brand}
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType != 3">
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType == 3">
and ltwt.refer = '发车前修改'
</if>
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType != 4">
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType == 4">
and ltwt.refer = '人为操作错误'
</if>
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType != 5">
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType == 5">
and ltwt.refer = '财务修改'
</if>
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType != 6">
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType == 6">
and ltwt.refer = '商家要求'
</if>
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType != 7">
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType == 7">
and ltwt.refer = '业务调整'
</if>
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType != 2">
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType == 1">
group by lww.id
</if>
<if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType == 2">
</if>
</select>
</mapper>

14
blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.java
Unescape View File

@ -1,7 +1,9 @@
package com.logpm.report.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.report.dto.AllTrunklineTimeDetailDTO;
import com.logpm.report.dto.ReportCheckTimeDetailDTO;
import com.logpm.report.dto.ReportStartTimeDetailDTO;
import com.logpm.report.dto.ReportTimeDTO;
import com.logpm.report.vo.*;
import org.apache.ibatis.annotations.Mapper;
@ -56,4 +58,16 @@ public interface ReportTimeMapper {
IPage<ReportCheckWaybillTimeDetailVO> checkWaybillTimeDetailPage(IPage<Object> page, @Param("param") ReportCheckTimeDetailDTO reportCheckTimeDetailDTO);
List<ReportCheckWaybillTimeDetailVO> checkWaybillTimeDetailExport(@Param("param") ReportCheckTimeDetailDTO reportCheckTimeDetailDTO);
IPage<ReportPackgeAllTrunklineTimeDetailVO> packageAllTrunklineTimeDetailPage(IPage<Object> page, @Param("param") AllTrunklineTimeDetailDTO allTrunklineTimeDetailDTO);
List<ReportPackgeAllTrunklineTimeDetailVO> packageAllTrunklineTimeDetailExport(@Param("param") AllTrunklineTimeDetailDTO allTrunklineTimeDetailDTO);
IPage<ReportPackgeStartTimeDetailVO> packageStartTimeDetailPage(IPage<Object> page, @Param("param") ReportStartTimeDetailDTO reportStartTimeDetailDTO);
List<ReportPackgeStartTimeDetailVO> packageStartTimeDetailExport(@Param("param") ReportStartTimeDetailDTO reportStartTimeDetailDTO);
IPage<ReportPackgeStartTimeDetailVO> packageTransferTimeDetailPage(IPage<Object> page, @Param("param") ReportStartTimeDetailDTO reportStartTimeDetailDTO);
List<ReportPackgeStartTimeDetailVO> packageTransferTimeDetailExport(@Param("param") ReportStartTimeDetailDTO reportStartTimeDetailDTO);
}

738
blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml
Unescape View File

@ -224,7 +224,9 @@
<select id="packageStartTimePage" resultType="com.logpm.report.vo.ReportPackgeStartTimeVO">
select waw.business_line businessLine,
lww.departure_warehouse_id departureWarehouseId,
lww.departure_warehouse_name departureWarehouseName,
lww.destination_warehouse_id destinationWarehouseId,
lww.destination_warehouse_name destinationWarehouseName,
lta.brand brand,
count(lta.id) totalNum,
@ -275,7 +277,9 @@
and lta.create_time &lt;= #{param.endTime}
</if>
group by waw.business_line,
lww.departure_warehouse_id,
lww.departure_warehouse_name,
lww.destination_warehouse_id,
lww.destination_warehouse_name,
lta.brand
</select>
@ -333,7 +337,9 @@
and lta.create_time &lt;= #{param.endTime}
</if>
group by waw.business_line,
lww.departure_warehouse_id,
lww.departure_warehouse_name,
lww.destination_warehouse_id,
lww.destination_warehouse_name,
lta.brand
</select>
@ -553,8 +559,11 @@
<select id="packageTransferTimePage" resultType="com.logpm.report.vo.ReportPackgeTransferTimeVO">
select waw.business_line businessLine,
ldpl.send_warehouse_id departureWarehouseId,
ldpl.send_warehouse_name departureWarehouseName,
ldpl.accept_warehouse_id destinationWarehouseId,
ldpl.accept_warehouse_name destinationWarehouseName,
ldpl.warehouse_id warehouseId,
ldpl.warehouse warehouseName,
ldpl.brand_name brand,
sum(ldpl.quantity) incomingNum,
@ -611,8 +620,11 @@
and ldpl.create_time &lt;= #{param.endTime}
</if>
group by waw.business_line,
ldpl.send_warehouse_id,
ldpl.send_warehouse_name,
ldpl.accept_warehouse_id,
ldpl.accept_warehouse_name,
ldpl.warehouse_id,
ldpl.warehouse,
ldpl.brand_name
</select>
@ -677,8 +689,11 @@
and ldpl.create_time &lt;= #{param.endTime}
</if>
group by waw.business_line,
ldpl.send_warehouse_id,
ldpl.send_warehouse_name,
ldpl.accept_warehouse_id,
ldpl.accept_warehouse_name,
ldpl.warehouse_id,
ldpl.warehouse,
ldpl.brand_name
</select>
@ -813,7 +828,9 @@
<select id="packageAllTrunklineTimePage" resultType="com.logpm.report.vo.ReportPackgeAllTrunklineTimeVO">
select waw.business_line businessLine,
lww.departure_warehouse_id departureWarehouseId,
lww.departure_warehouse_name departureWarehouseName,
lww.destination_warehouse_id destinationWarehouseId,
lww.destination_warehouse_name destinationWarehouseName,
lww.brand brand,
IFNULL(lrat.hours_time,#{param.hoursTime}) hoursTime,
@ -881,7 +898,9 @@
</foreach>
</if>
group by waw.business_line,
lww.departure_warehouse_id,
lww.departure_warehouse_name,
lww.destination_warehouse_id,
lww.destination_warehouse_name,
lww.brand
</select>
@ -1615,20 +1634,14 @@
lta.order_type orderType,
lta.system_type systemType,
lta.service_num serviceNum,
case when lta.freeze_status = '0' then '否'
when lta.freeze_status = '1' then '是'
else '未知'
end freezeStatus,
lta.freeze_status,
lta.waybill_status,
lta.create_time createTime,
lww.document_making_time documentMakingTime,
case when lta.waybill_status = '0' then '未开单'
when lta.waybill_status = '1' then '已开单'
else '未知'
end waybillStatus,
round(TIMESTAMPDIFF(SECOND, lta.create_time, lww.create_time)/3600,1) openHours,
#{param.hoursTime} hoursTime,
case when round(TIMESTAMPDIFF(SECOND, lta.create_time, lww.create_time)/3600,1) &lt;= #{param.hoursTime} then '未超时'
when round(TIMESTAMPDIFF(SECOND, lta.create_time, lww.create_time)/3600,1) > #{param.hoursTime} then '超时'
case when round(TIMESTAMPDIFF(SECOND, lta.create_time, lww.create_time)/3600,1) &lt;= #{param.hoursTime} then '0'
when round(TIMESTAMPDIFF(SECOND, lta.create_time, lww.create_time)/3600,1) > #{param.hoursTime} then '1'
else '未知'
end isOverTime
from logpm_trunkline_advance lta
@ -1663,8 +1676,8 @@
<if test="param.endTime != null ">
and lta.create_time &lt;= #{param.endTime}
</if>
<if test="param.waybillCode != null and param.waybillCode != ''">
and lta.waybill_no like concat('%',#{param.waybillCode},'%')
<if test="param.waybillNo != null and param.waybillNo != ''">
and lta.waybill_no like concat('%',#{param.waybillNo},'%')
</if>
<if test="param.orderCode != null and param.orderCode != ''">
and lta.order_code like concat('%',#{param.orderCode},'%')
@ -1720,10 +1733,10 @@
<if test="param.openTimeEnd != null">
and lta.create_time &lt;= #{param.openTimeEnd}
</if>
<if test="overTimeStatus != null and overTimeStatus == 0">
<if test="param.overTimeStatus != null and param.overTimeStatus == 0">
and round(TIMESTAMPDIFF(SECOND, lta.create_time, lww.create_time)/3600,1) &lt;= #{param.hoursTime}
</if>
<if test="overTimeStatus != null and overTimeStatus == 1">
<if test="param.overTimeStatus != null and param.overTimeStatus == 1">
and round(TIMESTAMPDIFF(SECOND, lta.create_time, lww.create_time)/3600,1) > #{param.hoursTime}
</if>
@ -1757,6 +1770,7 @@
and lta.waybill_status='1'
and lww.create_time > DATE_ADD( lta.create_time, INTERVAL #{param.hoursTime} HOUR )
</if>
group by lta.id
</select>
<select id="openTimeDetailExport" resultType="com.logpm.report.vo.ReportOpenTimeDetailVO">
@ -1838,8 +1852,8 @@
<if test="param.endTime != null ">
and lta.create_time &lt;= #{param.endTime}
</if>
<if test="param.waybillCode != null and param.waybillCode != ''">
and lta.waybill_no like concat('%',#{param.waybillCode},'%')
<if test="param.waybillNo != null and param.waybillNo != ''">
and lta.waybill_no like concat('%',#{param.waybillNo},'%')
</if>
<if test="param.orderCode != null and param.orderCode != ''">
and lta.order_code like concat('%',#{param.orderCode},'%')
@ -1932,6 +1946,7 @@
and lta.waybill_status='1'
and lww.create_time > DATE_ADD( lta.create_time, INTERVAL #{param.hoursTime} HOUR )
</if>
group by lta.id
</select>
@ -1955,52 +1970,20 @@
lww.complete_departure completeDeparture,
lww.departure_warehouse_name departureWarehouseName,
lww.destination_warehouse_name destinationWarehouseName,
case when lww.delivery_way='1' then '自提'
when lww.delivery_way='2' then '送货'
when lww.delivery_way='3' then '送货上门'
when lww.delivery_way='4' then '送货上门(有电梯)'
when lww.delivery_way='5' then '送货上门(无电梯)'
when lww.delivery_way='6' then '送货卸货'
when lww.delivery_way='7' then '送货安装'
ELSE '未知' END deliveryWay,
lww.delivery_way deliveryWay,
lww.customer_train customerTrain,
CASE WHEN IFNULL(lww.return_status,0)=0 THEN '未回单'
WHEN IFNULL(lww.return_status,0)=1 THEN '已回单'
ELSE '未知' END returnStatus,
IFNULL(lww.return_status,0) returnStatus,
lww.remark remark,
case when lbc.clean_obj_type='1' THEN '工厂'
when lbc.clean_obj_type='2' THEN '商场'
when lbc.clean_obj_type='3' THEN '个人'
else '未知' end cleanObjType,
case when lww.pay_type='1' then '现金'
when lww.pay_type='2' then '银行卡'
when lww.pay_type='3' then '微信'
when lww.pay_type='4' then '支付宝'
when lww.pay_type='5' then '支票'
when lww.pay_type='6' then '账本'
else '未知' end payType,
case when lww.pay_way='1' then '现付'
when lww.pay_way='2' then '到付'
when lww.pay_way='3' then '月结'
when lww.pay_way='4' then '回付'
when lww.pay_way='5' then '内部结算'
when lww.pay_way='6' then '多笔付'
else '未知' end payWay,
lbc.clean_obj_type cleanObjType,
lww.pay_type payType,
lww.pay_way payWay,
lww.x_pay nowPay,
lww.d_pay arrivePay,
lww.h_pay backPay,
lww.y_pay monthPay,
case when lbc.type_service='1' then '商配'
when lbc.type_service='2' then '市配'
when lbc.type_service='3' then '自提'
when lbc.type_service='4' then '三方中转'
else '未知' end serviceType,
CASE WHEN IFNULL(lww.update_status,0)=0 THEN '未改单'
WHEN IFNULL(lww.update_status,0)=1 THEN '已改单'
ELSE '未知' END updateStatus,
CASE WHEN IFNULL(lww.check_status,0)=0 THEN '未审核'
WHEN IFNULL(lww.check_status,0)=1 THEN '已审核'
ELSE '未知' END checkStatus,
lbc.type_service serviceType,
IFNULL(lww.update_status,0) updateStatus,
IFNULL(lww.check_status,0) checkStatus,
lww.check_reson checkReson,
lww.check_remark checkRemark,
lww.check_user_name checkUserName,
@ -2008,17 +1991,7 @@
lww.cancle_check_remark cancleCheckRemark,
lww.cancle_check_user_name cancleCheckUserName,
lww.cancle_check_time cancleCheckTime,
case when lww.waybill_status='10' then '部分入库'
when lww.waybill_status='20' then '入库'
when lww.waybill_status='30' then '部分中转'
when lww.waybill_status='40' then '中转'
when lww.waybill_status='50' then '目的仓部分到达'
when lww.waybill_status='60' then '目的仓到达'
when lww.waybill_status='70' then '配送部分装车'
when lww.waybill_status='80' then '配送装车'
when lww.waybill_status='90' then '部分签收'
when lww.waybill_status='100' then '已签收'
else '未知' end waybillStatus,
lww.waybill_status waybillStatus,
lww.document_making_time openTime,
lww.goods_name goodsName,
lww.total_count totalCount,
@ -2047,14 +2020,8 @@
lww.claiming_value claimingValue,
lww.third_operation_fee thirdOperationFee,
lww.rebate rebate,
CASE WHEN lww.pay_status='10' THEN '未付款'
WHEN lww.pay_status='20' THEN '部分付款'
WHEN lww.pay_status='30' THEN '已付款'
ELSE '未知' END payStatus,
CASE WHEN lww.settlement_status='10' THEN '未结算'
WHEN lww.settlement_status='20' THEN '部分结算'
WHEN lww.settlement_status='30' THEN '已结算'
ELSE '未知' END settlementStatus,
lww.pay_status payStatus,
lww.settlement_status settlementStatus,
lww.sign_num signNum,
lww.sign_time signTime,
lww.delivery_time deliveryTime,
@ -2068,8 +2035,8 @@
count(lwwd.id) goodsTypeCount,
round(TIMESTAMPDIFF(SECOND, lww.create_time, lww.check_time)/3600,1) checkHours,
#{param.hoursTime} hoursTime,
case when round(TIMESTAMPDIFF(SECOND, lww.create_time, lww.check_time)/3600,1) &lt;= #{param.hoursTime} then '未超时'
when round(TIMESTAMPDIFF(SECOND, lww.create_time, lww.check_time)/3600,1) > #{param.hoursTime} then '超时'
case when round(TIMESTAMPDIFF(SECOND, lww.create_time, lww.check_time)/3600,1) &lt;= #{param.hoursTime} then '0'
when round(TIMESTAMPDIFF(SECOND, lww.create_time, lww.check_time)/3600,1) > #{param.hoursTime} then '1'
else '未知'
end isOverTime
from logpm_warehouse_waybill lww
@ -2109,9 +2076,6 @@
<if test="param.customerTrain != null and param.customerTrain != ''">
and Locate(#{param.customerTrain},lww.customer_train) > 0
</if>
<if test="param.brand != null and param.brand != ''">
and Locate(#{param.brand},lww.brand) > 0
</if>
<if test="param.shipper != null and param.shipper != ''">
and Locate(#{param.shipper},lww.shipper) > 0
</if>
@ -2179,11 +2143,11 @@
<if test="param.documentMakingTimeEndDate != null">
and lww.document_making_time &lt;= #{param.documentMakingTimeEndDate}
</if>
<if test="param.createTimeStartDate != null">
and lww.create_time &gt;= #{param.createTimeStartDate}
<if test="param.startTime != null">
and lww.create_time &gt;= #{param.startTime}
</if>
<if test="param.createTimeEndDate != null">
and lww.create_time &lt;= #{param.createTimeEndDate}
<if test="param.endTime != null">
and lww.create_time &lt;= #{param.endTime}
</if>
<if test="param.checkTimeStartDate != null">
and lww.check_time &gt;= #{param.checkTimeStartDate}
@ -2209,15 +2173,6 @@
<if test="param.consigneeAddress != null and param.consigneeAddress != ''">
and Locate(#{param.consigneeAddress},lww.consignee_address) > 0
</if>
<if test="param.totalCount != null">
and lww.total_count = #{param.totalCount}
</if>
<if test="param.totalWeight != null">
and lww.total_weight = #{param.totalWeight}
</if>
<if test="param.totalVolume != null">
and lww.total_volume = #{param.totalVolume}
</if>
<if test="param.abolishTimeStartDate != null">
and lww.abolish_time &gt;= #{param.abolishTimeStartDate}
</if>
@ -2245,7 +2200,7 @@
<if test="param.checkDetailType != null and param.checkDetailType == 2 ">
and lww.check_status=1
</if>
<if test="param.checkDetailType != null and param.checkDetailType == 2 ">
<if test="param.checkDetailType != null and param.checkDetailType == 3 ">
and lww.check_status=0
</if>
<if test="param.checkDetailType != null and param.checkDetailType == 4 ">
@ -2430,9 +2385,6 @@
<if test="param.customerTrain != null and param.customerTrain != ''">
and Locate(#{param.customerTrain},lww.customer_train) > 0
</if>
<if test="param.brand != null and param.brand != ''">
and Locate(#{param.brand},lww.brand) > 0
</if>
<if test="param.shipper != null and param.shipper != ''">
and Locate(#{param.shipper},lww.shipper) > 0
</if>
@ -2500,11 +2452,11 @@
<if test="param.documentMakingTimeEndDate != null">
and lww.document_making_time &lt;= #{param.documentMakingTimeEndDate}
</if>
<if test="param.createTimeStartDate != null">
and lww.create_time &gt;= #{param.createTimeStartDate}
<if test="param.startTime != null">
and lww.create_time &gt;= #{param.startTime}
</if>
<if test="param.createTimeEndDate != null">
and lww.create_time &lt;= #{param.createTimeEndDate}
<if test="param.endTime != null">
and lww.create_time &lt;= #{param.endTime}
</if>
<if test="param.checkTimeStartDate != null">
and lww.check_time &gt;= #{param.checkTimeStartDate}
@ -2530,15 +2482,6 @@
<if test="param.consigneeAddress != null and param.consigneeAddress != ''">
and Locate(#{param.consigneeAddress},lww.consignee_address) > 0
</if>
<if test="param.totalCount != null">
and lww.total_count = #{param.totalCount}
</if>
<if test="param.totalWeight != null">
and lww.total_weight = #{param.totalWeight}
</if>
<if test="param.totalVolume != null">
and lww.total_volume = #{param.totalVolume}
</if>
<if test="param.abolishTimeStartDate != null">
and lww.abolish_time &gt;= #{param.abolishTimeStartDate}
</if>
@ -2566,7 +2509,7 @@
<if test="param.checkDetailType != null and param.checkDetailType == 2 ">
and lww.check_status=1
</if>
<if test="param.checkDetailType != null and param.checkDetailType == 2 ">
<if test="param.checkDetailType != null and param.checkDetailType == 3 ">
and lww.check_status=0
</if>
<if test="param.checkDetailType != null and param.checkDetailType == 4 ">
@ -2577,6 +2520,579 @@
order by lww.create_time desc
</select>
<select id="packageAllTrunklineTimeDetailPage" resultType="com.logpm.report.vo.ReportPackgeAllTrunklineTimeDetailVO">
select ltad.waybill_no waybillNo,
ltad.order_code orderCode,
ltad.now_warehouse_name nowWarehouseName,
lww.departure_warehouse_name departureWarehouseName,
lww.destination_warehouse_name destinationWarehouseName,
ltad.train_number trainNumber,
lta.is_gcp isGcp,
ltad.first_pack_name firstPackName,
ltad.second_pack_name secondPackName,
ltad.third_pack_name thirdPackName,
ltad.material_code materialCode,
ltad.material_name materialName,
ltad.order_package_code orderPackageCode,
lta.system_type systemType,
ltad.service_num serviceNum,
ltad.quantity senderNum,
ltad.volume volume,
ltad.weight weight,
lta.delivery_date deliveryDate,
ltad.warehouse_name warehouseName,
lta.create_user_name createUserName,
lta.create_time createTime,
IF(ldpl.id IS NULL,0,1) isDesIncoming,
ldpl.create_time desIncomgingTime,
round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1) incomingHours,
IFNULL(lrat.hours_time,#{param.hoursTime}) hoursTime,
case when round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1)&lt;=IFNULL(lrat.hours_time,#{param.hoursTime}) then '0'
when round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1)>IFNULL(lrat.hours_time,#{param.hoursTime}) then '1'
else '未知' end isOverTime
from logpm_trunkline_advance_detail ltad
left join logpm_trunkline_advance lta on lta.id = ltad.advance_id
left join logpm_warehouse_waybill lww on lww.id = ltad.waybill_id
left join logpm_warehouse_warehouse waw on waw.id = lww.departure_warehouse_id
left join logpm_distribution_parcel_list ldpl on ltad.order_package_code = ldpl.order_package_code and ldpl.warehouse_id = lww.destination_warehouse_id
left join logpm_reportconfig_all_trunkline lrat on lrat.departure_warehouse_id = ldpl.send_warehouse_id and lrat.destination_warehouse_id = ldpl.accept_warehouse_id and lrat.is_deleted=0
where 1=1
and lww.departure_warehouse_id != lww.destination_warehouse_id
and waw.business_line = #{param.businessLine}
and lww.departure_warehouse_id = #{param.departureWarehouseId}
and lww.destination_warehouse_id = #{param.destinationWarehouseId}
and lww.brand = #{param.brand}
<if test="param.startTime != null">
and ltad.create_time &gt;= #{param.startTime}
</if>
<if test="param.endTime != null">
and ltad.create_time &lt;= #{param.endTime}
</if>
<if test="param.orderCode != null and param.orderCode != ''">
and ltad.order_code like concat('%',#{param.orderCode},'%')
</if>
<if test="param.waybillNo != null and param.waybillNo != ''">
and ltad.waybill_no like concat('%',#{param.waybillNo},'%')
</if>
<if test="param.departureWarehouseName != null and param.departureWarehouseName != ''">
and lww.departure_warehouse_name like concat('%',#{param.departureWarehouseName},'%')
</if>
<if test="param.destinationWarehouseName != null and param.destinationWarehouseName != ''">
and lww.destination_warehouse_name like concat('%',#{param.destinationWarehouseName},'%')
</if>
<if test="param.orderPackageCode != null and param.orderPackageCode != ''">
and ltad.order_package_code like concat('%',#{param.orderPackageCode},'%')
</if>
<if test="param.serviceNum != null and param.serviceNum != ''">
and ltad.service_num like concat('%',#{param.serviceNum},'%')
</if>
<if test="param.trainNumber != null and param.trainNumber != ''">
and ltad.train_number like concat('%',#{param.trainNumber},'%')
</if>
<if test="param.isDesIncomging != null">
and IF(ldpl.id IS NULL,0,1) = #{param.isDesIncomging}
</if>
<if test="param.isOverTime != null and param.isOverTime ==0">
and round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1)&lt;=IFNULL(lrat.hours_time,#{param.hoursTime})
</if>
<if test="param.isOverTime != null and param.isOverTime ==1">
and round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1)>IFNULL(lrat.hours_time,#{param.hoursTime})
</if>
<if test="param.allTrunklineTimeDetailType != null and param.allTrunklineTimeDetailType ==2">
and ldpl.id IS NOT NULL
</if>
<if test="param.allTrunklineTimeDetailType != null and param.allTrunklineTimeDetailType ==3">
and ldpl.id IS NULL
</if>
<if test="param.allTrunklineTimeDetailType != null and param.allTrunklineTimeDetailType ==4">
and ldpl.id IS NOT NULL
and round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1)&lt;=IFNULL(lrat.hours_time,#{param.hoursTime})
</if>
</select>
<select id="packageAllTrunklineTimeDetailExport" resultType="com.logpm.report.vo.ReportPackgeAllTrunklineTimeDetailVO">
select ltad.waybill_no waybillNo,
ltad.order_code orderCode,
ltad.now_warehouse_name nowWarehouseName,
lww.departure_warehouse_name departureWarehouseName,
lww.destination_warehouse_name destinationWarehouseName,
ltad.train_number trainNumber,
lta.is_gcp isGcp,
ltad.first_pack_name firstPackName,
ltad.second_pack_name secondPackName,
ltad.third_pack_name thirdPackName,
ltad.material_code materialCode,
ltad.material_name materialName,
ltad.order_package_code orderPackageCode,
lta.system_type systemType,
ltad.service_num serviceNum,
ltad.quantity senderNum,
ltad.volume volume,
ltad.weight weight,
lta.delivery_date deliveryDate,
ltad.warehouse_name warehouseName,
lta.create_user_name createUserName,
lta.create_time createTime,
IF(ldpl.id IS NULL,0,1) isDesIncoming,
ldpl.create_time desIncomgingTime,
round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1) incomingHours,
IFNULL(lrat.hours_time,#{param.hoursTime}) hoursTime,
case when round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1)&lt;=IFNULL(lrat.hours_time,#{param.hoursTime}) then '未超时'
when round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1)>IFNULL(lrat.hours_time,#{param.hoursTime}) then '超时'
else '未知' end isOverTime
from logpm_trunkline_advance_detail ltad
left join logpm_trunkline_advance lta on lta.id = ltad.advance_id
left join logpm_warehouse_waybill lww on lww.id = ltad.waybill_id
left join logpm_warehouse_warehouse waw on waw.id = lww.departure_warehouse_id
left join logpm_distribution_parcel_list ldpl on ltad.order_package_code = ldpl.order_package_code and ldpl.warehouse_id = lww.destination_warehouse_id
left join logpm_reportconfig_all_trunkline lrat on lrat.departure_warehouse_id = ldpl.send_warehouse_id and lrat.destination_warehouse_id = ldpl.accept_warehouse_id and lrat.is_deleted=0
where 1=1
and lww.departure_warehouse_id != lww.destination_warehouse_id
and waw.business_line = #{param.businessLine}
and lww.departure_warehouse_id = #{param.departureWarehouseId}
and lww.destination_warehouse_id = #{param.destinationWarehouseId}
and lww.brand = #{param.brand}
<if test="param.startTime != null">
and ltad.create_time &gt;= #{param.startTime}
</if>
<if test="param.endTime != null">
and ltad.create_time &lt;= #{param.endTime}
</if>
<if test="param.orderCode != null and param.orderCode != ''">
and ltad.order_code like concat('%',#{param.orderCode},'%')
</if>
<if test="param.waybillNo != null and param.waybillNo != ''">
and ltad.waybill_no like concat('%',#{param.waybillNo},'%')
</if>
<if test="param.departureWarehouseName != null and param.departureWarehouseName != ''">
and lww.departure_warehouse_name like concat('%',#{param.departureWarehouseName},'%')
</if>
<if test="param.destinationWarehouseName != null and param.destinationWarehouseName != ''">
and lww.destination_warehouse_name like concat('%',#{param.destinationWarehouseName},'%')
</if>
<if test="param.orderPackageCode != null and param.orderPackageCode != ''">
and ltad.order_package_code like concat('%',#{param.orderPackageCode},'%')
</if>
<if test="param.serviceNum != null and param.serviceNum != ''">
and ltad.service_num like concat('%',#{param.serviceNum},'%')
</if>
<if test="param.trainNumber != null and param.trainNumber != ''">
and ltad.train_number like concat('%',#{param.trainNumber},'%')
</if>
<if test="param.isDesIncomging != null">
and IF(ldpl.id IS NULL,0,1) = #{param.isDesIncomging}
</if>
<if test="param.isOverTime != null and param.isOverTime ==0">
and round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1)&lt;=IFNULL(lrat.hours_time,#{param.hoursTime})
</if>
<if test="param.isOverTime != null and param.isOverTime ==1">
and round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1)>IFNULL(lrat.hours_time,#{param.hoursTime})
</if>
<if test="param.allTrunklineTimeDetailType != null and param.allTrunklineTimeDetailType ==2">
and ldpl.id IS NOT NULL
</if>
<if test="param.allTrunklineTimeDetailType != null and param.allTrunklineTimeDetailType ==3">
and ldpl.id IS NULL
</if>
<if test="param.allTrunklineTimeDetailType != null and param.allTrunklineTimeDetailType ==4">
and ldpl.id IS NOT NULL
and round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1)&lt;=IFNULL(lrat.hours_time,#{param.hoursTime})
</if>
</select>
<select id="packageStartTimeDetailPage" resultType="com.logpm.report.vo.ReportPackgeStartTimeDetailVO">
select ltad.waybill_no waybillNo,
ltad.order_code orderCode,
ltad.now_warehouse_name nowWarehouseName,
lww.departure_warehouse_name departureWarehouseName,
lww.destination_warehouse_name destinationWarehouseName,
ltad.train_number trainNumber,
lta.is_gcp isGcp,
ltad.first_pack_name firstPackName,
ltad.second_pack_name secondPackName,
ltad.third_pack_name thirdPackName,
ltad.material_code materialCode,
ltad.material_name materialName,
ltad.order_package_code orderPackageCode,
lta.system_type systemType,
ltad.service_num serviceNum,
ltad.quantity senderNum,
ltad.volume volume,
ltad.weight weight,
lta.delivery_date deliveryDate,
ltad.warehouse_name warehouseName,
lta.create_user_name createUserName,
lta.create_time createTime,
ltad.incoming_time incomgingTime,
if(ltcll.start_date is null,0,1) isStarting,
ltcll.start_date startTime,
round(TIMESTAMPDIFF(SECOND,ltad.incoming_time,IFNULL(ltcll.start_date,NOW()))/3600,1) startHours,
#{param.hoursTime} hoursTime,
case when round(TIMESTAMPDIFF(SECOND,ltad.incoming_time,IFNULL(ltcll.start_date,NOW()))/3600,1)&lt;=#{param.hoursTime} then '0'
when round(TIMESTAMPDIFF(SECOND,ltad.incoming_time,IFNULL(ltcll.start_date,NOW()))/3600,1)>#{param.hoursTime} then '1'
else '未知' end isOverTime
from logpm_trunkline_advance_detail ltad
left join logpm_trunkline_advance lta on lta.id = ltad.advance_id
left join logpm_warehouse_waybill lww on lww.id = ltad.waybill_id
left join logpm_warehouse_warehouse waw on waw.id = ltad.warehouse_id
left join logpm_trunkline_cars_load_scan ltcls on ltcls.scan_code = ltad.order_package_code and ltcls.warehouse_id = ltad.warehouse_id and ltcls.type = 1
left join logpm_trunkline_cars_load_line ltcll on ltcll.load_id = ltcls.load_id and ltcll.node_id = ltcls.warehouse_id
where ltad.create_time > '2024-10-22 00:00:00'
and lww.departure_warehouse_id != lww.destination_warehouse_id
and waw.business_line is not null
and waw.business_line = #{param.businessLine}
and lww.departure_warehouse_id = #{param.departureWarehouseId}
and lww.destination_warehouse_id = #{param.destinationWarehouseId}
and lww.brand = #{param.brand}
<if test="param.startTime != null">
and ltad.create_time &gt;= #{param.startTime}
</if>
<if test="param.endTime != null">
and ltad.create_time &lt;= #{param.endTime}
</if>
<if test="param.orderCode != null and param.orderCode != ''">
and ltad.order_code like concat('%',#{param.orderCode},'%')
</if>
<if test="param.waybillNo != null and param.waybillNo != ''">
and ltad.waybill_no like concat('%',#{param.waybillNo},'%')
</if>
<if test="param.nowWarehouseName != null and param.nowWarehouseName != ''">
and ltad.now_warehouse_name like concat('%',#{param.nowWarehouseName},'%')
</if>
<if test="param.departureWarehouseName != null and param.departureWarehouseName != ''">
and lww.departure_warehouse_name like concat('%',#{param.departureWarehouseName},'%')
</if>
<if test="param.destinationWarehouseName != null and param.destinationWarehouseName != ''">
and lww.destination_warehouse_name like concat('%',#{param.destinationWarehouseName},'%')
</if>
<if test="param.orderPackageCode != null and param.orderPackageCode != ''">
and ltad.order_package_code like concat('%',#{param.orderPackageCode},'%')
</if>
<if test="param.serviceNum != null and param.serviceNum != ''">
and ltad.service_num like concat('%',#{param.serviceNum},'%')
</if>
<if test="param.trainNumber != null and param.trainNumber != ''">
and ltad.train_number like concat('%',#{param.trainNumber},'%')
</if>
<if test="param.isDesIncomging != null">
and if(ltcll.start_date is null,0,1) = #{param.isDesIncomging}
</if>
<if test="param.isOverTime != null and param.isOverTime ==0">
and round(TIMESTAMPDIFF(SECOND,ltad.incoming_time,IFNULL(ltcll.start_date,NOW()))/3600,1)&lt;=#{param.hoursTime}
</if>
<if test="param.isOverTime != null and param.isOverTime ==1">
and round(TIMESTAMPDIFF(SECOND,ltad.incoming_time,IFNULL(ltcll.start_date,NOW()))/3600,1)>#{param.hoursTime}
</if>
<if test="param.startDetailType != null and param.startDetailType ==1">
and ltad.waybill_id is not null
</if>
<if test="param.startDetailType != null and param.startDetailType ==2">
and ltcls.id is not null
</if>
<if test="param.startDetailType != null and param.startDetailType ==3">
and ltcls.id is null
</if>
<if test="param.startDetailType != null and param.startDetailType ==4">
and ltcls.id is null
and now() &lt;= DATE_ADD( ltad.create_time, INTERVAL #{param.hoursTime} HOUR )
</if>
group by ltad.id
</select>
<select id="packageStartTimeDetailExport" resultType="com.logpm.report.vo.ReportPackgeStartTimeDetailVO">
select ltad.waybill_no waybillNo,
ltad.order_code orderCode,
ltad.now_warehouse_name nowWarehouseName,
lww.departure_warehouse_name departureWarehouseName,
lww.destination_warehouse_name destinationWarehouseName,
ltad.train_number trainNumber,
lta.is_gcp isGcp,
ltad.first_pack_name firstPackName,
ltad.second_pack_name secondPackName,
ltad.third_pack_name thirdPackName,
ltad.material_code materialCode,
ltad.material_name materialName,
ltad.order_package_code orderPackageCode,
lta.system_type systemType,
ltad.service_num serviceNum,
ltad.quantity senderNum,
ltad.volume volume,
ltad.weight weight,
lta.delivery_date deliveryDate,
ltad.warehouse_name warehouseName,
lta.create_user_name createUserName,
lta.create_time createTime,
ltad.incoming_time incomgingTime,
if(ltcll.start_date is null,0,1) isStarting,
ltcll.start_date startTime,
round(TIMESTAMPDIFF(SECOND,ltad.incoming_time,IFNULL(ltcll.start_date,NOW()))/3600,1) startHours,
#{param.hoursTime} hoursTime,
case when round(TIMESTAMPDIFF(SECOND,ltad.incoming_time,IFNULL(ltcll.start_date,NOW()))/3600,1)&lt;=#{param.hoursTime} then '未超时'
when round(TIMESTAMPDIFF(SECOND,ltad.incoming_time,IFNULL(ltcll.start_date,NOW()))/3600,1)>#{param.hoursTime} then '超时'
else '未知' end isOverTime
from logpm_trunkline_advance_detail ltad
left join logpm_trunkline_advance lta on lta.id = ltad.advance_id
left join logpm_warehouse_waybill lww on lww.id = ltad.waybill_id
left join logpm_warehouse_warehouse waw on waw.id = ltad.warehouse_id
left join logpm_trunkline_cars_load_scan ltcls on ltcls.scan_code = ltad.order_package_code and ltcls.warehouse_id = ltad.warehouse_id and ltcls.type = 1
left join logpm_trunkline_cars_load_line ltcll on ltcll.load_id = ltcls.load_id and ltcll.node_id = ltcls.warehouse_id
where ltad.create_time > '2024-10-22 00:00:00'
and lww.departure_warehouse_id != lww.destination_warehouse_id
and waw.business_line is not null
and waw.business_line = #{param.businessLine}
and lww.departure_warehouse_id = #{param.departureWarehouseId}
and lww.destination_warehouse_id = #{param.destinationWarehouseId}
and lww.brand = #{param.brand}
<if test="param.startTime != null">
and ltad.create_time &gt;= #{param.startTime}
</if>
<if test="param.endTime != null">
and ltad.create_time &lt;= #{param.endTime}
</if>
<if test="param.orderCode != null and param.orderCode != ''">
and ltad.order_code like concat('%',#{param.orderCode},'%')
</if>
<if test="param.waybillNo != null and param.waybillNo != ''">
and ltad.waybill_no like concat('%',#{param.waybillNo},'%')
</if>
<if test="param.nowWarehouseName != null and param.nowWarehouseName != ''">
and ltad.now_warehouse_name like concat('%',#{param.nowWarehouseName},'%')
</if>
<if test="param.departureWarehouseName != null and param.departureWarehouseName != ''">
and lww.departure_warehouse_name like concat('%',#{param.departureWarehouseName},'%')
</if>
<if test="param.destinationWarehouseName != null and param.destinationWarehouseName != ''">
and lww.destination_warehouse_name like concat('%',#{param.destinationWarehouseName},'%')
</if>
<if test="param.orderPackageCode != null and param.orderPackageCode != ''">
and ltad.order_package_code like concat('%',#{param.orderPackageCode},'%')
</if>
<if test="param.serviceNum != null and param.serviceNum != ''">
and ltad.service_num like concat('%',#{param.serviceNum},'%')
</if>
<if test="param.trainNumber != null and param.trainNumber != ''">
and ltad.train_number like concat('%',#{param.trainNumber},'%')
</if>
<if test="param.isDesIncomging != null">
and if(ltcll.start_date is null,0,1) = #{param.isDesIncomging}
</if>
<if test="param.isOverTime != null and param.isOverTime ==0">
and round(TIMESTAMPDIFF(SECOND,ltad.incoming_time,IFNULL(ltcll.start_date,NOW()))/3600,1)&lt;=#{param.hoursTime}
</if>
<if test="param.isOverTime != null and param.isOverTime ==1">
and round(TIMESTAMPDIFF(SECOND,ltad.incoming_time,IFNULL(ltcll.start_date,NOW()))/3600,1)>#{param.hoursTime}
</if>
<if test="param.startDetailType != null and param.startDetailType ==1">
and ltad.waybill_id is not null
</if>
<if test="param.startDetailType != null and param.startDetailType ==2">
and ltcls.id is not null
</if>
<if test="param.startDetailType != null and param.startDetailType ==3">
and ltcls.id is null
</if>
<if test="param.startDetailType != null and param.startDetailType ==4">
and ltcls.id is null
and now() &lt;= DATE_ADD( ltad.create_time, INTERVAL #{param.hoursTime} HOUR )
</if>
group by ltad.id
</select>
<select id="packageTransferTimeDetailPage" resultType="com.logpm.report.vo.ReportPackgeStartTimeDetailVO">
select ldpl.waybill_number waybillNo,
ldpl.order_code orderCode,
ldpl.warehouse nowWarehouseName,
ldpl.send_warehouse_name departureWarehouseName,
ldpl.accept_warehouse_name destinationWarehouseName,
ldpl.train_number trainNumber,
lta.is_gcp isGcp,
ldpl.firsts firstPackName,
ldpl.`second` secondPackName,
ldpl.third_product thirdPackName,
ldpl.material_code materialCode,
ldpl.material_name materialName,
ldpl.order_package_code orderPackageCode,
lta.system_type systemType,
ldpl.service_number serviceNum,
ldpl.quantity senderNum,
ldpl.volume volume,
ldpl.weight weight,
lta.delivery_date deliveryDate,
lta.warehouse_name warehouseName,
lta.create_user_name createUserName,
lta.create_time createTime,
ldpl.create_time incomgingTime,
if(ltcll.start_date is null,0,1) isStarting,
ltcll.start_date startTime,
round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1) startHours,
72 hoursTime,
case when round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1)&lt;=72 then '未超时'
when round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1)>72 then '超时'
else '未知' end isOverTime
from logpm_distribution_parcel_list ldpl
left join logpm_trunkline_advance lta on lta.id = ldpl.advance_id
left join logpm_warehouse_warehouse waw on waw.id = ldpl.warehouse_id
left join logpm_trunkline_cars_load_scan ltcls on ltcls.scan_code = ldpl.order_package_code and ltcls.warehouse_id = ldpl.warehouse_id and ltcls.type = 1
left join logpm_trunkline_cars_load_line ltcll on ltcll.load_id = ltcls.load_id and ltcll.node_id = ltcls.warehouse_id
where ldpl.is_transfer = 1
and ldpl.create_time > '2024-10-22 00:00:00'
and ldpl.conditions != 3
and ldpl.waybill_id is not null
and ldpl.warehouse_id != ldpl.send_warehouse_id
and ldpl.warehouse_id != ldpl.accept_warehouse_id
and waw.business_line = #{param.businessLine}
and ldpl.send_warehouse_id = #{param.departureWarehouseId}
and ldpl.warehouse_id = #{param.warehouseId}
and ldpl.accept_warehouse_id = #{param.destinationWarehouseId}
and ldpl.brand_name = #{param.brand}
<if test="param.startTime != null">
and ldpl.create_time &gt;= #{param.startTime}
</if>
<if test="param.endTime != null">
and ldpl.create_time &lt;= #{param.endTime}
</if>
<if test="param.orderCode != null and param.orderCode != ''">
and ldpl.order_code like concat('%',#{param.orderCode},'%')
</if>
<if test="param.waybillNo != null and param.waybillNo != ''">
and ldpl.waybill_number like concat('%',#{param.waybillNo},'%')
</if>
<if test="param.departureWarehouseName != null and param.departureWarehouseName != ''">
and ldpl.send_warehouse_name like concat('%',#{param.departureWarehouseName},'%')
</if>
<if test="param.destinationWarehouseName != null and param.destinationWarehouseName != ''">
and ldpl.accept_warehouse_name like concat('%',#{param.destinationWarehouseName},'%')
</if>
<if test="param.orderPackageCode != null and param.orderPackageCode != ''">
and ldpl.order_package_code like concat('%',#{param.orderPackageCode},'%')
</if>
<if test="param.serviceNum != null and param.serviceNum != ''">
and ldpl.service_number like concat('%',#{param.serviceNum},'%')
</if>
<if test="param.trainNumber != null and param.trainNumber != ''">
and ldpl.train_number like concat('%',#{param.trainNumber},'%')
</if>
<if test="param.isDesIncomging != null">
and if(ltcll.start_date is null,0,1) = #{param.isDesIncomging}
</if>
<if test="param.isOverTime != null and param.isOverTime ==0">
and round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1)&lt;=#{param.hoursTime}
</if>
<if test="param.isOverTime != null and param.isOverTime ==1">
and round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1)>#{param.hoursTime}
</if>
<if test="param.startDetailType != null and param.startDetailType ==2">
and ltcls.id is not null
</if>
<if test="param.startDetailType != null and param.startDetailType ==3">
and ltcls.id is null
</if>
<if test="param.startDetailType != null and param.startDetailType ==3">
and ltcls.id is null
and now() &lt;= DATE_ADD( ldpl.create_time, INTERVAL #{param.hoursTime} HOUR )
</if>
</select>
<select id="packageTransferTimeDetailExport" resultType="com.logpm.report.vo.ReportPackgeStartTimeDetailVO">
select ldpl.waybill_number waybillNo,
ldpl.order_code orderCode,
ldpl.warehouse nowWarehouseName,
ldpl.send_warehouse_name departureWarehouseName,
ldpl.accept_warehouse_name destinationWarehouseName,
ldpl.train_number trainNumber,
lta.is_gcp isGcp,
ldpl.firsts firstPackName,
ldpl.`second` secondPackName,
ldpl.third_product thirdPackName,
ldpl.material_code materialCode,
ldpl.material_name materialName,
ldpl.order_package_code orderPackageCode,
lta.system_type systemType,
ldpl.service_number serviceNum,
ldpl.quantity senderNum,
ldpl.volume volume,
ldpl.weight weight,
lta.delivery_date deliveryDate,
lta.warehouse_name warehouseName,
lta.create_user_name createUserName,
lta.create_time createTime,
ldpl.create_time incomgingTime,
if(ltcll.start_date is null,0,1) isStarting,
ltcll.start_date startTime,
round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1) startHours,
72 hoursTime,
case when round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1)&lt;=72 then '未超时'
when round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1)>72 then '超时'
else '未知' end isOverTime
from logpm_distribution_parcel_list ldpl
left join logpm_trunkline_advance lta on lta.id = ldpl.advance_id
left join logpm_warehouse_warehouse waw on waw.id = ldpl.warehouse_id
left join logpm_trunkline_cars_load_scan ltcls on ltcls.scan_code = ldpl.order_package_code and ltcls.warehouse_id = ldpl.warehouse_id and ltcls.type = 1
left join logpm_trunkline_cars_load_line ltcll on ltcll.load_id = ltcls.load_id and ltcll.node_id = ltcls.warehouse_id
where ldpl.is_transfer = 1
and ldpl.create_time > '2024-10-22 00:00:00'
and ldpl.conditions != 3
and ldpl.waybill_id is not null
and ldpl.warehouse_id != ldpl.send_warehouse_id
and ldpl.warehouse_id != ldpl.accept_warehouse_id
and waw.business_line = #{param.businessLine}
and ldpl.send_warehouse_id = #{param.departureWarehouseId}
and ldpl.warehouse_id = #{param.warehouseId}
and ldpl.accept_warehouse_id = #{param.destinationWarehouseId}
and ldpl.brand_name = #{param.brand}
<if test="param.startTime != null">
and ldpl.create_time &gt;= #{param.startTime}
</if>
<if test="param.endTime != null">
and ldpl.create_time &lt;= #{param.endTime}
</if>
<if test="param.orderCode != null and param.orderCode != ''">
and ldpl.order_code like concat('%',#{param.orderCode},'%')
</if>
<if test="param.waybillNo != null and param.waybillNo != ''">
and ldpl.waybill_number like concat('%',#{param.waybillNo},'%')
</if>
<if test="param.departureWarehouseName != null and param.departureWarehouseName != ''">
and ldpl.send_warehouse_name like concat('%',#{param.departureWarehouseName},'%')
</if>
<if test="param.destinationWarehouseName != null and param.destinationWarehouseName != ''">
and ldpl.accept_warehouse_name like concat('%',#{param.destinationWarehouseName},'%')
</if>
<if test="param.orderPackageCode != null and param.orderPackageCode != ''">
and ldpl.order_package_code like concat('%',#{param.orderPackageCode},'%')
</if>
<if test="param.serviceNum != null and param.serviceNum != ''">
and ldpl.service_number like concat('%',#{param.serviceNum},'%')
</if>
<if test="param.trainNumber != null and param.trainNumber != ''">
and ldpl.train_number like concat('%',#{param.trainNumber},'%')
</if>
<if test="param.isDesIncomging != null">
and if(ltcll.start_date is null,0,1) = #{param.isDesIncomging}
</if>
<if test="param.isOverTime != null and param.isOverTime ==0">
and round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1)&lt;=#{param.hoursTime}
</if>
<if test="param.isOverTime != null and param.isOverTime ==1">
and round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1)>#{param.hoursTime}
</if>
<if test="param.startDetailType != null and param.startDetailType ==2">
and ltcls.id is not null
</if>
<if test="param.startDetailType != null and param.startDetailType ==3">
and ltcls.id is null
</if>
<if test="param.startDetailType != null and param.startDetailType ==3">
and ltcls.id is null
and now() &lt;= DATE_ADD( ldpl.create_time, INTERVAL #{param.hoursTime} HOUR )
</if>
</select>
</mapper>

9
blade-service/logpm-report/src/main/java/com/logpm/report/service/IReportIncomingService.java
Unescape View File

@ -1,6 +1,7 @@
package com.logpm.report.service;
import com.logpm.report.dto.ReportIncomingDTO;
import com.logpm.report.dto.ReportIncomingDetailDTO;
import org.springblade.core.tool.api.R;
import javax.servlet.http.HttpServletResponse;
@ -15,4 +16,12 @@ public interface IReportIncomingService {
R consigineeIncomingPage(ReportIncomingDTO reportIncomingDTO);
void consigineeIncomingExport(ReportIncomingDTO reportIncomingDTO, HttpServletResponse response);
R incomingDetailPage(ReportIncomingDetailDTO reportIncomingDetailDTO);
void incomingDetailExport(ReportIncomingDetailDTO reportIncomingDetailDTO, HttpServletResponse response);
R deptIncomingPageNew(ReportIncomingDTO reportIncomingDTO);
void deptIncomingExportNew(ReportIncomingDTO reportIncomingDTO, HttpServletResponse response);
}

14
blade-service/logpm-report/src/main/java/com/logpm/report/service/IReportTimeService.java
Unescape View File

@ -1,6 +1,8 @@
package com.logpm.report.service;
import com.logpm.report.dto.AllTrunklineTimeDetailDTO;
import com.logpm.report.dto.ReportCheckTimeDetailDTO;
import com.logpm.report.dto.ReportStartTimeDetailDTO;
import com.logpm.report.dto.ReportTimeDTO;
import org.springblade.core.tool.api.R;
@ -52,4 +54,16 @@ public interface IReportTimeService {
R checkWaybillTimeDetailPage(ReportCheckTimeDetailDTO reportCheckTimeDetailDTO);
void checkWaybillTimeDetailExport(ReportCheckTimeDetailDTO reportCheckTimeDetailDTO, HttpServletResponse response);
R packageAllTrunklineTimeDetailPage(AllTrunklineTimeDetailDTO allTrunklineTimeDetailDTO);
void packageAllTrunklineTimeDetailExport(AllTrunklineTimeDetailDTO allTrunklineTimeDetailDTO, HttpServletResponse response);
R packageStartTimeDetailPage(ReportStartTimeDetailDTO reportStartTimeDetailDTO);
void packageStartTimeDetailExport(ReportStartTimeDetailDTO reportStartTimeDetailDTO, HttpServletResponse response);
R packageTransferTimeDetailPage(ReportStartTimeDetailDTO reportStartTimeDetailDTO);
void packageTransferTimeDetailExport(ReportStartTimeDetailDTO reportStartTimeDetailDTO, HttpServletResponse response);
}

269
blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportIncomingServiceImpl.java
Unescape View File

@ -3,12 +3,10 @@ package com.logpm.report.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.logpm.report.dto.ReportIncomingDTO;
import com.logpm.report.dto.ReportIncomingDetailDTO;
import com.logpm.report.mapper.ReportIncomingMapper;
import com.logpm.report.service.IReportIncomingService;
import com.logpm.report.vo.ReportConsigneeIncomingExportVO;
import com.logpm.report.vo.ReportDeptIncomingExportVO;
import com.logpm.report.vo.ReportDeptIncomingNumVO;
import com.logpm.report.vo.ReportDeptIncomingVO;
import com.logpm.report.vo.*;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.common.exception.CustomerException;
@ -461,4 +459,267 @@ public class ReportIncomingServiceImpl implements IReportIncomingService {
//导出ls
ExcelUtil.export(response, "收货单位收入报表导出", "收货单位收入报表导出", list, ReportConsigneeIncomingExportVO.class);
}
@Override
public R incomingDetailPage(ReportIncomingDetailDTO reportIncomingDetailDTO) {
IPage<Object> page = new Page<>();
page.setCurrent(reportIncomingDetailDTO.getPageNum());
page.setSize(reportIncomingDetailDTO.getPageSize());
String startTimeStr = reportIncomingDetailDTO.getStartTimeStr();
String endTimeStr = reportIncomingDetailDTO.getEndTimeStr();
reportIncomingDetailDTO.setStartTime(CommonUtil.getStartByDateStr(startTimeStr));
reportIncomingDetailDTO.setEndTime(CommonUtil.getEndByDateStr(endTimeStr));
reportIncomingDetailDTO.setDocumentMakingTimeStartDate(CommonUtil.getStartByDateStr(reportIncomingDetailDTO.getDocumentMakingTimeStartStr()));
reportIncomingDetailDTO.setDocumentMakingTimeEndDate(CommonUtil.getEndByDateStr(reportIncomingDetailDTO.getDocumentMakingTimeEndStr()));
reportIncomingDetailDTO.setCreateTimeStartDate(CommonUtil.getStartByDateStr(reportIncomingDetailDTO.getCreateTimeStartStr()));
reportIncomingDetailDTO.setCreateTimeEndDate(CommonUtil.getEndByDateStr(reportIncomingDetailDTO.getCreateTimeEndStr()));
reportIncomingDetailDTO.setAbolishTimeStartDate(CommonUtil.getStartByDateStr(reportIncomingDetailDTO.getAbolishTimeStartStr()));
reportIncomingDetailDTO.setAbolishTimeEndDate(CommonUtil.getEndByDateStr(reportIncomingDetailDTO.getAbolishTimeEndStr()));
reportIncomingDetailDTO.setFreezeTimeStartDate(CommonUtil.getStartByDateStr(reportIncomingDetailDTO.getFreezeTimeStartStr()));
reportIncomingDetailDTO.setFreezeTimeEndDate(CommonUtil.getEndByDateStr(reportIncomingDetailDTO.getFreezeTimeEndStr()));
reportIncomingDetailDTO.setCheckTimeStartDate(CommonUtil.getStartByDateStr(reportIncomingDetailDTO.getCheckTimeStartStr()));
reportIncomingDetailDTO.setCheckTimeEndDate(CommonUtil.getEndByDateStr(reportIncomingDetailDTO.getCheckTimeEndStr()));
IPage<ReportIncomingDetailVO> iPage = reportIncomingMapper.incomingDetailPage(page,reportIncomingDetailDTO);
return R.data(iPage);
}
@Override
public void incomingDetailExport(ReportIncomingDetailDTO reportIncomingDetailDTO, HttpServletResponse response) {
reportIncomingDetailDTO.setDocumentMakingTimeStartDate(CommonUtil.getStartByDateStr(reportIncomingDetailDTO.getDocumentMakingTimeStartStr()));
reportIncomingDetailDTO.setDocumentMakingTimeEndDate(CommonUtil.getEndByDateStr(reportIncomingDetailDTO.getDocumentMakingTimeEndStr()));
reportIncomingDetailDTO.setCreateTimeStartDate(CommonUtil.getStartByDateStr(reportIncomingDetailDTO.getCreateTimeStartStr()));
reportIncomingDetailDTO.setCreateTimeEndDate(CommonUtil.getEndByDateStr(reportIncomingDetailDTO.getCreateTimeEndStr()));
reportIncomingDetailDTO.setAbolishTimeStartDate(CommonUtil.getStartByDateStr(reportIncomingDetailDTO.getAbolishTimeStartStr()));
reportIncomingDetailDTO.setAbolishTimeEndDate(CommonUtil.getEndByDateStr(reportIncomingDetailDTO.getAbolishTimeEndStr()));
reportIncomingDetailDTO.setFreezeTimeStartDate(CommonUtil.getStartByDateStr(reportIncomingDetailDTO.getFreezeTimeStartStr()));
reportIncomingDetailDTO.setFreezeTimeEndDate(CommonUtil.getEndByDateStr(reportIncomingDetailDTO.getFreezeTimeEndStr()));
reportIncomingDetailDTO.setCheckTimeStartDate(CommonUtil.getStartByDateStr(reportIncomingDetailDTO.getCheckTimeStartStr()));
reportIncomingDetailDTO.setCheckTimeEndDate(CommonUtil.getEndByDateStr(reportIncomingDetailDTO.getCheckTimeEndStr()));
List<ReportIncomingDetailExportVO> list = reportIncomingMapper.incomingDetailExport(reportIncomingDetailDTO);
ExcelUtil.export(response, "收入明细报表导出", "收入明细报表导出", list, ReportIncomingDetailExportVO.class);
}
@Override
public R deptIncomingPageNew(ReportIncomingDTO reportIncomingDTO) {
IPage<Object> page = new Page<>();
page.setCurrent(reportIncomingDTO.getPageNum());
page.setSize(reportIncomingDTO.getPageSize());
String year = reportIncomingDTO.getYear();
String month = reportIncomingDTO.getMonth();
String startTimeStr = reportIncomingDTO.getStartTimeStr();
String endTimeStr = reportIncomingDTO.getEndTimeStr();
String timeStr = null;
if(StringUtil.isNotBlank(startTimeStr) && StringUtil.isNotBlank(endTimeStr)){
reportIncomingDTO.setStartTime(CommonUtil.getStartByDateStr(startTimeStr));
reportIncomingDTO.setEndTime(CommonUtil.getEndByDateStr(endTimeStr));
timeStr=startTimeStr+"至"+endTimeStr;
}else{
if(StringUtil.isNotBlank(month)){
Calendar instance = Calendar.getInstance();
if(StringUtil.isBlank(year)){
log.info("############deptIncomingPage：请选择年份");
return R.fail(405,"请选择年份");
}
try{
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
final Date parse = sdf.parse(year+"-"+month);
reportIncomingDTO.setStartTime(CommonUtil.StringToDate(sdf1.format(parse)));
final Calendar cal = Calendar.getInstance();
cal.setTime(parse);
final int last = cal.getActualMaximum(Calendar.DAY_OF_MONTH);
cal.set(Calendar.DAY_OF_MONTH, last);
cal.add(Calendar.DATE, +1);
cal.add(Calendar.SECOND, -1);
reportIncomingDTO.setEndTime(cal.getTime());
timeStr = year+"年"+month+"月";
}catch (Exception e){
log.info("############deptIncomingPage：");
return R.fail(405,"请选择年份");
}
}else{
if(StringUtil.isNotBlank(year)){
Calendar instance = Calendar.getInstance();
instance.set(Calendar.YEAR,Integer.parseInt(year));
instance.set(Calendar.MONTH,Calendar.JANUARY);
instance.set(Calendar.DAY_OF_MONTH,1);
instance.set(Calendar.HOUR_OF_DAY, 0);
instance.set(Calendar.MINUTE, 0);
instance.set(Calendar.SECOND, 0);
instance.set(Calendar.MILLISECOND, 0);
reportIncomingDTO.setStartTime(instance.getTime());
instance.set(Calendar.MONTH,Calendar.DECEMBER);
instance.set(Calendar.DAY_OF_MONTH,31);
instance.set(Calendar.HOUR_OF_DAY, 23);
instance.set(Calendar.MINUTE, 59);
instance.set(Calendar.SECOND, 59);
instance.set(Calendar.MILLISECOND, 999);
reportIncomingDTO.setEndTime(instance.getTime());
timeStr = year+"年";
}else{
Calendar instance = Calendar.getInstance();
instance.set(Calendar.HOUR_OF_DAY, 23);
instance.set(Calendar.MINUTE, 59);
instance.set(Calendar.SECOND, 59);
instance.set(Calendar.MILLISECOND, 999);
reportIncomingDTO.setEndTime(instance.getTime());
instance.add(Calendar.DATE, -7);
instance.set(Calendar.HOUR_OF_DAY, 0);
instance.set(Calendar.MINUTE, 0);
instance.set(Calendar.SECOND, 0);
instance.set(Calendar.MILLISECOND, 0);
reportIncomingDTO.setStartTime(instance.getTime());
timeStr=CommonUtil.dateToStringGeneral(reportIncomingDTO.getStartTime())+"至"+CommonUtil.dateToStringGeneral(reportIncomingDTO.getEndTime());
}
}
}
IPage<ReportDeptIncomingVO> iPage = reportIncomingMapper.deptIncomingPageNew(page,reportIncomingDTO);
//查询数据对应的在库数和签收数
List<ReportDeptIncomingNumVO> ls = reportIncomingMapper.findIncomingNumNew(reportIncomingDTO);
//把ls转化为以businessLine，brand，departureWarehouseName，destinationWarehouseName为key的map
Map<String, ReportDeptIncomingNumVO> map = ls.stream()
.collect(Collectors.toMap(t-> t.getBusinessLine()+"&&"+t.getBrand()+"&&"+t.getDepartureWarehouseName()+"&&"+t.getDestinationWarehouseName()+"&&"+t.getNian()+"&&"+t.getYue(), reportDeptIncomingNumVO -> reportDeptIncomingNumVO));
List<ReportDeptIncomingVO> records = iPage.getRecords();
String finalTimeStr = timeStr;
records.forEach(reportDeptIncomingVO -> {
String businessLine = reportDeptIncomingVO.getBusinessLine();
String brand = reportDeptIncomingVO.getBrand();
String departureWarehouseName = reportDeptIncomingVO.getDepartureWarehouseName();
String destinationWarehouseName = reportDeptIncomingVO.getDestinationWarehouseName();
String nian = reportDeptIncomingVO.getNian();
String yue = reportDeptIncomingVO.getYue();
reportDeptIncomingVO.setTimeStr(finalTimeStr);
ReportDeptIncomingNumVO reportDeptIncomingNumVO = map.get(businessLine + "&&" + brand + "&&" + departureWarehouseName + "&&" + destinationWarehouseName+"&&"+nian+"&&"+yue);
if(!Objects.isNull(reportDeptIncomingNumVO)){
reportDeptIncomingVO.setStockNum(reportDeptIncomingNumVO.getStockNum());
reportDeptIncomingVO.setSignNum(reportDeptIncomingNumVO.getSignNum());
}
});
iPage.setRecords(records);
return R.data(iPage);
}
@Override
public void deptIncomingExportNew(ReportIncomingDTO reportIncomingDTO, HttpServletResponse response) {
String year = reportIncomingDTO.getYear();
String month = reportIncomingDTO.getMonth();
String startTimeStr = reportIncomingDTO.getStartTimeStr();
String endTimeStr = reportIncomingDTO.getEndTimeStr();
String timeStr = null;
if(StringUtil.isNotBlank(startTimeStr) && StringUtil.isNotBlank(endTimeStr)){
reportIncomingDTO.setStartTime(CommonUtil.getStartByDateStr(startTimeStr));
reportIncomingDTO.setEndTime(CommonUtil.getEndByDateStr(endTimeStr));
timeStr=startTimeStr+"至"+endTimeStr;
}else{
if(StringUtil.isNotBlank(month)){
Calendar instance = Calendar.getInstance();
if(StringUtil.isBlank(year)){
log.info("############deptIncomingPage：请选择年份");
throw new CustomerException(405,"请选择年份");
}
try{
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
final Date parse = sdf.parse(year+"-"+month);
reportIncomingDTO.setStartTime(CommonUtil.StringToDate(sdf1.format(parse)));
final Calendar cal = Calendar.getInstance();
cal.setTime(parse);
final int last = cal.getActualMaximum(Calendar.DAY_OF_MONTH);
cal.set(Calendar.DAY_OF_MONTH, last);
cal.add(Calendar.DATE, +1);
cal.add(Calendar.SECOND, -1);
reportIncomingDTO.setEndTime(cal.getTime());
timeStr = year+"年"+month+"月";
}catch (Exception e){
log.info("############deptIncomingPage：请选择年份11111");
throw new CustomerException(405,"请选择年份");
}
}else{
if(StringUtil.isNotBlank(year)){
Calendar instance = Calendar.getInstance();
instance.set(Calendar.YEAR,Integer.parseInt(year));
instance.set(Calendar.MONTH,Calendar.JANUARY);
instance.set(Calendar.DAY_OF_MONTH,1);
instance.set(Calendar.HOUR_OF_DAY, 0);
instance.set(Calendar.MINUTE, 0);
instance.set(Calendar.SECOND, 0);
instance.set(Calendar.MILLISECOND, 0);
reportIncomingDTO.setStartTime(instance.getTime());
instance.set(Calendar.MONTH,Calendar.DECEMBER);
instance.set(Calendar.DAY_OF_MONTH,31);
instance.set(Calendar.HOUR_OF_DAY, 23);
instance.set(Calendar.MINUTE, 59);
instance.set(Calendar.SECOND, 59);
instance.set(Calendar.MILLISECOND, 999);
reportIncomingDTO.setEndTime(instance.getTime());
timeStr = year+"年";
}else{
Calendar instance = Calendar.getInstance();
instance.set(Calendar.HOUR_OF_DAY, 23);
instance.set(Calendar.MINUTE, 59);
instance.set(Calendar.SECOND, 59);
instance.set(Calendar.MILLISECOND, 999);
reportIncomingDTO.setEndTime(instance.getTime());
instance.add(Calendar.DATE, -7);
instance.set(Calendar.HOUR_OF_DAY, 0);
instance.set(Calendar.MINUTE, 0);
instance.set(Calendar.SECOND, 0);
instance.set(Calendar.MILLISECOND, 0);
reportIncomingDTO.setStartTime(instance.getTime());
timeStr=CommonUtil.dateToStringGeneral(reportIncomingDTO.getStartTime())+"至"+CommonUtil.dateToStringGeneral(reportIncomingDTO.getEndTime());
}
}
}
List<ReportDeptIncomingExportVO> list = reportIncomingMapper.deptIncomingExportNew(reportIncomingDTO);
//查询数据对应的在库数和签收数
List<ReportDeptIncomingNumVO> ls = reportIncomingMapper.findIncomingNumNew(reportIncomingDTO);
//把ls转化为以businessLine，brand，departureWarehouseName，destinationWarehouseName为key的map
Map<String, ReportDeptIncomingNumVO> map = ls.stream()
.collect(Collectors.toMap(t-> t.getBusinessLine()+"&&"+t.getBrand()+"&&"+t.getDepartureWarehouseName()+"&&"+t.getDestinationWarehouseName()+"&&"+t.getNian()+"&&"+t.getYue(), reportDeptIncomingNumVO -> reportDeptIncomingNumVO));
String finalTimeStr = timeStr;
list.forEach(reportDeptIncomingVO -> {
String businessLine = reportDeptIncomingVO.getBusinessLine();
String brand = reportDeptIncomingVO.getBrand();
String departureWarehouseName = reportDeptIncomingVO.getDepartureWarehouseName();
String destinationWarehouseName = reportDeptIncomingVO.getDestinationWarehouseName();
String nian = reportDeptIncomingVO.getNian();
String yue = reportDeptIncomingVO.getYue();
reportDeptIncomingVO.setTimeStr(finalTimeStr);
ReportDeptIncomingNumVO reportDeptIncomingNumVO = map.get(businessLine + "&&" + brand + "&&" + departureWarehouseName + "&&" + destinationWarehouseName+"&&"+nian+"&&"+yue);
if(!Objects.isNull(reportDeptIncomingNumVO)){
reportDeptIncomingVO.setStockNum(reportDeptIncomingNumVO.getStockNum());
reportDeptIncomingVO.setSignNum(reportDeptIncomingNumVO.getSignNum());
}
});
//导出ls
ExcelUtil.export(response, "营业部收入报表导出-新", "营业部收入报表导出-新", list, ReportDeptIncomingExportVO.class);
}
}

153
blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportTimeServiceImpl.java
Unescape View File

@ -3,7 +3,9 @@ package com.logpm.report.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.logpm.report.dto.AllTrunklineTimeDetailDTO;
import com.logpm.report.dto.ReportCheckTimeDetailDTO;
import com.logpm.report.dto.ReportStartTimeDetailDTO;
import com.logpm.report.dto.ReportTimeDTO;
import com.logpm.report.entity.*;
import com.logpm.report.mapper.ReportTimeMapper;
@ -545,6 +547,8 @@ public class ReportTimeServiceImpl implements IReportTimeService {
page.setCurrent(reportCheckTimeDetailDTO.getPageNum());
page.setSize(reportCheckTimeDetailDTO.getPageSize());
reportCheckTimeDetailDTO.setStartTime(CommonUtil.getStartByDateStr(reportCheckTimeDetailDTO.getStartTimeStr()));
reportCheckTimeDetailDTO.setEndTime(CommonUtil.getEndByDateStr(reportCheckTimeDetailDTO.getEndTimeStr()));
reportCheckTimeDetailDTO.setDocumentMakingTimeStartDate(CommonUtil.getStartByDateStr(reportCheckTimeDetailDTO.getDocumentMakingTimeStartStr()));
reportCheckTimeDetailDTO.setDocumentMakingTimeEndDate(CommonUtil.getEndByDateStr(reportCheckTimeDetailDTO.getDocumentMakingTimeEndStr()));
reportCheckTimeDetailDTO.setCreateTimeStartDate(CommonUtil.getStartByDateStr(reportCheckTimeDetailDTO.getCreateTimeStartStr()));
@ -576,6 +580,8 @@ public class ReportTimeServiceImpl implements IReportTimeService {
@Override
public void checkWaybillTimeDetailExport(ReportCheckTimeDetailDTO reportCheckTimeDetailDTO, HttpServletResponse response) {
reportCheckTimeDetailDTO.setStartTime(CommonUtil.getStartByDateStr(reportCheckTimeDetailDTO.getStartTimeStr()));
reportCheckTimeDetailDTO.setEndTime(CommonUtil.getEndByDateStr(reportCheckTimeDetailDTO.getEndTimeStr()));
reportCheckTimeDetailDTO.setDocumentMakingTimeStartDate(CommonUtil.getStartByDateStr(reportCheckTimeDetailDTO.getDocumentMakingTimeStartStr()));
reportCheckTimeDetailDTO.setDocumentMakingTimeEndDate(CommonUtil.getEndByDateStr(reportCheckTimeDetailDTO.getDocumentMakingTimeEndStr()));
reportCheckTimeDetailDTO.setCreateTimeStartDate(CommonUtil.getStartByDateStr(reportCheckTimeDetailDTO.getCreateTimeStartStr()));
@ -605,4 +611,151 @@ public class ReportTimeServiceImpl implements IReportTimeService {
//导出ls
ExcelUtil.export(response, "审单及时率明细报表导出", "审单及时率明细报表导出", list, ReportCheckWaybillTimeDetailVO.class);
}
@Override
public R packageAllTrunklineTimeDetailPage(AllTrunklineTimeDetailDTO allTrunklineTimeDetailDTO) {
IPage<Object> page = new Page<>();
page.setCurrent(allTrunklineTimeDetailDTO.getPageNum());
page.setSize(allTrunklineTimeDetailDTO.getPageSize());
allTrunklineTimeDetailDTO.setStartTime(CommonUtil.getStartByDateStr(allTrunklineTimeDetailDTO.getStartTimeStr()));
allTrunklineTimeDetailDTO.setEndTime(CommonUtil.getEndByDateStr(allTrunklineTimeDetailDTO.getEndTimeStr()));
allTrunklineTimeDetailDTO.setHoursTime(0);
QueryWrapper<ReportConfigAllTrunklineEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("departure_warehouse_name","全部")
.eq("destination_warehouse_name","全部")
.eq("is_deleted",0);
ReportConfigAllTrunklineEntity allTrunklineEntity = allTrunklineService.getOne(queryWrapper);
if(!Objects.isNull(allTrunklineEntity)){
allTrunklineTimeDetailDTO.setHoursTime(allTrunklineEntity.getHoursTime());
}
IPage<ReportPackgeAllTrunklineTimeDetailVO> iPage = reportTimeMapper.packageAllTrunklineTimeDetailPage(page,allTrunklineTimeDetailDTO);
return R.data(iPage);
}
@Override
public void packageAllTrunklineTimeDetailExport(AllTrunklineTimeDetailDTO allTrunklineTimeDetailDTO, HttpServletResponse response) {
allTrunklineTimeDetailDTO.setStartTime(CommonUtil.getStartByDateStr(allTrunklineTimeDetailDTO.getStartTimeStr()));
allTrunklineTimeDetailDTO.setEndTime(CommonUtil.getEndByDateStr(allTrunklineTimeDetailDTO.getEndTimeStr()));
allTrunklineTimeDetailDTO.setHoursTime(0);
QueryWrapper<ReportConfigAllTrunklineEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("departure_warehouse_name","全部")
.eq("destination_warehouse_name","全部")
.eq("is_deleted",0);
ReportConfigAllTrunklineEntity allTrunklineEntity = allTrunklineService.getOne(queryWrapper);
if(!Objects.isNull(allTrunklineEntity)){
allTrunklineTimeDetailDTO.setHoursTime(allTrunklineEntity.getHoursTime());
}
List<ReportPackgeAllTrunklineTimeDetailVO> list = reportTimeMapper.packageAllTrunklineTimeDetailExport(allTrunklineTimeDetailDTO);
//导出ls
ExcelUtil.export(response, "干线整体时效明细报表导出", "干线整体时效明细报表导出", list, ReportPackgeAllTrunklineTimeDetailVO.class);
}
@Override
public R packageStartTimeDetailPage(ReportStartTimeDetailDTO reportStartTimeDetailDTO) {
IPage<Object> page = new Page<>();
page.setCurrent(reportStartTimeDetailDTO.getPageNum());
page.setSize(reportStartTimeDetailDTO.getPageSize());
reportStartTimeDetailDTO.setStartTime(CommonUtil.getStartByDateStr(reportStartTimeDetailDTO.getStartTimeStr()));
reportStartTimeDetailDTO.setEndTime(CommonUtil.getEndByDateStr(reportStartTimeDetailDTO.getEndTimeStr()));
reportStartTimeDetailDTO.setHoursTime(72);
QueryWrapper<ReportConfigDespatchEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("departure_warehouse_name","全部")
.eq("destination_warehouse_name","全部")
.eq("brand","全部")
.eq("is_deleted",0);
ReportConfigDespatchEntity despatchEntity = despatchService.getOne(queryWrapper);
if(!Objects.isNull(despatchEntity)){
reportStartTimeDetailDTO.setHoursTime(despatchEntity.getHoursTime());
}
IPage<ReportPackgeStartTimeDetailVO> iPage = reportTimeMapper.packageStartTimeDetailPage(page,reportStartTimeDetailDTO);
return R.data(iPage);
}
@Override
public void packageStartTimeDetailExport(ReportStartTimeDetailDTO reportStartTimeDetailDTO, HttpServletResponse response) {
reportStartTimeDetailDTO.setStartTime(CommonUtil.getStartByDateStr(reportStartTimeDetailDTO.getStartTimeStr()));
reportStartTimeDetailDTO.setEndTime(CommonUtil.getEndByDateStr(reportStartTimeDetailDTO.getEndTimeStr()));
reportStartTimeDetailDTO.setHoursTime(72);
QueryWrapper<ReportConfigDespatchEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("departure_warehouse_name","全部")
.eq("destination_warehouse_name","全部")
.eq("brand","全部")
.eq("is_deleted",0);
ReportConfigDespatchEntity despatchEntity = despatchService.getOne(queryWrapper);
if(!Objects.isNull(despatchEntity)){
reportStartTimeDetailDTO.setHoursTime(despatchEntity.getHoursTime());
}
List<ReportPackgeStartTimeDetailVO> list = reportTimeMapper.packageStartTimeDetailExport(reportStartTimeDetailDTO);
//导出ls
ExcelUtil.export(response, "干线发运时效明细报表导出", "干线发运时效明细报表导出", list, ReportPackgeStartTimeDetailVO.class);
}
@Override
public R packageTransferTimeDetailPage(ReportStartTimeDetailDTO reportStartTimeDetailDTO) {
IPage<Object> page = new Page<>();
page.setCurrent(reportStartTimeDetailDTO.getPageNum());
page.setSize(reportStartTimeDetailDTO.getPageSize());
reportStartTimeDetailDTO.setStartTime(CommonUtil.getStartByDateStr(reportStartTimeDetailDTO.getStartTimeStr()));
reportStartTimeDetailDTO.setEndTime(CommonUtil.getEndByDateStr(reportStartTimeDetailDTO.getEndTimeStr()));
reportStartTimeDetailDTO.setHoursTime(72);
QueryWrapper<ReportConfigDespatchEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("departure_warehouse_name","全部")
.eq("destination_warehouse_name","全部")
.eq("brand","全部")
.eq("is_deleted",0);
ReportConfigDespatchEntity despatchEntity = despatchService.getOne(queryWrapper);
if(!Objects.isNull(despatchEntity)){
reportStartTimeDetailDTO.setHoursTime(despatchEntity.getHoursTime());
}
IPage<ReportPackgeStartTimeDetailVO> iPage = reportTimeMapper.packageTransferTimeDetailPage(page,reportStartTimeDetailDTO);
return R.data(iPage);
}
@Override
public void packageTransferTimeDetailExport(ReportStartTimeDetailDTO reportStartTimeDetailDTO, HttpServletResponse response) {
reportStartTimeDetailDTO.setStartTime(CommonUtil.getStartByDateStr(reportStartTimeDetailDTO.getStartTimeStr()));
reportStartTimeDetailDTO.setEndTime(CommonUtil.getEndByDateStr(reportStartTimeDetailDTO.getEndTimeStr()));
reportStartTimeDetailDTO.setHoursTime(72);
QueryWrapper<ReportConfigDespatchEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("departure_warehouse_name","全部")
.eq("destination_warehouse_name","全部")
.eq("brand","全部")
.eq("is_deleted",0);
ReportConfigDespatchEntity despatchEntity = despatchService.getOne(queryWrapper);
if(!Objects.isNull(despatchEntity)){
reportStartTimeDetailDTO.setHoursTime(despatchEntity.getHoursTime());
}
List<ReportPackgeStartTimeDetailVO> list = reportTimeMapper.packageTransferTimeDetailExport(reportStartTimeDetailDTO);
//导出ls
ExcelUtil.export(response, "干线中转时效明细报表导出", "干线中转时效明细报表导出", list, ReportPackgeStartTimeDetailVO.class);
}
}

3
blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportDeptIncomingVO.java
Unescape View File

@ -10,9 +10,12 @@ public class ReportDeptIncomingVO implements Serializable {
private String businessLine;//事业线
private Long departureWarehouseId;//始发仓id
private String departureWarehouseName;//始发仓
private Long destinationWarehouseId;//目的仓id
private String destinationWarehouseName;//目的仓
private String brand;//品牌
private Long consigneeId;//收货单位id
private String consignee;//收货单位
private String nian;//年
private String yue;//月

224
blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportIncomingDetailExportVO.java
Unescape View File

@ -0,0 +1,224 @@
package com.logpm.report.vo;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class ReportIncomingDetailExportVO implements Serializable {
@ExcelIgnore
private Long waybillId;
@ExcelProperty(value = "品牌")
private String brand;
@ExcelProperty(value = "运单号")
private String waybillNo;
@ExcelProperty(value = "订单号")
private String orderNo;
@ExcelProperty(value = "收货单位")
private String consignee;
@ExcelProperty(value = "收货人")
private String consigneeName;
@ExcelProperty(value = "收货人电话")
private String consigneeMobile;
@ExcelProperty(value = "收货人地址")
private String consigneeAddress;
@ExcelProperty(value = "发货单位")
private String shipper;
@ExcelProperty(value = "发货人")
private String shipperName;
@ExcelProperty(value = "发货人电话")
private String shipperMobile;
@ExcelProperty(value = "发货地址")
private String shipperAddress;
@ExcelProperty(value = "到站")
private String destination;
@ExcelProperty(value = "完整到站")
private String completeDestination;
@ExcelProperty(value = "发站")
private String departure;
@ExcelProperty(value = "完整发站")
private String completeDeparture;
@ExcelProperty(value = "发站仓")
private String departureWarehouseName;
@ExcelProperty(value = "目的仓")
private String destinationWarehouseName;
@ExcelProperty(value = "目的仓")
private String deliveryWay;
@ExcelProperty(value = "车次号")
private String customerTrain;
@ExcelProperty(value = "备注")
private String remark;
@ExcelProperty(value = "结算方")
private String cleanObjType;
@ExcelProperty(value = "支付方式")
private String payType;
@ExcelProperty(value = "付款方式")
private String payWay;
@ExcelProperty(value = "现付")
private BigDecimal nowPay;
@ExcelProperty(value = "到付")
private BigDecimal arrivePay;
@ExcelProperty(value = "回付")
private BigDecimal backPay;
@ExcelProperty(value = "月结")
private BigDecimal monthPay;
@ExcelProperty(value = "服务类型")
private String serviceType;
@ExcelProperty(value = "是否改单")
private String updateStatus;
@ExcelProperty(value = "是否审单")
private String checkStatus;
@ExcelProperty(value = "审核原因")
private String checkReson;
@ExcelProperty(value = "审核备注")
private String checkRemark;
@ExcelProperty(value = "审核人")
private String checkUserName;
@ExcelProperty(value = "审核时间")
private Date checkTime;
@ExcelProperty(value = "取消审核备注")
private String cancleCheckRemark;
@ExcelProperty(value = "取消审核人")
private String cancleCheckUserName;
@ExcelProperty(value = "取消审核时间")
private Date cancleCheckTime;
@ExcelProperty(value = "运单状态")
private String waybillStatus;
@ExcelProperty(value = "开单时间")
private Date openTime;
@ExcelProperty(value = "货物品类")
private String goodsName;
@ExcelProperty(value = "总数量")
private Integer totalCount;
@ExcelProperty(value = "总重量")
private BigDecimal totalWeight;
@ExcelProperty(value = "总体积")
private BigDecimal totalVolume;
@ExcelProperty(value = "总费用")
private BigDecimal totalFee;
@ExcelProperty(value = "开单费用")
private BigDecimal systemTotalFee;
@ExcelProperty(value = "提货费")
private BigDecimal pickupFee;
@ExcelProperty(value = "运费")
private BigDecimal freightFee;
@ExcelProperty(value = "仓库服务费合计")
private BigDecimal warehouseServiceFee;
@ExcelProperty(value = "仓储费")
private BigDecimal warehouseFee;
@ExcelProperty(value = "仓储管理费")
private BigDecimal warehouseManagementFee;
@ExcelProperty(value = "仓储分拣费")
private BigDecimal warehouseSortingFee;
@ExcelProperty(value = "仓储操作费")
private BigDecimal warehouseOprationFee;
@ExcelProperty(value = "配送服务费合计")
private BigDecimal deliveryServiceFee;
@ExcelProperty(value = "配送费")
private BigDecimal deliveryFee;
@ExcelProperty(value = "配送装卸费")
private BigDecimal deliveryHandlingFee;
@ExcelProperty(value = "配送分货费")
private BigDecimal deliverySortingFee;
@ExcelProperty(value = "配送上楼费")
private BigDecimal deliveryUpfloorFee;
@ExcelProperty(value = "配送平移费")
private BigDecimal deliveryMoveFee;
@ExcelProperty(value = "配送公里数")
private BigDecimal deliveryLine;
@ExcelProperty(value = "超区公里费")
private BigDecimal deliveryLineFee;
@ExcelProperty(value = "其他费用")
private BigDecimal otherFee;
@ExcelProperty(value = "安装费")
private BigDecimal installFee;
@ExcelProperty(value = "保价费")
private BigDecimal insuranceFee;
@ExcelProperty(value = "申明价值")
private BigDecimal claimingValue;
@ExcelProperty(value = "三方操作费")
private BigDecimal thirdOperationFee;
@ExcelProperty(value = "回扣")
private BigDecimal rebate;
@ExcelProperty(value = "收款状态")
private String payStatus;
@ExcelProperty(value = "结算状态")
private String settlementStatus;
@ExcelProperty(value = "签收数量")
private Integer signNum;
@ExcelProperty(value = "签收时间")
@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date signTime;
@ExcelProperty(value = "配送时间")
@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date deliveryTime;
@ExcelProperty(value = "签收人")
private String signUserName;
@ExcelProperty(value = "配送司机")
private String deliveryDriverName;
@ExcelProperty(value = "品类数量")
private String goodsTypeNum;
@ExcelProperty(value = "品类开单运费")
private String goodsTypePrice;
@ExcelProperty(value = "品类系统配送单价")
private String goodsTypeDeliveryPrice;
@ExcelProperty(value = "品类系统提货单价")
private String goodsTypePickupPrice;
@ExcelProperty(value = "品类系统运费单价")
private String goodsTypeFreightPrice;
@ExcelProperty(value = "品类数")
private Integer goodsTypeCount;
}

116
blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportIncomingDetailVO.java
Unescape View File

@ -0,0 +1,116 @@
package com.logpm.report.vo;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class ReportIncomingDetailVO implements Serializable {
private Long id;
private String brand;
private String waybillNo;
private String orderNo;
private String consignee;
private String consigneeName;
private String consigneeMobile;
private String consigneeAddress;
private String shipper;
private String shipperName;
private String shipperMobile;
private String shipperAddress;
private String destination;
private String completeDestination;
private String departure;
private String completeDeparture;
private String departureWarehouseName;
private String destinationWarehouseName;
private String deliveryWay;
private String customerTrain;
private Integer returnStatus;
private String remark;
private String cleanObjType;
private String payType;
private String payWay;
private BigDecimal xPay;
private BigDecimal dPay;
private BigDecimal hPay;
private BigDecimal yPay;
private String serviceType;
private Integer updateStatus;
private Integer checkStatus;
private String checkReson;
private String checkRemark;
private String checkUserName;
private Date checkTime;
private String cancleCheckRemark;
private String cancleCheckUserName;
private Date cancleCheckTime;
private String waybillStatus;
private String waybillType;
private Date openTime;
private String goodsName;
private Integer totalCount;
private BigDecimal totalWeight;
private BigDecimal totalVolume;
private BigDecimal totalFee;
private BigDecimal systemTotalFee;
private BigDecimal pickupFee;
private BigDecimal freightFee;
private BigDecimal warehouseServiceFee;
private BigDecimal warehouseFee;
private BigDecimal warehouseManagementFee;
private BigDecimal warehouseSortingFee;
private BigDecimal warehouseOprationFee;
private BigDecimal deliveryServiceFee;
private BigDecimal deliveryFee;
private BigDecimal deliveryHandlingFee;
private BigDecimal deliverySortingFee;
private BigDecimal deliveryUpfloorFee;
private BigDecimal deliveryMoveFee;
private BigDecimal deliveryLine;
private BigDecimal deliveryLineFee;
private BigDecimal otherFee;
private BigDecimal installFee;
private BigDecimal insuranceFee;
private BigDecimal claimingValue;
private BigDecimal thirdOperationFee;
private BigDecimal rebate;
private String goodsTypeNum;
private String goodsTypePrice;
private String goodsTypeDeliveryPrice;
private String goodsTypePickupPrice;
private String goodsTypeFreightPrice;
private Integer goodsTypeCount;
private String payStatus;
private String settlementStatus;
/**
* 签收件数
*/
private Integer signCount;
/**
* 签收人
*/
private String signUserName;
/**
* 签收时间
*/
private Date signTime;
/**
* 配送时间
*/
private Date deliveryTime;
/**
* 配送司机
*/
private String deliveryDriverName;
}

98
blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportPackgeAllTrunklineTimeDetailVO.java
Unescape View File

@ -0,0 +1,98 @@
package com.logpm.report.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class ReportPackgeAllTrunklineTimeDetailVO implements Serializable {
@ExcelProperty(value = "运单号")
private String waybillNo;
@ExcelProperty(value = "订单自编号")
private String orderCode;
@ExcelProperty(value = "当前所在仓")
private String nowWarehouseName;
@ExcelProperty(value = "始发仓")
private String departureWarehouseName;
@ExcelProperty(value = "目的仓")
private String destinationWarehouseName;
@ExcelProperty(value = "客户车次号")
private String trainNumber;
@ExcelProperty(value = "干仓配")
private String isGcp;
@ExcelProperty(value = "一级品类")
private String firstPackName;
@ExcelProperty(value = "二级品类")
private String secondPackName;
@ExcelProperty(value = "三级品类")
private String thirdPackName;
@ExcelProperty(value = "物料编码")
private String materialCode;
@ExcelProperty(value = "物料名称")
private String materialName;
@ExcelProperty(value = "包条码")
private String orderPackageCode;
@ExcelProperty(value = "订单来源")
private String systemType;
@ExcelProperty(value = "服务号")
private String serviceNum;
@ExcelProperty(value = "发货数量")
private Integer senderNum;
@ExcelProperty(value = "体积")
private BigDecimal volume;
@ExcelProperty(value = "重量")
private BigDecimal weight;
@ExcelProperty(value = "基地发货日期")
@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date deliveryDate;
@ExcelProperty(value = "导入仓库")
private String warehouseName;
@ExcelProperty(value = "订单创建人")
private String createUserName;
@ExcelProperty(value = "订单创建时间")
@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ExcelProperty(value = "是否目的仓入库")
private String isDesIncoming;
@ExcelProperty(value = "目的仓入库时间")
@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date desIncomgingTime;
@ExcelProperty(value = "实际入库时效")
private String incomingHours;
@ExcelProperty(value = "标准入库时效")
private String hoursTime;
@ExcelProperty(value = "是否超时")
private String isOverTime;
}

5
blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportPackgeAllTrunklineTimeVO.java
Unescape View File

@ -1,5 +1,6 @@
package com.logpm.report.vo;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
@ -10,8 +11,12 @@ public class ReportPackgeAllTrunklineTimeVO implements Serializable {
@ExcelProperty(value = "事业线")
private String businessLine;
@ExcelIgnore
private Long departureWarehouseId;
@ExcelProperty(value = "始发仓")
private String departureWarehouseName;
@ExcelIgnore
private Long destinationWarehouseId;
@ExcelProperty(value = "目的仓")
private String destinationWarehouseName;
@ExcelProperty(value = "品牌")

102
blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportPackgeStartTimeDetailVO.java
Unescape View File

@ -0,0 +1,102 @@
package com.logpm.report.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class ReportPackgeStartTimeDetailVO implements Serializable {
@ExcelProperty(value = "运单号")
private String waybillNo;
@ExcelProperty(value = "订单自编号")
private String orderCode;
@ExcelProperty(value = "当前所在仓")
private String nowWarehouseName;
@ExcelProperty(value = "始发仓")
private String departureWarehouseName;
@ExcelProperty(value = "目的仓")
private String destinationWarehouseName;
@ExcelProperty(value = "客户车次号")
private String trainNumber;
@ExcelProperty(value = "干仓配")
private String isGcp;
@ExcelProperty(value = "一级品类")
private String firstPackName;
@ExcelProperty(value = "二级品类")
private String secondPackName;
@ExcelProperty(value = "三级品类")
private String thirdPackName;
@ExcelProperty(value = "物料编码")
private String materialCode;
@ExcelProperty(value = "物料名称")
private String materialName;
@ExcelProperty(value = "包条码")
private String orderPackageCode;
@ExcelProperty(value = "订单来源")
private String systemType;
@ExcelProperty(value = "服务号")
private String serviceNum;
@ExcelProperty(value = "发货数量")
private Integer senderNum;
@ExcelProperty(value = "体积")
private BigDecimal volume;
@ExcelProperty(value = "重量")
private BigDecimal weight;
@ExcelProperty(value = "基地发货日期")
@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date deliveryDate;
@ExcelProperty(value = "导入仓库")
private String warehouseName;
@ExcelProperty(value = "订单创建人")
private String createUserName;
@ExcelProperty(value = "订单创建时间")
@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ExcelProperty(value = "入库时间")
@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date incomgingTime;
@ExcelProperty(value = "是否发运")
private String isStarting;
@ExcelProperty(value = "发运时间")
@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
@ExcelProperty(value = "实际发运时效")
private String startHours;
@ExcelProperty(value = "标准发运时效")
private String hoursTime;
@ExcelProperty(value = "是否超时")
private String isOverTime;
}

5
blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportPackgeStartTimeVO.java
Unescape View File

@ -1,5 +1,6 @@
package com.logpm.report.vo;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
@ -10,8 +11,12 @@ public class ReportPackgeStartTimeVO implements Serializable {
@ExcelProperty(value = "事业线")
private String businessLine;
@ExcelIgnore
private Long departureWarehouseId;
@ExcelProperty(value = "始发仓")
private String departureWarehouseName;
@ExcelIgnore
private Long destinationWarehouseId;
@ExcelProperty(value = "目的仓")
private String destinationWarehouseName;
@ExcelProperty(value = "品牌")

7
blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportPackgeTransferTimeVO.java
Unescape View File

@ -1,5 +1,6 @@
package com.logpm.report.vo;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
@ -10,10 +11,16 @@ public class ReportPackgeTransferTimeVO implements Serializable {
@ExcelProperty(value = "事业线")
private String businessLine;
@ExcelIgnore
private Long departureWarehouseId;
@ExcelProperty(value = "始发仓")
private String departureWarehouseName;
@ExcelIgnore
private Long destinationWarehouseId;
@ExcelProperty(value = "目的仓")
private String destinationWarehouseName;
@ExcelIgnore
private Long warehouseId;
@ExcelProperty(value = "中转仓")
private String warehouseName;
@ExcelProperty(value = "品牌")

1
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderAsyncService.java
Unescape View File

@ -9,6 +9,7 @@ import java.util.List;
public interface IOpenOrderAsyncService {
void saveLog(Long waybillId, String waybillNo, String trackType, String refer, String operationRemark, String nickName,Long userId,Long warehouseId,String warehouseName);
void saveAbnormalLog(Long waybillId, String waybillNo, String trackType, String refer, String operationRemark, String nickName,Long userId,Long warehouseId,String warehouseName);
void saveStartCarLog(TrunklineCarsLoadLineEntity carsLoadLineEntity,String nickName,Long userId);
void saveTripartiteStartCarLog(TrunklineCarsLoadLineEntity carsLoadLineEntity,String nickName,Long userId);

50
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderAsyncServiceImpl.java
Unescape View File

@ -127,6 +127,49 @@ public class OpenOrderAsyncServiceImpl implements IOpenOrderAsyncService {
// DynamicDataSourceContextHolder.clear();
}
@Override
public void saveAbnormalLog(Long waybillId, String waybillNo, String trackType, String refer, String operationRemark, String nickName, Long userId, Long warehouseId, String warehouseName) {
if(Objects.isNull(waybillId)){
log.warn("##########saveAbnormalLog: 运单信息为空 {}",waybillId);
return ;
}
if("61".equals(trackType)){
QueryWrapper<TrunklineWaybillTrackEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("warehouse_id",warehouseId)
.eq("waybill_id",waybillId)
.eq("track_type",trackType);
TrunklineWaybillTrackEntity waybillTrackEntity = trunklineWaybillTrackService.getOne(queryWrapper);
if(Objects.isNull(waybillTrackEntity)){
waybillTrackEntity = new TrunklineWaybillTrackEntity();
waybillTrackEntity.setWarehouseId(warehouseId);
waybillTrackEntity.setWarehouseName(warehouseName);
waybillTrackEntity.setWaybillId(waybillId);
waybillTrackEntity.setWaybillNo(waybillNo);
waybillTrackEntity.setTrackType(trackType);
waybillTrackEntity.setRefer(refer);
waybillTrackEntity.setOperationRemark(operationRemark);
waybillTrackEntity.setCreateUserName(nickName);
waybillTrackEntity.setCheckStatus(1);
waybillTrackEntity.setCheckTime(new Date());
trunklineWaybillTrackService.save(waybillTrackEntity);
}
}else{
TrunklineWaybillTrackEntity waybillTrackEntity = new TrunklineWaybillTrackEntity();
waybillTrackEntity.setWarehouseId(warehouseId);
waybillTrackEntity.setWarehouseName(warehouseName);
waybillTrackEntity.setWaybillId(waybillId);
waybillTrackEntity.setWaybillNo(waybillNo);
waybillTrackEntity.setTrackType(trackType);
waybillTrackEntity.setRefer(refer);
waybillTrackEntity.setOperationRemark(operationRemark);
waybillTrackEntity.setCreateUserName(nickName);
waybillTrackEntity.setCheckStatus(1);
waybillTrackEntity.setCheckTime(new Date());
trunklineWaybillTrackService.save(waybillTrackEntity);
}
}
@LogpmAsync("asyncExecutor")
@Override
public void saveStartCarLog(TrunklineCarsLoadLineEntity carsLoadLineEntity,String nickName,Long userId) {
@ -950,6 +993,7 @@ public class OpenOrderAsyncServiceImpl implements IOpenOrderAsyncService {
//把billladingWaybillEntities转化成以billladingId为key的Map
Map<Long, TrunklineBillladingWaybillEntity> billladingNoWaybillMap = billladingNoWaybillEntities.stream().collect(Collectors.toMap(TrunklineBillladingWaybillEntity::getBillladingId, Function.identity()));
List<Long> removeBillladingWaybillIds = new ArrayList<>();
billladingPackageMap.keySet().forEach(billladingId -> {
BillladingPackageVO billladingPackageVO = billladingPackageMap.get(billladingId);
Integer num = billladingPackageVO.getNum();
@ -961,7 +1005,7 @@ public class OpenOrderAsyncServiceImpl implements IOpenOrderAsyncService {
billladingNoWaybillEntity.setRealNum(realNum - num);
} else {
billladingNoWaybillEntity.setRealNum(0);
billladingNoWaybillEntity.setIsDeleted(1);
removeBillladingWaybillIds.add(billladingNoWaybillEntity.getId());
}
updateBillladingWaybillEntities.add(billladingNoWaybillEntity);
TrunklineBillladingWaybillEntity addbillladingWaybillEntity = new TrunklineBillladingWaybillEntity();
@ -987,7 +1031,9 @@ public class OpenOrderAsyncServiceImpl implements IOpenOrderAsyncService {
trunklineBillladingWaybillService.updateBillladingFeeByBillladingId(billladingEntity);
}
if(CollUtil.isNotEmpty(removeBillladingWaybillIds)){
trunklineBillladingWaybillService.deleteLogic(removeBillladingWaybillIds);
}
}

5
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingWaybillServiceImpl.java
Unescape View File

@ -114,6 +114,11 @@ public class TrunklineBillladingWaybillServiceImpl extends BaseServiceImpl<Trunk
t.setBillladingFee(fee);
updateById(t);
}
//把trunklineBillladingWaybillEntities中所有元素的realNum求和
// realNum = trunklineBillladingWaybillEntities.stream().map(TrunklineBillladingWaybillEntity::getRealNum).reduce(0, Integer::sum);
//
// baseMapper
}
@Override

51
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
Unescape View File

@ -4697,9 +4697,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
if("1".equals(chargeType)){
totalIncomingParice.set(totalIncomingParice.get().add(new BigDecimal(price).multiply(new BigDecimal(unloadNum1))));
}else if("2".equals(chargeType)){
totalIncomingParice.set(totalIncomingParice.get().add(new BigDecimal(price).multiply(new BigDecimal(oneVolume))));
totalIncomingParice.set(totalIncomingParice.get().add(new BigDecimal(price).multiply(new BigDecimal(oneVolume)).multiply(new BigDecimal(unloadNum1))));
}else if("3".equals(chargeType)){
totalIncomingParice.set(totalIncomingParice.get().add(new BigDecimal(price).multiply(new BigDecimal(oneWeight))));
totalIncomingParice.set(totalIncomingParice.get().add(new BigDecimal(price).multiply(new BigDecimal(oneWeight)).multiply(new BigDecimal(unloadNum1))));
}
totalVolume.set(totalVolume.get().add(new BigDecimal(oneVolume).multiply(new BigDecimal(unloadNum1))));
totalWeight.set(totalWeight.get().add(new BigDecimal(oneWeight).multiply(new BigDecimal(unloadNum1))));
@ -11594,10 +11594,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
inComingDTO.setWarehouseId(warehouseId);
inComingService.incomingPackage(inComingDTO);
Long waybillId = advanceDetailEntity.getWaybillId();
String waybillNo = advanceDetailEntity.getWaybillNo();
//需要补装车扫记录
TrunklineCarsLoadScanEntity trunklineCarsLoadScanEntity = new TrunklineCarsLoadScanEntity();
trunklineCarsLoadScanEntity.setOrderCode(advanceDetailEntity.getOrderCode());
trunklineCarsLoadScanEntity.setWaybillId(advanceDetailEntity.getWaybillId());
trunklineCarsLoadScanEntity.setWaybillId(waybillId);
trunklineCarsLoadScanEntity.setWaybillNo(advanceDetailEntity.getWaybillNo());
trunklineCarsLoadScanEntity.setLoadId(loadId);
trunklineCarsLoadScanEntity.setLoadCode(loadCode);
@ -11634,6 +11637,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
carsLoadAsyncService.savaUnloadLog(warehouseId, warehouseName, loadId, loadCode, null, null, null, orderPackageCode, 1,
1, 1, 1, trayId, trayCode, trayName, null, loadScanId, "有数据,异常卸车");
String operationRemark = "干线异常到达"+warehouseName+"，到达时间"+ CommonUtil.dateToStringGeneral(new Date());
openOrderAsyncService.saveAbnormalLog(waybillId,waybillNo,"61",warehouseName+" 已到达",operationRemark,AuthUtil.getNickName(),AuthUtil.getUserId(),warehouseId,warehouseName);
}else{
@ -11688,6 +11693,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
carsLoadAsyncService.savaUnloadLog(warehouseId, warehouseName, loadId, loadCode, wi, wn, oc, orderPackageCode, 1,
1, 1, 1, trayId, trayCode, trayName, null, loadScanId, "有数据,无计划,无装车,异常卸车");
String operationRemark = "干线异常到达"+warehouseName+"，到达时间"+ CommonUtil.dateToStringGeneral(new Date());
openOrderAsyncService.saveAbnormalLog(wi,wn,"61",warehouseName+" 已到达",operationRemark,AuthUtil.getNickName(),AuthUtil.getUserId(),warehouseId,warehouseName);
//无装车记录异常日志记录
// try {
// carsLoadAsyncService.abnormalListUnloadByLoadIdAndWarehouseId(loadId, warehouseId, warehouseName, loadScanId, AuthUtil.getTenantId(), AuthUtil.getUserId(), AuthUtil.getNickName(), Func.firstLong(AuthUtil.getDeptId()));
@ -11876,6 +11885,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
carsLoadAsyncService.savaUnloadLog(warehouseId, warehouseName, loadId, loadCode, null, null, null, orderPackageCode, 1,
1, 0, 1, trayId, trayCode, trayName, null, loadScanId, "无数据,异常卸车");
}
} else {
//没装车记录，有包件信息
@ -11945,6 +11955,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
distributionStockArticleClient.submitHandleNumByOrderId(1, articleId);
distributionParcelListClient.updateOrderPackageCodeById(pacakageId, "60");
String operationRemark = "干线异常到达"+warehouseName+"，到达时间"+ CommonUtil.dateToStringGeneral(new Date());
openOrderAsyncService.saveAbnormalLog(waybillId,waybillNumber,"61",warehouseName+" 已到达",operationRemark,AuthUtil.getNickName(),AuthUtil.getUserId(),warehouseId,warehouseName);
Long currentOrderId = null;
//查询当前仓库订单信息有没有
@ -12463,13 +12475,18 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
inComingDTO.setWarehouseId(warehouseId);
inComingService.incomingPackage(inComingDTO);
Long waybillId = advanceDetailEntity.getWaybillId();
String waybillNo = advanceDetailEntity.getWaybillNo();
//需要补装车扫记录
TrunklineCarsLoadScanEntity trunklineCarsLoadScanEntity = new TrunklineCarsLoadScanEntity();
trunklineCarsLoadScanEntity.setReserve5("210");
trunklineCarsLoadScanEntity.setWarehouseId(warehouseId);
trunklineCarsLoadScanEntity.setWarehouseName(warehouseName);
trunklineCarsLoadScanEntity.setOrderCode(advanceDetailEntity.getOrderCode());
trunklineCarsLoadScanEntity.setWaybillId(advanceDetailEntity.getWaybillId());
trunklineCarsLoadScanEntity.setWaybillNo(advanceDetailEntity.getWaybillNo());
trunklineCarsLoadScanEntity.setWaybillId(waybillId);
trunklineCarsLoadScanEntity.setWaybillNo(waybillNo);
trunklineCarsLoadScanEntity.setLoadId(loadId);
trunklineCarsLoadScanEntity.setLoadCode(loadCode);
trunklineCarsLoadScanEntity.setScanCode(orderPackageCode);
@ -12496,18 +12513,26 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
trunklineCarsUnloadLogService.savaUnloadLog(warehouseId, warehouseName, loadId, loadCode, null, null, null, orderPackageCode, 1,
1, 1, 1, trayId, trayCode, trayName, null, loadScanId, "有数据,异常卸车");
String operationRemark = "干线异常到达"+warehouseName+"，到达时间"+ CommonUtil.dateToStringGeneral(new Date());
openOrderAsyncService.saveAbnormalLog(waybillId,waybillNo,"61",warehouseName+" 已到达",operationRemark,AuthUtil.getNickName(),AuthUtil.getUserId(),warehouseId,warehouseName);
}else{
//已入库
Long nowWarehouseId = advanceDetailEntity.getNowWarehouseId();
String nowWarehouseName = advanceDetailEntity.getNowWarehouseName();
Long waybillId = advanceDetailEntity.getWaybillId();
String waybillNo = advanceDetailEntity.getWaybillNo();
//需要补装车扫记录
TrunklineCarsLoadScanEntity trunklineCarsLoadScanEntity = new TrunklineCarsLoadScanEntity();
trunklineCarsLoadScanEntity.setWarehouseId(warehouseId);
trunklineCarsLoadScanEntity.setReserve5("210");
trunklineCarsLoadScanEntity.setWarehouseName(warehouseName);
trunklineCarsLoadScanEntity.setOrderCode(advanceDetailEntity.getOrderCode());
trunklineCarsLoadScanEntity.setWaybillId(advanceDetailEntity.getWaybillId());
trunklineCarsLoadScanEntity.setWaybillNo(advanceDetailEntity.getWaybillNo());
trunklineCarsLoadScanEntity.setWaybillId(waybillId);
trunklineCarsLoadScanEntity.setWaybillNo(waybillNo);
trunklineCarsLoadScanEntity.setLoadId(loadId);
trunklineCarsLoadScanEntity.setLoadCode(loadCode);
trunklineCarsLoadScanEntity.setScanCode(orderPackageCode);
@ -12537,6 +12562,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
//无装车记录异常日志记录
try {
String operationRemark = "干线异常到达"+warehouseName+"，到达时间"+ CommonUtil.dateToStringGeneral(new Date());
openOrderAsyncService.saveAbnormalLog(waybillId,waybillNo,"61",warehouseName+" 已到达",operationRemark,AuthUtil.getNickName(),AuthUtil.getUserId(),warehouseId,warehouseName);
carsLoadAsyncService.abnormalListUnloadByLoadIdAndWarehouseId(loadId, warehouseId, warehouseName, loadScanId, AuthUtil.getTenantId(), AuthUtil.getUserId(), AuthUtil.getNickName(), Func.firstLong(AuthUtil.getDeptId()));
} catch (Exception e) {
log.warn("###############unloadPackageNoXz: 存入异常列表记录失败");
@ -12656,7 +12685,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
Long wid = parcelListEntity.getWarehouseId();
String wName = parcelListEntity.getWarehouse();
Long pacakageId = parcelListEntity.getId();
Long waybillId = null;
Long waybillId = parcelListEntity.getWaybillId();;
DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, wid);
if (Objects.isNull(stockArticleEntity)) {
@ -12667,6 +12696,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
//需要补装车扫记录
TrunklineCarsLoadScanEntity trunklineCarsLoadScanEntity = new TrunklineCarsLoadScanEntity();
trunklineCarsLoadScanEntity.setReserve5("210");
trunklineCarsLoadScanEntity.setWarehouseId(warehouseId);
trunklineCarsLoadScanEntity.setWarehouseName(warehouseName);
trunklineCarsLoadScanEntity.setLoadId(loadId);
@ -12709,6 +12739,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
distributionStockArticleClient.submitHandleNumByOrderId(1, articleId);
distributionParcelListClient.updateOrderPackageCodeById(pacakageId, "60");
String operationRemark = "干线异常到达"+warehouseName+"，到达时间"+ CommonUtil.dateToStringGeneral(new Date());
openOrderAsyncService.saveAbnormalLog(waybillId,waybillNumber,"61",warehouseName+" 已到达",operationRemark,AuthUtil.getNickName(),AuthUtil.getUserId(),warehouseId,warehouseName);
Long currentOrderId = null;
//查询当前仓库订单信息有没有
@ -12796,6 +12828,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
//无装车记录异常日志记录
try {
assert carsLoadAsyncService != null;
carsLoadAsyncService.abnormalListUnloadByLoadIdAndWarehouseId(loadId, warehouseId, warehouseName, loadScanId, AuthUtil.getTenantId(), AuthUtil.getUserId(), AuthUtil.getNickName(), Func.firstLong(AuthUtil.getDeptId()));
} catch (Exception e) {
@ -12804,6 +12837,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
} else {
String scanStatus = carsLoadScanEntity.getScanStatus();
if(!"1".equals(scanStatus)){
carsLoadScanEntity.setUnloadTrayCode(unloadTrayCode);
carsLoadScanEntity.setUnloadTrayName(unloadTrayName);
@ -12827,6 +12861,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
carsLoadScanEntity.setUnloadAbnormal(1);
remark = "有数据,有计划,有装车,卸车目的地不正确,异常卸车";
}
carsLoadScanEntity.setReserve5("210");
carsLoadScanEntity.setUnloadNodeId(warehouseId);
carsLoadScanEntity.setUnloadNodeName(warehouseName);
carsLoadScanEntity.setUnloadNum(carsLoadScanEntity.getNum());

3
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillPackageServiceImpl.java
Unescape View File

@ -175,6 +175,9 @@ public class TrunklineWaybillPackageServiceImpl extends BaseServiceImpl<Trunklin
WarehouseWaybillEntity updateEntity = new WarehouseWaybillEntity();
updateEntity.setId(waybillEntity.getId());
Integer signNum = waybillEntity.getSignNum();
if(Objects.isNull(signNum)){
signNum = 0;
}
if(signNum == 0){
if(Objects.equals(totalCount, num)){
if(packageStatus == 0){

4
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java
Unescape View File

@ -7,7 +7,6 @@ import com.logpm.trunkline.entity.TrunklineWaybillTrackEntity;
import com.logpm.trunkline.mapper.TrunklineWaybillPackageMapper;
import com.logpm.trunkline.mapper.TrunklineWaybillTrackMapper;
import com.logpm.trunkline.service.IOpenOrderAsyncService;
import com.logpm.trunkline.service.ITrunklineWaybillOrderService;
import com.logpm.trunkline.service.ITrunklineWaybillPackageService;
import com.logpm.trunkline.service.ITrunklineWaybillTrackService;
import com.logpm.trunkline.vo.TrunklineWaybillTrackVO;
@ -73,6 +72,9 @@ public class TrunklineWaybillTrackServiceImpl extends BaseServiceImpl<TrunklineW
}
Integer signNum = warehouseWaybillEntity.getSignNum();
if(Objects.isNull(signNum)){
signNum = 0;
}
int newSignNum = signNum + num;
Integer waybillType = warehouseWaybillEntity.getWaybillType();
Long waybillId = warehouseWaybillEntity.getId();

14
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
Unescape View File

@ -1813,10 +1813,20 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
trayTypeEntity.setStockTotalNum(0);
if ("10".equals(trayType)) {//服务号
trayTypeEntity.setFilterValue(stockArticleEntity.getServiceNumber());
String serviceNumber = stockArticleEntity.getServiceNumber();
if(StringUtil.isBlank(serviceNumber)){
log.error("#############saveTrayTypeByOrderPackageCode: 服务号不存在 serviceNumber={}", serviceNumber);
throw new CustomerException(405, "服务号不存在，请切换打托方式");
}
trayTypeEntity.setFilterValue(serviceNumber);
} else if ("20".equals(trayType)) {//订单自编号
String orderCode = stockArticleEntity.getOrderCode();
if(StringUtil.isBlank(orderCode)){
log.error("#############saveTrayTypeByOrderPackageCode: 订单号不存在 orderCode={}", orderCode);
throw new CustomerException(405, "订单号不存在，请切换打托方式");
}
trayTypeEntity.setFilterId(stockArticleEntity.getId());
trayTypeEntity.setFilterValue(stockArticleEntity.getOrderCode());
trayTypeEntity.setFilterValue(orderCode);
} else if ("30".equals(trayType)) {//商场
Long mallId = stockArticleEntity.getMallId();
if (!Objects.isNull(mallId)) {

Write Preview
Loading…
Cancel
Save