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

商配编辑调整

training
kilo 1 year ago
parent
838820e2e3
commit
cc03da92e1
7 changed files with 110 additions and 65 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. 2
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionAddvaluePackageEntity.java
  2. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
  3. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
  4. 17
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
  5. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java
  6. 24
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
  7. 26
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

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

@ -92,7 +92,7 @@ public class DistributionAddvaluePackageEntity extends TenantEntity implements S
/**
* 包件类型;1-订制品；2-库存品
*/
@ApiModelProperty(value = "包件类型;1-订制品；2-库存品")
@ApiModelProperty(value = "包件类型;1-订制品；2-库存品 3-零担")
private Integer conditions;
/**
* 包条码

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

@ -277,7 +277,7 @@
ldrs.stock_article_status stockArticleState,
( select sum(loaded_nub) FROM
logpm_distribution_loadscan AS ldl
WHERE ldl.order_id=ldrs.stock_article_id and ldl.scan_status != 1
WHERE ldl.order_id=ldrs.stock_article_id and ldl.scan_status != 1 and ldl.reservation_id = lds.reservation_id
) AS loadingNumber ,
( select count(*) FROM
logpm_distribution_stock AS lstock

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

@ -244,4 +244,7 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
* @return
*/
List<DistributionParcelNumberDTO> selectZeroPackageListByReservationId(@Param("reservationId")Long reservationId);
//查询零担品类包件信息
List<DistributionAddvaluePackageEntity> selectAppZeroPackageListByReservationId(@Param("reservationId")Long reservationId);
}

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

@ -1033,5 +1033,22 @@
WHERE
ldrzp.reservation_id=#{reservationId} and ldrs.stock_article_status in ('1','3') AND ldrzp.zero_package_status IN ( '1', '3' )
</select>
<select id="selectAppZeroPackageListByReservationId"
resultType="com.logpm.distribution.entity.DistributionAddvaluePackageEntity">
SELECT
ldrzp.parcel_list_id,
ldrzp.quantity AS quantity,
ldrzp.reservation_id AS reservationId,
3 AS conditions,
ldsa.order_code AS orderCode,
ldsa.id AS stockArticleId
FROM
logpm_distribution_reservation_stockarticle AS ldrs
INNER JOIN logpm_distribution_stock_article AS ldsa ON ldrs.stock_article_id = ldsa.id
LEFT JOIN logpm_distribution_reservation_zero_package AS ldrzp ON ldrs.stock_article_id = ldrzp.stock_article_id
AND ldrs.reservation_id = ldrzp.reservation_id
INNER JOIN logpm_distribution_parcel_list As ldpl ON ldrzp.parcel_list_id = ldpl.id
WHERE ldrs.reservation_id =#{reservationId}
</select>
</mapper>

1
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java
Unescape View File

