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

1.一键装车修改

test
0.0 2 years ago
parent
6176545ce3
commit
4e7c2b84fc
22 changed files with 527 additions and 128 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. 5
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java
  2. 19
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java
  3. 34
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliverySelfVO.java
  4. 32
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppLoadscanVO.java
  5. 38
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppParcelListVO.java
  6. 69
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java
  7. 20
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
  8. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSigndetailController.java
  9. 6
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistributionAppDeliveryListDTO.java
  10. 8
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java
  11. 19
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
  12. 8
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliverySelfMapper.java
  13. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliverySelfMapper.xml
  14. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryTripartiteMapper.java
  15. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryTripartiteMapper.xml
  16. 16
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPackagereceiptMapper.xml
  17. 16
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAsyncService.java
  18. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryInfoService.java
  19. 18
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
  20. 61
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
  21. 6
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java
  22. 267
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

5
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java
Unescape View File

@ -165,5 +165,10 @@ public class DistributionParcelListEntity extends TenantEntity {
*/
@ApiModelProperty(value = "品牌名称")
private String brandName;
/**
* 配送状态
*/
@ApiModelProperty(value = "配送状态")
private String deliveryState;
}

19
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java
Unescape View File

@ -42,6 +42,18 @@ public class DistributionAppDeliveryListVO extends DistributionDeliveryListEntit
@ApiModelProperty(value = "装车件数")
private Integer loadingNub;
/**
* 装车订单数
*/
@ApiModelProperty(value = "装车订单数")
private Integer loadOrdNub;
/**
* 装车客户数
*/
@ApiModelProperty(value = "装车客户数")
private Integer loadCusNub;
/**
* 是否备货
@ -57,4 +69,11 @@ public class DistributionAppDeliveryListVO extends DistributionDeliveryListEntit
@ApiModelProperty(value = "预约客户数据")
private List<DistributionAppReservationVO> reservationList;
/**
* 包条数据
*/
@ApiModelProperty(value = "包条数据")
private List<DistributionAppParcelListVO> parcelListVOS;
}

34
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliverySelfVO.java
Unescape View File

@ -0,0 +1,34 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.distribution.vo.app;
import com.logpm.distribution.entity.DistributionDeliverySelfEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 自主配送信息列表 视图实体类
*
* @author Tjj
* @since 2023-07-04
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class DistributionAppDeliverySelfVO extends DistributionDeliverySelfEntity {
private static final long serialVersionUID = 1L;
}

32
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppLoadscanVO.java
Unescape View File

@ -0,0 +1,32 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.distribution.vo.app;
import lombok.Data;
/**
* 装车扫描表 App-视图实体类
*
* @author lmy
* @since 2023-07-24
*/
@Data
public class DistributionAppLoadscanVO {
private static final long serialVersionUID = 1L;
}

38
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppParcelListVO.java
Unescape View File

@ -0,0 +1,38 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.distribution.vo.app;
import com.logpm.distribution.entity.DistributionParcelListEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 在库订单包件清单 视图实体类
*
* @author cyz
* @since 2023-06-13
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class DistributionAppParcelListVO extends DistributionParcelListEntity {
private static final long serialVersionUID = 1L;
}

69
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java
Unescape View File

@ -7,12 +7,15 @@ import com.logpm.distribution.dto.DistributionDeliveryListDTO;
import com.logpm.distribution.dto.app.DistributionAppDeliveryListDTO;
import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO;
import com.logpm.distribution.entity.DistributionDeliveryListEntity;
import com.logpm.distribution.entity.DistributionDeliverySelfEntity;
import com.logpm.distribution.service.IDistributionDeliveryInfoService;
import com.logpm.distribution.service.IDistributionDeliveryListService;
import com.logpm.distribution.vo.DistributionDeliveryListVO;
import com.logpm.distribution.vo.DistributionStockArticleVO;
import com.logpm.distribution.vo.app.DistributionAppDeliveryListVO;
import com.logpm.distribution.vo.app.DistributionAppDeliverySelfVO;
import com.logpm.distribution.vo.app.DistributionAppLoadscanVO;
import com.logpm.distribution.vo.app.DistributionAppStockArticleVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -23,6 +26,7 @@ import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
* 预约列表 控制器
@ -41,10 +45,11 @@ public class DistributionDeliveryAppController {
/**
* 配送管理 列表
*/
@GetMapping("/list")
@GetMapping("/page")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "列表", notes = "DistributionAppDeliveryListDTO")
public R<IPage<DistributionAppDeliveryListVO>> list(DistributionAppDeliveryListDTO distributionDeliveryList, Query query) {
@ -52,11 +57,22 @@ public class DistributionDeliveryAppController {
return R.data(pages);
}
/**
* 配送管理 选择车辆
*/
@PostMapping("/vehicle")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "车辆列表", notes = "传入reservationId")
public R<List<DistributionAppDeliverySelfVO>> vehicle(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
List<DistributionAppDeliverySelfVO> distributionDeliverySelfEntityList = distributionDeliveryListService.selectDistributionAppDeliverySelfVOList(distrilbutionloadingscanDTO);
return R.data(distributionDeliverySelfEntityList);
}
/**
* 配送 查看客户
*/
@GetMapping("/custom")
@ApiOperationSupport(order = 1)
@ApiOperationSupport(order = 3)
@ApiOperation(value = "详情", notes = "传入DistributionDeliveryListDTO")
public R<DistributionAppDeliveryListVO> detail(DistributionAppDeliveryListDTO distributionDeliveryList) {
DistributionDeliveryListEntity detail = distributionDeliveryListService.getOne(Condition.getQueryWrapper(distributionDeliveryList));
@ -68,20 +84,31 @@ public class DistributionDeliveryAppController {
* 配送 查看订单
*/
@GetMapping("/order")
@ApiOperationSupport(order = 1)
@ApiOperationSupport(order = 4)
@ApiOperation(value = "查看订单", notes = "DistributionAppDeliveryListDTO")
public R<IPage<DistributionAppStockArticleVO>> order(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO, Query query) {
IPage<DistributionAppStockArticleVO> pages = distributionDeliveryInfoService.selectDistributionAppDeliveryorder(Condition.getPage(query), distributionAppDeliveryListDTO);
return R.data(pages);
}
/**
* 查看配送明细
*/
@GetMapping("/wrap")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "查看配送明细", notes = "DistributionAppDeliveryListDTO")
public R<DistributionAppDeliveryListVO> wrap(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO, Query query) {
DistributionAppDeliveryListVO distributionAppDeliveryListVO = distributionDeliveryListService.selectDistributionAppDeliverywrap(Condition.getPage(query), distributionAppDeliveryListDTO);
return R.data(distributionAppDeliveryListVO);
}
/**
* 配送管理 装车扫描
*/
@PostMapping("/loadingscan")
@ApiOperationSupport(order = 2)
@ApiOperationSupport(order = 6)
@ApiOperation(value = "装车扫描", notes = "传入DistrilbutionloadingscanDTO")
public R loadingscan(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
R msg = distributionDeliveryListService.loadingscan(distrilbutionloadingscanDTO);
@ -92,7 +119,7 @@ public class DistributionDeliveryAppController {
* 配送管理 库存品装车
*/
@PostMapping("/loadinginventory")
@ApiOperationSupport(order = 3)
@ApiOperationSupport(order = 7)
@ApiOperation(value = "库存品装车", notes = "传入DistrilbutionloadingscanDTO")
public R loadinginventory(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
R msg = distributionDeliveryListService.loadinginventory(distrilbutionloadingscanDTO);
@ -103,7 +130,7 @@ public class DistributionDeliveryAppController {
* 配送管理 装车扫描（取消）
*/
@PostMapping("/loadingscanoff")
@ApiOperationSupport(order = 4)
@ApiOperationSupport(order = 8)
@ApiOperation(value = "装车扫描（取消）", notes = "传入DistrilbutionloadingscanDTO")
public R loadingscanoff(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
R msg = distributionDeliveryListService.loadingscanoff(distrilbutionloadingscanDTO);
@ -111,13 +138,35 @@ public class DistributionDeliveryAppController {
}
/**
* 配送管理 装车确认(确认)
* 配送管理 装车确认(一键确认)
*/
@GetMapping("/oneack")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "装车确认(确认)）", notes = "DistrilbutionloadingscanDTO")
@PostMapping("/oneack")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "装车确认(一键确认)）", notes = "DistrilbutionloadingscanDTO")
public R oneack(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
R msg = distributionDeliveryListService.oneack(distrilbutionloadingscanDTO);
return msg;
}
/**
* 配送管理 装车确认
*/
@PostMapping("/loadingack")
@ApiOperationSupport(order = 10)
public R loadingack(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
R msg = distributionDeliveryListService.loadingack(distrilbutionloadingscanDTO);
return msg;
}
/**
* 配送管理 装车扫描(一键装车)
*/
@PostMapping("/oneloading")
@ApiOperationSupport(order = 11)
public R oneloading(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
R msg = distributionDeliveryListService.oneloading(distrilbutionloadingscanDTO);
return msg;
}
}

20
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
Unescape View File

@ -164,25 +164,9 @@ public class DistributionDeliveryListController extends BladeController {
// return msg;
// }
/**
* 配送管理 装车扫描(一键装车)
*/
@PostMapping("/oneloading")
@ApiOperationSupport(order = 2)
public R oneloading(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
R msg = distributionDeliveryListService.oneloading(distrilbutionloadingscanDTO);
return msg;
}
/**
* 配送管理 装车确认
*/
@PostMapping("/loadingack")
@ApiOperationSupport(order = 2)
public R loadingack(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
R msg = distributionDeliveryListService.loadingack(distrilbutionloadingscanDTO);
return msg;
}

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSigndetailController.java
Unescape View File

@ -84,7 +84,7 @@ public class DistributionSigndetailController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入distributionSigndetail")
@ApiOperation(value = "详情", notes = "传入distribution.Signdetail")
public R<DistributionSigndetailVO> detail(DistributionSigndetailDTO distributionSigndetail) {
DistributionSigndetailEntity detail = distributionSigndetailService.getOne(Condition.getQueryWrapper(distributionSigndetail));
DistributionSigndetailVO distributionSigndetailVO = new DistributionSigndetailVO();

6
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistributionAppDeliveryListDTO.java
Unescape View File

@ -39,4 +39,10 @@ public class DistributionAppDeliveryListDTO extends DistributionDeliveryListEnti
@ApiModelProperty(value = "查询创建时间")
private String createTime_query;
/**
* 是否扫描
*/
@ApiModelProperty(value = "是否扫描")
private String isScan;
}

8
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java
Unescape View File

@ -157,7 +157,7 @@ public interface DistributionDeliveryListMapper extends BaseMapper<DistributionD
*
* @return
*/
List<DistributionLoadscaninvnVO> selectdeliverOnevn(Long reservationId, Long deliveryId);
List<DistributionLoadscaninvnEntity> selectdeliverOnevn(@Param("reservationId") Long reservationId,@Param("deliveryId") Long deliveryId);
/**
* 通过配送任务库存品扫描（无拆包）
*
@ -181,4 +181,10 @@ public interface DistributionDeliveryListMapper extends BaseMapper<DistributionD
*/
List<DistributionStockArticleVO> getDeliveryStockArticleInfo(String id);
/**
* 查询所有的库存品(拆包)
*
* @return
*/
List<DistributionLoadscaninvnVO> selectdeliverOnevnopen(Long reservationId, Long deliveryId);
}

19
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
Unescape View File

@ -124,6 +124,21 @@
</if>
</where>
</select>
<select id="selectdeliverOnevnopen" resultType="com.logpm.distribution.vo.DistributionLoadscaninvnVO">
SELECT
lds.id packageId,
lds.stock_article orderId,
lds.coding packetBarCode,
lds.reservation_id reservationId,
1 packageNub,
lddl.id deliveryId,
lddl.train_number trainNumber
FROM
logpm_distribution_delivery_list lddl
join
logpm_distribution_stock lds on lds.delivery_list_id = lddl.id
where lddl.id = #{deliveryId} and ldpl.reservation_id =#{reservationId}
</select>
<select id="exportDistributionDeliveryList" resultType="com.logpm.distribution.excel.DistributionDeliveryListExcel">
@ -452,7 +467,7 @@
WHERE
lds.is_deleted = 0 and lddl.id = #{deliveryId} and ldsl.id =#{inventoryId}
</select>
<select id="selectdeliverOnevn" resultType="com.logpm.distribution.vo.DistributionLoadscaninvnVO">
<select id="selectdeliverOnevn" resultType="com.logpm.distribution.entity.DistributionLoadscaninvnEntity">
SELECT
ldsl.id inventoryId,
ldsl.packet_bar_code packetBarCode,
@ -465,7 +480,7 @@
JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id
JOIN logpm_distribution_stock_list ldsl ON ldrs.stocklist_id = ldsl.id
WHERE
lds.is_deleted = 0 and lddl.id = #{deliveryId} and ldsl.id =#{inventoryId}
lds.is_deleted = 0 and lddl.id = #{deliveryId} and lds.reservation_id =#{reservationId}
</select>
<select id="selectdeliveryworkVnScan" resultType="com.logpm.distribution.entity.DistributionLoadscaninvnEntity">
SELECT

8
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliverySelfMapper.java
Unescape View File

@ -22,6 +22,7 @@ import com.logpm.distribution.excel.DistributionDeliverySelfExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.distribution.vo.app.DistributionAppDeliverySelfVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -50,7 +51,12 @@ public interface DistributionDeliverySelfMapper extends BaseMapper<DistributionD
* @return
*/
List<DistributionDeliverySelfExcel> exportDistributionDeliverySelf(@Param("ew") Wrapper<DistributionDeliverySelfEntity> queryWrapper);
/**
* 自定义查询配送的信息
*
* @return
*/
List<DistributionAppDeliverySelfVO> selectListcustom(Long deliveryId);
/**
* 查询配送任务自主配送司机车辆信息
* @param id

3
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliverySelfMapper.xml
Unescape View File

@ -49,5 +49,8 @@
</if>
</where>
</select>
<select id="selectListcustom" resultType="com.logpm.distribution.vo.app.DistributionAppDeliverySelfVO">
select id id,driver_id driverId, vehicle_id vehicleId,is_master isMaster,driver_name driverName,vehicle_nub vehicleNub FROM logpm_distribution_delivery_self where delivery_id = #{deliveryId}
</select>
</mapper>

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryTripartiteMapper.java
Unescape View File

@ -22,6 +22,7 @@ import com.logpm.distribution.excel.DistributionDeliveryTripartiteExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.distribution.vo.app.DistributionAppDeliverySelfVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -57,4 +58,5 @@ public interface DistributionDeliveryTripartiteMapper extends BaseMapper<Distrib
* @return
*/
DistributionDeliveryTripartiteVO getDeliveryTripartiteInfo(String id);
List<DistributionAppDeliverySelfVO> selectListcustom(Long deliveryId);
}

3
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryTripartiteMapper.xml
Unescape View File

@ -47,5 +47,8 @@
</if>
</where>
</select>
<select id="selectListcustom" resultType="com.logpm.distribution.vo.app.DistributionAppDeliverySelfVO">
select id id,driver_name driverName,vehicle_num vehicleNub FROM logpm_distribution_delivery_tripartite FROM logpm_distribution_delivery_tripartite where delivery_id = #{deliveryId}
</select>
</mapper>

16
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPackagereceiptMapper.xml
Unescape View File

@ -35,9 +35,9 @@
</select>
<select id="selectListByMasterId" resultType="com.logpm.distribution.vo.DistributionPackagereceiptVO">
SELECT
ldpg.id id,
ldpl.id id,
ldpl.warehouse warehouse,
ldpl.conditions conditions,
ldl.signfor_state signforState,
ldpl.packet_bar_code packetBarCode,
ldpl.goods_allocation goodsAllocation,
ldpl.pallet pallet,
@ -46,16 +46,10 @@
ldpl.third_product thirdProduct,
ldpl.material material,
ldpl.quantity quantity,
ldsf.service_number serviceNumber,
ldsf.train_number trainNumber,
ldpg.state state,
ldpg.received_quantity stareceivedQuantityte
(SELECT lddl.train_number from logpm_distribution_delivery_list lddl WHERE lddl.id =ldl.delivery_id) trainNumber
FROM
logpm_distribution_packagereceipt ldpg
JOIN logpm_distribution_parcel_list ldpl ON ldpg.wrap_bar_id = ldpl.id
JOIN logpm_distribution_signfor ldsf ON ldpg.master_id = ldsf.id
WHERE
ldpg.is_deleted = 0
logpm_distribution_loadscan ldl join logpm_distribution_parcel_list ldpl on ldpl.id =ldl.package_id where ldl.order_id = #{id}
</select>
</mapper>

16
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAsyncService.java
Unescape View File

@ -0,0 +1,16 @@
package com.logpm.distribution.service;
import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO;
/**
* 配送签收异步线程
*/
public interface IDistributionAsyncService {
/**
* 从包条扫描状态处理订单，客户，配送状态
*
* @param distrilbutionloadingscanDTO
* @return
*/
void makeSureByPackage(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO);
}

3
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryInfoService.java
Unescape View File

@ -25,6 +25,8 @@ import com.logpm.distribution.excel.DistributionDeliveryInfoExcel;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.distribution.vo.DistributionStockArticleVO;
import com.logpm.distribution.vo.DistributionStockListVO;
import com.logpm.distribution.vo.app.DistributionAppDeliveryListVO;
import com.logpm.distribution.vo.app.DistributionAppLoadscanVO;
import com.logpm.distribution.vo.app.DistributionAppStockArticleVO;
import org.springblade.core.mp.base.BaseService;
import java.util.List;
@ -93,4 +95,5 @@ public interface IDistributionDeliveryInfoService extends BaseService<Distributi
* @return
*/
IPage<DistributionAppStockArticleVO> selectDistributionAppDeliveryorder(IPage<DistributionAppStockArticleVO> page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO);
}

18
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
Unescape View File

@ -22,6 +22,7 @@ import com.logpm.distribution.dto.DistributionDeliveryListDTO;
import com.logpm.distribution.dto.app.DistributionAppDeliveryListDTO;
import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO;
import com.logpm.distribution.entity.DistributionDeliveryListEntity;
import com.logpm.distribution.entity.DistributionDeliverySelfEntity;
import com.logpm.distribution.vo.DistributionDeliveryListPrintReponseVO;
import com.logpm.distribution.vo.DistributionDeliveryListPrintRequestVO;
import com.logpm.distribution.vo.DistributionDeliveryListVO;
@ -29,6 +30,8 @@ import com.logpm.distribution.excel.DistributionDeliveryListExcel;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.distribution.vo.DistributionstatisticsnmbVO;
import com.logpm.distribution.vo.app.DistributionAppDeliveryListVO;
import com.logpm.distribution.vo.app.DistributionAppDeliverySelfVO;
import com.logpm.distribution.vo.app.DistributionAppLoadscanVO;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.tool.api.R;
@ -94,7 +97,7 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
*/
R oneloading(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO);
/**
*App-装车扫描(确认)
*App-装车扫描(一键确认)
*/
R oneack(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO);
/**
@ -125,7 +128,18 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
* App-配送管理 详情
*/
DistributionAppDeliveryListVO getAppDeliverydetailVO(DistributionDeliveryListEntity detail);
/**
* App-配送管理 选择车辆
*/
List<DistributionAppDeliverySelfVO> selectDistributionAppDeliverySelfVOList(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO);
/**
* App-查看配送明细
*
* @param page
* @param distributionAppDeliveryListDTO
* @return
*/
DistributionAppDeliveryListVO selectDistributionAppDeliverywrap(IPage<DistributionAppLoadscanVO> page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO);
/**
* 查询配送任务详情
* @param id

61
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
Unescape View File

@ -0,0 +1,61 @@
package com.logpm.distribution.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO;
import com.logpm.distribution.entity.DistributionLoadscanEntity;
import com.logpm.distribution.entity.DistributionParcelListEntity;
import com.logpm.distribution.mapper.DistributionLoadscanMapper;
import com.logpm.distribution.mapper.DistributionParcelListMapper;
import com.logpm.distribution.service.IDistributionAsyncService;
import lombok.AllArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@Log4j2
@Service
@AllArgsConstructor
public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
private final DistributionLoadscanMapper distributionLoadscanMapper;
private final DistributionParcelListServiceImpl distributionParcelListService;
private final DistributionParcelListMapper distributionParcelListMapper;
@Override
@Async
@Transactional(isolation = Isolation.READ_UNCOMMITTED, rollbackFor = Exception.class)
public void makeSureByPackage(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
log.info("[makeSureByPackage]线程开启>>>>>>>>>>>>>>>>>>>>>>>>{}",distrilbutionloadingscanDTO);
//查询该扫描车次扫描的所有在库包条
List<DistributionLoadscanEntity> distributionLoadscanEntities = distributionLoadscanMapper.selectList(new QueryWrapper<DistributionLoadscanEntity>().lambda()
.eq(DistributionLoadscanEntity::getDeliveryId,distrilbutionloadingscanDTO.getDeliveryId())
);
if (distributionLoadscanEntities.size()<0){log.info("[makeSureByPackage]包条无数据"); return;}
// 使用流式操作和映射，提取包条Id并创建新的列表
List<Long> PackageIdList = distributionLoadscanEntities.stream().map(DistributionLoadscanEntity::getPackageId).collect(Collectors.toList());
//修改状态包条状态
distributionParcelListService.update(new UpdateWrapper<DistributionParcelListEntity>().lambda()
.in(DistributionParcelListEntity::getId,PackageIdList)
.set(DistributionParcelListEntity::getDeliveryState,"5")
);
//提取订单Id(去重)
List<Long> OrderList = distributionLoadscanEntities.stream().map(DistributionLoadscanEntity::getOrderId).distinct().collect(Collectors.toList());
//查询修改订单状态
List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListMapper.selectList(new QueryWrapper<DistributionParcelListEntity>().lambda()
.in(DistributionParcelListEntity::getStockArticleId, OrderList)
//.eq(DistributionParcelListEntity::get)
);
}
}

6
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java
Unescape View File

@ -25,7 +25,12 @@ import com.logpm.distribution.mapper.DistributionDeliveryInfoMapper;
import com.logpm.distribution.service.IDistributionDeliveryInfoService;
import com.logpm.distribution.vo.DistributionStockArticleVO;
import com.logpm.distribution.vo.DistributionStockListVO;
import com.logpm.distribution.vo.app.DistributionAppDeliveryListVO;
import com.logpm.distribution.vo.app.DistributionAppLoadscanVO;
import com.logpm.distribution.vo.app.DistributionAppStockArticleVO;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -87,4 +92,5 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
return page.setRecords(distributionAppStockArticleVOS);
}
}

267
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
Unescape View File

@ -23,13 +23,16 @@ import com.logpm.distribution.dto.app.DistributionAppDeliveryListDTO;
import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO;
import com.logpm.distribution.entity.*;
import com.logpm.distribution.mapper.*;
import com.logpm.distribution.service.IDistributionAsyncService;
import com.logpm.distribution.vo.*;
import com.logpm.distribution.excel.DistributionDeliveryListExcel;
import com.logpm.distribution.service.IDistributionDeliveryListService;
import com.logpm.distribution.vo.app.DistributionAppDeliveryListVO;
import com.logpm.distribution.vo.app.DistributionAppDeliverySelfVO;
import com.logpm.distribution.vo.app.DistributionAppLoadscanVO;
import com.logpm.distribution.vo.app.DistributionAppReservationVO;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.lang.StringUtils;
import org.springblade.common.serviceConstant.ServiceConstant;
import org.springblade.core.redis.cache.BladeRedis;
@ -56,7 +59,7 @@ import java.util.*;
*/
@Service
@AllArgsConstructor
@Slf4j
@Log4j2
public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<DistributionDeliveryListMapper, DistributionDeliveryListEntity> implements IDistributionDeliveryListService {
private final DistributionDeliveryInfoMapper distributionDeliveryInfoMapper;
private final DistributionReservationMapper distributionReservationMapper;
@ -75,6 +78,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
private final DistributionReservationStockarticleMapper distributionReservationStockarticleMapper;
private final DistributionStockupMapper distributionStockupMapper;
private final BladeRedis bladeRedis;
private final IDistributionAsyncService distributionAsyncService;
@Override
public IPage<DistributionDeliveryListVO> selectDistributionDeliveryListPage(IPage<DistributionDeliveryListVO> page, DistributionDeliveryListDTO distributionDeliveryList) {
@ -108,10 +112,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
//装车件数
Integer sum = distributionSignforMapper.selectloadNub(distributionDeliveryListVO.getId());
distributionDeliveryListVO.setLoadNub(sum);
// if (detail.getSource() == 1) {
//查询客户信息
List<DistributionDeliveryInfoVO> customList = distributionDeliveryInfoMapper.selectcustomList(detail.getId());
distributionDeliveryListVO.setReservationList(customList);
// if (detail.getSource() == 1) {
//查询客户信息
List<DistributionDeliveryInfoVO> customList = distributionDeliveryInfoMapper.selectcustomList(detail.getId());
distributionDeliveryListVO.setReservationList(customList);
// } else if (detail.getSource() == 2) {
// //查询订单信息
// List<DistributionDeliveryInfoVO> customList = distributionDeliveryInfoMapper.selectcustomListByOrderId(detail.getOrderId());
@ -131,16 +135,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
DistributionstatisticsnmbVO distributionstatisticsnmbVO = new DistributionstatisticsnmbVO();
//商配车次
Integer a = baseMapper.selectBycommercialNub(distributionDeliveryList);
Integer commercialNub = a != null ? a: 0;
Integer commercialNub = a != null ? a : 0;
//商配件数
Integer b = baseMapper.selectcommercialTotal(distributionDeliveryList);
Integer commercialTotal = b != null ? b: 0;
Integer commercialTotal = b != null ? b : 0;
//市配车次
Integer c = baseMapper.selectmarketNub(distributionDeliveryList);
Integer marketNub = c != null ? c: 0;
Integer marketNub = c != null ? c : 0;
//市配件数
Integer d = baseMapper.selectmarketTotal(distributionDeliveryList);
Integer marketTotal = d != null ? d: 0;
Integer marketTotal = d != null ? d : 0;
//配送总车次
distributionstatisticsnmbVO.setVehiclesNub(commercialNub + marketNub);
//配送总件数
@ -245,11 +249,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
//获取当前用户司机
DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
DistributionDeliverySelfEntity distributionDeliverySelfEntity = null;
if (distributionDeliveryListEntity.getKind().equals("1")){
if (distributionDeliveryListEntity.getKind().equals("1")) {
distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectById(distrilbutionloadingscanDTO.getLoadingId());
}else {
} else {
DistributionDeliveryTripartiteEntity distributionDeliveryTripartiteEntity = distributionDeliveryTripartiteMapper.selectById(distrilbutionloadingscanDTO.getLoadingId());
BeanUtils.copyProperties(distributionDeliveryTripartiteEntity,distributionDeliverySelfEntity);
BeanUtils.copyProperties(distributionDeliveryTripartiteEntity, distributionDeliverySelfEntity);
}
if (distrilbutionloadingscanDTO.getType() == 1) {
@ -278,8 +282,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
return R.fail(3002, "重复扫码");
}
//依次插入该装车记录,设置车辆
if (null != distributionDeliverySelfEntity.getDriverId()){
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
if (null != distributionDeliverySelfEntity.getDriverId()) {
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
}
distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName());
distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub());
@ -289,8 +293,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
if (null != distributionDeliverySelfEntity.getDriverPhone()) {
distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
}
if (null != distributionDeliverySelfEntity.getVehicleId()){
distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
if (null != distributionDeliverySelfEntity.getVehicleId()) {
distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
}
distributionLoadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId());
//distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.);
@ -372,8 +376,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
return R.fail(3002, "重复扫码");
}
//依次插入该装车记录,设置车辆
if (null != distributionDeliverySelfEntity.getDriverId()){
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
if (null != distributionDeliverySelfEntity.getDriverId()) {
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
}
distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName());
distributionLoadscanEntity.setScanStatus(2);
@ -384,8 +388,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
if (null != distributionDeliverySelfEntity.getDriverPhone()) {
distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
}
if (null != distributionDeliverySelfEntity.getVehicleId()){
distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
if (null != distributionDeliverySelfEntity.getVehicleId()) {
distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
}
//distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.);
//依次更新该装车记录,设置车辆
@ -428,8 +432,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
return R.fail(3004, "有其他车次货物");
}
//依次插入该装车记录,设置车辆
if (null != distributionDeliverySelfEntity.getDriverId()){
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
if (null != distributionDeliverySelfEntity.getDriverId()) {
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
}
distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName());
distributionLoadscanEntity.setScanStatus(2);
@ -441,8 +445,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
if (null != distributionDeliverySelfEntity.getDriverPhone()) {
distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
}
if (null != distributionDeliverySelfEntity.getVehicleId()){
distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
if (null != distributionDeliverySelfEntity.getVehicleId()) {
distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
}
//查询本车次是否第一次扫码,没有则更新上车时间
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
@ -462,8 +466,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
return R.fail(3002, "重复扫码");
}
//依次插入该装车记录,设置车辆
if (null != distributionDeliverySelfEntity.getDriverId()){
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
if (null != distributionDeliverySelfEntity.getDriverId()) {
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
}
distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName());
distributionLoadscanEntity.setScanStatus(2);
@ -474,8 +478,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
if (null != distributionDeliverySelfEntity.getDriverPhone()) {
distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
}
if (null != distributionDeliverySelfEntity.getVehicleId()){
distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
if (null != distributionDeliverySelfEntity.getVehicleId()) {
distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
}
//查询本车次是否第一次扫码,没有则更新上车时间
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
@ -502,8 +506,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
return R.fail(3002, "重复扫描");
}
//依次插入该装车记录,设置车辆
if (null != distributionDeliverySelfEntity.getDriverId()){
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());}
if (null != distributionDeliverySelfEntity.getDriverId()) {
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
}
distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName());
distributionLoadscanEntity.setScanStatus(2);
distributionLoadscanEntity.setScanType("3");
@ -514,8 +519,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
if (null != distributionDeliverySelfEntity.getDriverPhone()) {
distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
}
if (null != distributionDeliverySelfEntity.getVehicleId()){
distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());}
if (null != distributionDeliverySelfEntity.getVehicleId()) {
distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
}
//查询本车次是否第一次扫码,没有则更新上车时间
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
//更新签收表的装车数量
@ -536,8 +542,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
return R.fail(3002, "重复扫描");
}
//依次插入该装车记录,设置车辆
if (null != distributionDeliverySelfEntity.getDriverId()){
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());}
if (null != distributionDeliverySelfEntity.getDriverId()) {
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
}
distributionLoadscanEntity.setDriverId(distrilbutionloadingscanDTO.getLoadingId());
distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName());
distributionLoadscanEntity.setScanStatus(2);
@ -548,8 +555,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
if (null != distributionDeliverySelfEntity.getDriverPhone()) {
distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
}
if (null !=distributionDeliverySelfEntity.getVehicleId()){
distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
if (null != distributionDeliverySelfEntity.getVehicleId()) {
distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
}
//查询本车次是否第一次扫码,没有则更新上车时间
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
@ -571,14 +578,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
//查询当前任务有是否全部上车
DistributionDeliveryListEntity distributionDeliveryListEntity = baseMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
if (distributionDeliveryListEntity.getScannedNumber() < distributionDeliveryListEntity.getDeliveryNumber()) {
List<DistributionReservationEntity> distributionReservationEntities = baseMapper.selectRservationByDeliveryId(distrilbutionloadingscanDTO.getDeliveryId());
List<DistributionReservationEntity> distributionReservationEntities = baseMapper.selectRservationByDeliveryId(distrilbutionloadingscanDTO.getDeliveryId());
for (DistributionReservationEntity distributionReservationEntity : distributionReservationEntities) {
Long Sum = distributionLoadscanMapper.selectCount(new QueryWrapper<DistributionLoadscanEntity>().lambda()
.eq(DistributionLoadscanEntity::getReservationId,distributionReservationEntity.getId())
.ne(DistributionLoadscanEntity::getScanStatus,1)
.ne(DistributionLoadscanEntity::getScanStatus,4)
.eq(DistributionLoadscanEntity::getReservationId, distributionReservationEntity.getId())
.ne(DistributionLoadscanEntity::getScanStatus, 1)
.ne(DistributionLoadscanEntity::getScanStatus, 4)
);
if (distributionReservationEntity.getReservationNum()<=Sum){
if (distributionReservationEntity.getReservationNum() <= Sum) {
distributionReservationEntities.remove(distributionReservationEntity);
}
}
@ -606,20 +613,22 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
*/
//获取当前用户司机
DistributionDeliverySelfEntity distributionDeliverySelfEntity = null;
if (StringUtils.isBlank(distrilbutionloadingscanDTO.getLoadingId())){
if (StringUtils.isBlank(distrilbutionloadingscanDTO.getLoadingId())) {
distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectOne(new QueryWrapper<DistributionDeliverySelfEntity>().lambda()
.eq(DistributionDeliverySelfEntity::getIsMaster,2)
.eq(DistributionDeliverySelfEntity::getDeliveryId,distrilbutionloadingscanDTO.getDeliveryId())
.eq(DistributionDeliverySelfEntity::getIsMaster, 2)
.eq(DistributionDeliverySelfEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
);
}else {
distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectById(distrilbutionloadingscanDTO.getLoadingId());
} else {
distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectById(distrilbutionloadingscanDTO.getLoadingId());
}
//先查询有数据的
List<DistributionLoadscanEntity> distributionLoadscanEntities = baseMapper.selectdeliverOne(distrilbutionloadingscanDTO.getReservationId(), distrilbutionloadingscanDTO.getDeliveryId());
//无数据的
// List<DistributionLoadscanEntity> distributionLoadscanEntitiesno = baseMapper.selectdeliverOneNo(distrilbutionloadingscanDTO.getReservationId(), distrilbutionloadingscanDTO.getDeliveryId());
//查询所有的库存品
List<DistributionLoadscaninvnVO> distributionLoadscanvnEntities = baseMapper.selectdeliverOnevn(distrilbutionloadingscanDTO.getReservationId(), distrilbutionloadingscanDTO.getDeliveryId());
// List<DistributionLoadscanEntity> distributionLoadscanEntitiesno = baseMapper.selectdeliverOneNo(distrilbutionloadingscanDTO.getReservationId(), distrilbutionloadingscanDTO.getDeliveryId());
//查询所有的库存品(无拆包)
List<DistributionLoadscaninvnEntity> distributionLoadscanvnEntities = baseMapper.selectdeliverOnevn(distrilbutionloadingscanDTO.getReservationId(), distrilbutionloadingscanDTO.getDeliveryId());
//查询所有的库存品(拆包)
List<DistributionLoadscaninvnVO> distributionLoadscanvnEntitiesopen = baseMapper.selectdeliverOnevnopen(distrilbutionloadingscanDTO.getReservationId(), distrilbutionloadingscanDTO.getDeliveryId());
//将该客户所有的物品上该车辆
if (distributionLoadscanEntities.size() > 0) {
for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) {
@ -633,8 +642,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
continue;
}
//依次插入该装车记录,设置车辆
if (StringUtils.isNotBlank(distributionDeliverySelfEntity.getDriverId())){
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());}
if (StringUtils.isNotBlank(distributionDeliverySelfEntity.getDriverId())) {
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
}
distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName());
distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub());
distributionLoadscanEntity.setScanStatus(2);
@ -643,8 +653,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
if (StringUtils.isNotBlank(distributionDeliverySelfEntity.getDriverPhone())) {
distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
}
if (StringUtils.isNotBlank(distributionDeliverySelfEntity.getVehicleId())){
distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());}
if (StringUtils.isNotBlank(distributionDeliverySelfEntity.getVehicleId())) {
distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
}
distributionLoadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId());
//查询本车次是否第一次扫码,没有则更新上车时间
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
@ -654,7 +665,62 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
distributionLoadscanService.saveBatch(distributionLoadscanEntities);
}
//库存品装车
if (distributionLoadscanvnEntities.size() > 0) {
for (DistributionLoadscaninvnEntity distributionLoadscanEntity : distributionLoadscanvnEntities) {
//依次插入该装车记录,设置车辆
if (null != distributionDeliverySelfEntity.getDriverId()) {
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
}
distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName());
distributionLoadscanEntity.setScanStatus(2);
distributionLoadscanEntity.setScanType("1");
distributionLoadscanEntity.setScanTime(new Date());
if (null == distributionLoadscanEntity.getPackageNub()) {
distributionLoadscanEntity.setPackageNub(1);
}
distributionLoadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId());
distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub());
if (null != distributionDeliverySelfEntity.getDriverPhone()) {
distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
}
if (null != distributionDeliverySelfEntity.getVehicleId()) {
distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
}
//查询本车次是否第一次扫码,没有则更新上车时间
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
//更新签收表的装车数量
Integer j = distributionSignforMapper.updateloadByReservationId(distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
}
distributionLoadscaninvnService.saveBatch(distributionLoadscanvnEntities);
}
if (distributionLoadscanvnEntitiesopen.size() > 0) {
for (DistributionLoadscaninvnEntity distributionLoadscanEntity : distributionLoadscanvnEntitiesopen) {
//依次插入该装车记录,设置车辆
if (null != distributionDeliverySelfEntity.getDriverId()) {
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
}
distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName());
distributionLoadscanEntity.setScanStatus(2);
distributionLoadscanEntity.setScanType("1");
distributionLoadscanEntity.setScanTime(new Date());
if (null == distributionLoadscanEntity.getPackageNub()) {
distributionLoadscanEntity.setPackageNub(1);
}
distributionLoadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId());
distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub());
if (null != distributionDeliverySelfEntity.getDriverPhone()) {
distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
}
if (null != distributionDeliverySelfEntity.getVehicleId()) {
distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
}
//查询本车次是否第一次扫码,没有则更新上车时间
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
//更新签收表的装车数量
Integer j = distributionSignforMapper.updateloadByReservationId(distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
}
distributionLoadscaninvnService.saveBatch(distributionLoadscanvnEntities);
}
// if (distributionLoadscanEntitiesno.size() > 0) {
// for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntitiesno) {
// //查询是否重复扫码
@ -696,15 +762,17 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
public R oneack(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
//获取当前用户司机
//DistributionDeliverySelfEntity distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectById(distrilbutionloadingscanDTO.getLoadingId());
//将当前车次的所有信息装车
//将当前车次的所有信息确认装车
boolean update = distributionLoadscanService.update(new UpdateWrapper<DistributionLoadscanEntity>().lambda()
.eq(DistributionLoadscanEntity::getDeliveryId,distrilbutionloadingscanDTO.getDeliveryId())
.set(DistributionLoadscanEntity::getScanStatus,3)
.eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
.set(DistributionLoadscanEntity::getScanStatus, 3)
);
//库存品装车
//异步确认包条扫描信息
distributionAsyncService.makeSureByPackage(distrilbutionloadingscanDTO);
//库存品确认装车
distributionLoadscaninvnService.update(new UpdateWrapper<DistributionLoadscaninvnEntity>().lambda()
.eq(DistributionLoadscaninvnEntity::getDeliveryId,distrilbutionloadingscanDTO.getDeliveryId())
.set(DistributionLoadscaninvnEntity::getScanStatus,3)
.eq(DistributionLoadscaninvnEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
.set(DistributionLoadscaninvnEntity::getScanStatus, 3)
);
return R.status(update);
}
@ -802,22 +870,22 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
//获取当前用户司机
DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
DistributionDeliverySelfEntity distributionDeliverySelfEntity = null;
if (distributionDeliveryListEntity.getKind().equals("1")){
if (distributionDeliveryListEntity.getKind().equals("1")) {
distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectById(distrilbutionloadingscanDTO.getLoadingId());
}else {
} else {
DistributionDeliveryTripartiteEntity distributionDeliveryTripartiteEntity = distributionDeliveryTripartiteMapper.selectById(distrilbutionloadingscanDTO.getLoadingId());
BeanUtils.copyProperties(distributionDeliveryTripartiteEntity,distributionDeliverySelfEntity);
BeanUtils.copyProperties(distributionDeliveryTripartiteEntity, distributionDeliverySelfEntity);
}
boolean b =false;
if (distrilbutionloadingscanDTO.getInventorytype()==3){
boolean b = false;
if (distrilbutionloadingscanDTO.getInventorytype() == 3) {
//无拆包
List<DistributionLoadscaninvnEntity> distributionLoadscanvnEntities = new ArrayList<>();
distributionLoadscanvnEntities = baseMapper.selectdeliveryworkVnScan(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
if (distributionLoadscanvnEntities.size() <= 0) {
//拆包从备货查询
distributionLoadscanvnEntities = baseMapper.selectdeliveryworkVnScanStock(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
if (distributionLoadscanvnEntities.size()<=0){
return R.fail(3001, "窜货");
if (distributionLoadscanvnEntities.size() <= 0) {
return R.fail(3001, "窜货");
}
}
for (DistributionLoadscaninvnEntity distributionLoadscanEntity : distributionLoadscanvnEntities) {
@ -831,13 +899,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
// return R.fail(3002, "重复货物");
// }
//依次插入该装车记录,设置车辆
if (null !=distributionDeliverySelfEntity.getDriverId()){
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());}
if (null != distributionDeliverySelfEntity.getDriverId()) {
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
}
distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName());
distributionLoadscanEntity.setScanStatus(2);
distributionLoadscanEntity.setScanType("1");
distributionLoadscanEntity.setScanTime(new Date());
if (null == distributionLoadscanEntity.getPackageNub() ){
if (null == distributionLoadscanEntity.getPackageNub()) {
distributionLoadscanEntity.setPackageNub(1);
}
distributionLoadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId());
@ -845,15 +914,17 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
if (null != distributionDeliverySelfEntity.getDriverPhone()) {
distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
}
if (null != distributionDeliverySelfEntity.getVehicleId()){
distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());}
if (null != distributionDeliverySelfEntity.getVehicleId()) {
distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
}
//查询本车次是否第一次扫码,没有则更新上车时间
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
//更新签收表的装车数量
Integer j = distributionSignforMapper.updateloadByReservationId(distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
}
b = distributionLoadscaninvnService.saveBatch(distributionLoadscanvnEntities);
}else if (distrilbutionloadingscanDTO.getInventorytype()==1){
b = distributionLoadscaninvnService.saveBatch(distributionLoadscanvnEntities);
} else if (distrilbutionloadingscanDTO.getInventorytype() == 1) {
//TODO 库存品手动输入
}
return R.status(b);
@ -877,16 +948,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
@Override
public R singleloading(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
List<DistributionLoadscanEntity> distributionLoadscanEntities = distributionLoadscanMapper.selectList(new QueryWrapper<DistributionLoadscanEntity>().lambda()
.ne(DistributionLoadscanEntity::getScanStatus,1)
.eq(DistributionLoadscanEntity::getDeliveryId,distrilbutionloadingscanDTO.getDeliveryId())
.eq(DistributionLoadscanEntity::getPacketBarCode,distrilbutionloadingscanDTO.getBarcode())
.ne(DistributionLoadscanEntity::getScanStatus, 1)
.eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
.eq(DistributionLoadscanEntity::getPacketBarCode, distrilbutionloadingscanDTO.getBarcode())
);
if (distributionLoadscanEntities.size()< 0){
if (distributionLoadscanEntities.size() < 0) {
return R.fail(3005, "该货物未装车");
}
boolean b =false;
boolean b = false;
for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) {
b = distributionLoadscanService.updateById(distributionLoadscanEntity);
b = distributionLoadscanService.updateById(distributionLoadscanEntity);
}
return R.status(b);
}
@ -916,7 +987,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
Func.copy(detail, distributionAppDeliveryListVO);
// //装车件数
// Integer sum = distributionSignforMapper.selectloadNub(distributionAppDeliveryListVO.getId());
// distributionAppDeliveryListVO.setLoadingNub(sum);
// distributionAppDeliveryListVO.setLoadingNub(sum);
//查询客户
List<DistributionAppReservationVO> customList = distributionDeliveryInfoMapper.selectAppcustomList(detail.getId());
distributionAppDeliveryListVO.setReservationList(customList);
@ -949,4 +1020,36 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
//4、结果封装
return deliveryListVO;
}
@Override
public List<DistributionAppDeliverySelfVO> selectDistributionAppDeliverySelfVOList(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
//查询该配送类型
DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
List<DistributionAppDeliverySelfVO> distributionAppDeliverySelfVOS = new ArrayList<>();
if (distributionDeliveryListEntity.getKind().equals("1")) {
//自主配送
distributionAppDeliverySelfVOS = distributionDeliverySelfMapper.selectListcustom(distrilbutionloadingscanDTO.getDeliveryId());
} else {
//三方配送
distributionAppDeliverySelfVOS = distributionDeliveryTripartiteMapper.selectListcustom(distrilbutionloadingscanDTO.getDeliveryId());
}
return distributionAppDeliverySelfVOS;
}
@Override
public DistributionAppDeliveryListVO selectDistributionAppDeliverywrap(IPage<DistributionAppLoadscanVO> page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
//查询配送
DistributionDeliveryListEntity distributionDeliveryListEntity = baseMapper.selectById(distributionAppDeliveryListDTO.getId());
DistributionAppDeliveryListVO distributionAppDeliveryListVO = new DistributionAppDeliveryListVO();
Func.copy(distributionDeliveryListEntity, distributionAppDeliveryListVO);
//查询完成客户数
//查询完成订单数
//查询该配送所有包条
//distributionParcelListMapper.selectList();
return null;
}
}

Write Preview
Loading…
Cancel
Save