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 2852e4076..b9d665643 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 @@ -167,4 +167,6 @@ public interface DistributionParcelListMapper extends BaseMapper packageIds); void updateTransferStatus(@Param("orderCode") String orderCode, @Param("warehouseId") Long warehouseId, @Param("isTransfer") Integer isTransfer); + + List> selectAllErrorReservationOrder(); } 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 1ca03990a..aacb94456 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 @@ -1074,4 +1074,10 @@ and warehouse_id = #{warehouseId} + + 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 712a952a5..43d368afc 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 @@ -446,11 +446,11 @@ ldsl.sku, ldsl.grounding_time, ldsl.unpack, - lwug.position_code + (SELECT GROUP_CONCAT(position_code) from logpm_warehouse_updown_goods lwug where lwug.association_id =ldsl.material_id and market_name=ldsl.market_name) as position_code + + FROM logpm_distribution_stock_list ldsl - JOIN - logpm_warehouse_updown_goods lwug ON ldsl.material_id = lwug.association_id ldsl.service_type = #{par.serviceType} and ldsl.warehouse_id = #{par.warehouseId} and ldsl.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 0d0474983..c43d365e1 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 @@ -175,4 +175,7 @@ public interface IDistributionParcelListService extends BaseService updateEntityByOpenOrder(Long advanceId, Long warehouseId, Long waybillId); + + + } 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 d8c200cee..df7530eaa 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 @@ -919,4 +919,5 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl reservationDatarepair(String param) { + + + + + return null; + + + } + + + + + +} diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/ISyncDistributionParcelListMapper.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/ISyncDistributionParcelListMapper.java new file mode 100644 index 000000000..53931cffa --- /dev/null +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/ISyncDistributionParcelListMapper.java @@ -0,0 +1,14 @@ +package com.logpm.patch.mapper; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface ISyncDistributionParcelListMapper { + + + List> selectAllErrorReservationOrder(); + +} diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/ISyncDistributionParcelListService.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/ISyncDistributionParcelListService.java new file mode 100644 index 000000000..324f508f8 --- /dev/null +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/ISyncDistributionParcelListService.java @@ -0,0 +1,14 @@ +package com.logpm.patch.service; + +import java.util.List; +import java.util.Map; + +public interface ISyncDistributionParcelListService { + + /** + * 获取错误的预约信息 + * @return + */ + List> selectAllErrorReservationOrder(); + +} diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncDistributionParcelListServiceImpl.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncDistributionParcelListServiceImpl.java new file mode 100644 index 000000000..a6d3631ca --- /dev/null +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncDistributionParcelListServiceImpl.java @@ -0,0 +1,15 @@ +package com.logpm.patch.service.impl; + +import com.logpm.patch.service.ISyncDistributionParcelListService; + +import java.util.List; +import java.util.Map; + +public class SyncDistributionParcelListServiceImpl implements ISyncDistributionParcelListService { + @Override + public List> selectAllErrorReservationOrder() { + + + return null; + } +}