From 7efac8201d0a706cee90446cbf24d279691ab628 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Tue, 31 Oct 2023 19:31:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../DistributionDeliveryAppController.java | 4 +--
.../mapper/DistributionStockListMapper.xml | 2 +-
.../IDistributionDeliveryInfoService.java | 2 +-
.../DistributionDeliveryInfoServiceImpl.java | 4 +--
.../DistributionDeliveryListServiceImpl.java | 25 ++++++++++++-------
.../impl/DistributionSignforServiceImpl.java | 3 ++-
.../DistributionStockListServiceImpl.java | 2 +-
7 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java
index a22f558ec..95a61c883 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java
@@ -89,8 +89,8 @@ public class DistributionDeliveryAppController {
@GetMapping("/order")
@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);
+ public R<List<DistributionAppStockArticleVO>> order(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
+ List<DistributionAppStockArticleVO> pages = distributionDeliveryInfoService.selectDistributionAppDeliveryorder(distributionAppDeliveryListDTO);
return R.data(pages);
}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
index 5cc216c28..a2d8476ec 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
@@ -426,7 +426,7 @@
FROM
logpm_distribution_stock_list
<where>
- service_type = #{par.serviceType} and warehouse_name = #{par.warehouseName}
+ service_type = #{par.serviceType} and warehouse_id = #{par.warehouseId}
<if test="par.incomingBatch != null and par.incomingBatch != ''">
and incoming_batch like concat('%',#{par.incomingBatch},'%')
</if>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryInfoService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryInfoService.java
index 0f6425591..d798535a8 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryInfoService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryInfoService.java
@@ -92,7 +92,7 @@ public interface IDistributionDeliveryInfoService extends BaseService<Distributi
* @param distributionAppDeliveryListDTO
* @return
*/
- IPage<DistributionAppStockArticleVO> selectDistributionAppDeliveryorder(IPage<DistributionAppStockArticleVO> page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO);
+ List<DistributionAppStockArticleVO> selectDistributionAppDeliveryorder(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO);
/**
* 从客户查看库存品
*
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java
index 6851ce687..a0fbe02a3 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java
@@ -156,7 +156,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
}
@Override
- public IPage<DistributionAppStockArticleVO> selectDistributionAppDeliveryorder(IPage<DistributionAppStockArticleVO> page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
+ public List<DistributionAppStockArticleVO> selectDistributionAppDeliveryorder(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
//-------------------------------------2023-10-07 客户查看订单详情-----------------------------------------------------------------
// 这里先查询出客户的订单信息，然后查询订单的预约包件信息
@@ -332,7 +332,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
distributionAppStockArticleVOS.add(appStockArticleVO);
});
}
- return page.setRecords(distributionAppStockArticleVOS);
+ return distributionAppStockArticleVOS;
}
// packageListByReservationId.stream().collect(Collectors.groupingBy())
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 5f8851ea3..fc2340a99 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -2247,13 +2247,15 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
distributionAppDeliveryListVO.setVehicleStatus_name("未配车");
}
//查询是否备货
- distributionAppDeliveryListVO.setIsstock("备货完成");
- Integer reNub = distributionStockMapper.selectCount(new QueryWrapper<DistributionStockEntity>().lambda()
- .in(!reList.isEmpty(), DistributionStockEntity::getReservationId, reList)
- ).intValue(); //扫描件数
- Integer deliveryNumber = distributionAppDeliveryListVO.getDeliveryNumber(); //配送件数
- if (reNub < deliveryNumber) {
- distributionAppDeliveryListVO.setIsstock("备货未完成");
+ distributionAppDeliveryListVO.setIsstock("备货未完成");
+ List<DistributionStockEntity> stockEntityList = distributionStockMapper.selectList(new QueryWrapper<DistributionStockEntity>().lambda()
+ .eq(DistributionStockEntity::getReservationId, distributionAppDeliveryListVO.getReservationId()));
+ if (Func.isNotEmpty(stockEntityList)){
+ Integer deliveryNumber = distributionAppDeliveryListVO.getDeliveryNumber(); //配送件数
+ int sum = stockEntityList.stream().mapToInt(DistributionStockEntity::getStockQuantity).sum();
+ if (sum == deliveryNumber) {
+ distributionAppDeliveryListVO.setIsstock("备货完成");
+ }
}
//查询司机
List<DistributionAppDeliverySelfVO> distributionAppDeliverySelfVOS = distributionDeliverySelfMapper.selectListcustom(distributionAppDeliveryListVO.getId());
@@ -2640,6 +2642,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
.ne(DistributionParcelListEntity::getOrderPackageLoadingStatus, OrderPackageLoadingStatusConstant.yizhuangche.getValue())
.ne(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.yiyueyue.getValue())
.notIn(DistributionParcelListEntity::getOrderPackageStatus, new String[]{OrderPackageStatusConstant.yichuku.getValue(), OrderPackageStatusConstant.yiqianshou.getValue()}));
+ if (Func.isEmpty(distributionParcelListEntities)){
+
+ throw new RuntimeException(s.getOrderCode()+"无可用数量");
+ }
distributionParcelListEntities.forEach(dp -> {
if (!dp.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())) {
if (!Func.equals(dp.getOrderPackageFreezeStatus(), OrderPackageFreezeStatusConstant.yidongjie.getValue()) && !Func.equals(dp.getOrderPackageReservationStatus(), OrderPackageReservationStatusConstant.yiyueyue.getValue())) {
@@ -2666,12 +2672,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
s.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
s.setAvailableQuantity(0);
distributionStockArticleService.updateById(s);
-
} else {
packageListInfo.forEach(p -> {
orderPackageNum.getAndAdd(p.getQuantity());
DistributionReservationPackageEntity reservationPackageEntity = new DistributionReservationPackageEntity();
- reservationPackageEntity.setPacketBarStatus(ReservationPackageStatusConstant.zhengchang.getValue());
+ reservationPackageEntity.setPacketBarStatus(ReservationPackageStatusConstant.xinzeng.getValue());
reservationPackageEntity.setPacketBarCode(p.getOrderPackageCode());
reservationPackageEntity.setStockArticleId(s.getId());
reservationPackageEntity.setReservationId(reservationEntity.getId());
@@ -2727,6 +2732,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
});
} else {
log.error("###########################零担订单查询品类错误，订单ID:{}", s.getId());
+ throw new RuntimeException(s.getOrderCode()+"无可用数量");
}
}
} else {
@@ -2774,6 +2780,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
DistributionStockupInfoEntity stockupInfoEntity = new DistributionStockupInfoEntity();
stockupInfoEntity.setReservationId(reservationEntity.getId());
stockupInfoEntity.setStockupId(deliveryStockupInfo.getId());
+ stockupInfoEntity.setStockUpType("1");
distributionStockupInfoService.save(stockupInfoEntity);
} else {
//根据配送计划和运单号查询出该预约
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index d3a567a2e..276d4559c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -1125,7 +1125,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
// ).stream().mapToInt(DistributionLoadscaninvnEntity::getReceivedQuantity).sum();
distributionAppDeliveryListVO.setSignNub(signNum.get());
- distributionAppDeliveryListVO.setDeliveryNumber(loadNum.get());
+ distributionAppDeliveryListVO.setLoadingNub(loadNum.get());
+// distributionAppDeliveryListVO.setDeliveryNumber(loadNum.get());
//查询完成客户数
Integer cusCount = distributionDeliveryListMapper.selectCompletecusInCount(distributionAppDeliveryListVO.getId());
//查询完成订单数
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
index 04adecd85..ccb2f1ff7 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
@@ -459,7 +459,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
return null;
}
DistributionStockListDTO stockListDTO = Func.copy(distributionStockList, DistributionStockListDTO.class);
- stockListDTO.setWarehouseName(myCurrentWarehouse.getName());
+ stockListDTO.setWarehouseId(myCurrentWarehouse.getId());
List<DistributionStockListVO> stockListVOList = baseMapper.selectAllStockList(stockListDTO);
page.setRecords(stockListVOList);
return page;