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

Merge branch 'fix_bug_20231216' into fix_bug_20231220 

# Conflicts:
#	blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
#	blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
single_db
pref_mail@163.com 1 year ago
parent
09b2e9f3ce ddfed431d6
commit
fb48089535
14 changed files with 324 additions and 81 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. 6
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java
  2. 43
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
  3. 6
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java
  4. 148
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
  5. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java
  6. 24
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
  7. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
  8. 39
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
  9. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
  10. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryInfoService.java
  11. 12
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
  12. 5
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
  13. 6
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java
  14. 107
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

6
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java
Unescape View File

@ -42,6 +42,12 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity {
*/
@ApiModelProperty(value = "仓库")
private String warehouse;
/**
* 运单号
*/
@ApiModelProperty(value = "运单号")
private String waybillNo;
/**
* 签收类型;1-签收，2-代签收
*/

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

@ -91,13 +91,39 @@ public class DistributionDeliveryListController extends BladeController {
return R.data(pages);
}
/**
* 查看订单
*/
@GetMapping("/clientDetail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "查看配送客户详情列表", notes = "传入distributionDeliveryList")
public R<IPage<DistributionDeliveryInfoVO>> clientDetail(@RequestParam Map<String, Object> distributionReservationDTO , Query query) {
IPage<DistributionDeliveryInfoVO> pages = distributionDeliveryListService.getClientDetail(Condition.getPage(query), distributionReservationDTO);
return R.data(pages);
}
/**
* 查看订单
*/
@GetMapping("/order")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "查看订单", notes = "传入distributionDeliveryList")
public R<IPage<DistributionStockArticleVO>> order(@RequestParam Map<String, Object> distributionStockArticle , Query query) {
IPage<DistributionStockArticleVO> pages = distributionDeliveryInfoService.selectDistributionDeliveryorder(Condition.getPage(query), distributionStockArticle);
return R.data(pages);
}
/**
* 查看包件详情
*/
@GetMapping("/packdetail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "查看包件详情", notes = "传入distributionDeliveryList")
public R<List<DistributionParcelListVO>> packdetail(DistributionDeliveryInfoDTO distributionDeliveryInfoDTO, Query query) {
public R<List<DistributionParcelListVO>> packdetail(@RequestParam Map<String,Object> distributionDeliveryInfoDTO, Query query) {
List<DistributionParcelListVO> parcelListEntityList = distributionDeliveryListService.getPackageListByDeliverylistId(Condition.getPage(query), distributionDeliveryInfoDTO);
// IPage<DistributionDeliveryInfoVO> pages = distributionDeliveryInfoService.selectDistributionDeliveryInfopackdetail(Condition.getPage(query), distributionDeliveryInfoDTO);
return R.data(parcelListEntityList);
@ -110,8 +136,8 @@ public class DistributionDeliveryListController extends BladeController {
@GetMapping("/inventory")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "查看包件详情", notes = "传入distributionDeliveryList")
public R<List<DistributionReservationStocklistVO>> inventory(DistributionDeliveryInfoDTO distributionDeliveryInfoDTO, Query query) {
List<DistributionReservationStocklistVO> pages = distributionDeliveryListService.selectDistributionDeliveryinventory(Condition.getPage(query), distributionDeliveryInfoDTO);
public R<List<DistributionReservationStocklistVO>> inventory(@RequestParam Map<String,Object> distributionInventoryDTO, Query query) {
List<DistributionReservationStocklistVO> pages = distributionDeliveryListService.selectDistributionDeliveryinventory(Condition.getPage(query), distributionInventoryDTO);
return R.data(pages);
}
@ -141,16 +167,7 @@ public class DistributionDeliveryListController extends BladeController {
return R.data(r);
}
/**
* 查看订单
*/
@GetMapping("/order")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "查看订单", notes = "传入distributionDeliveryList")
public R<IPage<DistributionStockArticleVO>> order(DistributionDeliveryInfoDTO distributionDeliveryInfoDTO, Query query) {
IPage<DistributionStockArticleVO> pages = distributionDeliveryInfoService.selectDistributionDeliveryorder(Condition.getPage(query), distributionDeliveryInfoDTO);
return R.data(pages);
}
/**

6
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java
Unescape View File

@ -32,6 +32,7 @@ import com.logpm.distribution.vo.app.DistributionAppStockArticleVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* 配送装车中间表 Mapper 接口
@ -75,7 +76,8 @@ public interface DistributionDeliveryInfoMapper extends BaseMapper<DistributionD
*
* @return
*/
List<DistributionDeliveryInfoVO> selectcustomList(Long id);
List<DistributionDeliveryInfoVO> selectcustomList(@Param("id") Long id);
List<DistributionDeliveryInfoVO> selectClientList(@Param("id") Long id, @Param("param")Map<String,Object> param);
/**
* 从预约客户查询包条自定义分页
* @param page
@ -112,7 +114,7 @@ public interface DistributionDeliveryInfoMapper extends BaseMapper<DistributionD
*
* @return
*/
List<DistributionStockArticleVO> selectDistributionDeliveryOrderPage(IPage<DistributionStockArticleVO> page,@Param("param") DistributionDeliveryInfoDTO distributionDeliveryInfoDTO);
List<DistributionStockArticleVO> selectDistributionDeliveryOrderPage(IPage<DistributionStockArticleVO> page,@Param("param") Map<String,Object> distributionStockArticle);
/**
* App-通过配送查询客户信息
*

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

@ -81,6 +81,7 @@
ldr.delivery_address deliveryAddress,
ldr.delivery_phone deliveryPhone,
ldr.stock_article_id orderIds,
ldr.waybill_no waybillNo,
lds.delivery_sign_pictures deliverySignPictures,
lds.clerk_sign_pictures clerkSignPictures,
ldr.reservation_num packageNub,
@ -233,18 +234,10 @@
ldsa.customer_address,
ldsa.total_number,
ldsa.hand_quantity,
ldsa.waybill_number,
ldsa.service_number,
ldrs.reservation_num AS deliveryNumber,
ldsa.description_goods descriptionGoods,
(
SELECT
GROUP_CONCAT( ldpl.material_name SEPARATOR ',' )
FROM
logpm_distribution_parcel_list ldpl
JOIN logpm_distribution_reservation_package ldrp ON ldrp.parce_list_id = ldpl.id
WHERE
ldrp.reservation_id = lds.reservation_id
) materialName,
t.materialName,
-- (SELECT COUNT(*) from logpm_distribution_reservation_package ldrp WHERE ldrp.stock_article_id = ldsa.id ) deliveryNumber,
(
SELECT
@ -282,11 +275,56 @@
WHERE lstock.stock_article=ldrs.stock_article_id
) AS stockupNumber
FROM
logpm_distribution_signfor lds
logpm_distribution_signfor lds
JOIN logpm_distribution_reservation_stockarticle ldrs ON lds.reservation_id = ldrs.reservation_id
JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id
JOIN logpm_distribution_stock_article ldsa ON ldrs.stock_article_id = ldsa.id
JOIN
(SELECT
DISTINCT ldpl.stock_article_id,GROUP_CONCAT(DISTINCT ldpl.material_name) AS materialName
FROM
logpm_distribution_parcel_list ldpl
JOIN logpm_distribution_reservation_package ldrp ON ldrp.parce_list_id = ldpl.id
GROUP BY ldpl.stock_article_id
) AS t ON t.stock_article_id = ldsa.id
where lddl.id = #{param.deliveryId} AND ldrs.stock_article_status != 2
<if test="param.orderCode != '' and param.orderCode != null">
and ldsa.order_code like concat('%',#{param.orderCode},'%')
</if>
<if test="param.consigneeUnit != '' and param.consigneeUnit != null">
and ldsa.consignee_unit like concat('%',#{param.consigneeUnit},'%')
</if>
<if test="param.consigneePerson != '' and param.consigneePerson != null">
and ldsa.consignee_person like concat('%',#{param.consigneePerson},'%')
</if>
<if test="param.consigneePerson != '' and param.consigneePerson != null">
and ldsa.consignee_person like concat('%',#{param.consigneePerson},'%')
</if>
<if test="param.consigneeAddress != '' and param.consigneeAddress != null">
and ldsa.consignee_address like concat('%',#{param.consigneeAddress},'%')
</if>
<if test="param.consigneeMobile != '' and param.consigneeMobile != null">
and ldsa.consignee_mobile like concat('%',#{param.consigneeMobile},'%')
</if>
<if test="param.customerName != '' and param.customerName != null">
and ldsa.customer_name like concat('%',#{param.customerName},'%')
</if>
<if test="param.customerTelephone != '' and param.customerTelephone != null">
and ldsa.customer_telephone like concat('%',#{param.customerTelephone},'%')
</if>
<if test="param.customerAddress != '' and param.customerAddress != null">
and ldsa.customer_address like concat('%',#{param.customerAddress},'%')
</if>
<if test="param.waybillNumber != '' and param.waybillNumber != null">
and ldsa.waybill_number like concat('%',#{param.waybillNumber},'%')
</if>
<if test="param.serviceNumber != '' and param.serviceNumber != null">
and ldsa.service_number like concat('%',#{param.serviceNumber},'%')
</if>
<if test="param.materialName != '' and param.materialName != null">
and t.materialName like concat('%',#{param.materialName},'%')
</if>
</select>
<select id="selectAppcustomList" resultType="com.logpm.distribution.vo.app.DistributionAppReservationVO">
SELECT
@ -519,4 +557,90 @@ FROM
WHERE lds.reservation_id = #{reservationId} and lwtg.association_type in ('3')
GROUP BY lwtg.tray_id,lds.reservation_id,lwtg.tray_code,lwtg.num,lwtg.association_type
</select>
<select id="selectClientList" resultType="com.logpm.distribution.vo.DistributionDeliveryInfoVO">
SELECT
ldr.reservation_num,
ldr.id id,
ldr.is_urgent isUrgent,
ldr.mall_name mallName,
ldr.reservation_code reservationCode,
lds.id deliveryId,
ldr.store_name,
ldr.remarks remarks,
ldr.delivery_way deliveryWay,
ldr.loading_status loadingStatus,
ldr.signing_status reservationSigningStatus,
ldr.receiving_unit receivingUnit,
ldr.consignee consignee,
lds.signing_type signingType,
lds.train_number trainNumber,
ldr.delivery_address deliveryAddress,
ldr.delivery_phone deliveryPhone,
ldr.stock_article_id orderIds,
ldr.waybill_no waybillNo,
lds.delivery_sign_pictures deliverySignPictures,
lds.clerk_sign_pictures clerkSignPictures,
ldr.reservation_num packageNub,
ldr.reservation_stock_list_num reservationStockListNum,
lds.loaded_number loadedNub,
lds.loadedin_number inventoryNub,
lds.reservation_id reservationId,
lds.received_quantity receivedQuantity,
(SELECT
ldss.forklift_name
FROM
logpm_distribution_stockup_info AS ldsi
LEFT JOIN logpm_distribution_stockup AS ldss ON ldsi.stockup_id = ldss.id
WHERE
ldsi.reservation_id = lds.reservation_id
) AS forkliftName,
CASE
WHEN ldr.stockup_status ='10' THEN '待指派'
WHEN ldr.stockup_status ='20' THEN '待备货'
WHEN ldr.stockup_status ='30' THEN '备货中'
WHEN ldr.stockup_status ='40' THEN '备货完成'
END stockupStatusName,
CASE
WHEN ldr.is_urgent ='1' THEN '否'
else '是'
END isUrgentName,
CASE
WHEN lds.signing_status ='1' THEN '待审核'
else '已审核'
END signingStatus,
CASE
WHEN lds.driver_signing ='1' THEN '未签收'
else '已签收'
END driverSigning
FROM
logpm_distribution_signfor lds
JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
<where>
lds.is_deleted = 0 and lds.delivery_id = #{id} and ldr.reservation_status != 40
<if test="param.reservationCode != '' and param.reservationCode != null">
and ldr.reservation_code like concat('%',#{param.reservationCode},'%')
</if>
<if test="param.reservationCode != '' and param.reservationCode != null">
and ldr.reservation_code like concat('%',#{param.reservationCode},'%')
</if>
<if test="param.waybillNo != '' and param.waybillNo != null">
and ldr.waybill_no like concat('%',#{param.waybillNo},'%')
</if>
<if test="param.mallName != '' and param.mallName != null">
and ldr.mall_name like concat('%',#{param.mallName},'%')
</if>
<if test="param.consignee != '' and param.consignee != null">
and ldr.consignee like concat('%',#{param.consignee},'%')
</if>
<if test="param.deliveryPhone != '' and param.deliveryPhone != null">
and ldr.delivery_phone like concat('%',#{param.deliveryPhone},'%')
</if>
<if test="param.deliveryAddress != '' and param.deliveryAddress != null">
and ldr.delivery_address like concat('%',#{param.deliveryAddress},'%')
</if>
<if test="param.receivingUnit != '' and param.receivingUnit != null">
and ldr.receiving_unit like concat('%',#{param.receivingUnit},'%')
</if>
</where>
</select>
</mapper>

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

@ -371,7 +371,7 @@ public interface DistributionDeliveryListMapper extends BaseMapper<DistributionD
* @param deliveryId
* @return
*/
List<DistributionReservationStocklistVO> getInventoryByDeliveryId(IPage<Object> page,@Param("deliveryListId") Long deliveryId);
List<DistributionReservationStocklistVO> getInventoryByDeliveryId(IPage<Object> page,@Param("deliveryListId") Long deliveryId,@Param("param") Map<String,Object> param);
/**
* 查询该配送计划下指定收货单位的预约信息

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

@ -1429,6 +1429,30 @@
<if test="deliveryListId != null and deliveryListId != ''">
and lds.delivery_id = #{deliveryListId}
</if>
<if test="param.incomingBatch != null and param.incomingBatch != ''">
and ldsl.incoming_batch like concat('%',#{param.incomingBatch},'%')
</if>
<if test="param.orderCode != null and param.orderCode != ''">
and ldsl.order_code like concat('%',#{param.orderCode},'%')
</if>
<if test="param.marketName != null and param.marketName != ''">
and ldsl.market_name like concat('%',#{param.marketName},'%')
</if>
<if test="param.brandName != null and param.brandName != ''">
and ldsl.brand_name like concat('%',#{param.brandName},'%')
</if>
<if test="param.cargoNumber != null and param.cargoNumber != ''">
and ldsl.cargo_number like concat('%',#{param.cargoNumber},'%')
</if>
<if test="param.descriptionGoods != null and param.descriptionGoods != ''">
and ldsl.description_goods like concat('%',#{param.descriptionGoods},'%')
</if>
<if test="param.cargoNorms != null and param.cargoNorms != ''">
and ldsl.cargo_norms like concat('%',#{param.cargoNorms},'%')
</if>
<if test="param.cargoUnit != null and param.cargoUnit != ''">
and ldsl.cargo_unit like concat('%',#{param.cargoUnit},'%')
</if>
</where>
</select>
<select id="selectReservationByDeliveryListIdAndCustomerUnit"

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

@ -123,7 +123,7 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
* @param id1
* @return
*/
List<DistributionParcelListEntity> getReservationPackage(@Param("reservationId") Long id,@Param("stockArticleId") Long id1);
List<DistributionParcelListEntity> getReservationPackage(@Param("reservationId") Long id,@Param("stockArticleId") Long id1,@Param("param")Map<String,Object> param);
/**
* 删除预约单

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

@ -704,6 +704,45 @@
<if test="stockArticleId !=null and stockArticleId!= ''">
and ldrp.stock_article_id = #{stockArticleId}
</if>
<if test="param.waybillNumber !=null and param.waybillNumber != ''">
and ldpl.waybill_number like concat('%',#{param.waybillNumber},'%')
</if>
<if test="param.serviceNumber !=null and param.serviceNumber != ''">
and ldpl.service_number like concat('%',#{param.serviceNumber},'%')
</if>
<if test="param.orderCode !=null and param.orderCode != ''">
and ldpl.order_code like concat('%',#{param.orderCode},'%')
</if>
<if test="param.orderPackageCode !=null and param.orderPackageCode != ''">
and ldpl.order_package_code like concat('%',#{param.orderPackageCode},'%')
</if>
<if test="param.warehouse !=null and param.warehouse != ''">
and ldpl.warehouse like concat('%',#{param.warehouse},'%')
</if>
<if test="param.materialName !=null and param.materialName != ''">
and ldpl.material_name like concat('%',#{param.materialName},'%')
</if>
<if test="param.acceptWarehouseName !=null and param.acceptWarehouseName != ''">
and ldpl.accept_warehouse_name like concat('%',#{param.acceptWarehouseName},'%')
</if>
<if test="param.sendWarehouseName !=null and param.sendWarehouseName != ''">
and ldpl.send_warehouse_name like concat('%',#{param.sendWarehouseName},'%')
</if>
<if test="param.acceptWarehouseName !=null and param.acceptWarehouseName != ''">
and ldpl.accept_warehouse_name like concat('%',#{param.acceptWarehouseName},'%')
</if>
<if test="param.trainNumber !=null and param.trainNumber != ''">
and ldpl.train_number like concat('%',#{param.trainNumber},'%')
</if>
<if test="param.firsts !=null and param.firsts != ''">
and ldpl.firsts like concat('%',#{param.firsts},'%')
</if>
<if test="param.second !=null and param.second != ''">
and ldpl.second like concat('%',#{param.second},'%')
</if>
<if test="param.thirdProduct !=null and param.thirdProduct != ''">
and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
</if>
</where>
</select>
<select id="selectPackageByReservationAndStockArticle"

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

@ -449,7 +449,7 @@
FROM
logpm_distribution_stock_list
<where>
service_type = #{par.serviceType} and warehouse_id = #{par.warehouseId}
service_type = #{par.serviceType} and warehouse_id = #{par.warehouseId} and is_deleted = 0
<if test="par.incomingBatch != null and par.incomingBatch != ''">
and incoming_batch like concat('%',#{par.incomingBatch},'%')
</if>

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

@ -28,6 +28,7 @@ import org.springblade.core.mp.base.BaseService;
import org.springblade.core.tool.api.R;
import java.util.List;
import java.util.Map;
/**
* 配送装车中间表 服务类
@ -84,7 +85,7 @@ public interface IDistributionDeliveryInfoService extends BaseService<Distributi
* @param distributionDeliveryInfoDTO
* @return
*/
IPage<DistributionStockArticleVO> selectDistributionDeliveryorder(IPage<DistributionStockArticleVO> page, DistributionDeliveryInfoDTO distributionDeliveryInfoDTO);
IPage<DistributionStockArticleVO> selectDistributionDeliveryorder(IPage<DistributionStockArticleVO> page, Map<String, Object> distributionStockArticle);
/**
* 从客户查看订单
*

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

@ -189,7 +189,7 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
R<?> updateMarketDeliveryList(DistributionDeliveryListDTO deliveryListDTO);
List<DistributionParcelListVO> getPackageListByDeliverylistId(IPage<DistributionParcelListEntity> page, DistributionDeliveryInfoDTO distributionDeliveryInfoDTO);
List<DistributionParcelListVO> getPackageListByDeliverylistId(IPage<DistributionParcelListEntity> page, Map<String,Object> distributionDeliveryInfoDTO);
/**
* 查询商配计划科操作订单列表
@ -218,7 +218,7 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
* @param distributionDeliveryInfoDTO
* @return
*/
List<DistributionReservationStocklistVO> selectDistributionDeliveryinventory(IPage<Object> page, DistributionDeliveryInfoDTO distributionDeliveryInfoDTO);
List<DistributionReservationStocklistVO> selectDistributionDeliveryinventory(IPage<Object> page, Map<String,Object> distributionInventoryDTO);
/**
* 生成配送的打印模型
@ -368,6 +368,14 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
*/
List<AftersalesAbnormalPackageVO> aftersalesPackageScan(Long deliveryId, String scanBarCode);
/**
* 查询配送任务客户列表
* @param page
* @param distributionReservationDTO
* @return
*/
IPage<DistributionDeliveryInfoVO> getClientDetail(IPage<DistributionDeliveryInfoVO> page, Map<String, Object> distributionReservationDTO);
/**
* 工单查询配送信息
* @param page

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

@ -710,8 +710,9 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
log.error("############包件信息异常:{}", parcelListEntity);
throw new RuntimeException("包件信息异常");
}
parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
distributionParcelListService.updateById(parcelListEntity);
List<Long> ids = new ArrayList<>();
ids.add(parcelListEntity.getId());
distributionParcelListMapper.updatePackageListByIds(ids);
//维护包件所属订单是否均已完成装车，如果均已完成装车则订单进行装车状态的修改
if (parcelListEntity.getConditions() != 2) {
DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(parcelListEntity.getStockArticleId());

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

@ -146,8 +146,8 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
}
@Override
public IPage<DistributionStockArticleVO> selectDistributionDeliveryorder(IPage<DistributionStockArticleVO> page, DistributionDeliveryInfoDTO distributionDeliveryInfoDTO) {
List<DistributionStockArticleVO> distributionDeliveryInfoVOS = baseMapper.selectDistributionDeliveryOrderPage(page, distributionDeliveryInfoDTO);
public IPage<DistributionStockArticleVO> selectDistributionDeliveryorder(IPage<DistributionStockArticleVO> page, Map<String, Object> distributionStockArticle) {
List<DistributionStockArticleVO> distributionDeliveryInfoVOS = baseMapper.selectDistributionDeliveryOrderPage(page, distributionStockArticle);
// for (DistributionStockArticleVO distributionDeliveryInfoVO : distributionDeliveryInfoVOS) {
// //查询签收数量
@ -434,4 +434,6 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
}
}

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

@ -610,9 +610,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
}
DistributionStockArticleEntity stockArticleEntity = distributionStockArticleMapper.selectById(parcelListEntity.getStockArticleId());
if (shangpeiFlag) {
List<DistributionReservationEntity> reservationEntities = reservationEntityList.stream().filter(r -> Func.isNotEmpty(r.getConsignee()) && r.getConsignee().equals(stockArticleEntity.getCustomerName()) && r.getDeliveryAddress().equals(stockArticleEntity.getCustomerAddress()) && r.getDeliveryPhone().equals(stockArticleEntity.getCustomerTelephone()) && r.getMallName().equals(stockArticleEntity.getMallName())).collect(Collectors.toList());
//查看是否存在满足条件的预约单
if (reservationEntities.size() == 1) {
if (Func.isEmpty(distrilbutionloadingscanDTO.getReservationId())){
log.info("异常装车未指定客户");
return Resp.scanFail("请指定客户进行异常装车","请指定客户进行异常装车");
}
return R.fail(5000, "异常装车");
// return Resp.scanFail("装车失败","程序出错，请联系彪桑");
} else {
@ -624,12 +629,17 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
}
}
} else {
shangpeiFlag = reservationEntityList.stream().allMatch(r -> r.getDeliveryType().equals(DistributionTypeConstant.shangpei.getValue()));
if (shangpeiFlag) {
List<DistributionReservationEntity> reservationEntities = reservationEntityList.stream().filter(r -> r.getReceivingUnit().equals(stockArticleEntity.getConsigneeUnit()) && r.getMallName().equals(stockArticleEntity.getMallName())).collect(Collectors.toList());
//查询是否满足商配异常装车
boolean flag = reservationEntityList.stream().anyMatch(r -> r.getReceivingUnit().equals(stockArticleEntity.getConsigneeUnit()) && r.getMallName().equals(stockArticleEntity.getMallName()));
if (reservationEntities.size() == 1) {
if (Func.isEmpty(distrilbutionloadingscanDTO.getReservationId())){
log.info("异常装车未指定客户");
return Resp.scanFail("请指定客户进行异常装车","请指定客户进行异常装车");
}
return R.fail(5000, "异常装车");
} else {
return Resp.scanFail("装车失败", "窜货");
@ -2128,11 +2138,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
Integer a = distributionDeliveryListMapper.updateloadingTimeById(distributionLoadscaninvnEntity.getDeliveryId());
//更新签收表的装车数量
Integer j = distributionSignforMapper.updateloadByinvn(distributionLoadscaninvnEntity.getDeliveryId(), distributionLoadscaninvnEntity.getReservationId(), distributionLoadscaninvnEntity.getLoadedNub());
//处理出库问题
distributionStockListMapper.deductionQuantityStock(distributionLoadscaninvnEntity.getInventoryId(), distributionLoadscaninvnEntity.getLoadedNub());
//异步处理状态信息
distributionAsyncService.changeMarketDeliveryListStatus(distributionLoadscaninvnEntity.getOrderPackageCode(), distributionLoadscaninvnEntity.getDeliveryId(), distributionLoadscaninvnEntity.getReservationId());
//处理出库问题
//扣减出库数量
distributionStockListMapper.deductionQuantityStock(distributionLoadscaninvnEntity.getInventoryId(), distributionLoadscaninvnEntity.getLoadedNub());
// DistributionStockListEntity distributionStockListEntity = distributionStockListMapper.selectOne(Wrappers.<DistributionStockListEntity>query().lambda().eq(DistributionStockListEntity::getId, distributionLoadscaninvnEntity.getInventoryId()));
// BigDecimal quantityStock = new BigDecimal(distributionStockListEntity.getQuantityStock());
// BigDecimal loadedNub = new BigDecimal(distributionLoadscaninvnEntity.getLoadedNub());
@ -4185,22 +4195,25 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
}
@Override
public List<DistributionParcelListVO> getPackageListByDeliverylistId(IPage<DistributionParcelListEntity> page, DistributionDeliveryInfoDTO distributionDeliveryInfoDTO) {
public List<DistributionParcelListVO> getPackageListByDeliverylistId(IPage<DistributionParcelListEntity> page, Map<String,Object> distributionDeliveryInfoDTO) {
if (Func.isEmpty(distributionDeliveryInfoDTO.get("deliveryId"))){
return null;
}
Long deliveryId = Long.parseLong((String) distributionDeliveryInfoDTO.get("deliveryId")) ;
//查询零担订单包件
// List<DistributionParcelNumberVO> parcelNumberVOS = baseMapper.getZeroPackageListByDeliveryId(distributionDeliveryInfoDTO.getDeliveryId());
List<DistributionStockArticleVO> deliveryStockArticleInfo = baseMapper.getDeliveryStockArticleInfo(distributionDeliveryInfoDTO.getDeliveryId());
List<DistributionStockArticleVO> deliveryStockArticleInfo = baseMapper.getDeliveryStockArticleInfo(deliveryId);
if (Func.isEmpty(deliveryStockArticleInfo)) {
log.error("配送任务订单查询异常:{}", deliveryStockArticleInfo);
return null;
}
List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = baseMapper.getReservationStockArticleByDeliveryId(distributionDeliveryInfoDTO.getDeliveryId());
List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = baseMapper.getReservationStockArticleByDeliveryId(deliveryId);
if (Func.isEmpty(reservationStockarticleEntityList)) {
log.error("配送任务订单查询异常:{}", reservationStockarticleEntityList);
return null;
}
List<DistributionLoadscanEntity> loadscanEntities = distributionLoadscanMapper.selectList(Wrappers.<DistributionLoadscanEntity>query().lambda().eq(DistributionLoadscanEntity::getDeliveryId, distributionDeliveryInfoDTO.getDeliveryId()).ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
List<DistributionLoadscanEntity> loadscanEntities = distributionLoadscanMapper.selectList(Wrappers.<DistributionLoadscanEntity>query().lambda().eq(DistributionLoadscanEntity::getDeliveryId, deliveryId).ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
Map<Long, DistributionLoadscanEntity> loadingDataMap = null;
if (Func.isNotEmpty(loadscanEntities)) {
loadingDataMap = loadscanEntities.stream().collect(Collectors.toMap(DistributionLoadscanEntity::getPackageId, Function.identity(), (k1, k2) -> k2));
@ -4208,7 +4221,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
ArrayList<DistributionParcelListVO> distributionParcelListVOS = new ArrayList<>();
for (DistributionReservationStockarticleEntity reservationStockarticleEntity : reservationStockarticleEntityList) {
if (reservationStockarticleEntity.getIsZero().equals(IsOrNoConstant.no.getValue())) {
List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.getReservationPackage(reservationStockarticleEntity.getReservationId(), reservationStockarticleEntity.getStockArticleId());
List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.getReservationPackage(reservationStockarticleEntity.getReservationId(), reservationStockarticleEntity.getStockArticleId(),distributionDeliveryInfoDTO);
List<DistributionParcelListVO> parcelListVOList = DistributionParcelListWrapper.build().listVO(parcelListEntityList);
for (DistributionParcelListVO distributionParcelListVO : parcelListVOList) {
if (Func.isNotEmpty(loadingDataMap)) {
@ -4254,8 +4267,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
distributionParcelListVOS.add(distributionParcelListVO);
}
} else if (reservationStockarticleEntity.getIsZero().equals(IsOrNoConstant.yes.getValue())) {
List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.getReservationPackage(reservationStockarticleEntity.getReservationId(), reservationStockarticleEntity.getStockArticleId());
List<DistributionParcelListEntity> zeroParcelListEntityList = baseMapper.getZeroPackageListByDeliveryId(distributionDeliveryInfoDTO.getDeliveryId(), reservationStockarticleEntity.getStockArticleId());
List<DistributionParcelListEntity> zeroParcelListEntityList = baseMapper.getZeroPackageListByDeliveryId(deliveryId, reservationStockarticleEntity.getStockArticleId());
List<DistributionParcelListVO> zeroParcelListVOList = DistributionParcelListWrapper.build().listVO(zeroParcelListEntityList);
for (DistributionParcelListVO parcelListVO : zeroParcelListVOList) {
if (Func.isNotEmpty(loadingDataMap)) {
@ -4528,11 +4540,15 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
}
@Override
public List<DistributionReservationStocklistVO> selectDistributionDeliveryinventory(IPage<Object> page, DistributionDeliveryInfoDTO distributionDeliveryInfoDTO) {
List<DistributionReservationStocklistVO> distributionStockListEntities = baseMapper.getInventoryByDeliveryId(page, distributionDeliveryInfoDTO.getDeliveryId());
public List<DistributionReservationStocklistVO> selectDistributionDeliveryinventory(IPage<Object> page,Map<String,Object> distributionInventoryDTO) {
if (Func.isEmpty(distributionInventoryDTO.get("deliveryId"))){
log.info("#####查询配送计划库存品列表deliveryId缺失");
return null;
}
Long deliveryId = Long.parseLong(distributionInventoryDTO.get("deliveryId").toString());
List<DistributionReservationStocklistVO> distributionStockListEntities = baseMapper.getInventoryByDeliveryId(page, deliveryId,distributionInventoryDTO);
distributionStockListEntities.forEach(rs -> {
List<DistributionLoadscaninvnEntity> list = distributionLoadscaninvnService.list(Wrappers.<DistributionLoadscaninvnEntity>query().lambda().eq(DistributionLoadscaninvnEntity::getInventoryId, rs.getStocklistId()).eq(DistributionLoadscaninvnEntity::getReservationId, rs.getReservationId()).eq(DistributionLoadscaninvnEntity::getDeliveryId, distributionDeliveryInfoDTO.getDeliveryId()).ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
List<DistributionLoadscaninvnEntity> list = distributionLoadscaninvnService.list(Wrappers.<DistributionLoadscaninvnEntity>query().lambda().eq(DistributionLoadscaninvnEntity::getInventoryId, rs.getStocklistId()).eq(DistributionLoadscaninvnEntity::getReservationId, rs.getReservationId()).eq(DistributionLoadscaninvnEntity::getDeliveryId, deliveryId).ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
rs.setLoadedinNumber(0);
if (Func.isNotEmpty(list)) {
//存在装车记录
@ -5969,42 +5985,45 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
return aftersalesAbnormalPackageVOS;
}
/**
*
* 工单查询配送数据
* @param page
* @param distributionDeliveryInfoDTO
* @return
*/
@Override
public IPage<DistributionDeliveryWordVO> getShippingInformation(IPage<Object> page, DistributionDeliveryListDTO distributionDeliveryInfoDTO) {
IPage<DistributionDeliveryWordVO> iPage= baseMapper.getShippingInformation(page,distributionDeliveryInfoDTO);
if(!iPage.getRecords().isEmpty()){
iPage.getRecords().forEach( i ->{
if("1".equals(i.getKind())){
//自主
//查询司机信息
List<DistributionDeliverySelfEntity> distributionDeliverySelfEntities = distributionDeliverySelfMapper.selectList(Wrappers.<DistributionDeliverySelfEntity>query().lambda()
.eq(DistributionDeliverySelfEntity::getDeliveryId, i.getId())
);
if(!distributionDeliverySelfEntities.isEmpty()){
String collect = distributionDeliverySelfEntities.stream().map(DistributionDeliverySelfEntity::getDriverName).collect(Collectors.joining(","));
i.setDriverName(collect);
public IPage<DistributionDeliveryInfoVO> getClientDetail(IPage<DistributionDeliveryInfoVO> page, Map<String, Object> distributionReservationDTO) {
if (Func.isEmpty(distributionReservationDTO.get("deliveryId"))){
log.info("############获取客户详情失败，deliveryId为空");
return null;
}
Long deliveryId = Long.parseLong((String)distributionReservationDTO.get("deliveryId"));
List<DistributionDeliveryInfoVO> customList = distributionDeliveryInfoMapper.selectClientList(deliveryId,distributionReservationDTO);
if (!customList.isEmpty()) {
customList.forEach(c -> {
if (Func.isNotEmpty(c.getLoadingStatus())) {
switch (c.getLoadingStatus()) {
case "10":
c.setLoadingStatus(ReservationLoadingStatusConstant.daizhuangche.getName());
break;
case "20":
c.setLoadingStatus(ReservationLoadingStatusConstant.bufenzhuangche.getName());
break;
case "30":
c.setLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getName());
break;
}
}else{
//三方
List<DistributionDeliveryTripartiteEntity> list = distributionDeliveryTripartiteService.list(Wrappers.<DistributionDeliveryTripartiteEntity>query().lambda()
.eq(DistributionDeliveryTripartiteEntity::getDeliveryId, i.getId())
);
if(!list.isEmpty()){
String collect = list.stream().map(DistributionDeliveryTripartiteEntity::getDriverName).collect(Collectors.joining(","));
i.setDriverName(collect);
}
if (Func.isNotEmpty(c.getReservationSigningStatus())) {
switch (c.getReservationSigningStatus()) {
case "10":
c.setReservationSigningStatus(ReservationSigningStatusConstant.daiqianshou.getName());
break;
case "20":
c.setReservationSigningStatus(ReservationSigningStatusConstant.bufenqianshou.getName());
break;
case "30":
c.setReservationSigningStatus(ReservationSigningStatusConstant.yiqianshou.getName());
break;
}
}
});
}
return iPage;
return page.setRecords(customList);
}

Write Preview
Loading…
Cancel
Save