@ -266,6 +266,7 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
List<Long> packageListIds = distributionAppAddvalueDTO.getPackageListIds();
Long reservationId = distributionAppAddvalueDTO.getReservationId();
List<DistributionAddvaluePackageEntity> parcelListEntities = distributionReservationMapper.selectAppPackageListByReservationId(reservationId);
List<DistributionAddvaluePackageEntity> zeroPackageList = distributionReservationMapper.selectAppZeroPackageListByReservationId(reservationId);
List<DistributionAddvaluePackageEntity> detailEntities = distributionReservationMapper.selectAppInventoryListByReservation(reservationId);
parcelListEntities.addAll(detailEntities);
if (Func.isEmpty(parcelListEntities)) {

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

@ -1250,6 +1250,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
loadscanEntity.setScanStatus(LoadingStatusConstant.yijianzhuangche.getValue());
loadscanEntity.setOneClick(2);
loadscanEntity.setScanUser(user.getUserName());
loadscanEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId());
loadscanEntity.setTrainNumber(distributionDeliveryListEntity.getTrainNumber());
loadscanEntity.setPackageNub(parcelListEntity.getQuantity());
loadscanEntity.setLoadedNub(parcelListEntity.getQuantity());
loadscanEntity.setScanTime(new Date());
@ -2913,21 +2915,24 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
DistributionReservationPackageEntity reservationPackageEntity1 = distributionReservationPackageService.getById("1717072702285783041");
log.info("reservationEntity.getId()>>>>>>>>{}", reservationEntity.getId());
log.info("s.getId()>>>>>>>>{}", s.getId());
// List<DistributionReservationPackageEntity> list = distributionReservationPackageMapper.selectList(Wrappers.<DistributionReservationPackageEntity>query().lambda()
// .eq(DistributionReservationPackageEntity::getReservationId, reservationEntity.getId())
// .eq(DistributionReservationPackageEntity::getStockArticleId, s.getId())
// .ne(DistributionReservationPackageEntity::getPacketBarCode, "2")
// );
List<DistributionReservationPackageEntity> list = distributionReservationPackageMapper.selectList(Wrappers.<DistributionReservationPackageEntity>query().lambda()
.eq(DistributionReservationPackageEntity::getReservationId, reservationEntity.getId())
.eq(DistributionReservationPackageEntity::getStockArticleId, s.getId())
.ne(DistributionReservationPackageEntity::getPacketBarCode, "2")
);
List<DistributionReservationPackageEntity> distributionReservationPackageEntities = distributionReservationPackageMapper.selectList(new QueryWrapper<DistributionReservationPackageEntity>().lambda()
.eq(DistributionReservationPackageEntity::getReservationId, reservationEntity.getId())
.eq(DistributionReservationPackageEntity::getStockArticleId, s.getId())
.ne(DistributionReservationPackageEntity::getPacketBarStatus, "2")
);
if (Func.isEmpty(distributionReservationPackageEntities)) {
log.error("###########################预约包件查询错误:{}", distributionReservationPackageEntities);
throw new RuntimeException("服务器正忙...");
}
Map<Long, List<DistributionReservationPackageEntity>> oldPackageList =distributionReservationPackageEntities.stream().filter(rp->!Func.equals(rp.getPacketBarStatus(),ReservationPackageStatusConstant.quxiao.getValue())).collect(Collectors.groupingBy(DistributionReservationPackageEntity::getParceListId));
log.info("distributionReservationPackageEntities>>>>>>>>{}", distributionReservationPackageEntities);
Map<Long, List<DistributionReservationPackageEntity>> oldPackageList = list.stream().collect(Collectors.groupingBy(DistributionReservationPackageEntity::getParceListId));
//查看订单包件是否发生变化
//此订单包件数量统计
if (Func.isNotEmpty(packageListInfo)) {
@ -2957,12 +2962,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
//取消包件的预约状态，并且进行整个订单的状态修改
DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(reservationPackageEntity.getParceListId());
parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
distributionParcelListService.updateById(parcelListEntity);
distributionAsyncService.checkStockArticleReservationStatus(parcelListEntity);
});
} else {
//查找该订单没有进行包件选择的操作， 但是存在newOrder列表中 视为该订单保持计划选择
oldOrder.remove(s.getId());
}
oldOrder.remove(s.getId());
} else if (reservationStockarticleEntity.getIsZero().equals(IsOrNoConstant.yes.getValue())) {
//这里就是需要查看零担订单是否进行了数量修改 即使没有操作这里也可作为一次校验
List<DistributionReservationZeroPackageEntity> reservationZeroPackageEntityList = distributionReservationZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
@ -3050,6 +3057,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
packageTotal.getAndAdd(reservationStockarticleEntity.getReservationNum());
}
});
if (Func.isNotEmpty(oldOrder)) {
oldOrder.forEach((m, n) -> {
DistributionReservationStockarticleEntity reservationStockarticleEntity = n.get(0);
@ -3091,7 +3100,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
}
});
}
});
//重新维护预约信息
reservationEntity.setDeliveryType(DistributionTypeConstant.shangpei.getValue());
reservationEntity.setStockupStatus(ReservationStockupStatusConstant.daibeihuo.getValue());

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

