From 4a64d93ceb91d875c317864d2cd24b01e536ebe2 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sun, 18 Feb 2024 15:14:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E5=8C=BA=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E9=9B=B6=E6=8B=85=E8=AE=A2=E5=8D=95=E6=89=AB=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IDistributionStockArticleClient.java | 4 + .../distribution/vo/UpDownStockupAreaVO.java | 7 ++ .../AftersalesWorkOrderController.java | 1 - .../feign/DistributionStockArticleClient.java | 10 +++ .../DistributionStockArticleMapper.java | 13 ++- .../mapper/DistributionStockArticleMapper.xml | 21 +++++ .../IDistributionStockArticleService.java | 8 ++ .../DistributionStockArticleServiceImpl.java | 13 ++- ...rehouseUpdownStockupAreaApiController.java | 79 ++++++++++++++++++- .../IWarehouseUpdownStockupAreaService.java | 8 ++ ...WarehouseUpdownStockupAreaServiceImpl.java | 27 +++++++ 11 files changed, 184 insertions(+), 7 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java index e8edd5d0d..af16013b2 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java @@ -19,6 +19,7 @@ package com.logpm.distribution.feign; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.entity.DistributionStockArticleEntity; +import com.logpm.distribution.vo.UpDownStockupAreaVO; import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; @@ -98,6 +99,9 @@ public interface IDistributionStockArticleClient { @GetMapping(API_PREFIX + "/findZeroByOrderCodeAndWarehouseId") DistributionStockArticleEntity findZeroByOrderCodeAndWarehouseId(@RequestParam String orderCode, @RequestParam Long warehouseId); + @GetMapping(API_PREFIX + "/findUpDownStockupZeroByOrderCodeAndWarehouseId") + UpDownStockupAreaVO findUpDownStockupZeroByOrderCodeAndWarehouseId(@RequestParam String orderCode, @RequestParam Long warehouseId); + @GetMapping(API_PREFIX + "/findStockArticleByCodeAndMarketAndWarehouseId") List findStockArticleByCodeAndMarketAndWarehouseId(@RequestParam String incomingBatch,@RequestParam String marketNames,@RequestParam Long warehouseId); diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/UpDownStockupAreaVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/UpDownStockupAreaVO.java index eb27133b5..47879e1ec 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/UpDownStockupAreaVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/UpDownStockupAreaVO.java @@ -25,7 +25,10 @@ public class UpDownStockupAreaVO { private String goodsType; + private String goodsName; + private String orderCode; + private String materielCode; private String materielName; @@ -34,6 +37,10 @@ public class UpDownStockupAreaVO { private Integer num; + private Integer enterNum; + + private String waybillCode; + } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java index 7e2d33aa2..aa10c699b 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java @@ -688,7 +688,6 @@ public class AftersalesWorkOrderController extends BladeController { BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); if(ObjectUtils.isNotNull(myCurrentWarehouse)){ aftersalesWorkOrderDTO.setWarehouseId(myCurrentWarehouse.getId()); - } try { IPage list= aftersalesWorkOrderService.getPendingWorkOrder(aftersalesWorkOrderDTO,Condition.getPage(query)); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java index 85c4cced8..7f8f9df67 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java @@ -25,6 +25,7 @@ import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.entity.DistributionStockArticleEntity; import com.logpm.distribution.service.IDistributionParcelListService; import com.logpm.distribution.service.IDistributionStockArticleService; +import com.logpm.distribution.vo.UpDownStockupAreaVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.exception.CustomerException; @@ -179,6 +180,15 @@ public class DistributionStockArticleClient implements IDistributionStockArticle return distributionStockArticleService.findZeroByOrderCodeAndWarehouseId(orderCode,warehouseId); } + /** + * @param orderCode + * @param warehouseId + * @return + */ + @Override + public UpDownStockupAreaVO findUpDownStockupZeroByOrderCodeAndWarehouseId(String orderCode, Long warehouseId) { + return distributionStockArticleService.findUpDownStockupZeroByOrderCodeAndWarehouseId(orderCode,warehouseId); + } @Override diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java index ac66cecb3..d0ac9abfb 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java @@ -22,10 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.dto.DistributionStockArticleOweDTO; import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.entity.DistributionStockArticleEntity; -import com.logpm.distribution.vo.DistributionParcelNumberVO; -import com.logpm.distribution.vo.DistributionStockArticleGroundingVO; -import com.logpm.distribution.vo.DistributionStockArticleQRCodeVO; -import com.logpm.distribution.vo.DistributionStockArticleVO; +import com.logpm.distribution.vo.*; import com.logpm.distribution.vo.app.queryOrderVO; import org.apache.ibatis.annotations.Param; @@ -165,4 +162,12 @@ public interface DistributionStockArticleMapper extends BaseMapper + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java index 57c0983ed..7af286f0e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java @@ -204,4 +204,12 @@ public interface IDistributionStockArticleService extends BaseService upShelfStockList = updownTypeDTO.getUpShelfStockList(); + try{ + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(Objects.isNull(myCurrentWarehouse)){ + log.warn(method+"仓库信息不能为空"); + return R.fail(403,"仓库信息不能为空"); + } + + int size = upShelfStockList.size(); + if(size == 0 ){ + log.warn(method+"没有处理的数据"); + return R.fail(403,"无处理数据"); + } + + for (UpShelfStockDTO dto:upShelfStockList){ + Integer enterNum = dto.getEnterNum(); + if(Objects.isNull(enterNum) || enterNum == 0){ + log.warn(method+"请输入正确的数量"); + return R.fail(403,"请输入正确的数量"); + } + } + + if(Objects.isNull(allocationId)){ + log.warn(method+"库位信息不能为空 allocationId={}",allocationId); + return R.fail(403,"库位信息不能为空"); + } + + //查询该库位的货物信息 + return warehouseUpdownStockupAreaService.upShelfStockList(upShelfStockList,allocationId,myCurrentWarehouse.getId()); + }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,"系统异常，联系管理员"); + } + } + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownStockupAreaService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownStockupAreaService.java index 925cb4a41..06bfbc55d 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownStockupAreaService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownStockupAreaService.java @@ -93,4 +93,12 @@ public interface IWarehouseUpdownStockupAreaService extends BaseService upShelfStockList, Long allocationId, Long warehouseId); + + /** + * 扫描零担订单 + * @param zeroStockArticleCode + * @return + */ + R scanZeroStockArticle(String zeroStockArticleCode,Long warehouseId); + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java index 920c7700b..d978efd0e 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java @@ -36,6 +36,7 @@ import com.logpm.warehouse.bean.Resp; import com.logpm.warehouse.dto.UpShelfPackageDTO; import com.logpm.warehouse.dto.UpShelfStockDTO; import com.logpm.warehouse.dto.UpStockupAreaPackageDTO; +import com.logpm.warehouse.dto.UpdownZeroOrderDTO; import com.logpm.warehouse.entity.*; import com.logpm.warehouse.feign.WarehouseGoodsAllocationClient; import com.logpm.warehouse.mapper.WarehouseUpdownStockupAreaMapper; @@ -43,6 +44,7 @@ import com.logpm.warehouse.service.*; import com.logpm.warehouse.vo.*; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; +import org.springblade.common.constant.common.IsOrNoConstant; import org.springblade.common.exception.CustomerException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.api.R; @@ -505,6 +507,31 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl