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

Merge branch 'dev' into pre-production

master
汤建军 8 months ago
parent
002079f147 b0ce0fb05a
commit
166f2c2a85
10 changed files with 95 additions and 172 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/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
  2. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java
  3. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
  4. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
  5. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
  6. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java
  7. 13
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
  8. 26
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
  9. 70
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseRetentionApiController.java
  10. 142
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java

6
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
Unescape View File

@ -131,11 +131,11 @@ public class DistributionSignforController extends BladeController {
/**
* 异常装车包件列表
*/
@PostMapping("/loadingAbnormalPackageListTurnDown")
@GetMapping("/loadingAbnormalPackageListTurnDown")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入distributionSignfor")
public R loadingAbnormalPackageListTurnDown(@RequestParam("ids") String ids) {
R r = distributionSignforService.loadingAbnormalPackageListTurnDown(ids);
public R loadingAbnormalPackageListTurnDown(@RequestParam("ids") String ids,@RequestParam("yesOrNo") boolean yesOrNo) {
R r = distributionSignforService.loadingAbnormalPackageListTurnDown(ids,yesOrNo);
return r;
}

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

@ -426,7 +426,7 @@ public interface DistributionDeliveryListMapper extends BaseMapper<DistributionD
* @param deliveryId
* @return
*/
DistributionRetentionScanVo selectRetentionPackage(@Param("orderPackageCode")String orderPackageCode,@Param("deliveryId") Long deliveryId);
DistributionRetentionScanVo selectRetentionPackage(@Param("orderPackageCode")String orderPackageCode,@Param("deliveryId") Long deliveryId,@Param("warehouseId") Long warehouseId);
/**
* 查询滞留零担包件信息

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

@ -2039,7 +2039,7 @@
LEFT JOIN logpm_distribution_reservation_package AS ldrp ON ldrp.stock_article_id = ldrs.stock_article_id and ldrp.reservation_id = ldr.id
LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldpl.id = ldrp.parce_list_id and ldpl.stock_article_id = ldsa.id
WHERE
lddl.id=#{deliveryId} AND ldrp.packet_bar_status in ('1','3') AND ldrs.is_zero = 0 AND ldpl.order_package_code = #{orderPackageCode} AND ldr.reservation_status != 4
lddl.id=#{deliveryId} AND ldrp.packet_bar_status in ('1','3') AND ldrs.is_zero = 0 AND ldpl.order_package_code = #{orderPackageCode} AND ldr.reservation_status != 4 AND ldpl.warehouse_id = #{warehouseId}
</select>
<select id="selectRetentionZeroPackage" resultType="com.logpm.distribution.vo.DistributionRetentionScanVo">

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

@ -523,6 +523,7 @@
INNER JOIN logpm_distribution_signfor AS lds ON lddl.id = lds.delivery_id
INNER JOIN logpm_distribution_reservation AS ldr ON ldr.id = lds.reservation_id
<where>
ldr.reservation_status != 40
<if test="id!='' and id != null">
and lddl.id = #{id}
</if>

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

@ -1090,7 +1090,8 @@
ldla.id AS id,
ldla.auditing_status AS auditingStatus,
CASE when ldla.auditing_status = 1 then '待审核'
else '已审核'
when ldla.auditing_status = 2 then '已审核'
else '已驳回'
end AS auditingStatusName,
ldla.auditing_time AS auditingTime,
ldla.auditing_user AS auditingUser,

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

@ -363,6 +363,6 @@ public interface IDistributionSignforService extends BaseService<DistributionSig
* @param ids
* @return
*/
R loadingAbnormalPackageListTurnDown(String ids);
R loadingAbnormalPackageListTurnDown(String ids,boolean yesOrNo);
}

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

@ -5913,6 +5913,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
.eq(DistributionLoadscanEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode())
.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
.eq(DistributionLoadscanEntity::getWarehouseId, myCurrentWarehouse.getId())
);
// List<DistributionParcelListEntity> parcelListEntities = baseMapper.selectPackageListByDeliveryListId(distrilbutionloadingscanDTO.getDeliveryId());
if (Func.isNotEmpty(loadscanEntityList)) {
@ -5928,13 +5929,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
log.info("滞留扫描失败，包件已签收>>>>>>>>>>>>>>>>>>>>>>>reservationId:{},packageCode:{}", distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getOrderPackageCode());
return Resp.scanFail("包件已签收", "包件已签收");
}
DistributionRetentionScanVo retentionScanVo = baseMapper.selectRetentionPackage(distributionLoadscanEntity.getOrderPackageCode(), distributionLoadscanEntity.getDeliveryId());
DistributionRetentionScanVo retentionScanVo = baseMapper.selectRetentionPackage(distributionLoadscanEntity.getOrderPackageCode(), distributionLoadscanEntity.getDeliveryId(),myCurrentWarehouse.getId());
retentionScanVos.add(retentionScanVo);
}
} else {
List<DistributionLoadscaninvnEntity> loadscaninvnEntityList = distributionLoadscaninvnService.list(Wrappers.<DistributionLoadscaninvnEntity>query().lambda()
.eq(DistributionLoadscaninvnEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode())
.ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
.eq(DistributionLoadscaninvnEntity::getWarehouseId, myCurrentWarehouse.getId())
);
if (Func.isNotEmpty(loadscaninvnEntityList)) {
if (loadscaninvnEntityList.size() == 1) {
@ -6053,6 +6055,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
@Override
public R getTrayInfoAndPackageList(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if (Func.isEmpty(myCurrentWarehouse)) {
log.error("#############缺少托盘码,barcode:{}", myCurrentWarehouse);
return Resp.scanFail("未授权!!!", "未授权!!!");
}
String barcode = distrilbutionloadingscanDTO.getBarcode();
if (Func.isEmpty(barcode)) {
log.error("#############缺少托盘码,barcode:{}", barcode);
@ -6086,9 +6093,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
//托盘货物都存在该配送任务的包件列表
//进行客户划分
for (WarehouseTrayGoodsEntity warehouseTrayGoodsEntity : goodsLsit) {
DistributionRetentionScanVo retentionScanVo = baseMapper.selectRetentionPackage(warehouseTrayGoodsEntity.getAssociationValue(), distrilbutionloadingscanDTO.getDeliveryId());
DistributionRetentionScanVo retentionScanVo = baseMapper.selectRetentionPackage(warehouseTrayGoodsEntity.getAssociationValue(), distrilbutionloadingscanDTO.getDeliveryId(),myCurrentWarehouse.getId());
if (Func.isNotEmpty(retentionScanVo)) {
if (retentionScanVo.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())) {
log.error("滞留扫描出现签收包件>>>>>>>>>>>>>>>:{}", retentionScanVo.getOrderPackageCode());

26
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
Unescape View File

@ -6493,7 +6493,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
@Override
public R loadingAbnormalPackageListTurnDown(String ids) {
public R loadingAbnormalPackageListTurnDown(String ids,boolean yesOrNo) {
//异常驳回进行异常信息的删除,对于装车记录的清理,对于已装车和签收的数量扣减
String method = "####################异常驳回loadingAbnormalPackageListTurnDown";
if (Func.isEmpty(ids)){
@ -6535,7 +6535,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
//进行异常列表的清理
for (DistributionLoadscanAbnormalEntity abnormalEntity : abnormalEntities) {
//存在异常操作为进行审核操作才可进行驳回
if (Objects.isNull(abnormalEntity.getAuditingStatus())){
if (!Objects.isNull(abnormalEntity.getAuditingStatus()) && LoadingAbnormalAuditingStatusConstant.daishenhe.getValue().equals(abnormalEntity.getAuditingStatus())){
//驳回视为进行审核,审核结果为驳回
abnormalEntity.setAuditingStatus(3);
abnormalEntity.setAuditingUser(AuthUtil.getNickName());
@ -6561,19 +6561,25 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
}
if (!updateList.isEmpty()) {
distributionLoadscanAbnormalService.updateBatchById(updateList);
}
}
//进行装车记录的统计
}
//扣减装车和签收数
distributionSignforMapper.deductionLoadingAndSignforPacjageNum(reservationId,deliveryId,loadingNum,signforNum);
//恢复包件数据
distributionParcelListService.update(Wrappers.<DistributionParcelListEntity>update().lambda()
.in(DistributionParcelListEntity::getId,packageIdList)
.set(DistributionParcelListEntity::getOrderPackageReservationStatus,OrderPackageReservationStatusConstant.daiyuyue.getValue())
.set(DistributionParcelListEntity::getOrderPackageLoadingStatus,OrderPackageLoadingStatusConstant.weizhuancghe.getValue())
.set(DistributionParcelListEntity::getOrderPackageStatus,OrderPackageStatusConstant.yiruku.getValue())
.set(DistributionParcelListEntity::getOrderPackageStockupStatus,OrderPackageStockupStatusConstant.daibeihuo.getValue())
);
if (yesOrNo){
//恢复包件数据
distributionParcelListService.update(Wrappers.<DistributionParcelListEntity>update().lambda()
.in(DistributionParcelListEntity::getId,packageIdList)
.set(DistributionParcelListEntity::getOrderPackageReservationStatus,OrderPackageReservationStatusConstant.daiyuyue.getValue())
.set(DistributionParcelListEntity::getOrderPackageLoadingStatus,OrderPackageLoadingStatusConstant.weizhuancghe.getValue())
.set(DistributionParcelListEntity::getOrderPackageStatus,OrderPackageStatusConstant.yiruku.getValue())
.set(DistributionParcelListEntity::getOrderPackageStockupStatus,OrderPackageStockupStatusConstant.daibeihuo.getValue())
);
}
//维护相关的订单信息
distributionStockArticleService.maintenanceOrderInfoByIds(orderIds);
return R.success("异常驳回成功");

70
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseRetentionApiController.java
Unescape View File

@ -78,7 +78,6 @@ public class WarehouseRetentionApiController {
@ApiOperationSupport(order = 1)
@ApiOperation(value = "保存滞留扫描列表", notes = "传入trayTypeDTO")
public R saveRetentionList(@RequestBody WarehouseRetentionRecordDTO warehouseRetentionScanDTOS) {
// R r = warehouseRetentionScanService.saveRetentionList(warehouseRetentionScanDTOS);
R r = warehouseRetentionRecordService.saveRetentionList(warehouseRetentionScanDTOS);
return r;
}
@ -88,77 +87,8 @@ public class WarehouseRetentionApiController {
@ApiOperationSupport(order = 1)
@ApiOperation(value = "保存滞留扫描列表", notes = "传入trayTypeDTO")
public R updateRetentionList(@RequestBody WarehouseRetentionRecordDTO warehouseRetentionScanDTOS) {
// R r = warehouseRetentionScanService.saveRetentionList(warehouseRetentionScanDTOS);
R r = warehouseRetentionRecordService.updateRetentionList(warehouseRetentionScanDTOS);
return r;
}
// @GetMapping("/initRetentionList")
// @ApiOperationSupport(order = 1)
// @ApiOperation(value = "初始化滞留车次信息", notes = "传入trayTypeDTO")
// public R<WarehouseRetentionRecordVO> initRetentionList(@RequestParam Long deliveryId) {
// WarehouseRetentionRecordVO warehouseRetentionRecordVO = warehouseRetentionRecordService.initRetentionList(deliveryId);
// return R.data(warehouseRetentionRecordVO);
// }
//
//
// @ResponseBody
// @PostMapping("/retentionScanPackage")
// @ApiOperationSupport(order = 1)
// @ApiOperation(value = "滞留扫描包件码", notes = "传入trayTypeDTO")
// public R retentionScanPackage(@RequestBody RetentionDTO retentionDTO) {
// String method = "###########retentionScanPackage: ";
// log.info(method + "滞留扫描包件码 retentionDTO={}", retentionDTO);
// String orderPackageCode = retentionDTO.getOrderPackageCode();//包件码
// try{
// if(StringUtil.isBlank(orderPackageCode)){
// log.warn("############retentionScanPackage: 包件码不能为空 orderPackageCode={}",orderPackageCode);
// return R.fail(403,"包件码不能为空");
// }
//
// //查询订制品打托列表
// return warehouseRetentionRecordService.retentionScanPackage(orderPackageCode);
// }catch (CustomerException e){
// log.warn(e.message);
// return R.fail(e.code,e.message);
// }catch (Exception e){
// log.error(method+"系统异常，联系管理员",e);
// return R.fail(500,"系统异常，联系管理员");
// }
// }
// @ResponseBody
// @PostMapping("/retentionScanPackage")
// @ApiOperationSupport(order = 1)
// @ApiOperation(value = "滞留扫描包件码", notes = "传入trayTypeDTO")
// public R retentionScanPackage(@RequestBody RetentionDTO retentionDTO) {
// String method = "###########retentionScanPackage: ";
// log.info(method + "滞留扫描包件码 retentionDTO={}", retentionDTO);
// String orderPackageCode = retentionDTO.getOrderPackageCode();//包件码
// try{
// if(StringUtil.isBlank(orderPackageCode)){
// log.warn("############retentionScanPackage: 包件码不能为空 orderPackageCode={}",orderPackageCode);
// return R.fail(403,"包件码不能为空");
// }
//
// //查询订制品打托列表
// return warehouseRetentionRecordService.retentionScanPackage(orderPackageCode);
// }catch (CustomerException e){
// log.warn(e.message);
// return R.fail(e.code,e.message);
// }catch (Exception e){
// log.error(method+"系统异常，联系管理员",e);
// return R.fail(500,"系统异常，联系管理员");
// }
// }
}

142
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java
Unescape View File

@ -89,12 +89,12 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if ("admin".equals(AuthUtil.getUser().getUserName())){
if (Func.isNotEmpty(myCurrentWarehouse)){
if ("admin".equals(AuthUtil.getUser().getUserName())) {
if (Func.isNotEmpty(myCurrentWarehouse)) {
warehouseRetentionRecord.setRetentionWarehouseId(myCurrentWarehouse.getId());
}
}else {
if (Func.isEmpty(myCurrentWarehouse)){
} else {
if (Func.isEmpty(myCurrentWarehouse)) {
return null;
}
warehouseRetentionRecord.setRetentionWarehouseId(myCurrentWarehouse.getId());
@ -169,7 +169,7 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
warehouseRetentionRecordVO.setRetentionScanVOList(WarehouseRetentionScanWrapper.build().listVO(retentionScanEntityList));
}
warehouseRetentionRecordVO.setRetentionTotal(0);
if(Func.isNotEmpty(retentionScanEntityList)){
if (Func.isNotEmpty(retentionScanEntityList)) {
int retentionTotal = retentionScanEntityList.stream().mapToInt(WarehouseRetentionScanEntity::getRetentionQuantity).sum();
warehouseRetentionRecordVO.setRetentionTotal(retentionTotal);
@ -192,69 +192,50 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
//对滞留订制品包件进行去重
BladeUser user = AuthUtil.getUser();
//TODO 保存车次数据还需要处理
WarehouseRetentionRecordEntity warehouseRetentionRecordEntity = new WarehouseRetentionRecordEntity();
warehouseRetentionRecordEntity.setTaskId(warehouseRetentionRecordDTO.getDeliveryId());
// warehouseRetentionRecordEntity.setRemark(warehouseRetentionRecordDTO.getRemark());
warehouseRetentionRecordEntity.setRetentionCarNo(warehouseRetentionRecordDTO.getTrainNumber());
warehouseRetentionRecordEntity.setRetentionType(2);
warehouseRetentionRecordEntity.setRetentionCarId(warehouseRetentionRecordDTO.getLoadingId());
warehouseRetentionRecordEntity.setRetentionWarehouseId(myCurrentWarehouse.getId());
warehouseRetentionRecordEntity.setRetentionWarehouseName(myCurrentWarehouse.getName());
warehouseRetentionRecordEntity.setAssembleCarPersonId(warehouseRetentionRecordDTO.getAssembleCarPersonId());
warehouseRetentionRecordEntity.setAssembleCarPersonName(warehouseRetentionRecordDTO.getAssembleCarPersonName());
warehouseRetentionRecordEntity.setRetentionCreateUserId(user.getUserId());
warehouseRetentionRecordEntity.setRetentionCreateUserName(user.getUserName());
this.save(warehouseRetentionRecordEntity);
AtomicInteger retentionTotal = new AtomicInteger();
AtomicBoolean saveFlah = new AtomicBoolean(false);
warehouseRetentionScanDTOS.forEach(r -> {
//查询是否进行多次滞留
WarehouseRetentionScanEntity retentionScanServiceOne = warehouseRetentionScanService.getOne(Wrappers.<WarehouseRetentionScanEntity>query().lambda()
.eq(WarehouseRetentionScanEntity::getConditions, r.getConditions())
.eq(WarehouseRetentionScanEntity::getOrderPackageId, r.getOrderPackageId())
.eq(WarehouseRetentionScanEntity::getReservationId, r.getReservationId())
.eq(WarehouseRetentionScanEntity::getOrderId, r.getOrderId())
.eq(WarehouseRetentionScanEntity::getOrderCode, r.getOrderCode())
.eq(WarehouseRetentionScanEntity::getScanType, r.getScanType())
.eq(WarehouseRetentionScanEntity::getCancelRetentionStatus, IsOrNoConstant.no.getValue())
);
//避免重复添加相同的滞留包件数据
if (Func.isEmpty(retentionScanServiceOne)) {
r.setRetentionScanTime(new Date());
r.setRetentionScanUserId(user.getUserId());
r.setRetentionScanUsername(user.getNickName());
r.setRetentionQuantity(r.getRetentionQuantity());
retentionTotal.getAndAdd(r.getRetentionQuantity());
r.setDeliveryId(warehouseRetentionRecordDTO.getDeliveryId());
r.setRefId(warehouseRetentionRecordEntity.getId());
//进行滞留之后需要对包件进行取消配送的操作
Integer conditions = r.getConditions();
warehouseRetentionScanService.save(Func.copy(r, WarehouseRetentionScanEntity.class));
//查询是否进行多次滞留
WarehouseRetentionScanEntity retentionScanServiceOne = warehouseRetentionScanService.getOne(Wrappers.<WarehouseRetentionScanEntity>query().lambda()
.eq(WarehouseRetentionScanEntity::getConditions, r.getConditions())
.eq(WarehouseRetentionScanEntity::getOrderPackageId, r.getOrderPackageId())
.eq(WarehouseRetentionScanEntity::getReservationId, r.getReservationId())
.eq(WarehouseRetentionScanEntity::getOrderId, r.getOrderId())
.eq(WarehouseRetentionScanEntity::getOrderCode, r.getOrderCode())
.eq(WarehouseRetentionScanEntity::getScanType, r.getScanType())
.eq(WarehouseRetentionScanEntity::getCancelRetentionStatus, IsOrNoConstant.no.getValue())
);
//避免重复添加相同的滞留包件数据
if (Func.isEmpty(retentionScanServiceOne)) {
r.setRetentionScanTime(new Date());
r.setRetentionScanUserId(user.getUserId());
r.setRetentionScanUsername(user.getNickName());
r.setRetentionQuantity(r.getRetentionQuantity());
retentionTotal.getAndAdd(r.getRetentionQuantity());
r.setDeliveryId(warehouseRetentionRecordDTO.getDeliveryId());
//进行滞留之后需要对包件进行取消配送的操作
warehouseRetentionScanService.save(Func.copy(r, WarehouseRetentionScanEntity.class));
}
switch (r.getConditions()) {
case 1:
//订制品
saveFlah.set(distributionDeliveryListClient.retentionDeliveryReservationPackage(r.getDeliveryId(), r.getReservationId(), r.getOrderPackageId(), r.getConditions()));
break;
case 2:
//库存品
saveFlah.set(distributionDeliveryListClient.retentionDeliveryReservationInventory(r.getDeliveryId(), r.getReservationId(), r.getOrderPackageId()));
break;
case 3:
//零担
saveFlah.set(distributionDeliveryListClient.retentionDeliveryReservationZeroPackage(r.getDeliveryId(), r.getReservationId(), r.getOrderPackageId(), r.getRetentionQuantity(), r.getOrderId()));
break;
}
switch (r.getConditions()) {
case 1:
//订制品
saveFlah.set(distributionDeliveryListClient.retentionDeliveryReservationPackage(r.getDeliveryId(), r.getReservationId(), r.getOrderPackageId(), r.getConditions()));
break;
case 2:
//库存品
saveFlah.set(distributionDeliveryListClient.retentionDeliveryReservationInventory(r.getDeliveryId(), r.getReservationId(), r.getOrderPackageId()));
break;
case 3:
//零担
saveFlah.set(distributionDeliveryListClient.retentionDeliveryReservationZeroPackage(r.getDeliveryId(), r.getReservationId(), r.getOrderPackageId(),r.getRetentionQuantity(),r.getOrderId()));
break;
}
//进行滞留操作的包件需要和原来订单 预约进行绑定解除
// reservationClient.retentionCancelReservationPack();
});
if (saveFlah.get()){
warehouseRetentionRecordEntity.setRetentionQuantity(retentionTotal.get());
this.updateById(warehouseRetentionRecordEntity);
return Resp.scanSuccess("操作成功", retentionTotal.get()+"件");
}else {
if (saveFlah.get()) {
return Resp.scanSuccess("操作成功", retentionTotal.get() + "件");
} else {
throw new RuntimeException("服务器正忙...");
}
@ -304,7 +285,7 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
rs.setDeliveryId(warehouseRetentionScanDTOS.getDeliveryId());
rs.setRefId(retentionRecordEntity.getId());
warehouseRetentionScanService.save(Func.copy(rs, WarehouseRetentionScanEntity.class));
switch (rs.getConditions()){
switch (rs.getConditions()) {
case 1:
//订制品
saveFlah.set(distributionDeliveryListClient.retentionDeliveryReservationPackage(rs.getDeliveryId(), rs.getReservationId(), rs.getOrderPackageId(), rs.getConditions()));
@ -315,10 +296,10 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
break;
case 3:
//零担
saveFlah.set(distributionDeliveryListClient.retentionDeliveryReservationZeroPackage(rs.getDeliveryId(), rs.getReservationId(), rs.getOrderPackageId(),rs.getRetentionQuantity(),rs.getOrderId()));
saveFlah.set(distributionDeliveryListClient.retentionDeliveryReservationZeroPackage(rs.getDeliveryId(), rs.getReservationId(), rs.getOrderPackageId(), rs.getRetentionQuantity(), rs.getOrderId()));
break;
default:
log.error(">>>>> rs.getConditions()={}",rs.getConditions());
log.error(">>>>> rs.getConditions()={}", rs.getConditions());
}
}
@ -330,16 +311,15 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
.eq(WarehouseRetentionScanEntity::getRefId, warehouseRetentionScanDTOS.getId())).stream().mapToInt(WarehouseRetentionScanEntity::getRetentionQuantity).sum();
retentionRecordEntity.setRetentionQuantity(retentionTotal);
this.updateById(retentionRecordEntity);
if (saveFlah.get()){
return Resp.scanSuccess("操作成功", "共计滞留"+retentionTotal+"件");
}else {
if (saveFlah.get()) {
return Resp.scanSuccess("操作成功", "共计滞留" + retentionTotal + "件");
} else {
throw new RuntimeException("服务器正忙...");
}
}
@Override
public List<WarehouseRetentionRecordExcel> exportWarehouseRetentionRecord(Map<String, Object> paramMap) {
// 获取当前登录的仓库信息
@ -371,34 +351,34 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
WarehouseRetentionRecordVO warehouseRetentionRecordVO = Func.copy(warehouseRetentionRecordEntity, WarehouseRetentionRecordVO.class);
//查询滞留列表信息 然后这里需要对滞留包件进行分组处理
List<WarehouseRetentionScanVO> warehouseRetentionScanVOS = baseMapper.selectWarehouseRetentionScanVoList(id);
if (Func.isEmpty(warehouseRetentionScanVOS)){
log.info("##########查询滞留包件信息空:{}",id);
if (Func.isEmpty(warehouseRetentionScanVOS)) {
log.info("##########查询滞留包件信息空:{}", id);
return null;
}
warehouseRetentionRecordVO.setRetentionScanVOList(warehouseRetentionScanVOS);
//查询配送信息
List<Long> deliveryIds = warehouseRetentionScanVOS.stream().filter(del -> Func.isNotEmpty(del.getDeliveryId())).map(WarehouseRetentionScanVO::getDeliveryId).distinct().collect(Collectors.toList());
if (deliveryIds.size() == 1){
if (deliveryIds.size() == 1) {
DistributionDeliveryListVO deliveryDriverInfo = distributionDeliveryListClient.getRetentionDelivery(deliveryIds.get(0));
if (Func.isNotEmpty(deliveryDriverInfo)){
if (Func.isNotEmpty(deliveryDriverInfo)) {
warehouseRetentionRecordVO.setDeliveryListVO(deliveryDriverInfo);
}
}else {
} else {
return null;
}
//获取客户信息
List<Long> reservationIds = warehouseRetentionScanVOS.stream().filter(f->Func.isNotEmpty(f.getReservationId())).map(WarehouseRetentionScanVO::getReservationId).collect(Collectors.toList());
if (Func.isNotEmpty(reservationIds)){
List<Long> reservationIds = warehouseRetentionScanVOS.stream().filter(f -> Func.isNotEmpty(f.getReservationId())).map(WarehouseRetentionScanVO::getReservationId).collect(Collectors.toList());
if (Func.isNotEmpty(reservationIds)) {
String ids = reservationIds.stream().map(Objects::toString).collect(Collectors.joining(","));
List<DistributionReservationEntity> reservationEntityList = distributionReservationClient.getReservationList(ids);
if (Func.isNotEmpty(reservationEntityList)){
if (Func.isNotEmpty(reservationEntityList)) {
//构造滞留所需要展示的预约信息
warehouseRetentionRecordVO.setReservationEntityList(reservationEntityList);
}else {
log.error("##########查询多个预约ID为空:{}",reservationIds);
} else {
log.error("##########查询多个预约ID为空:{}", reservationIds);
return null;
}
}else {
} else {
return null;
}
return warehouseRetentionRecordVO;
@ -406,10 +386,10 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
@Override
public List<WarehouseRetentionScanVO> getRetentionPackageByType(Long retentionId, Integer type) {
if (type == 0){
if (type == 0) {
type = null;
}
List<WarehouseRetentionScanVO> warehouseRetentionScanVOS = baseMapper.selectWarehouseRetentionScanVoListByType(retentionId,type);
List<WarehouseRetentionScanVO> warehouseRetentionScanVOS = baseMapper.selectWarehouseRetentionScanVoListByType(retentionId, type);
return warehouseRetentionScanVOS;
}

Write Preview
Loading…
Cancel
Save