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

Merge remote-tracking branch 'origin/dev' into dev

training
pref_mail@163.com 1 year ago
parent
d7fcea7650 4f3b243a11
commit
c23d546200
14 changed files with 382 additions and 80 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. 4
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java
  2. 5
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java
  3. 1
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java
  4. 12
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java
  5. 8
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java
  6. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java
  7. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
  8. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
  9. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
  10. 20
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java
  11. 141
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
  12. 21
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
  13. 234
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
  14. 3
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java

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

@ -215,6 +215,10 @@ public class DistributionParcelListEntity extends TenantEntity {
@TableField(exist = false)
private Integer reservationNum;
@ApiModelProperty(value = "是否选择")
@TableField(exist = false)
private Boolean choice; //是否选择
@ApiModelProperty(value = "备货状态")

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

@ -39,6 +39,11 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
public class DistributionStockListEntity extends TenantEntity {
/**
* 预留1
*/
@ApiModelProperty(value = "预留1")
private Long id;
/**
* 预留1
*/

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

@ -38,5 +38,6 @@ public class DistributionStockupOrderListVO implements Serializable {
private Long stockId; //备货id
private Long allocationId; //货位id
private Integer stockQuantity; //备货数量
private Integer allocationNumber; //货位数量
}

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

@ -37,28 +37,28 @@ public class DistributionAppDeliveryListVO extends DistributionDeliveryListEntit
/**
* 装车件数
*/
@ApiModelProperty(value = "装车件数")
@ApiModelProperty(value = "计划装车件数")
private Integer loadingNub;
/**
* 装车订单数
*/
@ApiModelProperty(value = "装车订单数")
@ApiModelProperty(value = "完成装车订单数")
private Integer loadOrdNub;
/**
* 签收件数
*/
@ApiModelProperty(value = "签收件数")
@ApiModelProperty(value = "实际装车件数")
private Integer signNub;
/**
* 签收完成件数
*/
@ApiModelProperty(value = "签收完成件数")
@ApiModelProperty(value = "装车完成件数")
private Integer signNubSr;
/**
* 装车客户数
*/
@ApiModelProperty(value = "装车客户数")
@ApiModelProperty(value = "完成装车客户数")
private Integer loadCusNub;
/**
@ -136,6 +136,8 @@ public class DistributionAppDeliveryListVO extends DistributionDeliveryListEntit
private List<DistributionAppReservationVO> reservationList;
/**
* 包条数据
*/

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

@ -112,8 +112,8 @@ public class DistributionDeliveryAppController {
@GetMapping("/wrap")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "查看配送明细", notes = "DistributionAppDeliveryListDTO")
public R<IPage<DistributionAppParcelListVO>> wrap(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO, Query query) {
IPage<DistributionAppParcelListVO> page = distributionDeliveryListService.selectDistributionAppDeliverywrap(Condition.getPage(query), distributionAppDeliveryListDTO);
public R<DistributionAppDeliveryListVO> wrap(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
DistributionAppDeliveryListVO page = distributionDeliveryListService.selectDistributionAppDeliverywrap(distributionAppDeliveryListDTO);
return R.data(page);
}
@ -123,8 +123,8 @@ public class DistributionDeliveryAppController {
@GetMapping("/wrapIn")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "查看配送明细", notes = "DistributionAppDeliveryListDTO")
public R<IPage<DistributionAppStockArticleVO>> wrapIn(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO, Query query) {
IPage<DistributionAppStockArticleVO> page = distributionDeliveryListService.selectDistributionAppDeliverywrapIn(Condition.getPage(query), distributionAppDeliveryListDTO);
public R<List<DisStockListDetailVO>> wrapIn(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
List<DisStockListDetailVO> page = distributionDeliveryListService.selectDistributionAppDeliverywrapIn(distributionAppDeliveryListDTO);
return R.data(page);
}

4
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java
Unescape View File

@ -155,8 +155,8 @@ public class DistributionParcelListController extends BladeController {
@GetMapping("/pickupPack")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "查询自提包件信息", notes = "传入distributionParcelList")
public R<List<DistributionParcelListVO>> getPickupPack(@ApiIgnore @RequestParam Map<String, Object> distributionParcelList, Query query) {
List<DistributionParcelListVO> list = distributionParcelListService.getPickupPack(distributionParcelList);
public R<IPage<DistributionParcelListEntity>> getPickupPack(@ApiIgnore @RequestParam Map<String, Object> distributionParcelList, Query query) {
IPage<DistributionParcelListEntity> list = distributionParcelListService.getPickupPack(distributionParcelList,Condition.getPage(query));
return R.data(list);
}

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

@ -139,7 +139,7 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
* @param distributionAppDeliveryListDTO
* @return
*/
IPage<DistributionAppParcelListVO> selectDistributionAppDeliverywrap(IPage<DistributionAppParcelListVO> page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO);
DistributionAppDeliveryListVO selectDistributionAppDeliverywrap( DistributionAppDeliveryListDTO distributionAppDeliveryListDTO);
/**
* 查询配送任务详情
* @param id
@ -151,7 +151,7 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
*/
IPage<DistributionAppReservationVO> getAppDeliveryreservationListPage(IPage<DistributionAppReservationVO> page,DistributionAppDeliveryListDTO distributionDeliveryList);
IPage<DistributionAppStockArticleVO> selectDistributionAppDeliverywrapIn(IPage<DistributionAppStockArticleVO> page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO);
List<DisStockListDetailVO> selectDistributionAppDeliverywrapIn( DistributionAppDeliveryListDTO distributionAppDeliveryListDTO);
/**
* 修改配送任务

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

@ -152,7 +152,8 @@ public interface IDistributionParcelListService extends BaseService<Distribution
* 查询自提包件
*
* @param distributionParcelList
* @param page
* @return
*/
List<DistributionParcelListVO> getPickupPack(Map<String, Object> distributionParcelList);
IPage<DistributionParcelListEntity> getPickupPack(Map<String, Object> distributionParcelList,IPage<Object> page);
}

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

@ -1427,7 +1427,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
nu.set(nu.get() + sum);
}
//修改预约备货状态
if(nuy.get() == nu.get()){
if(nuy.get() >= nu.get()){
DistributionReservationEntity reservationEntity = new DistributionReservationEntity();
reservationEntity.setId(i.getReservationId());
reservationEntity.setStockupStatus(ReservationStockupStatusConstant.yibeihuo.getValue());

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

@ -75,6 +75,8 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
private IDistributionStockArticleService distributionStockArticleService;
private IDistributionStockListService distributionStockListService;
@Override
public IPage<DistributionDeliveryInfoVO> selectDistributionDeliveryInfoPage(IPage<DistributionDeliveryInfoVO> page, DistributionDeliveryInfoVO distributionDeliveryInfo) {
List<DistributionDeliveryInfoVO> distributionDeliveryInfoVOS = baseMapper.selectDistributionDeliveryInfoPage(page, distributionDeliveryInfo);
@ -393,8 +395,24 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
@Override
public List<DisStockListDetailVO> selectDistributionAppDeliveryInventory( DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
List<DisStockListDetailEntity> inventoryList = distributionReservationMapper.selectInventoryListByReservation(Long.parseLong(distributionAppDeliveryListDTO.getReservationId()));
if (Func.isEmpty(inventoryList)){
log.error("##########查询该客户库存品信息为null");
return null;
}
List<Long> stockListIds = inventoryList.stream().map(DisStockListDetailEntity::getStockListId).distinct().collect(Collectors.toList());
List<DistributionStockListEntity> distributionStockListEntities = distributionStockListService.listByIds(stockListIds);
Map<Long, DistributionStockListEntity> stockListMap = distributionStockListEntities.stream().collect(Collectors.toMap(DistributionStockListEntity::getId, Function.identity(), (k1, k2) -> k2));
List<DisStockListDetailVO> disStockListDetailVOS = DistributionDisStockListWrapper.build().listVO(inventoryList);
disStockListDetailVOS.stream().forEach(sd->{
if (Func.isNotEmpty(stockListMap.get(sd.getStockListId()))){
DistributionStockListEntity distributionStockListEntity = stockListMap.get(sd.getStockListId());
sd.setMarketName(distributionStockListEntity.getMarketName());
sd.setDescriptionGoods(distributionStockListEntity.getDescriptionGoods());
sd.setCargoUnit(distributionStockListEntity.getCargoUnit());
sd.setCargoNorms(distributionStockListEntity.getCargoNorms());
sd.setCargoNumber(distributionStockListEntity.getCargoNumber());
}
});
// List<DistributionAppStockArticleVO> distributionAppStockArticleVOS = baseMapper.selectDistributionAppDeliveryInventoryPage(page, distributionAppDeliveryListDTO);
return disStockListDetailVOS;
}

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

@ -41,10 +41,7 @@ import com.logpm.distribution.service.*;
import com.logpm.distribution.vo.*;
import com.logpm.distribution.vo.app.*;
import com.logpm.distribution.vo.print.PrintPreviewVO;
import com.logpm.distribution.wrapper.DistributionDeliveryListWrapper;
import com.logpm.distribution.wrapper.DistributionParcelListWrapper;
import com.logpm.distribution.wrapper.DistributionReservationWrapper;
import com.logpm.distribution.wrapper.DistributionStockArticleWrapper;
import com.logpm.distribution.wrapper.*;
import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity;
import com.logpm.warehouse.feign.IWarehouseTrayTypeClient;
import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient;
@ -89,6 +86,7 @@ import org.springframework.data.redis.connection.ReactiveListCommands;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
@ -141,6 +139,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
private final IBasicdataWarehouseClient warehouseClient;
private final IDisStockListDetailService disStockListDetailService;
private final DistributionStockListMapper distributionStockListMapper;
private final IDistributionStockListService distributionStockListService;
private final IWarehouseUpdownTypeClient warehouseUpdownTypeClient;
private final IBasicPrintTemplateClient basicPrintTemplateClient;
private final IWarehouseTrayTypeClient warehouseTrayTypeClient;
@ -1249,6 +1248,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
if (Func.isEmpty(reservationStockarticleEntityList)) {
log.error("####################reservationStockarticleEntityList维护数据异常,reservationID:{}", distrilbutionloadingscanDTO.getReservationId());
}
List<DisStockListDetailEntity> stockListDetailEntityList = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
.eq(DisStockListDetailEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId())
.ne(DisStockListDetailEntity::getStockPackageStatus, ReservationInventoryStatusConstant.quxiao.getValue()));
boolean inventoryLoadingFlag = stockListDetailEntityList.stream().allMatch(i -> i.getStockPackageStatus().equals(InventoryLoadingStatusConstant.yizhuangche.getValue()));
boolean inventoryStockUpFlag = stockListDetailEntityList.stream().anyMatch(l -> Func.isEmpty(l.getStockPackageCode()));
if (inventoryStockUpFlag) {
log.error("##################库存品未备货");
return Resp.scanFail("操作失败","存在库存品未备货");
// return R.fail("该客户存在库存品暂未备货 一键装车失败!!!");
}
Map<String, List<DistributionReservationStockarticleEntity>> allStockArticle = reservationStockarticleEntityList.stream().filter(f -> Func.isNotEmpty(f.getIsZero())).collect(Collectors.groupingBy(DistributionReservationStockarticleEntity::getIsZero));
DistributionDeliverySelfEntity finalDistributionDeliverySelfEntity = distributionDeliverySelfEntity;
allStockArticle.forEach((k, v) -> {
@ -1443,16 +1452,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
break;
}
});
List<DisStockListDetailEntity> stockListDetailEntityList = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
.eq(DisStockListDetailEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId())
.ne(DisStockListDetailEntity::getStockPackageStatus, ReservationInventoryStatusConstant.quxiao.getValue()));
boolean inventoryLoadingFlag = stockListDetailEntityList.stream().allMatch(i -> i.getStockPackageStatus().equals(InventoryLoadingStatusConstant.yizhuangche.getValue()));
boolean inventoryStockUpFlag = stockListDetailEntityList.stream().anyMatch(l -> Func.isEmpty(l.getStockPackageCode()));
if (inventoryStockUpFlag) {
log.error("##################库存品未备货");
throw new RuntimeException("该客户存在库存品暂未备货 一键装车失败!!!");
// return R.fail("该客户存在库存品暂未备货 一键装车失败!!!");
}
// List<DisStockListDetailEntity> stockListDetailEntityList = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
// .eq(DisStockListDetailEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId())
// .ne(DisStockListDetailEntity::getStockPackageStatus, ReservationInventoryStatusConstant.quxiao.getValue()));
// boolean inventoryLoadingFlag = stockListDetailEntityList.stream().allMatch(i -> i.getStockPackageStatus().equals(InventoryLoadingStatusConstant.yizhuangche.getValue()));
// boolean inventoryStockUpFlag = stockListDetailEntityList.stream().anyMatch(l -> Func.isEmpty(l.getStockPackageCode()));
// if (inventoryStockUpFlag) {
// log.error("##################库存品未备货");
// return Resp.scanFail("操作失败","存在库存品未备货");
//// return R.fail("该客户存在库存品暂未备货 一键装车失败!!!");
// }
if (!inventoryLoadingFlag) {
//存在库存品海为进行装车
for (DisStockListDetailEntity disStockListDetailEntity : stockListDetailEntityList) {
@ -2464,9 +2473,27 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
}
@Override
public IPage<DistributionAppStockArticleVO> selectDistributionAppDeliverywrapIn(IPage<DistributionAppStockArticleVO> page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
List<DistributionAppStockArticleVO> distributionAppStockListVOS = baseMapper.selectListbyink(page, distributionAppDeliveryListDTO.getId());
return page.setRecords(distributionAppStockListVOS);
public List<DisStockListDetailVO> selectDistributionAppDeliverywrapIn(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
List<DisStockListDetailEntity> detailEntities = baseMapper.selectInventoryListByDeliveryListId(distributionAppDeliveryListDTO.getId());
if (Func.isEmpty(detailEntities)){
return null;
}
List<Long> stockListIds = detailEntities.stream().map(DisStockListDetailEntity::getStockListId).distinct().collect(Collectors.toList());
List<DistributionStockListEntity> distributionStockListEntities = distributionStockListService.listByIds(stockListIds);
Map<Long, DistributionStockListEntity> stockListMap = distributionStockListEntities.stream().collect(Collectors.toMap(DistributionStockListEntity::getId, Function.identity(), (k1, k2) -> k2));
List<DisStockListDetailVO> disStockListDetailVOS = DistributionDisStockListWrapper.build().listVO(detailEntities);
disStockListDetailVOS.stream().forEach(sd->{
if (Func.isNotEmpty(stockListMap.get(sd.getStockListId()))){
DistributionStockListEntity distributionStockListEntity = stockListMap.get(sd.getStockListId());
sd.setMarketName(distributionStockListEntity.getMarketName());
sd.setDescriptionGoods(distributionStockListEntity.getDescriptionGoods());
sd.setCargoUnit(distributionStockListEntity.getCargoUnit());
sd.setCargoNorms(distributionStockListEntity.getCargoNorms());
sd.setCargoNumber(distributionStockListEntity.getCargoNumber());
}
});
return disStockListDetailVOS;
}
@Override
@ -3619,7 +3646,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
@Override
public IPage<DistributionAppParcelListVO> selectDistributionAppDeliverywrap(IPage<DistributionAppParcelListVO> page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
public DistributionAppDeliveryListVO selectDistributionAppDeliverywrap( DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
//查询配送
// DistributionDeliveryListEntity distributionDeliveryListEntity = baseMapper.selectById(distributionAppDeliveryListDTO.getId());
// DistributionAppDeliveryListVO distributionAppDeliveryListVO = new DistributionAppDeliveryListVO();
@ -3633,10 +3660,84 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
// for (DistributionAppStockArticleVO distributionAppStockArticleVO : distributionAppStockArticleVOS) {
// if (distributionAppStockArticleVO.getLoadingNub() >=distributionAppStockArticleVO.getReservationNum()) {ordCount +=1;}
// }
DistributionDeliveryListEntity distributionDeliveryListEntity = baseMapper.selectById(distributionAppDeliveryListDTO.getId());
DistributionAppDeliveryListVO distributionAppDeliveryListVO = Func.copy(distributionDeliveryListEntity, DistributionAppDeliveryListVO.class);
//查询该配送所有包条
List<DistributionAppParcelListVO> parcelListVOS = baseMapper.selectListbypack(page, distributionAppDeliveryListDTO);
List<DistributionAppParcelListVO> appParcelListVOS = new ArrayList<>();
List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = baseMapper.selectReservationStockByDeliveryId(distributionAppDeliveryListDTO.getId());
List<DistributionReservationEntity> reservationEntityList = baseMapper.selectReservationByDeliveryListId(distributionAppDeliveryListDTO.getId());
if (Func.isEmpty(reservationEntityList)){
log.error("###################查询配送预约信息异常，deliveryID:{}",distributionAppDeliveryListDTO.getId());
return null;
}
if (Func.isEmpty(reservationStockarticleEntityList)){
return null;
}
//计划客户数
Long customersNumber = reservationStockarticleEntityList.stream().map(DistributionReservationStockarticleEntity::getReservationId).count();
Long orderNumber = reservationStockarticleEntityList.stream().map(DistributionReservationStockarticleEntity::getStockArticleId).count();
int signNub = reservationEntityList.stream().mapToInt(DistributionReservationEntity::getReservationNum).sum() + reservationEntityList.stream().mapToInt(DistributionReservationEntity::getReservationStockListNum).sum();
//维护计划数量
distributionAppDeliveryListVO.setCustomersNumber(customersNumber.intValue());
distributionAppDeliveryListVO.setOrderNumber(orderNumber.intValue());
distributionAppDeliveryListVO.setSignNub(signNub);
//维护完成情况
Long loadCusNub = reservationEntityList.stream().filter(r -> r.getLoadingStatus().equals(ReservationLoadingStatusConstant.yizhuangche.getValue())).count();
distributionAppDeliveryListVO.setLoadCusNub(loadCusNub.intValue());
AtomicInteger loadOrdNub = new AtomicInteger();
AtomicInteger signNubSr = new AtomicInteger();
// distributionLoadscanService.list(Wrappers.query().lambda().eq(DistributionLoadscanEntity::get))
reservationStockarticleEntityList.forEach(rs->{
if (rs.getIsZero().equals(IsOrNoConstant.no.getValue())){
List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.selectPackageByReservationAndStockArticle(rs.getReservationId(), rs.getStockArticleId());
List<DistributionLoadscanEntity> packageLoadingList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
.eq(DistributionLoadscanEntity::getDeliveryId, distributionAppDeliveryListDTO.getId())
.eq(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
.eq(DistributionLoadscanEntity::getReservationId, rs.getReservationId())
.in(DistributionLoadscanEntity::getPackageId, parcelListEntityList.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList())));
if (Func.isNotEmpty(packageLoadingList)){
signNubSr.getAndAdd(packageLoadingList.stream().mapToInt(DistributionLoadscanEntity::getLoadedNub).sum());
}
boolean packageFlag = parcelListEntityList.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue()));
if (packageFlag){
//完成订单累加
loadOrdNub.getAndIncrement();
}
for (DistributionParcelListEntity parcelListEntity : parcelListEntityList) {
DistributionAppParcelListVO appParcelListVO = Func.copy(parcelListEntity, DistributionAppParcelListVO.class);
appParcelListVOS.add(appParcelListVO);
}
}else if (rs.getIsZero().equals(IsOrNoConstant.yes.getValue())){
List<DistributionParcelNumberVO> parcelNumberVOS = distributionReservationMapper.selectReservationZeroOrderDetail(rs.getStockArticleId(), rs.getReservationId());
List<DistributionLoadscanEntity> loadscanEntities = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
.eq(DistributionLoadscanEntity::getDeliveryId, distributionAppDeliveryListDTO.getId())
.eq(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
.eq(DistributionLoadscanEntity::getReservationId, rs.getReservationId())
.in(DistributionLoadscanEntity::getPackageId, parcelNumberVOS.stream().map(DistributionParcelNumberVO::getParcelListId).collect(Collectors.toList())));
if (Func.isNotEmpty(loadscanEntities)){
//统计装车数量
signNubSr.getAndAdd(loadscanEntities.stream().mapToInt(DistributionLoadscanEntity::getLoadedNub).sum());
int zeroPackageLoadingNum = loadscanEntities.stream().mapToInt(DistributionLoadscanEntity::getLoadedNub).sum();
if (rs.getReservationNum() == zeroPackageLoadingNum){
loadOrdNub.getAndIncrement();
}
}
parcelNumberVOS.forEach(p->{
DistributionAppParcelListVO appParcelListVO = Func.copy(p, DistributionAppParcelListVO.class);
appParcelListVOS.add(appParcelListVO);
});
}else {
log.error("############reservation_stockarticle表isZero字段维护错误,reservationId:{}",rs.getReservationId());
}
});
return page.setRecords(parcelListVOS);
distributionAppDeliveryListVO.setLoadOrdNub(loadOrdNub.get());
distributionAppDeliveryListVO.setSignNubSr(signNubSr.get());
// List<DistributionAppParcelListVO> parcelListVOS = baseMapper.selectListbypack(page, distributionAppDeliveryListDTO);
return distributionAppDeliveryListVO;
}
@Override

21
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
Unescape View File

@ -496,30 +496,33 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
* 查询自提包件
*
* @param distributionParcelList
* @param page
* @return
*/
@Override
public List<DistributionParcelListVO> getPickupPack(Map<String, Object> distributionParcelList) {
public IPage<DistributionParcelListEntity> getPickupPack(Map<String, Object> distributionParcelList, IPage<Object> page) {
Object o = distributionParcelList.get("stockArticleId");
Object reservationId = distributionParcelList.get("reservationId");
List<DistributionParcelListEntity> distributionParcelListEntities = baseMapper.selectList(Wrappers.<DistributionParcelListEntity>query().lambda()
.eq(DistributionParcelListEntity::getStockArticleId, o)
.eq(DistributionParcelListEntity::getConditions, "1")
);
List<DistributionParcelListVO> list = new ArrayList<>();
distributionParcelListEntities.forEach( i ->{
DistributionParcelListDTO parcelListEntity = new DistributionParcelListDTO();
parcelListEntity.setStockArticleId(Long.valueOf(o.toString()));
parcelListEntity.setConditions(1);
IPage<DistributionParcelListEntity> distributionParcelListEntityIPage = baseMapper.pageOweList(page, parcelListEntity);
List<DistributionParcelListEntity> list = new ArrayList<>();
distributionParcelListEntityIPage.getRecords().forEach( i ->{
DistributionReservationZeroPackageEntity one = reservationZeroPackageService.getOne(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
.eq(DistributionReservationZeroPackageEntity::getStockArticleId, i.getStockArticleId())
.eq(DistributionReservationZeroPackageEntity::getReservationId, reservationId)
.eq(DistributionReservationZeroPackageEntity::getParcelListId, i.getId())
.apply("zero_package_status in (1,3)")
);
DistributionParcelListVO parcelListVO = new DistributionParcelListVO();
DistributionParcelListEntity parcelListVO = new DistributionParcelListEntity();
BeanUtils.copyProperties(i,parcelListVO);
parcelListVO.setChoice(ObjectUtils.isNotNull(one) ? true : false);
list.add(parcelListVO);
});
return list;
distributionParcelListEntityIPage.setRecords(list);
return distributionParcelListEntityIPage;
}

234
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
Unescape View File

@ -17,6 +17,7 @@
package com.logpm.distribution.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -109,7 +110,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
@Autowired
private IWarehouseTrayGoodsClient warehouseTrayGoodsClient;
@Autowired
private IWarehouseTaryAllocationClient warehouseTaryAllocationClient;
private IWarehouseTaryAllocationClient warehouseTaryAllocationClient; //托盘货位ID
@Autowired
private IDistributionReservationPackageService distributionReservationPackageService;
@ -432,9 +433,18 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
//没有
List<DistributionStockPackageVO> list2 = distrilbutionBillStockService.listPackageSelf(i.getReservationId());
i.setPlanNum(i.getPlanNum()+list2.size());
List<DistributionStockEntity> listStock = distributionStockService.list(Wrappers.<DistributionStockEntity>query().lambda()
.eq(DistributionStockEntity::getBillLadingId, i.getReservationId())
.eq(DistributionStockEntity::getStockupId, stockupDTO.getStockupId())
);
if(!listStock.isEmpty()){
int sum = listStock.stream().mapToInt(DistributionStockEntity::getStockQuantity).sum();
i.setStockupNum(sum);
}else{
i.setStockupNum(0);
}
});
map.put("orderList", list);
} else {
//商 ，市
@ -454,6 +464,16 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
intToStrDistributionStockupListVO(distributionStockupListVO);
distributionStockupListVO.setReservationId(Long.parseLong(split[i]));
distributionStockupListVO.setPlanNum(distributionStockupListVO.getPlanNum()+ list1.stream().mapToInt(DistributionReservationZeroPackageEntity::getQuantity).sum());
List<DistributionStockEntity> list2 = distributionStockService.list(Wrappers.<DistributionStockEntity>query().lambda()
.eq(DistributionStockEntity::getReservationId, stockupDTO.getReservationId())
.eq(DistributionStockEntity::getStockupId, stockupDTO.getStockupId())
);
if(!list2.isEmpty()){
int sum = list2.stream().mapToInt(DistributionStockEntity::getStockQuantity).sum();
distributionStockupListVO.setStockupNum(sum);
}else{
distributionStockupListVO.setStockupNum(0);
}
list.add(distributionStockupListVO);
}
}
@ -606,6 +626,86 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
}
/**
* 查询零担托盘信息
*/
public DistributionStockupOrderListVO getTrayInfo(DistributionStockupOrderListVO i, Long stockArticleId,Long warehouseId,String orderCode,Long allocationId){
//查询货位上面有没有绑定托盘
WarehouseTrayGoodsEntity trayGoodsEntity = new WarehouseTrayGoodsEntity();
trayGoodsEntity.setAssociationId(stockArticleId);
trayGoodsEntity.setWarehouseId(warehouseId);
trayGoodsEntity.setAssociationValue(orderCode);
trayGoodsEntity.setAssociationType("1");
if(ObjectUtils.isNotNull(allocationId)){
List<WarehouseTaryAllocationEntity> allocationEntityList = warehouseTaryAllocationClient.getAllocationId(allocationId);
if(ObjectUtils.isNotNull(allocationEntityList) && !allocationEntityList.isEmpty()){
//查询托盘信息
List<WarehouseTrayGoodsEntity> trayList = warehouseTrayGoodsClient.getTrayList(trayGoodsEntity);
if(!trayList.isEmpty()){
i.setTrayId(trayList.get(0).getId().toString());
i.setPallet(trayList.get(0).getTrayCode());
}
}
}else{
List<WarehouseTrayGoodsEntity> trayList = warehouseTrayGoodsClient.getTrayList(trayGoodsEntity);
if(!trayList.isEmpty()){
String trayId = trayList.stream().map(WarehouseTrayGoodsEntity::getTrayId).collect(Collectors.toList()).stream().map(Object::toString).collect(Collectors.joining(","));
String trayCode = trayList.stream().map(WarehouseTrayGoodsEntity::getTrayCode).collect(Collectors.joining(","));
i.setTrayId(trayId);
i.setPallet(trayCode);
}
}
return i;
}
/**
* 查询零担货位信息
* @param list
* @return
*/
public List<DistributionStockupOrderListVO> getZeroTrayInfo(List<DistributionStockupOrderListVO> list){
List<DistributionStockupOrderListVO> listStockup = new ArrayList<>();
Iterator<DistributionStockupOrderListVO> iterator = list.iterator();
while (iterator.hasNext()){
DistributionStockupOrderListVO i = iterator.next();
BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
if(ObjectUtils.isNull(myCurrentWarehouse)){
throw new ServiceException("请选择仓库信息！！");
}
//查询货位信息
WarehouseUpdownGoodsEntity updownGoodsEntity = new WarehouseUpdownGoodsEntity();
updownGoodsEntity.setAssociationId(Long.valueOf(i.getStockArticleId()));
updownGoodsEntity.setWarehouseId(myCurrentWarehouse.getId());
updownGoodsEntity.setAssociationValue(i.getOrderCode());
updownGoodsEntity.setAssociationType("1");
List<WarehouseUpdownGoodsEntity> information = warehouseUpdownGoodsClient.getLocationStockListInformation(updownGoodsEntity);
if(!information.isEmpty()){
DistributionStockupOrderListVO finalI = i;
information.stream().forEach(q ->{
DistributionStockupOrderListVO stockupOrderListVO = new DistributionStockupOrderListVO();
BeanUtils.copyProperties(finalI,stockupOrderListVO);
//查询托盘信息
stockupOrderListVO = getTrayInfo(stockupOrderListVO,Long.valueOf(stockupOrderListVO.getStockArticleId()),myCurrentWarehouse.getId(),stockupOrderListVO.getOrderCode(),q.getAllocationId());
stockupOrderListVO.setAllocation(q.getPositionCode());
stockupOrderListVO.setAllocationId(q.getAllocationId());
stockupOrderListVO.setAllocationNumber(q.getNum());
listStockup.add(stockupOrderListVO);
iterator.remove();
});
}
}
list.addAll(listStockup);
return list;
}
/**
* 查询自提信息
* @param reservationId
@ -620,35 +720,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
}
//零担查询货位，托盘信息
if(stockupDTO.getIsZero().equals("1")){
list.stream().forEach( i ->{
BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
if(ObjectUtils.isNull(myCurrentWarehouse)){
throw new ServiceException("请选择仓库信息！！");
}
WarehouseTrayGoodsEntity trayGoodsEntity = new WarehouseTrayGoodsEntity();
trayGoodsEntity.setAssociationId(Long.valueOf(i.getStockArticleId()));
trayGoodsEntity.setWarehouseId(myCurrentWarehouse.getId());
trayGoodsEntity.setAssociationValue(i.getOrderCode());
trayGoodsEntity.setAssociationType("1");
List<WarehouseTrayGoodsEntity> trayList = warehouseTrayGoodsClient.getTrayList(trayGoodsEntity);
if(!trayList.isEmpty()){
i.setTrayId(trayList.get(0).getId().toString());
i.setPallet(trayList.get(0).getTrayCode());
}
WarehouseUpdownGoodsEntity updownGoodsEntity = new WarehouseUpdownGoodsEntity();
updownGoodsEntity.setAssociationId(Long.valueOf(i.getStockArticleId()));
trayGoodsEntity.setWarehouseId(myCurrentWarehouse.getId());
trayGoodsEntity.setAssociationValue(i.getOrderCode());
trayGoodsEntity.setAssociationType("1");
List<WarehouseUpdownGoodsEntity> information = warehouseUpdownGoodsClient.getLocationStockListInformation(updownGoodsEntity);
if(!information.isEmpty()){
i.setAllocation(information.get(0).getPositionCode());
i.setAllocationId(information.get(0).getAllocationId());
}
});
List<DistributionStockupOrderListVO> zeroTrayInfo = getZeroTrayInfo(list);
if(!zeroTrayInfo.isEmpty()){
list = zeroTrayInfo;
}
}
//获取有货位的数据
List<DistributionStockupOrderListVO> collect11 = list.stream().filter(o -> ObjectUtils.isNotNull(o.getAllocationId())).collect(Collectors.toList());
Set<DistributionStockupOrderListVO> listYou = new HashSet<>();
@ -838,6 +914,14 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
if(!list.isEmpty() && ObjectUtils.isNull(list.get(0))){
return new ArrayList<>();
}
//零担查询货位，托盘信息
if(stockupDTO.getIsZero().equals("1")){
List<DistributionStockupOrderListVO> zeroTrayInfo = getZeroTrayInfo(list);
if(!zeroTrayInfo.isEmpty()){
list = zeroTrayInfo;
}
}
List<DistributionStockupOrderListVO> collect11 = list.stream().filter(o -> ObjectUtils.isNotNull(o.getAllocationId())).collect(Collectors.toList()); //有货位
Set<DistributionStockupOrderListVO> listYou = new HashSet<>(); //
collect11.forEach( p ->{
@ -882,6 +966,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
if (ObjectUtils.isNull(p.getStockId())){
p.setScanNum(0);
}else{
p.setCompleteStact(true);
p.setScanNum(i2);
}
listYou.add(p);
@ -892,6 +977,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
if (ObjectUtils.isNull(p.getStockId())){
p.setScanNum(0);
}else{
p.setCompleteStact(true);
p.setScanNum(i2);
}
@ -2170,20 +2256,68 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
}
}
/**
* 查询货位数据
*/
public WarehouseUpdownGoodsEntity getAllocationInfo(Long allocationId,String orderCode,Long warehouseId){
//查询货位信息
WarehouseUpdownGoodsEntity updownGoodsEntity = new WarehouseUpdownGoodsEntity();
updownGoodsEntity.setAssociationType("1");
updownGoodsEntity.setAllocationId(allocationId);
updownGoodsEntity.setWarehouseId(warehouseId);
return warehouseUpdownGoodsClient.getLocationInformation(updownGoodsEntity);
}
/**
* 零担备货
* @param stockupDTO
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public R zeroStockUp(StockupZeroDTO stockupDTO) {
log.info("备货零担数据》》》",stockupDTO);
if (stockupDTO.getList().isEmpty()) return R.fail("基础数据为空");
if (ObjectUtils.isNull( stockupDTO.getAllocationId())) return Resp.scanFail("当前货物未上架，请上架！","当前货物未上架，请上架！");
//有没有多个订单数据
if(stockupDTO.getStockArticleId().contains(",")){
stockupDTO.setStockArticleIdList(stockupDTO.getStockArticleId().split(","));
stockupDTO.setStockArticleId(null);
}
BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
if(ObjectUtils.isNull(myCurrentWarehouse)){
throw new ServiceException("请选择仓库！！");
}
//查询货位是否有货
WarehouseUpdownGoodsEntity allocationInfo = getAllocationInfo(stockupDTO.getAllocationId(), null, myCurrentWarehouse.getId());
if(ObjectUtils.isNotNull(allocationInfo)){
int sum = stockupDTO.getList().stream().mapToInt(StockupZeroVO::getQuantity).sum();
if(allocationInfo.getNum() < sum){
return Resp.scanFail("备货数量大于该货架的数量！","备货数量大于该货架的数量！");
}
}else{
return Resp.scanFail("当前货物未上架，请上架！","当前货物未上架，请上架！");
}
//判断是否备货完成
for (StockupZeroVO i : stockupDTO.getList()) {
//查询是否备货完成
DistributionReservationZeroPackageEntity one = reservationZeroPackageService.getOne(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
.eq(DistributionReservationZeroPackageEntity::getZeroPackageStatus, "1")
.eq(DistributionReservationZeroPackageEntity::getId, i.getId())
);
if(ObjectUtils.isNull()){
return Resp.scanFail(i.getCategoryName()+"备货信息未找到！",i.getCategoryName()+"备货信息未找到！");
}
if(one.getQuantity().equals(one.getRealityQuantity())){
return Resp.scanFail(i.getCategoryName()+"备货已完成！！",i.getCategoryName()+"备货已完成！！");
}
}
//把数据取出来
List<StockupZeroVO> zeroStockUpData;;
@ -2206,7 +2340,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
//有
zeroStockUpData = distributionStockupService.getZeroStockUpDataYou(stockupDTO);
}
}
int xiugai= 0;
List<StockupZeroVO> collect = stockupDTO.getList().stream().filter( //可以
@ -2214,12 +2347,23 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
).collect(Collectors.toList());
//添加备货信息
List<DistributionStockEntity> stockEntityList = new ArrayList<>();
List<JSONObject> jsonObjectList = new ArrayList<>();
for (StockupZeroVO i : collect) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("warehouseId",myCurrentWarehouse.getId());
//查询是不是当前包件
DistributionReservationZeroPackageEntity byId1 = reservationZeroPackageService.getById(i.getId());
if(ObjectUtils.isNull(byId1)){
continue;
}
DistributionStockArticleEntity stockArticle = distributionStockArticleService.getById(byId1.getStockArticleId());
if(ObjectUtils.isNull(stockArticle)){
throw new ServiceException("订单数据不存在！！");
}
jsonObject.put("orderCode",stockArticle.getOrderCode());
jsonObject.put("waybillCode",stockArticle.getWaybillNumber());
//查询备货信息
QueryWrapper<DistributionStockEntity> queryWrapper = new QueryWrapper<>();
if(stockupDTO.getTypeService().equals("3")){
queryWrapper.eq("bill_lading_id",stockupDTO.getReservationId());
@ -2232,8 +2376,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
queryWrapper.eq("parcel_list_id", byId1.getParcelListId());
DistributionStockEntity one = distributionStockService.getOne(queryWrapper );
//查询备货数量
DistributionReservationZeroPackageEntity byId = reservationZeroPackageService.getById(i.getId());
if(i.getQuantity() > byId.getQuantity()){
// DistributionReservationZeroPackageEntity byId = reservationZeroPackageService.getById(i.getId());
if(i.getQuantity() > byId1.getQuantity()){
return Resp.scanFail(i.getCategoryName()+"备货数量大于待备货数量！",i.getCategoryName()+"备货数量大于待备货数量！");
}
Optional<StockupZeroVO> first = stockupDTO.getList().stream().filter(q -> i.getStockArticleId().equals(q.getStockArticleId()) && q.getQuantity() <= i.getQuantity() && q.getQuantity() > 0).findFirst();
@ -2243,12 +2387,14 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
DistributionStockEntity stockEntity = new DistributionStockEntity();
stockEntity.setId(one.getId());
stockEntity.setStockQuantity(first.get().getQuantity());
int i1 = first.get().getQuantity() - first.get().getRealityQuantity(); //这次备货的数量
jsonObject.put("enterNum",i1);
distributionStockService.updateById(stockEntity);
}else{
DistributionStockEntity stockEntity = new DistributionStockEntity();
stockEntity.setStockArticle(i.getStockArticleId());
stockEntity.setStockupId(stockupDTO.getStockupId());
stockEntity.setParcelListId(byId.getParcelListId());
stockEntity.setParcelListId(byId1.getParcelListId());
if(stockupDTO.getTypeService().equals("3")){
stockEntity.setBillLadingId(stockupDTO.getReservationId());
}else{
@ -2258,9 +2404,13 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
stockEntity.setGoodsName(i.getCategoryName());
stockEntity.setOutboundType("3");
stockEntity.setType(3);
stockEntity.setAllocationId(stockupDTO.getAllocationId());
//查询货位信息
stockEntity.setAllocationTitle(getAllocationInfo(stockupDTO.getAllocationId(),stockArticle.getOrderCode(),myCurrentWarehouse.getId()).getAllocationTitle());
DistributionStockupEntity distributionStockupEntity = distributionStockupService.selectById(stockupDTO.getStockupId());
stockEntity.setStockupArea(ObjectUtils.isNotNull(distributionStockupEntity) ? distributionStockupEntity.getStockupArea() : null);
stockEntity.setStockQuantity(first.get().getQuantity());// 备货数量
jsonObject.put("enterNum",i.getQuantity());
stockEntityList.add(stockEntity);
}
//修改备货数量
@ -2273,12 +2423,27 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
}else{
xiugai += 1;
}
//有货位下架
jsonObject.put("allocationId",stockupDTO.getAllocationId());
jsonObjectList.add(jsonObject);
}
if(!jsonObjectList.isEmpty()){
if(ObjectUtils.isNotNull(stockupDTO.getAllocationId())){
R r = warehouseUpdownTypeClient.downZeroOrder(jsonObjectList);
if(r.getCode() != 200){
return Resp.scanFail("货架下架失败！请联系管理员！","货架下架失败！请联系管理员！");
}
}
}
if(!stockEntityList.isEmpty()){
boolean b = distributionStockService.saveBatch(stockEntityList);
if(b){
//修改备货状态
distributionAsyncService.stockZero(stockupDTO);
//下架零担
return Resp.scanSuccess("备货成功！","备货成功！");
}else{
//
@ -2288,6 +2453,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
if(collect.size() == xiugai){
//修改备货状态
distributionAsyncService.stockZero(stockupDTO);
//下架零担
return Resp.scanSuccess("备货成功！","备货成功！");
}
return Resp.scanFail("备货失败！","备货失败！");

3
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java
Unescape View File

@ -71,8 +71,9 @@ public class WarehouseUpdownGoodsClient implements IWarehouseUpdownGoodsClient {
return warehouseUpdownGoodsService.getOne(Wrappers.<WarehouseUpdownGoodsEntity>query().lambda()
.eq(ObjectUtils.isNotNull(updownGoodsEntity.getAllocationId()),WarehouseUpdownGoodsEntity::getAllocationId,updownGoodsEntity.getAllocationId())
.eq(WarehouseUpdownGoodsEntity::getAssociationValue,updownGoodsEntity.getAssociationValue())
.eq(ObjectUtils.isNotNull(updownGoodsEntity.getAssociationValue()),WarehouseUpdownGoodsEntity::getAssociationValue,updownGoodsEntity.getAssociationValue())
.eq(WarehouseUpdownGoodsEntity::getWarehouseId,updownGoodsEntity.getWarehouseId())
.eq(ObjectUtils.isNotNull(updownGoodsEntity.getAssociationType()),WarehouseUpdownGoodsEntity::getAssociationType,updownGoodsEntity.getAssociationType())
.eq(ObjectUtils.isNotNull(updownGoodsEntity.getAssociationId()),WarehouseUpdownGoodsEntity::getAssociationId,updownGoodsEntity.getAssociationId())
);
}

Write Preview
Loading…
Cancel
Save