From 7ea84fd7d9e39aa2777c0f7cb00afa09ba21bcd5 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 2 Apr 2024 10:10:45 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1.=E5=8C=85=E4=BB=B6=E5=BA=93=E5=86=85?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=EF=BC=8C=E9=99=90=E5=88=B6=E5=8C=85=E4=BB=B6?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=BF=85=E9=A1=BB=E4=B8=BA=E5=9C=A8=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WarehouseTrayTypeServiceImpl.java | 11 +++++++++++ .../service/impl/WarehouseUpdownTypeServiceImpl.java | 5 +++++ 2 files changed, 16 insertions(+) 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 Date: Tue, 2 Apr 2024 10:27:12 +0800 Subject: [PATCH 2/4] =?UTF-8?q?1.=E6=89=B9=E9=87=8F=E5=85=A5=E5=BA=93=20?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trunkline/controller/IncomingController.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) 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); From c59cefc23fb1d8d109ae832dde534298d640ff7a Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 2 Apr 2024 11:49:58 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E5=AE=8C=E7=BB=93=E5=A4=87=E8=B4=A7=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionSignforController.java | 9 +-- .../IDistributionStockupInfoService.java | 7 ++ .../service/IDistributionStockupService.java | 5 -- .../impl/DistributionSignforServiceImpl.java | 1 - .../DistributionStockArticleServiceImpl.java | 4 ++ .../DistributionStockupInfoServiceImpl.java | 66 +++++++++++++++++++ .../impl/DistributionStockupServiceImpl.java | 31 --------- 7 files changed, 82 insertions(+), 41 deletions(-) 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,56 @@ 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 distributionStockupInfoEntity = entityList.get(0); + distributionStockupInfoEntity.setStockStatus("3"); + this.updateById(distributionStockupInfoEntity); + //查询备货任务是否都完成 + 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); + } + }else { + //查询备货任务错误的原因 + log.error(method+"预约单关联备货任务错误reservationId:{}",reservationId); + } + 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; - } - } } From b9d23adddf9e4f1d54c45423d8b8203bee0c6b55 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 2 Apr 2024 12:00:53 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E5=AE=8C=E7=BB=93=E5=A4=87=E8=B4=A7=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionStockupInfoServiceImpl.java | 63 ++++++++++++------- 1 file changed, 41 insertions(+), 22 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupInfoServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupInfoServiceImpl.java index 7e820c9fe..0c6e79d0d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupInfoServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupInfoServiceImpl.java @@ -108,6 +108,7 @@ public class DistributionStockupInfoServiceImpl extends BaseServiceImpl 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); - } }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; } }