diff --git a/blade-biz-common/src/main/java/org/springblade/common/model/PackageData.java b/blade-biz-common/src/main/java/org/springblade/common/model/PackageData.java index 377731934..6705a31e0 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/model/PackageData.java +++ b/blade-biz-common/src/main/java/org/springblade/common/model/PackageData.java @@ -33,6 +33,22 @@ public class PackageData implements Serializable { * 运单号 */ private String waybillNumber; + /** + * 批次号 + */ + private String pickupBatch; + /** + * 物料名称 + */ + private String materialName; + /** + * 物料Code + */ + private String materialCode; + /** + * 商场 + */ + private String mallName; /** * 数量 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java index 65f50cbbf..786180210 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java @@ -30,6 +30,7 @@ import com.logpm.distribution.vo.app.DistributionAppParcelListVO; import com.logpm.distribution.vo.app.DistributionAppStockArticleVO; import com.logpm.oldproject.dto.SignPushDataDTO; import org.apache.ibatis.annotations.Param; +import org.springblade.common.model.PackageData; import java.util.List; import java.util.Map; @@ -499,4 +500,6 @@ public interface DistributionDeliveryListMapper extends BaseMapper getBroadcastData(@Param("deliveryId")Long deliveryId,@Param("warehouseId") Long warehouseId); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index fcdbfeb5e..5096045e1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -2249,5 +2249,10 @@ + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java index 6a87f21ac..f35b3230c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java @@ -33,6 +33,7 @@ import com.logpm.distribution.vo.app.*; import com.logpm.distribution.vo.print.PrintPreviewVO; import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity; import com.logpm.warehouse.entity.WarehouseRetentionScanEntity; +import org.springblade.common.model.PackageData; import org.springblade.core.mp.base.BaseService; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -470,11 +471,16 @@ public interface IDistributionDeliveryListService extends BaseService getBroadcastData(Long id, Long warehouseId); - - - /** + /** * 查询签收预约客户包件信息 * @param reservationId * @param scanBarCode diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 1b5178c30..5d48112c2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -83,6 +83,7 @@ import org.springblade.common.constant.signing.SignforStatusConstant; import org.springblade.common.constant.stockup.StockAssignStatusConstant; import org.springblade.common.constant.stockup.StockupStatusConstant; import org.springblade.common.exception.CustomerException; +import org.springblade.common.model.PackageData; import org.springblade.common.serviceConstant.ServiceConstant; import org.springblade.common.utils.CommonUtil; import org.springblade.common.utils.QRCodeUtil; @@ -8097,6 +8098,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl getBroadcastData(Long deliveryId, Long warehouseId) { + + + + return baseMapper.getBroadcastData(deliveryId, warehouseId); + } + private void handleAbnormalTurnDown(Long deliveryId, String orderPackageCode, Long warehouseId) { List list = distributionLoadscanAbnormalService.list(Wrappers.query().lambda() .eq(DistributionLoadscanAbnormalEntity::getDeliveryListId, deliveryId) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index cc22cf5f2..6588699c5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -56,6 +56,8 @@ import org.springblade.common.constant.stockup.StockAssignStatusConstant; import org.springblade.common.constant.stockup.StockupStatusConstant; import org.springblade.common.constant.stockup.StockupTypeConstant; import org.springblade.common.exception.CustomerException; +import org.springblade.common.model.NodeFanoutMsg; +import org.springblade.common.model.PackageData; import org.springblade.common.serviceConstant.ServiceConstant; import org.springblade.common.utils.AddressUtil; import org.springblade.common.utils.CommonUtil; @@ -1384,9 +1386,40 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl packageDataList = distributionDeliveryListService.getBroadcastData(distributionDeliveryListEntity.getId(),distributionDeliveryListEntity.getWarehouseId()); + + + + } + @Override public R getReservationInfo(String reservationId) { //查询出预约信息 @@ -1901,7 +1934,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl disStockListDetailEntities = disStockListDetailService.list(Wrappers.query().lambda() .eq(DisStockListDetailEntity::getReservationId, id) .eq(DisStockListDetailEntity::getStockListId, distributionReservationStocklistEntity.getStocklistId()) - .ne(DisStockListDetailEntity::getStockLockingStatus, InventoryPackageStatusConstant.quxiao.getValue())); + .ne(DisStockListDetailEntity::getStockLockingStatus, InventoryPackageStatusConstant.quxiao.getValue()) + .orderByAsc(DisStockListDetailEntity::getStockPackageCode)); for (int i = 0; i < count; i++) { DisStockListDetailEntity disStockListDetailEntity = disStockListDetailEntities.get(i); disStockListDetailEntity.setStockPackageStatus(InventoryPackageStatusConstant.quxiao.getValue());