@ -39,6 +39,7 @@ import com.logpm.distribution.vo.app.*;
import com.logpm.distribution.wrapper.DistributionDisStockListWrapper;
import com.logpm.distribution.wrapper.DistributionParcelListAppWrapper;
import com.logpm.distribution.wrapper.DistributionParcelListWrapper;
import com.logpm.distribution.wrapper.DistributionStockArticleWrapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@ -387,8 +388,23 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
public DistributionSignforVO getOneCustom(Long id) {
DistributionSignforVO distributionSignforVO = baseMapper.selectOneCustom(id);
//查询客户下的订单列表信息
List<DistributionStockArticleVO> stockArticleEntityList = baseMapper.selectOrderList(id);
distributionSignforVO.setOrderInfo(stockArticleEntityList);
DistributionSignforEntity signforEntity = this.getById(id);
if (Func.isEmpty(signforEntity)){
log.error("###########查询签收信息异常，id:{}",id);
return null;
}
List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = distributionReservationStockarticleService.list(Wrappers.<DistributionReservationStockarticleEntity>query().lambda().eq(DistributionReservationStockarticleEntity::getReservationId, signforEntity.getReservationId()).ne(
DistributionReservationStockarticleEntity::getStockArticleStatus, ReservationOrderStatusConstant.quxiao.getValue()));
if (Func.isEmpty(reservationStockarticleEntityList)){
log.error("#####################预约查询无订单信息，reservationId:{}",signforEntity.getReservationId());
return null;
}
List<Long> orderIds = reservationStockarticleEntityList.stream().map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList());
List<DistributionStockArticleEntity> stockArticleEntities = distributionStockArticleService.listByIds(orderIds);
if (Func.isNotEmpty(stockArticleEntities)){
distributionSignforVO.setOrderInfo(DistributionStockArticleWrapper.build().listVO(stockArticleEntities));
}
// List<DistributionStockArticleVO> stockArticleEntityList = baseMapper.selectOrderList(id);
return distributionSignforVO;
}
@ -611,7 +627,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
AtomicInteger signingTotal = new AtomicInteger();
AtomicInteger abnormalSignTotal = new AtomicInteger();
List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda().eq(DistributionLoadscanEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId()).ne(DistributionLoadscanEntity::getScanState, LoadingStatusConstant.quxiao.getValue()));
List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda().eq(DistributionLoadscanEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId()).ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
List<DistributionLoadscaninvnEntity> loadscaninvnEntityList = distributionLoadscaninvnService.list(Wrappers.<DistributionLoadscaninvnEntity>query().lambda().eq(DistributionLoadscaninvnEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId()).ne(DistributionLoadscaninvnEntity::getScanState, LoadingStatusConstant.quxiao.getValue()));
if (Func.isNotEmpty(loadscanEntityList)) {
int packSignTotal = loadscanEntityList.stream().filter(l -> Func.equals(l.getSignforState(), LoadScanSigningStatusConstant.yiqianshou.getValue())).mapToInt(DistributionLoadscanEntity::getReceivedQuantity).sum();
@ -935,7 +951,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
if (Func.isNotEmpty(orderMap.get(stockArticleEntity.getId()))) {
//统计装车数
int loadingNum = orderMap.get(stockArticleEntity.getId()).stream().mapToInt(DistributionLoadscanEntity::getLoadedNub).sum();
int signforNub = orderMap.get(stockArticleEntity.getId()).stream().filter(f -> Func.equals(f.getIsSignfor(), LoadScanSigningStatusConstant.yiqianshou.getValue())).mapToInt(DistributionLoadscanEntity::getLoadedNub).sum();
int signforNub = orderMap.get(stockArticleEntity.getId()).stream().filter(f -> Func.equals(f.getIsSignfor(), LoadScanSigningStatusConstant.yiqianshou.getValue())).mapToInt(DistributionLoadscanEntity::getReceivedQuantity).sum();
distributionAppStockArticleVO.setLoadingNub(loadingNum);
distributionAppStockArticleVO.setSignforNub(signforNub);
}
@ -977,7 +993,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionAppStockArticleVO.setReservationNum(reservationTotal);
List<DistributionParcelNumberVO> parcelNumberVOS = distributionReservationMapper.selectReservationZeroOrderDetail(rs.getStockArticleId(), rs.getReservationId());
parcelNumberVOS.forEach(p -> {
DistributionLoadscanEntity loadscanEntity = distributionLoadscanService.getOne(Wrappers.<DistributionLoadscanEntity>query().lambda().eq(DistributionLoadscanEntity::getReservationId, distributionDeliveryList.getReservationId()).eq(DistributionLoadscanEntity::getOrderId, rs.getStockArticleId()).eq(DistributionLoadscanEntity::getPackageId, p.getParcelListId()).ne(DistributionLoadscanEntity::getScanState, LoadingStatusConstant.quxiao.getValue()));
DistributionLoadscanEntity loadscanEntity = distributionLoadscanService.getOne(Wrappers.<DistributionLoadscanEntity>query().lambda().eq(DistributionLoadscanEntity::getReservationId, distributionDeliveryList.getReservationId()).eq(DistributionLoadscanEntity::getOrderId, rs.getStockArticleId()).eq(DistributionLoadscanEntity::getPackageId, p.getParcelListId()).ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
p.setLoadingNum(0);
p.setSigningNum(0);
if (Func.isNotEmpty(loadscanEntity)) {

Write Preview
Loading…
Cancel
Save