diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderInfoVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderInfoVO.java index 6510c9cab..6fc89f44b 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderInfoVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderInfoVO.java @@ -13,6 +13,8 @@ public class DistributionStockupOrderInfoVO implements Serializable { private String customer;//客户 + private String address;//地址 + private Integer planNum;//计划件数 private Integer scanNum;//备货件数 diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListInfoVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListInfoVO.java index 228e1df26..07420b7f9 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListInfoVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListInfoVO.java @@ -14,6 +14,7 @@ public class DistributionStockupStockListInfoVO implements Serializable { private Long stockListId;//库存品id private String customer;//客户 + private String deliveryAddress;//地址 private Integer planNum;//计划件数 diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/PackageStockupVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/PackageStockupVO.java index 014b67253..f04a83cf3 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/PackageStockupVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/PackageStockupVO.java @@ -1,8 +1,11 @@ package com.logpm.distribution.vo; +import com.logpm.distribution.entity.DistributionParcelDetailsEntity; import lombok.Data; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; @Data public class PackageStockupVO implements Serializable { @@ -21,4 +24,6 @@ public class PackageStockupVO implements Serializable { private Long scanId;//扫码记录id + private List detailsEntities = new ArrayList<>(); + } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java index 1c0397a09..11d635600 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java @@ -53,12 +53,12 @@ public class WarehouseWaybillEntity extends TenantEntity { * 目的仓 */ @ApiModelProperty(value = "目的仓") - private String destinationWarehouse; + private String destinationWarehouseName; /** * 发站仓 */ @ApiModelProperty(value = "发站仓") - private String departureWarehouse; + private String departureWarehouseName; /** * 客户车次 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml index f425123af..170659fb0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml @@ -186,6 +186,7 @@ select ldr.id reservationId, ldsl.id stockListId, ldr.consignee customer, + ldr.delivery_address deliveryAddress, ldr.goods_area_name stockupArea, ldrs.reservation_num planNum, ldsl.storage_location warehouseArea, diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index 371c57d05..a52f837d2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -79,10 +79,10 @@ left join logpm_distribution_stockup_info ldsi on ldsi.reservation_id = ldr.id left join logpm_distribution_stockup lds on ldsi.stockup_id = lds.id - and lds.stockup_date <= #{param.stockupDateStart} - and lds.stockup_date >= #{param.stockupDateEnd} - and lds.stockup_status in (1,2,3) - and lds.stockup_status = 4 + and lds.stockup_date >= #{param.stockupDateStart} + and lds.stockup_date <= #{param.stockupDateEnd} + and lds.stockup_status in (10,20,30) + and lds.stockup_status = 40 and lds.is_deleted = 0 and lds.forklift_id = #{param.userId} 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 842d6be22..12aa79983 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 @@ -18,6 +18,7 @@ package com.logpm.distribution.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -25,6 +26,7 @@ import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataCodeClient; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.distribution.dto.app.StockupDTO; +import com.logpm.distribution.entity.DistributionParcelDetailsEntity; import com.logpm.distribution.entity.DistributionReservationEntity; import com.logpm.distribution.entity.DistributionStockupEntity; import com.logpm.distribution.excel.DistributionStockupExcel; @@ -80,6 +82,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl selectDistributionStockupPage(IPage page, DistributionStockupVO distributionStockup) { @@ -343,10 +348,16 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl qw = new QueryWrapper<>(); + qw.eq("package_code",orderPackageCode); + List parcelDetailsEntityList = distributionParcelDetailsService.list(qw); + vo.setDetailsEntities(parcelDetailsEntityList); } DistributionStockupOrderInfoVO vo = new DistributionStockupOrderInfoVO(); vo.setReservationId(reservationId); vo.setCustomer(reservationEntity.getConsignee()); + vo.setAddress(reservationEntity.getDeliveryAddress()); vo.setPlanNum(size); vo.setScanNum(scanNum); vo.setStockupArea(reservationEntity.getGoodsAreaName()); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java index fcb2103b5..0bcd11366 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java @@ -529,9 +529,9 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { warehouseWaybill = new WarehouseWaybillEntity(); warehouseWaybill.setWaybillNo(waybillNo); - warehouseWaybill.setDestinationWarehouse(warehouseName); + warehouseWaybill.setDestinationWarehouseName(warehouseName); warehouseWaybill.setDestinationWarehouseId(Objects.isNull(endhouse) ? null : endhouse.getId()); - warehouseWaybill.setDepartureWarehouse(startSite); + warehouseWaybill.setDepartureWarehouseName(startSite); warehouseWaybill.setDepartureWarehouseId(Objects.isNull(starthouse) ? null : starthouse.getId()); warehouseWaybill.setCustomerTrain(wayBillEntity.getCarNo()); warehouseWaybill.setBrand(wayBillEntity.getBrand());