From 154b0881d15191802de2ce30f93b13993bde03f4 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Tue, 26 Sep 2023 21:31:36 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/vo/app/queryOrderVO.java | 34 +++++++++ .../controller/BasicMaterialController.java | 1 + .../DistributionInQueryApiController.java | 50 +++++++++++++ .../distribution/dto/app/queryOrderDTO.java | 17 +++++ .../mapper/DistributionParcelListMapper.java | 8 +++ .../mapper/DistributionParcelListMapper.xml | 52 ++++++++++++++ .../DistributionStockArticleMapper.java | 5 ++ .../mapper/DistributionStockArticleMapper.xml | 25 +++++++ .../IDistributionStockArticleService.java | 11 +++ .../DistributionStockArticleServiceImpl.java | 70 +++++++++++++++++++ .../mapper/WarehouseUpdownGoodsLogMapper.xml | 1 - .../WarehouseWarehousingEntryServiceImpl.java | 3 + 12 files changed, 276 insertions(+), 1 deletion(-) create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/queryOrderVO.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionInQueryApiController.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/queryOrderDTO.java diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/queryOrderVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/queryOrderVO.java new file mode 100644 index 000000000..e8958026a --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/queryOrderVO.java @@ -0,0 +1,34 @@ +package com.logpm.distribution.vo.app; + +import com.logpm.distribution.entity.DistributionParcelListEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.ArrayList; +import java.util.List; + +@Data +@EqualsAndHashCode(callSuper = true) +public class queryOrderVO extends DistributionParcelListEntity { + private static final long serialVersionUID = 1L; + + /** + * 包件列表 + */ + @ApiModelProperty(value = "包件列表") + private List list = new ArrayList<>(); + /** + * 定制品 + */ + @ApiModelProperty(value = "定制品数量") + private Integer wrapNum; + + /** + * 库存品数量 + */ + @ApiModelProperty(value = "定制品数量") + private Integer inventoryNum; + + +} diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java index aec7feece..42ea59835 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java @@ -191,6 +191,7 @@ public class BasicMaterialController extends BladeController { basicMaterialExcel.setLogpmUnit("1"); basicMaterialExcel.setPackageNum("3"); basicMaterialExcel.setWeight(BigDecimal.valueOf(0)); + list.add(basicMaterialExcel); ExcelUtil.export(response, "物料基础信息数据模板" + DateUtil.time(), "物料基础信息数据模板表", list, BasicMaterialExcel.class); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionInQueryApiController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionInQueryApiController.java new file mode 100644 index 000000000..d84f9162a --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionInQueryApiController.java @@ -0,0 +1,50 @@ +package com.logpm.distribution.appcontroller; + +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.logpm.distribution.dto.app.queryOrderDTO; +import com.logpm.distribution.service.IDistributionStockArticleService; +import com.logpm.distribution.vo.app.queryOrderVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import lombok.extern.log4j.Log4j2; +import org.springblade.core.tool.api.R; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Log4j2 +@RestController +@AllArgsConstructor +@RequestMapping("/app/distributionInQuery") +@Api(value = "库内查询", tags = "库内查询") +public class DistributionInQueryApiController { + + private final IDistributionStockArticleService distributionStockArticleService; + + + @ResponseBody + @PostMapping("/order") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "查询订单", notes = "传入trayTypeDTO") + public R order(@RequestBody queryOrderDTO queryrderDTO) { + if (null == queryrderDTO.getType()){ + return R.fail("查询类型为空"); + } + queryOrderVO q = distributionStockArticleService.queryOrder(queryrderDTO); + return R.data(q); + } + + @ResponseBody + @PostMapping("/fuzzy") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "模糊查询", notes = "传入trayTypeDTO") + public R fuzzy(@RequestBody queryOrderDTO queryrderDTO) { + if (null == queryrderDTO.getType()){ + return R.fail("查询类型为空"); + } + List q = distributionStockArticleService.queryFuzzy(queryrderDTO); + return R.data(q); + } + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/queryOrderDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/queryOrderDTO.java new file mode 100644 index 000000000..a4e0a9aae --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/queryOrderDTO.java @@ -0,0 +1,17 @@ +package com.logpm.distribution.dto.app; + +import lombok.Data; + +@Data +public class queryOrderDTO { + + /** + * 查询条件 + */ + private String condition; + + /** + * 类型（1-包条,2-订单） + */ + private Integer type; +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java index f5149bada..a29b41f06 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java @@ -28,6 +28,7 @@ import com.logpm.distribution.vo.DistributionParcelListVO; import com.logpm.distribution.vo.PackageStockupVO; import org.apache.ibatis.annotations.Param; +import java.util.ArrayList; import java.util.List; /** @@ -106,4 +107,11 @@ public interface DistributionParcelListMapper extends BaseMapper getPackageList(@Param("stockArticleId") Long id); + + + List selectListByOderId(@Param("id")Long id,@Param("collect") List collect); + + ArrayList selectorderPackageCodeByLike(@Param("condition") String condition,@Param("collect") List collect); + + ArrayList selectorderCodeByLike(@Param("condition") String condition,@Param("collect") List collect); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index 050a05300..f236f2da1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -504,5 +504,57 @@ ldpl.stock_article_id = #{stockArticleId} and ldpl.order_package_reservation_status in ('10','20') and ldpl.order_package_reservation_status = '10' + + + 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 1266cc291..5d4616057 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 @@ -25,6 +25,7 @@ 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.distribution.vo.app.queryOrderVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -92,4 +93,8 @@ public interface DistributionStockArticleMapper extends BaseMapper pageListOwe(IPage page,@Param("param")DistributionStockArticleOweDTO stockArticleEntity); + + queryOrderVO selectOneByWrap(@Param("condition") String condition,@Param("collect") List collect); + + queryOrderVO selectOneByOrder(@Param("condition") String condition,@Param("collect") List collect); } 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 6f10dcca6..a559f9b06 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 @@ -404,6 +404,31 @@ GROUP BY ldsa.id ,ldpl.id + + + update logpm_distribution_stock_article 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 638b81c60..b875438f3 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 @@ -19,10 +19,12 @@ 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.dto.app.queryOrderDTO; import com.logpm.distribution.entity.DistributionStockArticleEntity; import com.logpm.distribution.excel.DistributionStockArticleExcel; import com.logpm.distribution.vo.DistributionStockArticleVO; import com.logpm.distribution.vo.OrderPackgeCodeDataVO; +import com.logpm.distribution.vo.app.queryOrderVO; import org.springblade.core.mp.base.BaseService; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -135,4 +137,13 @@ public interface IDistributionStockArticleService extends BaseService distributionStockArticle, Query query); + /** + * 订单查询 + * @param queryrderDTO + */ + queryOrderVO queryOrder(queryOrderDTO queryrderDTO); + + queryOrderVO queryOrderVOCont(String condition,Integer i); + + List queryFuzzy(queryOrderDTO queryrderDTO); } 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 304d5bc5f..be7830360 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 @@ -32,6 +32,7 @@ import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.distribution.dto.DistributionStockArticleDTO; import com.logpm.distribution.dto.DistributionStockArticleOweDTO; +import com.logpm.distribution.dto.app.queryOrderDTO; import com.logpm.distribution.entity.*; import com.logpm.distribution.excel.DistributionStockArticleExcel; import com.logpm.distribution.mapper.DistributionAddvalueMapper; @@ -43,6 +44,7 @@ import com.logpm.distribution.vo.DistributionParcelListVO; import com.logpm.distribution.vo.DistributionStockArticleQRCodeVO; import com.logpm.distribution.vo.DistributionStockArticleVO; import com.logpm.distribution.vo.OrderPackgeCodeDataVO; +import com.logpm.distribution.vo.app.queryOrderVO; import com.logpm.distribution.wrapper.DistributionParcelListWrapper; import com.logpm.distribution.wrapper.DistributionStockArticleWrapper; import lombok.AllArgsConstructor; @@ -779,6 +781,74 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl myWarehouseList = warehouseClient.getMyWatchWarehouse(); + List collect = myWarehouseList.stream() + .map(BasicdataWarehouseEntity::getId) + .collect(Collectors.toList()); + //查询包条所在订单 + queryOrderVO queryOrderVO; + if (i ==1){ + queryOrderVO = distributionStockArticleMapper.selectOneByWrap(condition,collect); + }else { + //根据订单自编码查询该订单 + queryOrderVO = distributionStockArticleMapper.selectOneByOrder(condition,collect); + } + if (null == queryOrderVO){ + return new queryOrderVO(); + } + Long id = queryOrderVO.getId(); + //查询订单下的所有包条 + List distributionParcelListEntitys = distributionParcelListMapper.selectListByOderId(id,collect); + queryOrderVO.setWrapNum(distributionParcelListEntitys.size()); + queryOrderVO.setInventoryNum(0); + queryOrderVO.setList(distributionParcelListEntitys); + return queryOrderVO; + } + + @Override + public List queryFuzzy(queryOrderDTO queryrderDTO) { + ArrayList arrayList = new ArrayList<>(); + //获取当前登录人仓库 + List myWarehouseList = warehouseClient.getMyWatchWarehouse(); + List collect = myWarehouseList.stream() + .map(BasicdataWarehouseEntity::getId) + .collect(Collectors.toList()); + //查询类型 + switch (queryrderDTO.getType()){ + case 1: + //查询包条 + arrayList =distributionParcelListMapper.selectorderPackageCodeByLike(queryrderDTO.getCondition(),collect); + break; + case 2: + //查询订单 + arrayList =distributionParcelListMapper.selectorderCodeByLike(queryrderDTO.getCondition(),collect); + break; + + }; + return arrayList; + } + + @Override public DistributionStockArticleEntity findStockArticleByOrderCodeAndWarehouseId(String orderCode, Long warehouseId) { QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsLogMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsLogMapper.xml index 3a9c9b830..fe9137fd2 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsLogMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsLogMapper.xml @@ -92,7 +92,6 @@ and lwup.binding_type = #{param.bindingType} - diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java index 2863feb68..4201ff66e 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java @@ -47,6 +47,7 @@ import com.logpm.warehouse.service.IWarehouseWarehousingDetailService; import com.logpm.warehouse.service.IWarehouseWarehousingEntryService; import com.logpm.warehouse.vo.WarehouseWarehousingEntryVO; import lombok.AllArgsConstructor; +import lombok.extern.log4j.Log4j2; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.mp.support.Condition; @@ -71,6 +72,7 @@ import java.util.stream.Collectors; */ @AllArgsConstructor @Service +@Log4j2 public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl implements IWarehouseWarehousingEntryService { private final IWarehouseWarehousingDetailService warehouseWarehousingDetailService; private final IDistributionStockListClient distributionStockListClient; @@ -355,6 +357,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl>>>>>>>>>>>{}",one); if(ObjectUtils.isNotNull(one) && ObjectUtils.isNotNull(one.getId())){ List list = warehouseWarehousingDetailService.list(Wrappers.query().lambda() .eq(WarehouseWarehousingDetailEntity::getWarehousingEntryId, one.getId())