diff --git a/blade-service-api/logpm-distribution-api/pom.xml b/blade-service-api/logpm-distribution-api/pom.xml index 58c37fbfa..1ba3936bb 100644 --- a/blade-service-api/logpm-distribution-api/pom.xml +++ b/blade-service-api/logpm-distribution-api/pom.xml @@ -3,15 +3,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - - org.springblade - logpm-warehouse-api - 3.1.0.RELEASE - compile - - - org.springblade blade-service-api 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 339b39731..86de2c27b 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 @@ -17,7 +17,6 @@ package com.logpm.distribution.feign; import com.logpm.distribution.entity.DistributionStockArticleEntity; -import com.logpm.warehouse.vo.UpShelfDataVO; import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; @@ -27,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; +import java.util.Map; /** * 配送在库订单 Feign接口类 @@ -82,5 +82,5 @@ public interface IDistributionStockArticleClient { @GetMapping(API_PREFIX + "/findEntityByStockArticleId") DistributionStockArticleEntity findEntityByStockArticleId(@RequestParam Long stockArticleId); @GetMapping(API_PREFIX + "/fingListByServiceNumber") - List fingListByServiceNumber(@RequestParam String serviceNumber); + List fingListByServiceNumber(@RequestParam String serviceNumber); } 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 703b34544..838ec2db3 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 @@ -22,7 +22,6 @@ 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.warehouse.vo.UpShelfDataVO; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Condition; @@ -33,6 +32,7 @@ import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; import java.util.List; +import java.util.Map; import java.util.Objects; /** @@ -143,7 +143,7 @@ public class DistributionStockArticleClient implements IDistributionStockArticle } @Override - public List fingListByServiceNumber(String serviceNumber) { + public List fingListByServiceNumber(String serviceNumber) { return distributionStockArticleService.fingListByServiceNumber(serviceNumber); } 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 c80d36e96..6867a91e2 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 @@ -23,7 +23,6 @@ import com.logpm.distribution.entity.DistributionStockArticleEntity; import com.logpm.distribution.excel.DistributionStockArticleExcel; import com.logpm.distribution.vo.DistributionStockArticleQRCodeVO; import com.logpm.distribution.vo.DistributionStockArticleVO; -import com.logpm.warehouse.vo.UpShelfDataVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -80,5 +79,5 @@ public interface DistributionStockArticleMapper extends BaseMapper fingListByServiceNumber(@Param("serviceNumber") String serviceNumber); + List fingListByServiceNumber(@Param("serviceNumber") String serviceNumber); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index 37f1dd120..56a0ce372 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -203,7 +203,7 @@ - select ldsa.service_number serviceNum, ldsa.order_code orderCode, ldsa.total_number num, 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 25ad12d83..adcf31b41 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 @@ -17,12 +17,11 @@ package com.logpm.distribution.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.dto.DistributionStockArticleDTO; import com.logpm.distribution.entity.DistributionStockArticleEntity; -import com.logpm.distribution.vo.DistributionStockArticleVO; import com.logpm.distribution.excel.DistributionStockArticleExcel; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.logpm.warehouse.vo.UpShelfDataVO; +import com.logpm.distribution.vo.DistributionStockArticleVO; import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; @@ -99,5 +98,5 @@ public interface IDistributionStockArticleService extends BaseService getPrintTemplates( Map params, HttpServletResponse response); - List fingListByServiceNumber(String serviceNumber); + List fingListByServiceNumber(String serviceNumber); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index 07172a646..8acc0fa0a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -474,7 +474,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl fingListByServiceNumber(String serviceNumber) { + public List fingListByServiceNumber(String serviceNumber) { return baseMapper.fingListByServiceNumber(serviceNumber); } } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseInventoryApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseInventoryApiController.java index 5905c5a92..ee66f03a5 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseInventoryApiController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseInventoryApiController.java @@ -41,9 +41,8 @@ public class WarehouseInventoryApiController { //查询该库位的货物信息 // List upShelfDataVOs; -// List upShelfDataVOs = warehouseUpdownTypeService.findUpShelfScanGoods(code,upshelfScanType); +// List upShelfDataVOs1; // List upShelfDataVOs = warehouseUpdownTypeService.findUpShelfScanGoods(code,upshelfScanType); -// return R.data(upShelfDataVOs); return R.success("success"); }catch (CustomerException e){ log.warn(e.message); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/ReCheckAllocationVO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/ReCheckAllocationVO.java new file mode 100644 index 000000000..9e7adf6eb --- /dev/null +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/ReCheckAllocationVO.java @@ -0,0 +1,9 @@ +package com.logpm.warehouse.dto; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ReCheckAllocationVO implements Serializable { +} diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java index c25e3657f..0b27ebf2f 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java @@ -26,6 +26,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Objects; @Log4j2 @@ -139,8 +140,18 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl ls = distributionStockArticleClient.fingListByServiceNumber(serviceNumber); - return ls; + List ls = distributionStockArticleClient.fingListByServiceNumber(serviceNumber); + List list = new ArrayList<>(); + for (Map map:ls){ + UpShelfDataVO upShelfDataVO = new UpShelfDataVO(); + upShelfDataVO.setServiceNum((String) map.get("serviceNum")); + upShelfDataVO.setOrderCode((String) map.get("orderCode")); + upShelfDataVO.setNum((Integer) map.get("num")); + upShelfDataVO.setCompleteSet((Integer) map.get("completeSet")); + list.add(upShelfDataVO); + } + + return list; }else if(upshelfScanType == 2){ DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCode(code); if(Objects.isNull(stockArticleEntity)){