diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java index d08ee5b42..fa7df1cd7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java @@ -32,10 +32,7 @@ import com.logpm.distribution.excel.DistributionSignforExcel; import com.logpm.distribution.excel.DistributionSignforOrderExcel; import com.logpm.distribution.excel.DistributionSignforOwnExcel; import com.logpm.distribution.excel.DistributionSignforPackageExcel; -import com.logpm.distribution.service.IDistributionAsyncService; -import com.logpm.distribution.service.IDistributionDeliveryListService; -import com.logpm.distribution.service.IDistributionReservationService; -import com.logpm.distribution.service.IDistributionSignforService; +import com.logpm.distribution.service.*; import com.logpm.distribution.service.impl.DistributionAddvalueServiceImpl; import com.logpm.distribution.vo.*; import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient; @@ -82,6 +79,8 @@ public class DistributionSignforController extends BladeController { private final DistributionAddvalueServiceImpl distributionAddvalueService; + private final IDistributionStockupInfoService distributionStockupInfoService; + private final IWarehouseUpdownTypeClient updownTypeClient; private final IBasicdataWarehouseClient warehouseClient; @@ -320,6 +319,8 @@ public class DistributionSignforController extends BladeController { DistributionSignforDTO distributionSignforDTO = new DistributionSignforDTO(); distributionSignforDTO.setId(distributionSignfor.getId()); distributionSignforService.updateSign(distributionSignforDTO); + distributionStockupInfoService.maintenanceStockUp(distributionSignfor.getReservationId(),1); + } // return R.status(distributionSignforService.updateById(distributionSignfor)); return r; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupInfoService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupInfoService.java index db6b437bb..b643e1f1a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupInfoService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupInfoService.java @@ -64,4 +64,11 @@ public interface IDistributionStockupInfoService extends BaseService selectStockListSelfNum(String s); + + /** + * 维护备货任务 + * @param reservationId + * @param type + */ + void maintenanceStockUp(Long reservationId, Integer type); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java index 6c597fe20..d99d36f0a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java @@ -301,10 +301,5 @@ public interface IDistributionStockupService extends BaseService 0){ + stockArticleEntity.setGenre(1); + } this.updateById(stockArticleEntity); } } else if (IsOrNoConstant.yes.getValue().equals(stockArticleEntity.getIsZero())) { @@ -1602,6 +1605,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl implements IDistributionStockupInfoService { + @Autowired + @Lazy + private IDistributionStockupService distributionStockupService; + @Override public IPage selectReservationStockupPage(IPage page, DistributionStockupInfoVO reservationStockup) { return page.setRecords(baseMapper.selectDistributionStockupInfoPage(page, reservationStockup)); @@ -85,4 +99,75 @@ public class DistributionStockupInfoServiceImpl extends BaseServiceImpl entityList = this.list(Wrappers.query().lambda() + .eq(DistributionStockupInfoEntity::getReservationId, reservationId) + .ne(DistributionStockupInfoEntity::getStockUpType, 3) + .ne(DistributionStockupInfoEntity::getStockStatus, "4") + ); + if (entityList.size()==1){ + distributionStockupInfoEntity = entityList.get(0); + + //可进行备货任务的完结标识 + distributionStockupInfoEntity.setStockStatus("3"); + this.updateById(distributionStockupInfoEntity); + //查询备货任务是否都完成 + }else { + //查询备货任务错误的原因 + log.error(method+"预约单关联备货任务错误reservationId:{}",reservationId); + } + break; + case 2: + List billLadingentityList = this.list(Wrappers.query().lambda() + .eq(DistributionStockupInfoEntity::getReservationId, reservationId) + .eq(DistributionStockupInfoEntity::getStockUpType, 3) + .ne(DistributionStockupInfoEntity::getStockStatus, "4") + ); + if (billLadingentityList.size() == 1){ + distributionStockupInfoEntity = billLadingentityList.get(0); + //可进行备货任务的完结标识 + distributionStockupInfoEntity.setStockStatus("3"); + this.updateById(distributionStockupInfoEntity); + }else { + log.error(method+"预约单关联备货任务错误reservationId:{}",reservationId); + } + break; + default: + List stockupInfoEntityList = this.list(Wrappers.query().lambda() + .eq(DistributionStockupInfoEntity::getStockupId, distributionStockupInfoEntity.getStockupId()) + .ne(DistributionStockupInfoEntity::getStockStatus, "4") + ); + if (Func.isNotEmpty(stockupInfoEntityList)){ + DistributionStockupEntity distributionStockupEntity = new DistributionStockupEntity(); + distributionStockupEntity.setId(distributionStockupInfoEntity.getStockupId()); + boolean flag = stockupInfoEntityList.stream().allMatch(f -> "3".equals(f.getStockStatus())); + if (flag){ + distributionStockupEntity.setStockupStatus(StockupStatusConstant.yibeihuo.getValue()); + }else { + //查询是否存在完结 + boolean anyMatch = stockupInfoEntityList.stream().anyMatch(f -> "3".equals(f.getStockStatus())); + if (anyMatch){ + distributionStockupEntity.setStockupStatus(StockupStatusConstant.beihuozhong.getValue()); + }else { + distributionStockupEntity.setStockupStatus(StockupStatusConstant.daibeihuo.getValue()); + } + } + distributionStockupService.updateById(distributionStockupEntity); + } + break; + } + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 564cafb1d..ade4e5ee4 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -3368,35 +3368,4 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl entityList = distributionStockupInfoService.list(Wrappers.query().lambda() - .eq(DistributionStockupInfoEntity::getReservationId, reservationId) - .ne(DistributionStockupInfoEntity::getStockUpType, "3") - ); - if (Func.isNotEmpty(entityList)){ - if (entityList.size() == 1){ - //进行备货任务 - - } else { - //一个预约任务对应了多个备货任务 - } - }else { - //查询预约任务错误 - - } - break; - case 2: - //自提备货 - break; - } - } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OpPushFailedPackageRecordServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OpPushFailedPackageRecordServiceImpl.java index 67e89772e..3a50bd291 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OpPushFailedPackageRecordServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OpPushFailedPackageRecordServiceImpl.java @@ -7,6 +7,7 @@ import com.logpm.factory.oupai.mapper.OpFailRetryPushPackageMapper; import com.logpm.factory.oupai.service.OpPushFailedPackageRecordService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; import java.util.Date; @@ -15,9 +16,8 @@ import java.util.HashMap; @Slf4j @Service @AllArgsConstructor -public class OpPushFailedPackageRecordServiceImpl implements OpPushFailedPackageRecordService { +public class OpPushFailedPackageRecordServiceImpl extends BaseServiceImpl implements OpPushFailedPackageRecordService { - private OpFailRetryPushPackageMapper opFailRetryPushPackageMapper; /** * 记录失败的数据 @@ -41,8 +41,8 @@ public class OpPushFailedPackageRecordServiceImpl implements OpPushFailedPackage // if (opFailRetryPushPackageMapper.selectByMap(queryMap) != null) { // return; // } + save(opFailRetryPushPackageEntity); - opFailRetryPushPackageMapper.insert(opFailRetryPushPackageEntity); }catch (Exception e){ log.error(e.getMessage(),e); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java index a04f40e86..f5dd9de9a 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java @@ -469,6 +469,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { // 不是重试的时候，记录对应数据 if (!isRetry) { + log.info(">>> 保存没有查询到欧派订单包件推送 的记录 {}" ,unitNo); opPushFailedPackageRecordService.record(unitNo, orderStatusDTO); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/IncomingController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/IncomingController.java index 828421cc2..8e56a026b 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/IncomingController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/IncomingController.java @@ -13,6 +13,7 @@ import org.springblade.common.exception.CustomerException; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Objects; @Slf4j @@ -67,11 +68,12 @@ public class IncomingController { @ResponseBody @PostMapping("/incomingBatchOrder") @ApiOperationSupport(order = 1) - @ApiOperation(value = "查询入库订单明细", notes = "传入inComingDTO") + @ApiOperation(value = "批量入库", notes = "传入inComingDTO") public R incomingBatchOrder(@RequestBody InComingDTO inComingDTO) { String method = "############incomingBatchOrder: "; log.info(method+"请求参数{}",inComingDTO); - Integer incomingType = inComingDTO.getIncomingType(); + List advanceIds = inComingDTO.getAdvanceIds(); + try{ BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); @@ -82,15 +84,11 @@ public class IncomingController { inComingDTO.setWarehouseId(myCurrentWarehouse.getId()); inComingDTO.setWarehouseName(myCurrentWarehouse.getName()); - if(Objects.isNull(incomingType)){ - log.warn(method+"入库方式不能为空 incomingType={}",incomingType); - return R.fail(405,"入库方式不能为空"); + if(advanceIds.isEmpty() || advanceIds.size() == 0){ + log.warn(method+"处理订单数据为空"); + return R.fail(405,"处理订单数据为空"); } - if(incomingType < 4){ - log.warn(method+"入库方式不正确 incomingType={}",incomingType); - return R.fail(405,"入库方式不正确"); - } return inComingService.incomingBatchOrder(inComingDTO); }catch (CustomerException e){ log.error(e.message,e); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java index e219c9c03..8ad5b5d11 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java @@ -469,6 +469,12 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl