From 8c4a7e580c6fb7c13a72b8c1f79a4d606161b1cf Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Wed, 16 Aug 2023 18:46:15 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8C=85=E4=BB=B6=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/DistributionParcelListVO.java | 6 + .../WarehouseStockArticleCopyEntity.java | 438 ++++++++++++++++++ .../feign/IWarehouseUpdownGoodsClient.java | 6 + .../vo/WarehouseStockArticleCopyVO.java | 39 ++ blade-service/logpm-distribution/pom.xml | 5 + .../DistributionParcelListController.java | 4 +- .../mapper/DistributionParcelListMapper.java | 2 +- .../mapper/DistributionParcelListMapper.xml | 4 +- .../IDistributionParcelListService.java | 2 +- .../DistributionParcelListServiceImpl.java | 2 +- .../DistributionParcelListWrapper.java | 8 +- .../WarehouseGoodsAllocationController.java | 80 ++++ .../feign/WarehouseUpdownGoodsClient.java | 6 + .../WarehouseGoodsAllocationMapper.java | 21 + .../mapper/WarehouseGoodsAllocationMapper.xml | 27 ++ .../mapper/WarehouseUpdownGoodsMapper.java | 2 + .../mapper/WarehouseUpdownGoodsMapper.xml | 10 + .../IWarehouseGoodsAllocationService.java | 20 + .../service/IWarehouseUpdownGoodsService.java | 7 + .../WarehouseGoodsAllocationServiceImpl.java | 25 + .../impl/WarehouseUpdownGoodsServiceImpl.java | 5 + 21 files changed, 711 insertions(+), 8 deletions(-) create mode 100644 blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockArticleCopyEntity.java create mode 100644 blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockArticleCopyVO.java diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java index c1c02fb48..dc10725f7 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java @@ -63,4 +63,10 @@ public class DistributionParcelListVO extends DistributionParcelListEntity { private String orderPackageReservationStatusName; + /** + * 包件货位信息 + */ + private String allocationMsg; + + } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockArticleCopyEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockArticleCopyEntity.java new file mode 100644 index 000000000..74a52dc49 --- /dev/null +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockArticleCopyEntity.java @@ -0,0 +1,438 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.warehouse.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 配送在库订单 实体类 + * + * @author cyz + * @since 2023-06-13 + */ +@Data +@TableName("logpm_distribution_stock_article") +@ApiModel(value = "DistributionStockArticle对象", description = "配送在库订单") +@EqualsAndHashCode(callSuper = true) +public class WarehouseStockArticleCopyEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + + /** + * 创建用户名称 + */ + @ApiModelProperty(value = "创建用户名称 ") + @TableField(exist = false) + private String createUserName; + + /** + * 服务号 + */ + @ApiModelProperty(value = "服务号") + private String serviceNumber; + /** + * 订单自编号 + */ + @ApiModelProperty(value = "订单自编号") + private String orderCode; + /** + * 寄件信息 + */ + @ApiModelProperty(value = "寄件信息") + private String sending; + + /** + * 门店id + */ + @ApiModelProperty(value = "门店id") + private Long storeId; + + + /** + * 商场id + */ + @ApiModelProperty(value = "商场id") + private Long mallId; + + /** + * 商场名称 + */ + @ApiModelProperty(value = "商场名称") + private String mallName; + /** + * 商场编号 + */ + @ApiModelProperty(value = "商场编码") + private String mallCode; + + + /** + * 门店编号 + */ + @ApiModelProperty(value = "门店编码") + private String storeCode; + + + /** + * 门店名称 + */ + @ApiModelProperty(value = "门店名称") + private String storeName; + /** + * 货物名称 + */ + @ApiModelProperty(value = "货物名称") + private String descriptionGoods; + /** + * 仓库 + */ + @ApiModelProperty(value = "仓库") + private String warehouse; + /** + * 车次号 + */ + @ApiModelProperty(value = "车次号") + private String trainNumber; + + /** + * 仓库ID + */ + @ApiModelProperty(value = "仓库ID") + private Long warehouseId; + + + + /** + * 入库时间 + */ + @ApiModelProperty(value = "入库时间") + @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss") + private Date warehouseEntryTime; + /** + * 在库时间 + */ + @ApiModelProperty(value = "在库时间") + private String storeTime; + /** + * 订单总件数 + */ + @ApiModelProperty(value = "订单总件数") + private Integer totalNumber; + /** + * 在库件数 + */ + @ApiModelProperty(value = "在库件数") + private Integer handQuantity; + /** + * 是否齐套 + */ + @ApiModelProperty(value = "是否齐套") + private Integer completeSet; + + /** + * 品牌 + */ + @ApiModelProperty(value = "品牌") + private String brand; + /** + * 服务类型 + */ + @ApiModelProperty(value = "服务类型") + private String typeService; + /** + * 顾客名字 + */ + @ApiModelProperty(value = "顾客名字") + private String customerName; + /** + * 顾客电话 + */ + @ApiModelProperty(value = "顾客电话") + private String customerTelephone; + /** + * 顾客地址 + */ + @ApiModelProperty(value = "顾客地址") + private String customerAddress; + /** + * 类型;1 预约单 2库存单 + */ + @ApiModelProperty(value = "类型;1 预约单 2库存单") + private Integer genre; + +// /** +// * 状态;1 配送 2 待配送 3部分入库 4已入库 +// */ +// @ApiModelProperty(value = "状态;1 配送 2 待配送 3部分入库 4已入库") +// @TableField(exist = false) +// private String stateName; + + /** + * 状态;1 已通知 2 未通知 + */ + @ApiModelProperty(value = "状态;1 已通知 2 未通知") + private Integer notification; + + /** + * 增值服务总费用 + */ + @ApiModelProperty(value = "增值服务总费用") + private BigDecimal fee; + + /** + * 协商费用 + */ + @ApiModelProperty(value = "协商费用") + private BigDecimal rate; + + /** + * 老系统advanceId + */ + @ApiModelProperty(value = "老系统advanceId") + private Integer advanceId; + /** + * 预约数量 + */ + @TableField(exist = false) + @ApiModelProperty(value = "预约数量") + private Integer reservationNum; + /** + * 运单号 + */ + @ApiModelProperty(value = "运单号") + private String waybillNumber; + /** + * 收货单位 + */ + @ApiModelProperty(value = "收货单位") + private String consigneeUnit; + /** + * 到付费用 + */ + @ApiModelProperty(value = "到付费用") + private BigDecimal collectFee; + /** + * 仓储费 + */ + @ApiModelProperty(value = "仓储费") + private BigDecimal storageFee; + + + + + + + + //-------------2023-07-16 新增在库订单字段 + + /** + * 收货人 + */ + @ApiModelProperty(value = "收货人") + private String consigneePerson; + + /** + * 收货人地址 + */ + @ApiModelProperty(value = "收货人地址") + private String consigneeAddress; + + + /** + * 收货人电话 + */ + @ApiModelProperty(value = "收货人电话") + private String consigneeMobile; + + + + // -----------2023-07-18 增加字段 + + + + @ApiModelProperty(value = "经销商名称") + private String dealerName; + + @ApiModelProperty(value = "经销商编码") + private String dealerCode; + + + + /** + * 可用数量(在库数-已经预约的包件数) + */ + @ApiModelProperty(value = "可用数量") + private Integer availableQuantity; + + /** + * 入库时间-终 + */ + @ApiModelProperty(value = "入库时间-终") + @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss") + private Date warehouseEntryTimeEnd; + + /** + * 分拣件数 + */ + @ApiModelProperty(value = "分拣件数") + private Integer sortingQuantity; + + /** + * 配送件数 + */ + @ApiModelProperty(value = "配送件数") + private Integer deliveryQuantity; + + /** + * 中转件数 + */ + @ApiModelProperty(value = "中转件数") + private Integer transferQuantity; + + /** + * 签收件数 + */ + @ApiModelProperty(value = "签收件数") + private Integer signinQuantity; + + + + /** + * 货位信息 + */ + @ApiModelProperty(value = "货位信息") + private String allocation; + + /** + * 订单来源 + */ + @ApiModelProperty(value = "订单来源") + private String resource; + + /** + * 托盘 + */ + @ApiModelProperty(value = "托盘") + private String trays; + + /** + * 干仓配 + */ + @ApiModelProperty(value = "干仓配") + private Integer isOpai; + + + /** + * 盘点时间 + */ + @ApiModelProperty(value = "盘点时间") + private Date inventoryDate; + + /** + * 盘点人 + */ + @ApiModelProperty(value = "盘点人") + private String inventoryPerson; + + /** + * 盘点人id + */ + @ApiModelProperty(value = "盘点人id") + private Long inventoryPersonId; + + @ApiModelProperty(value = "冻结状态") + private String freezeStatus; + /** + * 上架状态 + */ + @ApiModelProperty(value = "上架状态") + private String groundingStatus; + + + @ApiModelProperty(value = "订单状态") + private String orderStatus; + + @ApiModelProperty(value = "预约状态") + private String reservationStatus; + + @ApiModelProperty(value = "备货状态") + private String stockupStatus; + + @ApiModelProperty(value = "收货状态") + private String orderReceiveStatus; + + + + + + /** + * 有无数据源 + */ + @ApiModelProperty(value = "有无数据源；1-否、2-是") + private Integer isHaveData; + + /** + * 订单码 + */ + @ApiModelProperty(value = "订单码") + private String stockArticleCode; + /** + * 工厂车次 + */ + @ApiModelProperty(value = "工厂车次") + private String factoryTrain; + + private String isZero;//是否零担 0否 1是 + + + + +} diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownGoodsClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownGoodsClient.java index d9bc79727..e329787a8 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownGoodsClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownGoodsClient.java @@ -50,4 +50,10 @@ public interface IWarehouseUpdownGoodsClient { */ @GetMapping(TOP + "/selectCountByAllo") Integer selectCountByAllo(@RequestParam Long alloId); + + /** + *查询货物所在货位信息 + */ + @GetMapping(TOP + "/selectMsgBywrap") + String selectMsgBywrap(@RequestParam Long wrapId); } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockArticleCopyVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockArticleCopyVO.java new file mode 100644 index 000000000..c07b1cfc2 --- /dev/null +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockArticleCopyVO.java @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.warehouse.vo; + + +import com.logpm.distribution.entity.DistributionStockArticleEntity; + +import lombok.Data; +import lombok.EqualsAndHashCode; + + + +/** + * 配送在库订单 视图实体类 + * + * @author cyz + * @since 2023-06-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WarehouseStockArticleCopyVO extends DistributionStockArticleEntity { + private static final long serialVersionUID = 1L; + + +} diff --git a/blade-service/logpm-distribution/pom.xml b/blade-service/logpm-distribution/pom.xml index f31506a3f..24e40b716 100644 --- a/blade-service/logpm-distribution/pom.xml +++ b/blade-service/logpm-distribution/pom.xml @@ -47,6 +47,11 @@ logpm-basic-api 3.1.0.RELEASE + + org.springblade + logpm-warehouse-api + 3.1.0.RELEASE + org.springblade diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java index 12a58f517..da681b80f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java @@ -114,8 +114,8 @@ public class DistributionParcelListController extends BladeController { @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "传入distributionParcelList") public R> page(DistributionParcelListVO distributionParcelList, Query query) { - IPage pages = distributionParcelListService.selectDistributionParcelListPage(Condition.getPage(query), distributionParcelList); - return R.data(pages); + IPage pages = distributionParcelListService.selectDistributionParcelListPage(Condition.getPage(query), distributionParcelList); + return R.data(DistributionParcelListWrapper.build().pageVO(pages)); } /** 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 b35895e15..5089cd1e0 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 @@ -41,7 +41,7 @@ public interface DistributionParcelListMapper extends BaseMapper selectDistributionParcelListPage(IPage page, DistributionParcelListVO distributionParcelList); + List selectDistributionParcelListPage(IPage page, DistributionParcelListVO distributionParcelList); /** 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 815bae4ba..dc8600606 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 @@ -35,8 +35,8 @@ - + select ldpl.* from logpm_distribution_parcel_list ldpl where ldpl.is_deleted = 0 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java index 9ba8b5bfb..acb96aeea 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java @@ -40,7 +40,7 @@ public interface IDistributionParcelListService extends BaseService selectDistributionParcelListPage(IPage page, DistributionParcelListVO distributionParcelList); + IPage selectDistributionParcelListPage(IPage page, DistributionParcelListVO distributionParcelList); /** diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index 65f9f7a6c..77c9bb8a2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -43,7 +43,7 @@ import java.util.Map; public class DistributionParcelListServiceImpl extends BaseServiceImpl implements IDistributionParcelListService { @Override - public IPage selectDistributionParcelListPage(IPage page, DistributionParcelListVO distributionParcelList) { + public IPage selectDistributionParcelListPage(IPage page, DistributionParcelListVO distributionParcelList) { return page.setRecords(baseMapper.selectDistributionParcelListPage(page, distributionParcelList)); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java index 0f1683320..208e4a7f0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java @@ -2,6 +2,7 @@ package com.logpm.distribution.wrapper; import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.vo.DistributionParcelListVO; +import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient; import org.springblade.common.constant.DictBizConstant; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; @@ -16,7 +17,7 @@ import java.util.Objects; * @create: 2023-08-02 14:35 **/ public class DistributionParcelListWrapper extends BaseEntityWrapper { - + private IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient; public static DistributionParcelListWrapper build(){ return new DistributionParcelListWrapper(); } @@ -30,6 +31,11 @@ public class DistributionParcelListWrapper extends BaseEntityWrapper> wrap(WarehouseGoodsAllocationVO warehouseGoodsAllocation, Query query) { + IPage pages = warehouseGoodsAllocationService.selectwrap(warehouseGoodsAllocation,Condition.getPage(query)); + return R.data(pages); + } + + /** + * 货位上架 查询订单 + */ + @GetMapping("/order") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "货位上架 查询订单", notes = "传入warehouseGoodsAllocation") + public R> order(WarehouseStockArticleCopyVO warehouseGoodsAllocation, Query query) { + IPage pages = warehouseGoodsAllocationService.selectorder(warehouseGoodsAllocation,Condition.getPage(query)); + return R.data(pages); + } + + /** + * 货位上架 查询服务号 + */ + @GetMapping("/servicenub") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "货位上架 查询服务号", notes = "传入warehouseGoodsAllocation") + public R> servicenub(WarehouseStockArticleCopyVO warehouseGoodsAllocation, Query query) { + IPage pages = warehouseGoodsAllocationService.selectservicenub(warehouseGoodsAllocation,Condition.getPage(query)); + return R.data(pages); + } + + /** + * 货位上架 订单上架 + */ + @PostMapping("/uporder") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "货位上架 订单上架", notes = "传入updownTypeDTO") + public R uporder(@RequestBody UpdownTypeDTO updownTypeDTO) { + List upShelfOrderList = updownTypeDTO.getUpShelfOrderList(); + String allocationCode = updownTypeDTO.getTargetAllocation(); + if (upShelfOrderList.size()==0 || StringUtil.isBlank(allocationCode)){ + return R.fail("参数不全"); + } + return warehouseUpdownTypeService.upShelfOrder(upShelfOrderList,allocationCode); + } + + + /** + * 货位上架 服务号上架 + */ + @PostMapping("/upservice") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "货位上架 服务号上架", notes = "传入warehouseGoodsAllocation") + public R upservice(@RequestBody UpdownTypeDTO updownTypeDTO) { + //取出服务号 + List upShelfOrderList = updownTypeDTO.getUpShelfOrderList(); + String allocationCode = updownTypeDTO.getTargetAllocation(); + if (upShelfOrderList.size()==0 || StringUtil.isBlank(allocationCode)){ + return R.fail("参数不全"); + }else { + List ServiceNumberList = upShelfOrderList.stream().map(UpShelfOrderDTO::getServiceNumber).collect(Collectors.toList()); + //将改服务号的所有订单查出 + upShelfOrderList = warehouseGoodsAllocationService.selectorderByServiceNumber(ServiceNumberList); + + } + return warehouseUpdownTypeService.upShelfOrder(upShelfOrderList,allocationCode); + } + /** * 货位 可视化查询 */ diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java index b0ef0f6de..ee64331f1 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java @@ -33,4 +33,10 @@ public class WarehouseUpdownGoodsClient implements IWarehouseUpdownGoodsClient { public Integer selectCountByAllo(Long alloId) { return warehouseUpdownGoodsService.selectCountByAllo(alloId); } + + @Override + @GetMapping(TOP + "/selectMsgBywrap") + public String selectMsgBywrap(Long wrapId) { + return warehouseUpdownGoodsService.selectMsgBywrap(wrapId); + } } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java index 06d1635f7..ee16cafe9 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java @@ -16,6 +16,7 @@ */ package com.logpm.warehouse.mapper; +import com.logpm.warehouse.dto.UpShelfOrderDTO; import com.logpm.warehouse.entity.*; import com.logpm.warehouse.vo.*; import com.logpm.warehouse.excel.WarehouseGoodsAllocationExcel; @@ -88,4 +89,24 @@ public interface WarehouseGoodsAllocationMapper extends BaseMapper selectStockList(@Param("id")Long id); + + List selectOrder(IPage page,@Param("param")WarehouseStockArticleCopyVO warehouseGoodsAllocation); + /** + * 查询服务号 + * + * @return + */ + List selectservicenub(IPage page,@Param("param") WarehouseStockArticleCopyVO warehouseGoodsAllocation); + /** + * 根据服务号查询订单 + * + * @return + */ + List selectorderByServiceNumber(@Param("array") List serviceNumberList); + /** + * 查询包条 + * + * @return + */ + List selectwrap(IPage page,@Param("param") WarehouseGoodsAllocationVO warehouseGoodsAllocation); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml index 84d5eafc2..7b41c7acb 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml @@ -39,5 +39,32 @@ + + + + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java index 1811fab7f..3237e048b 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java @@ -67,6 +67,8 @@ public interface WarehouseUpdownGoodsMapper extends BaseMapper getStockTotalNumAndNum(@Param("updownTypeId") Long updownTypeId); + String selectMsgBywrap(@Param("wrapId") Long wrapId); + // /** // * 根据货位查询货物 diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml index 3bcf4e777..78225a766 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml @@ -166,5 +166,15 @@ and lwug.association_type = 4 and lwug.updown_type_id = #{updownTypeId} + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseGoodsAllocationService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseGoodsAllocationService.java index b97521e10..6b1fe7670 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseGoodsAllocationService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseGoodsAllocationService.java @@ -17,12 +17,16 @@ package com.logpm.warehouse.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.logpm.warehouse.dto.UpShelfOrderDTO; import com.logpm.warehouse.entity.WarehouseGoodsAllocationEntity; import com.logpm.warehouse.vo.WarehouseGoodsAllocationVO; import com.logpm.warehouse.excel.WarehouseGoodsAllocationExcel; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.warehouse.vo.WarehouseStockArticleCopyVO; import com.logpm.warehouse.vo.WarehouseVisCargo; +import com.logpm.warehouse.vo.WarehouseVisualizationVO; import org.springblade.core.mp.base.BaseService; +import org.springblade.core.mp.support.Query; import java.util.ArrayList; import java.util.List; @@ -59,4 +63,20 @@ public interface IWarehouseGoodsAllocationService extends BaseService selectVisCargo(); + /** + * 货位 查询订单 + */ + IPage selectorder(WarehouseStockArticleCopyVO warehouseGoodsAllocation, IPage page); + /** + * 货位 查询服务号 + */ + IPage selectservicenub(WarehouseStockArticleCopyVO warehouseGoodsAllocation, IPage page); + /** + * 货位 查询服务号对应的订单 + */ + List selectorderByServiceNumber(List serviceNumberList); + /** + * 货位 查询包件 + */ + IPage selectwrap(WarehouseGoodsAllocationVO warehouseGoodsAllocation, IPage page); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java index 4a0d40147..0645f531c 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java @@ -82,4 +82,11 @@ public interface IWarehouseUpdownGoodsService extends BaseService getZeroTotalNumAndNum(Long updownTypeId); Map getStockTotalNumAndNum(Long updownTypeId); + /** + * 关联查询货物的货位信息 + * + * @param wrapId + * @return + */ + String selectMsgBywrap(Long wrapId); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java index ea1aab525..cae6d6d25 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java @@ -19,6 +19,7 @@ package com.logpm.warehouse.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; +import com.logpm.warehouse.dto.UpShelfOrderDTO; import com.logpm.warehouse.entity.*; import com.logpm.warehouse.mapper.WarehouseUpdownGoodsMapper; import com.logpm.warehouse.vo.*; @@ -29,6 +30,7 @@ import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j; import lombok.extern.log4j.Log4j2; import org.springblade.core.mp.support.BladePage; +import org.springblade.core.mp.support.Query; import org.springblade.core.tool.utils.Func; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -121,4 +123,27 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl selectorder(WarehouseStockArticleCopyVO warehouseGoodsAllocation,IPage page) { + List list = baseMapper.selectOrder(page,warehouseGoodsAllocation); + return page.setRecords(list); + } + + @Override + public IPage selectservicenub(WarehouseStockArticleCopyVO warehouseGoodsAllocation, IPage page) { + List list = baseMapper.selectservicenub(page,warehouseGoodsAllocation); + return page.setRecords(list); + } + + @Override + public List selectorderByServiceNumber(List serviceNumberList) { + return baseMapper.selectorderByServiceNumber(serviceNumberList); + } + + @Override + public IPage selectwrap(WarehouseGoodsAllocationVO warehouseGoodsAllocation, IPage page) { + List warehouseVisualizationVOList = baseMapper.selectwrap(page,warehouseGoodsAllocation); + return page.setRecords(warehouseVisualizationVOList); + } + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java index 2afb348de..34eb007e3 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java @@ -132,4 +132,9 @@ public class WarehouseUpdownGoodsServiceImpl extends BaseServiceImpl