|
|
|
@ -33,32 +33,102 @@ import com.logpm.basicdata.entity.BasicdataClientEntity;
|
|
|
|
|
import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity; |
|
|
|
|
import com.logpm.basicdata.entity.BasicdataTrayEntity; |
|
|
|
|
import com.logpm.basicdata.entity.BasicdataWarehouseEntity; |
|
|
|
|
import com.logpm.basicdata.feign.*; |
|
|
|
|
import com.logpm.basicdata.feign.IBasicdataClientClient; |
|
|
|
|
import com.logpm.basicdata.feign.IBasicdataCodeClient; |
|
|
|
|
import com.logpm.basicdata.feign.IBasicdataGoodsAllocationClient; |
|
|
|
|
import com.logpm.basicdata.feign.IBasicdataGoodsAreaClient; |
|
|
|
|
import com.logpm.basicdata.feign.IBasicdataTrayClient; |
|
|
|
|
import com.logpm.basicdata.feign.IBasicdataWarehouseClient; |
|
|
|
|
import com.logpm.basicdata.vo.BasicdataGoodsAreaVO; |
|
|
|
|
import com.logpm.distribution.bean.Resp; |
|
|
|
|
import com.logpm.distribution.dto.app.StockConfigInfoVO; |
|
|
|
|
import com.logpm.distribution.dto.app.StockConfigOrderPackageListVO; |
|
|
|
|
import com.logpm.distribution.dto.app.StockupDTO; |
|
|
|
|
import com.logpm.distribution.dto.app.StockupZeroDTO; |
|
|
|
|
import com.logpm.distribution.entity.*; |
|
|
|
|
import com.logpm.distribution.entity.DisStockListDetailEntity; |
|
|
|
|
import com.logpm.distribution.entity.DisStockOrdercodeRecoEntity; |
|
|
|
|
import com.logpm.distribution.entity.DistributionDeliveryDetailsEntity; |
|
|
|
|
import com.logpm.distribution.entity.DistributionParcelDetailsEntity; |
|
|
|
|
import com.logpm.distribution.entity.DistributionParcelListEntity; |
|
|
|
|
import com.logpm.distribution.entity.DistributionReservationEntity; |
|
|
|
|
import com.logpm.distribution.entity.DistributionReservationPackageEntity; |
|
|
|
|
import com.logpm.distribution.entity.DistributionReservationStocklistEntity; |
|
|
|
|
import com.logpm.distribution.entity.DistributionReservationZeroPackageEntity; |
|
|
|
|
import com.logpm.distribution.entity.DistributionStockArticleEntity; |
|
|
|
|
import com.logpm.distribution.entity.DistributionStockEntity; |
|
|
|
|
import com.logpm.distribution.entity.DistributionStockListEntity; |
|
|
|
|
import com.logpm.distribution.entity.DistributionStockupEntity; |
|
|
|
|
import com.logpm.distribution.entity.DistributionStockupInfoEntity; |
|
|
|
|
import com.logpm.distribution.entity.DistrilbutionBillLadingEntity; |
|
|
|
|
import com.logpm.distribution.entity.DistrilbutionBillPackageEntity; |
|
|
|
|
import com.logpm.distribution.entity.DistrilbutionBillStockEntity; |
|
|
|
|
import com.logpm.distribution.excel.DistributionCityExcel; |
|
|
|
|
import com.logpm.distribution.excel.DistributionMarketExcel; |
|
|
|
|
import com.logpm.distribution.excel.DistributionSelfExcel; |
|
|
|
|
import com.logpm.distribution.excel.DistributionStockupPackageListDetailExcel; |
|
|
|
|
import com.logpm.distribution.mapper.*; |
|
|
|
|
import com.logpm.distribution.service.*; |
|
|
|
|
import com.logpm.distribution.vo.*; |
|
|
|
|
import com.logpm.distribution.vo.app.*; |
|
|
|
|
import com.logpm.distribution.mapper.DistributionReservationMapper; |
|
|
|
|
import com.logpm.distribution.mapper.DistributionStockListInfoMapper; |
|
|
|
|
import com.logpm.distribution.mapper.DistributionStockListMapper; |
|
|
|
|
import com.logpm.distribution.mapper.DistributionStockMapper; |
|
|
|
|
import com.logpm.distribution.mapper.DistributionStockupMapper; |
|
|
|
|
import com.logpm.distribution.mapper.DistrilbutionBillLadingMapper; |
|
|
|
|
import com.logpm.distribution.service.IDisStockListDetailService; |
|
|
|
|
import com.logpm.distribution.service.IDisStockOrdercodeRecoService; |
|
|
|
|
import com.logpm.distribution.service.IDistributionAsyncService; |
|
|
|
|
import com.logpm.distribution.service.IDistributionDeliveryDetailsService; |
|
|
|
|
import com.logpm.distribution.service.IDistributionNodeWorkService; |
|
|
|
|
import com.logpm.distribution.service.IDistributionParcelDetailsService; |
|
|
|
|
import com.logpm.distribution.service.IDistributionParcelListService; |
|
|
|
|
import com.logpm.distribution.service.IDistributionReservationPackageService; |
|
|
|
|
import com.logpm.distribution.service.IDistributionReservationService; |
|
|
|
|
import com.logpm.distribution.service.IDistributionReservationStocklistService; |
|
|
|
|
import com.logpm.distribution.service.IDistributionReservationZeroPackageService; |
|
|
|
|
import com.logpm.distribution.service.IDistributionStockArticleService; |
|
|
|
|
import com.logpm.distribution.service.IDistributionStockListService; |
|
|
|
|
import com.logpm.distribution.service.IDistributionStockService; |
|
|
|
|
import com.logpm.distribution.service.IDistributionStockupInfoService; |
|
|
|
|
import com.logpm.distribution.service.IDistributionStockupService; |
|
|
|
|
import com.logpm.distribution.service.IDistrilbutionBillLadingService; |
|
|
|
|
import com.logpm.distribution.service.IDistrilbutionBillPackageService; |
|
|
|
|
import com.logpm.distribution.service.IDistrilbutionBillStockService; |
|
|
|
|
import com.logpm.distribution.vo.DistributionParcelTrayVO; |
|
|
|
|
import com.logpm.distribution.vo.DistributionStockAllocationVO; |
|
|
|
|
import com.logpm.distribution.vo.DistributionStockPackageVO; |
|
|
|
|
import com.logpm.distribution.vo.DistributionStockupInventoryDetailVO; |
|
|
|
|
import com.logpm.distribution.vo.DistributionStockupListVO; |
|
|
|
|
import com.logpm.distribution.vo.DistributionStockupOrderInfoVO; |
|
|
|
|
import com.logpm.distribution.vo.DistributionStockupOrderListVO; |
|
|
|
|
import com.logpm.distribution.vo.DistributionStockupSelfVO; |
|
|
|
|
import com.logpm.distribution.vo.DistributionStockupStockListInfoVO; |
|
|
|
|
import com.logpm.distribution.vo.DistributionStockupStockListVO; |
|
|
|
|
import com.logpm.distribution.vo.DistributionStockupTrayVO; |
|
|
|
|
import com.logpm.distribution.vo.DistributionStockupVO; |
|
|
|
|
import com.logpm.distribution.vo.PackageStockupVO; |
|
|
|
|
import com.logpm.distribution.vo.StockListInfoListVO; |
|
|
|
|
import com.logpm.distribution.vo.app.DistributionAppStockUpClientVO; |
|
|
|
|
import com.logpm.distribution.vo.app.DistributionAppStockUpInventoryConfiglVO; |
|
|
|
|
import com.logpm.distribution.vo.app.DistributionAppStockUpInventoryDetailVO; |
|
|
|
|
import com.logpm.distribution.vo.app.DistributionAppStockUpOrderDetailVO; |
|
|
|
|
import com.logpm.distribution.vo.app.DistributionAppStockUpPackageDetailVO; |
|
|
|
|
import com.logpm.distribution.vo.app.DistributionAppStockUpScanDetailVO; |
|
|
|
|
import com.logpm.distribution.vo.app.DistributionAppStockUpVO; |
|
|
|
|
import com.logpm.distribution.vo.app.DistributionAppStockUpZeroOrderDetailVO; |
|
|
|
|
import com.logpm.distribution.wrapper.DistributionStockupWrapper; |
|
|
|
|
import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient; |
|
|
|
|
import com.logpm.warehouse.entity.WarehouseGoodsAllocationEntity; |
|
|
|
|
import com.logpm.warehouse.entity.WarehouseTaryAllocationEntity; |
|
|
|
|
import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity; |
|
|
|
|
import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity; |
|
|
|
|
import com.logpm.warehouse.feign.*; |
|
|
|
|
import com.logpm.warehouse.feign.IWarehouseGoodsAllocationClient; |
|
|
|
|
import com.logpm.warehouse.feign.IWarehouseTaryAllocationClient; |
|
|
|
|
import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient; |
|
|
|
|
import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient; |
|
|
|
|
import com.logpm.warehouse.feign.IWarehouseUpdownGoodsLogClient; |
|
|
|
|
import com.logpm.warehouse.feign.IWarehouseUpdownStockUpAreaClient; |
|
|
|
|
import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient; |
|
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
import org.apache.commons.lang3.math.NumberUtils; |
|
|
|
|
import org.apache.commons.lang.math.NumberUtils; |
|
|
|
|
import org.jetbrains.annotations.NotNull; |
|
|
|
|
import org.springblade.common.constant.CodeDesEnum; |
|
|
|
|
import org.springblade.common.constant.DictBizConstant; |
|
|
|
@ -73,7 +143,11 @@ import org.springblade.common.constant.orderpackage.OrderPackageGroundingStatusC
|
|
|
|
|
import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant; |
|
|
|
|
import org.springblade.common.constant.orderpackage.OrderPackageStockupStatusConstant; |
|
|
|
|
import org.springblade.common.constant.pda.PdaAudioLingoStatus; |
|
|
|
|
import org.springblade.common.constant.reservation.*; |
|
|
|
|
import org.springblade.common.constant.reservation.ReservationInventoryStatusConstant; |
|
|
|
|
import org.springblade.common.constant.reservation.ReservationLoadingStatusConstant; |
|
|
|
|
import org.springblade.common.constant.reservation.ReservationOrderStatusConstant; |
|
|
|
|
import org.springblade.common.constant.reservation.ReservationPackageStatusConstant; |
|
|
|
|
import org.springblade.common.constant.reservation.ReservationSigningStatusConstant; |
|
|
|
|
import org.springblade.common.constant.stockup.StockAssignStatusConstant; |
|
|
|
|
import org.springblade.common.constant.stockup.StockupStatusConstant; |
|
|
|
|
import org.springblade.common.constant.stockup.StockupTypeConstant; |
|
|
|
@ -107,7 +181,19 @@ import java.time.LocalDate;
|
|
|
|
|
import java.time.YearMonth; |
|
|
|
|
import java.time.format.DateTimeFormatter; |
|
|
|
|
import java.time.temporal.ChronoUnit; |
|
|
|
|
import java.util.*; |
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
import java.util.Arrays; |
|
|
|
|
import java.util.Collections; |
|
|
|
|
import java.util.Date; |
|
|
|
|
import java.util.HashMap; |
|
|
|
|
import java.util.HashSet; |
|
|
|
|
import java.util.Iterator; |
|
|
|
|
import java.util.List; |
|
|
|
|
import java.util.Map; |
|
|
|
|
import java.util.Objects; |
|
|
|
|
import java.util.Optional; |
|
|
|
|
import java.util.Set; |
|
|
|
|
import java.util.TreeSet; |
|
|
|
|
import java.util.concurrent.ConcurrentHashMap; |
|
|
|
|
import java.util.concurrent.atomic.AtomicBoolean; |
|
|
|
|
import java.util.concurrent.atomic.AtomicReference; |
|
|
|
|