From 4dfef293ebb26e0f6e25ac6186fdaa77583b69b4 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Fri, 18 Oct 2024 11:19:07 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E8=A3=85?= =?UTF-8?q?=E8=BD=A6=E8=8A=82=E7=82=B9=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 装车，入库增加车次运单信息 --- .../com/logpm/factorydata/vo/PushData.java | 4 + .../impl/TrunklineCarsLoadServiceImpl.java | 137 +++++++++++++++++- 2 files changed, 135 insertions(+), 6 deletions(-) diff --git a/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/vo/PushData.java b/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/vo/PushData.java index 688462d48..3f4908190 100644 --- a/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/vo/PushData.java +++ b/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/vo/PushData.java @@ -35,5 +35,9 @@ public class PushData implements Serializable { * 当前仓库名称 */ private String warehouseName; + /** + * 目的仓 + */ + private String destinationWarehouse; } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 9ee43206d..c179886c5 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -37,12 +37,95 @@ import com.logpm.factorydata.util.FactoryDataMessageSender; import com.logpm.factorydata.vo.NodePushMsg; import com.logpm.factorydata.vo.PushData; import com.logpm.trunkline.bean.Resp; -import com.logpm.trunkline.dto.*; -import com.logpm.trunkline.entity.*; +import com.logpm.trunkline.dto.BatchUnloadDTO; +import com.logpm.trunkline.dto.InComingDTO; +import com.logpm.trunkline.dto.LoadCarsDTO; +import com.logpm.trunkline.dto.LoadScanBrandDTO; +import com.logpm.trunkline.dto.LoadingPackageDTO; +import com.logpm.trunkline.dto.LoadingZeroDTO; +import com.logpm.trunkline.dto.OrderStatusDTO; +import com.logpm.trunkline.dto.ProductInfoDTO; +import com.logpm.trunkline.dto.TrunklineCarsLoadDTO; +import com.logpm.trunkline.dto.TrunklineCarsLoadLineDTO; +import com.logpm.trunkline.dto.TrunklineCarsOrderDTO; +import com.logpm.trunkline.dto.UnloadPackageDTO; +import com.logpm.trunkline.dto.UnloadZeroDTO; +import com.logpm.trunkline.dto.WaybillLogDTO; +import com.logpm.trunkline.dto.ZeroPackageDTO; +import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; +import com.logpm.trunkline.entity.TrunklineCarsLoadContractEntity; +import com.logpm.trunkline.entity.TrunklineCarsLoadEntity; +import com.logpm.trunkline.entity.TrunklineCarsLoadFinanceEntity; +import com.logpm.trunkline.entity.TrunklineCarsLoadLineEntity; +import com.logpm.trunkline.entity.TrunklineCarsLoadLinePhotoEntity; +import com.logpm.trunkline.entity.TrunklineCarsLoadLogEntity; +import com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity; +import com.logpm.trunkline.entity.TrunklineCarsOrderEntity; +import com.logpm.trunkline.entity.TrunklineCarsUnloadLogEntity; +import com.logpm.trunkline.entity.TrunklineCostShareRecordEntity; +import com.logpm.trunkline.entity.TrunklineLoadSignOrderEntity; +import com.logpm.trunkline.entity.TrunklineLoadSignPhotoEntity; +import com.logpm.trunkline.entity.TrunklineScanZeroDetailEntity; +import com.logpm.trunkline.entity.TrunklineWaybillOrderEntity; import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient; import com.logpm.trunkline.mapper.TrunklineCarsLoadMapper; -import com.logpm.trunkline.service.*; -import com.logpm.trunkline.vo.*; +import com.logpm.trunkline.service.ICarsLoadAsyncService; +import com.logpm.trunkline.service.IInComingService; +import com.logpm.trunkline.service.IOpenOrderAsyncService; +import com.logpm.trunkline.service.IPackageTrackLogAsyncService; +import com.logpm.trunkline.service.ITrunklineAdvanceDetailService; +import com.logpm.trunkline.service.ITrunklineCarsLoadContractService; +import com.logpm.trunkline.service.ITrunklineCarsLoadFinanceService; +import com.logpm.trunkline.service.ITrunklineCarsLoadLinePhotoService; +import com.logpm.trunkline.service.ITrunklineCarsLoadLineService; +import com.logpm.trunkline.service.ITrunklineCarsLoadLogService; +import com.logpm.trunkline.service.ITrunklineCarsLoadScanService; +import com.logpm.trunkline.service.ITrunklineCarsLoadService; +import com.logpm.trunkline.service.ITrunklineCarsLoadingLogService; +import com.logpm.trunkline.service.ITrunklineCarsOrderService; +import com.logpm.trunkline.service.ITrunklineCarsSignLogService; +import com.logpm.trunkline.service.ITrunklineCarsUnloadLogService; +import com.logpm.trunkline.service.ITrunklineCostShareRecordService; +import com.logpm.trunkline.service.ITrunklineLoadSignOrderService; +import com.logpm.trunkline.service.ITrunklineLoadSignPhotoService; +import com.logpm.trunkline.service.ITrunklineScanZeroDetailService; +import com.logpm.trunkline.service.ITrunklineWaybillOrderService; +import com.logpm.trunkline.service.ITrunklineWaybillPackageService; +import com.logpm.trunkline.service.ITrunklineWaybillTrackService; +import com.logpm.trunkline.vo.CarsLoadAllOrderVO; +import com.logpm.trunkline.vo.CarsLoadOrderInfoVO; +import com.logpm.trunkline.vo.CarsLoadScanAbnormalVO; +import com.logpm.trunkline.vo.CarsLoadWaybillInfoVO; +import com.logpm.trunkline.vo.CustmoerUnloadNumVO; +import com.logpm.trunkline.vo.GoodsLoadingNumVO; +import com.logpm.trunkline.vo.HasNotFinalNodeIdDataVO; +import com.logpm.trunkline.vo.LoadScanFinalNodeIdVO; +import com.logpm.trunkline.vo.LoadScanOrderVO; +import com.logpm.trunkline.vo.LoadZeroListVO; +import com.logpm.trunkline.vo.LoadingDetailExportVO; +import com.logpm.trunkline.vo.LoadingListGoodsVO; +import com.logpm.trunkline.vo.LoadingListMainVO; +import com.logpm.trunkline.vo.NodeNumDataVO; +import com.logpm.trunkline.vo.OrderCodeNumVO; +import com.logpm.trunkline.vo.OrderScanDetailVO; +import com.logpm.trunkline.vo.SignOrderDetailVO; +import com.logpm.trunkline.vo.SignPackageVO; +import com.logpm.trunkline.vo.SignScanOrderVO; +import com.logpm.trunkline.vo.TripartiteTransferVO; +import com.logpm.trunkline.vo.TrunklineCarsLoadLoadingListVO; +import com.logpm.trunkline.vo.TrunklineCarsLoadScanVO; +import com.logpm.trunkline.vo.TrunklineCarsLoadVO; +import com.logpm.trunkline.vo.TrunklineCarsOrderVO; +import com.logpm.trunkline.vo.TrunklineLoadSignOrderVO; +import com.logpm.trunkline.vo.TrunklineScanZeroDetailVO; +import com.logpm.trunkline.vo.UnloadPackageVO; +import com.logpm.trunkline.vo.UnloadScanOrderVO; +import com.logpm.trunkline.vo.UnloadZeroVO; +import com.logpm.trunkline.vo.WaybillCarsLoadVO; +import com.logpm.trunkline.vo.ZeroNumVO; +import com.logpm.trunkline.vo.ZeroPackageVO; +import com.logpm.trunkline.vo.ZeroSuppleListVO; +import com.logpm.trunkline.vo.ZeroSuppleVO; import com.logpm.warehouse.entity.WarehousePackageTrackLogEntity; import com.logpm.warehouse.entity.WarehouseTrayTypeEntity; import com.logpm.warehouse.entity.WarehouseWayBillDetail; @@ -56,7 +139,11 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; import org.springblade.common.annotations.RepeatSubmit; -import org.springblade.common.constant.*; +import org.springblade.common.constant.CodeNumConstant; +import org.springblade.common.constant.DictBizConstant; +import org.springblade.common.constant.IncomingTypeEnum; +import org.springblade.common.constant.RabbitConstant; +import org.springblade.common.constant.WorkNodeEnums; import org.springblade.common.constant.carsload.CarsLoadLogTypeConstant; import org.springblade.common.exception.CustomerException; import org.springblade.common.utils.CommonUtil; @@ -76,7 +163,18 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.math.RoundingMode; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +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.atomic.AtomicReference; import java.util.function.Function; import java.util.stream.Collectors; @@ -3464,6 +3562,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl map = new HashMap<>(); map.put("messageData", JSONUtil.toJsonStr(orderStatusDTO)); rabbitTemplate.convertAndSend(RabbitConstant.HWY_ORDER_STATUS_EXCHANGE, RabbitConstant.HWY_ORDER_STATUS_ROUTING, map); + JSONObject main = new JSONObject(); + main.put("trainNumber", entity.getTrainNumber()); + main.put("waybillNumber", entity.getWaybillNumber()); NodePushMsg nodePushMsg = NodePushMsg.builder() .operator(AuthUtil.getNickName()) .operatorTime(new Date()) @@ -5817,11 +5926,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl