Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/OrderStatusDTO.java

@@ -0,0 +1,114 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.dto;
+
+import lombok.Data;
+import org.springblade.core.tool.utils.StringUtil;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * OrderStatus
+ *
+ * @author zhy
+ * @since 2023-06-12
+ */
+@Data
+public class OrderStatusDTO implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@NotEmpty(message = "派车单号不能为空")
+	private String dispatchNumber;//派车单号
+
+	@NotEmpty(message = "客户订单号不能为空")
+	private String orderNo;//客户订单号
+
+	@NotEmpty(message = "工厂ID不能为空")
+	private String plantId;//工厂ID
+
+	@NotEmpty(message = "物流单号不能为空")
+	private String logiBillNo;//物流单号
+
+	@NotEmpty(message = "包件码不能为空")
+	private String unitNo;//包件码
+
+	@NotEmpty(message = "操作时间不能为空")
+	private String operationTime;//操作时间
+
+	@NotEmpty(message = "当前仓库不能为空")
+	private String currentWarehouse;//当前仓库
+
+	@NotEmpty(message = "目的仓库不能为空")
+	private String destinationWarehouse;//目的仓库
+
+	@NotEmpty(message = "状态不能为空")
+	private String status;//状态
+
+	@NotEmpty(message = "送货任务ID不能为空")
+	private String distributionContactId;
+
+	@NotEmpty(message = "托盘id")
+	private Integer trayId;
+
+	@NotEmpty(message = "托盘编码")
+	private String trayNo;
+
+	@NotEmpty(message = "操作人名称")
+	private String username;
+
+
+	/**
+	 * 验证参数是否都存在
+	 * @return
+	 */
+	public boolean verifyData(){
+		if(StringUtil.isBlank(dispatchNumber)){
+			return false;
+		}
+		if(StringUtil.isBlank(orderNo)){
+			return false;
+		}
+		if(StringUtil.isBlank(plantId)){
+			return false;
+		}
+		if(StringUtil.isBlank(logiBillNo)){
+			return false;
+		}
+		if(StringUtil.isBlank(unitNo)){
+			return false;
+		}
+		if(StringUtil.isBlank(operationTime)){
+			return false;
+		}
+		if(StringUtil.isBlank(currentWarehouse)){
+			return false;
+		}
+		if(StringUtil.isBlank(destinationWarehouse)){
+			return false;
+		}
+		if(StringUtil.isBlank(status)){
+			return false;
+		}
+		if(StringUtil.isBlank(distributionContactId)){
+			return false;
+		}
+		return true;
+	}
+
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

@@ -17,6 +17,7 @@
 package com.logpm.distribution.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -35,6 +36,7 @@ import com.logpm.distribution.bean.Resp;
 import com.logpm.distribution.dto.DistributionParcelListDTO;
 import com.logpm.distribution.dto.DistributionStockListDTO;
 import com.logpm.distribution.dto.DistrilbutionBillLadingDTO;
+import com.logpm.distribution.dto.OrderStatusDTO;
 import com.logpm.distribution.dto.app.BillLadingAppDTO;
 import com.logpm.distribution.entity.*;
 import com.logpm.distribution.excel.DistrilbutionBillLadingExcel;
@@ -52,6 +54,7 @@ import lombok.extern.log4j.Log4j2;
 import org.apache.logging.log4j.util.Strings;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.Inventory.InventoryStockUpStatusConstant;
+import org.springblade.common.constant.RabbitConstant;
 import org.springblade.common.constant.WorkNodeEnums;
 import org.springblade.common.constant.billLading.BillLadingStatusConstant;
 import org.springblade.common.constant.common.IsOrNoConstant;
@@ -76,6 +79,7 @@ import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.system.cache.DictBizCache;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
@@ -152,6 +156,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	private  BladeRedis redis;
 	@Resource
 	private FactoryDataMessageSender factoryDataMessageSender;
+	@Resource
+	private RabbitTemplate rabbitTemplate;
 
 
 	@Override
@@ -2959,6 +2965,10 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					distributionAsyncService.releaseBillLadingResource(Long.parseLong(s),myCurrentWarehouse.getId());
 				}
 				parcelListIds.addAll(ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getParcelListId).collect(Collectors.toSet()));
+				for (DistributionBillLadingScanEntity ladingScanEntity : ladingScanEntities) {
+					// 签收发送消息到工厂
+					pushFactoryOrderData(myCurrentWarehouse.getId(), ladingScanEntity.getParcelListId().toString(), ladingScanEntity.getOrderSelfNumbering());
+				}
 			}else {
 				distributionAsyncService.releaseBillLadingResource(Long.parseLong(s),myCurrentWarehouse.getId());
 			}
@@ -2993,7 +3003,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			}
 			//处理库存品签收数据
 			updateStock(s);
-
 		}
 		// 回传工厂数据
 		sendFactory(myCurrentWarehouse, parcelListIds);
@@ -3036,6 +3045,24 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		}
 	}
 
+	private void pushFactoryOrderData(Long warehouseId, String orderPackageCode, String orderCode) {
+		try {
+			// 发送入库消息
+			OrderStatusDTO orderStatusDTO = new OrderStatusDTO();
+			// 通过包件id 查询包件
+			orderStatusDTO.setUnitNo(orderPackageCode);
+			orderStatusDTO.setOrderNo(orderCode);
+			orderStatusDTO.setStatus("3");
+			orderStatusDTO.setOperationTime(DateUtil.now());
+			orderStatusDTO.setCurrentWarehouse(warehouseId.toString());
+			Map<String, Object> map = new HashMap<>();
+			map.put("messageData", orderStatusDTO);
+			rabbitTemplate.convertAndSend(RabbitConstant.HWY_ORDER_STATUS_EXCHANGE, RabbitConstant.HWY_ORDER_STATUS_ROUTING, map);
+		} catch (Exception e) {
+			log.error("入库推送失败：{}", e);
+		}
+	}
+
 	/**
 	 * 处理提货库存品签收
 	 */

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/OrderStatusDTO.java

@@ -0,0 +1,114 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.trunkline.dto;
+
+import lombok.Data;
+import org.springblade.core.tool.utils.StringUtil;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * OrderStatus
+ *
+ * @author zhy
+ * @since 2023-06-12
+ */
+@Data
+public class OrderStatusDTO implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@NotEmpty(message = "派车单号不能为空")
+	private String dispatchNumber;//派车单号
+
+	@NotEmpty(message = "客户订单号不能为空")
+	private String orderNo;//客户订单号
+
+	@NotEmpty(message = "工厂ID不能为空")
+	private String plantId;//工厂ID
+
+	@NotEmpty(message = "物流单号不能为空")
+	private String logiBillNo;//物流单号
+
+	@NotEmpty(message = "包件码不能为空")
+	private String unitNo;//包件码
+
+	@NotEmpty(message = "操作时间不能为空")
+	private String operationTime;//操作时间
+
+	@NotEmpty(message = "当前仓库不能为空")
+	private String currentWarehouse;//当前仓库
+
+	@NotEmpty(message = "目的仓库不能为空")
+	private String destinationWarehouse;//目的仓库
+
+	@NotEmpty(message = "状态不能为空")
+	private String status;//状态
+
+	@NotEmpty(message = "送货任务ID不能为空")
+	private String distributionContactId;
+
+	@NotEmpty(message = "托盘id")
+	private Integer trayId;
+
+	@NotEmpty(message = "托盘编码")
+	private String trayNo;
+
+	@NotEmpty(message = "操作人名称")
+	private String username;
+
+
+	/**
+	 * 验证参数是否都存在
+	 * @return
+	 */
+	public boolean verifyData(){
+		if(StringUtil.isBlank(dispatchNumber)){
+			return false;
+		}
+		if(StringUtil.isBlank(orderNo)){
+			return false;
+		}
+		if(StringUtil.isBlank(plantId)){
+			return false;
+		}
+		if(StringUtil.isBlank(logiBillNo)){
+			return false;
+		}
+		if(StringUtil.isBlank(unitNo)){
+			return false;
+		}
+		if(StringUtil.isBlank(operationTime)){
+			return false;
+		}
+		if(StringUtil.isBlank(currentWarehouse)){
+			return false;
+		}
+		if(StringUtil.isBlank(destinationWarehouse)){
+			return false;
+		}
+		if(StringUtil.isBlank(status)){
+			return false;
+		}
+		if(StringUtil.isBlank(distributionContactId)){
+			return false;
+		}
+		return true;
+	}
+
+
+}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java

@@ -1,10 +1,12 @@
 package com.logpm.trunkline.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.trunkline.bean.Resp;
 import com.logpm.trunkline.dto.InComingDTO;
+import com.logpm.trunkline.dto.OrderStatusDTO;
 import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
 import com.logpm.trunkline.entity.TrunklineBillladingPackageEntity;
 import com.logpm.trunkline.service.*;
@@ -13,11 +15,14 @@ import com.logpm.warehouse.feign.IWarehouseTrayTypeClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.IncomingTypeEnum;
+import org.springblade.common.constant.RabbitConstant;
 import org.springblade.common.constant.WorkNodeEnums;
+import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -33,7 +38,8 @@ public class InComingServiceImpl implements IInComingService {
 	private final IWarehouseTrayTypeClient warehouseTrayTypeClient;
 	private final IBasicdataWarehouseClient warehouseClient;
 	private final IPackageTrackLogAsyncService packageTrackLogAsyncService;
-//	private final DynamicDataSourceProvider dynamicDataSourceProvider;
+	//	private final DynamicDataSourceProvider dynamicDataSourceProvider;
+	private final RabbitTemplate rabbitTemplate;
 
 
 	@Override
@@ -48,84 +54,99 @@ public class InComingServiceImpl implements IInComingService {
 
 		String[] packageCodes = orderPackageCode.split(",");
 		for (String packageCode : packageCodes) {
-			log.info("############incomingPackage: 包件入库开始 packageCode={} billladingId={} warehouseId={}",packageCode,billladingId,warehouseId);
+			log.info("############incomingPackage: 包件入库开始 packageCode={} billladingId={} warehouseId={}", packageCode, billladingId, warehouseId);
 			//包件入库开始
 			//查询包件是否有数据
 			QueryWrapper<TrunklineAdvanceDetailEntity> advanceDetailQueryWrapper = new QueryWrapper<>();
-			advanceDetailQueryWrapper.eq("order_package_code",packageCode);
+			advanceDetailQueryWrapper.eq("order_package_code", packageCode);
 			TrunklineAdvanceDetailEntity advanceDetailEntity = advanceDetailService.getOne(advanceDetailQueryWrapper);
-			if(Objects.isNull(advanceDetailEntity)){
+			if (Objects.isNull(advanceDetailEntity)) {
-				log.warn("############incomingPackage: 包件不存在 packageCode={} warehouseId={}",packageCode,warehouseId);
+				log.warn("############incomingPackage: 包件不存在 packageCode={} warehouseId={}", packageCode, warehouseId);
-				return Resp.scanFail(405,"包件无数据","包件无数据");
+				return Resp.scanFail(405, "包件无数据", "包件无数据");
 			}
 			Long advanceDetailId = advanceDetailEntity.getId();
 			String packageStatus = advanceDetailEntity.getPackageStatus();
 			Long advanceId = advanceDetailEntity.getAdvanceId();
-			if("1".equals(packageStatus)){
+			if ("1".equals(packageStatus)) {
-				if(incomingType != 1){
+				if (incomingType != 1) {
-					log.warn("############incomingPackage: 包件已入库 packageCode={} warehouseId={}",packageCode,warehouseId);
+					log.warn("############incomingPackage: 包件已入库 packageCode={} warehouseId={}", packageCode, warehouseId);
-					return Resp.scanFail(405,"包件已入库","包件已入库");
+					return Resp.scanFail(405, "包件已入库", "包件已入库");
-				}else{
+				} else {
-					if(!Objects.isNull(billladingId)){
+					if (!Objects.isNull(billladingId)) {
 						//先判断该包件是否已经有提货记录了
 						TrunklineBillladingPackageEntity billladingPackageEntity = billladingPackageServicie.findBillladingPackage(packageCode);
-						if(Objects.isNull(billladingPackageEntity)){
+						if (Objects.isNull(billladingPackageEntity)) {
-							billladingPackageServicie.saveEntity(packageCode,billladingId,warehouseId,incomingType);
+							billladingPackageServicie.saveEntity(packageCode, billladingId, warehouseId, incomingType);
 						}
 					}
 
 					//4.如果有托盘码
-					if(StringUtil.isNotBlank(trayCode) && StringUtil.isNotBlank(trayType)){
+					if (StringUtil.isNotBlank(trayCode) && StringUtil.isNotBlank(trayType)) {
-						Map<String,Object> map = new HashMap<>();
+						Map<String, Object> map = new HashMap<>();
-						map.put("trayType",trayType);
+						map.put("trayType", trayType);
-						map.put("trayCode",trayCode);
+						map.put("trayCode", trayCode);
-						map.put("warehouseId",warehouseId);
+						map.put("warehouseId", warehouseId);
-						map.put("orderPackageCode",packageCode);
+						map.put("orderPackageCode", packageCode);
 						warehouseTrayTypeClient.orderScanOrderPackageCode(map);
 					}
 				}
-			}else{
+			} else {
-				if(StringUtil.isBlank(warehouseName)){
+				if (StringUtil.isBlank(warehouseName)) {
 					BasicdataWarehouseEntity warehouseEntity = warehouseClient.getEntityWarehouseId(warehouseId);
-					if(!Objects.isNull(warehouseEntity)){
+					if (!Objects.isNull(warehouseEntity)) {
 						warehouseName = warehouseEntity.getName();
 					}
 				}
 
 				//1.修改暂存单包件入库状态
-				advanceDetailService.updatePackageStatusById("1",advanceDetailId,warehouseId,warehouseName);
+				advanceDetailService.updatePackageStatusById("1", advanceDetailId, warehouseId, warehouseName);
 				List<String> incomingWarehouseNames = advanceDetailService.findIncomingWarehouseName(advanceId);
-				advanceService.updateIncomingWarehouseName(String.join(",",incomingWarehouseNames),advanceId);
+				advanceService.updateIncomingWarehouseName(String.join(",", incomingWarehouseNames), advanceId);
 
 				List<String> orderPackageCodes = new ArrayList<>();
 				orderPackageCodes.add(orderPackageCode);
 				//存入日志
-				packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(),AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()),AuthUtil.getNickName(),orderPackageCodes,warehouseId,warehouseName, WorkNodeEnums.INITIAL_WAREHOUSE_ENTRY.getCode(),"包件"+ IncomingTypeEnum.getValue(incomingType));
+				packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseName, WorkNodeEnums.INITIAL_WAREHOUSE_ENTRY.getCode(), "包件" + IncomingTypeEnum.getValue(incomingType));
 
 
 				//2.判断包件和订单是否已经存入在库订单
 				boolean b = advanceService.saveOrderAndPackage(advanceDetailEntity, warehouseId);
 
-				if(b){
+				if (b) {
 					//3.根据是否有提货单id绑定提货单
-					if(!Objects.isNull(billladingId)){
+					if (!Objects.isNull(billladingId)) {
 						//先判断该包件是否已经有提货记录了
 						TrunklineBillladingPackageEntity billladingPackageEntity = billladingPackageServicie.findBillladingPackage(packageCode);
-						if(Objects.isNull(billladingPackageEntity)){
+						if (Objects.isNull(billladingPackageEntity)) {
-							billladingPackageServicie.saveEntity(packageCode,billladingId,warehouseId,incomingType);
+							billladingPackageServicie.saveEntity(packageCode, billladingId, warehouseId, incomingType);
 						}
 					}
 
 					//4.如果有托盘码
-					if(StringUtil.isNotBlank(trayCode) && StringUtil.isNotBlank(trayType)){
+					if (StringUtil.isNotBlank(trayCode) && StringUtil.isNotBlank(trayType)) {
-						Map<String,Object> map = new HashMap<>();
+						Map<String, Object> map = new HashMap<>();
-						map.put("trayType",trayType);
+						map.put("trayType", trayType);
-						map.put("trayCode",trayCode);
+						map.put("trayCode", trayCode);
-						map.put("warehouseId",warehouseId);
+						map.put("warehouseId", warehouseId);
-						map.put("orderPackageCode",packageCode);
+						map.put("orderPackageCode", packageCode);
 						warehouseTrayTypeClient.orderScanOrderPackageCode(map);
 					}
 				}
+				try {
+					// 发送入库消息
+					OrderStatusDTO orderStatusDTO = new OrderStatusDTO();
+					// 通过包件id 查询包件
+					orderStatusDTO.setUnitNo(packageCode);
+					orderStatusDTO.setOrderNo(advanceDetailEntity.getOrderCode());
+					orderStatusDTO.setStatus("4");
+					orderStatusDTO.setOperationTime(DateUtil.now());
+					orderStatusDTO.setCurrentWarehouse(warehouseId.toString());
+					Map<String, Object> map = new HashMap<>();
+					map.put("messageData", orderStatusDTO);
+					rabbitTemplate.convertAndSend(RabbitConstant.HWY_ORDER_STATUS_EXCHANGE, RabbitConstant.HWY_ORDER_STATUS_ROUTING, map);
+				} catch (Exception e) {
+					log.error("入库推送失败：{}", e);
+				}
 			}
 		}
 		return R.success("入库成功");
@@ -134,14 +155,14 @@ public class InComingServiceImpl implements IInComingService {
 	@Override
 	public R findIncomingOrderList(InComingDTO inComingDTO) {
 		Integer incomingType = inComingDTO.getIncomingType();
-		if(incomingType == 5){
+		if (incomingType == 5) {
 			String incomingCode = inComingDTO.getIncomingCode();
-			if(!StringUtil.isBlank(incomingCode)){
+			if (!StringUtil.isBlank(incomingCode)) {
-				incomingCode = incomingCode.replaceAll("，",",");
+				incomingCode = incomingCode.replaceAll("，", ",");
 				List<String> orderCodes = new ArrayList<>();
-				if(incomingCode.contains(",")){
+				if (incomingCode.contains(",")) {
 					orderCodes.addAll(Arrays.asList(incomingCode.split(",")));
-				}else{
+				} else {
 					orderCodes.add(incomingCode);
 				}
 				inComingDTO.setOrderCodes(orderCodes);
@@ -177,20 +198,20 @@ public class InComingServiceImpl implements IInComingService {
 
 		for (Long advanceId : advanceIds) {
 			QueryWrapper<TrunklineAdvanceDetailEntity> queryWrapper = new QueryWrapper<>();
-			queryWrapper.eq("advance_id",advanceId)
+			queryWrapper.eq("advance_id", advanceId)
-				.eq("package_status","0");
+				.eq("package_status", "0");
 			//查询所有包件
 			List<TrunklineAdvanceDetailEntity> detailList = advanceDetailService.list(queryWrapper);
 
-			List<String> orderPackageCodes = advanceService.incomingPackageBatch(advanceId, warehouseId, detailList,userId,deptId,tenantId);
+			List<String> orderPackageCodes = advanceService.incomingPackageBatch(advanceId, warehouseId, detailList, userId, deptId, tenantId);
 
 			advanceDetailService.updateBatchById(detailList);
 
 			List<String> incomingWarehouseNames = advanceDetailService.findIncomingWarehouseName(advanceId);
-			advanceService.updateIncomingWarehouseName(String.join(",",incomingWarehouseNames),advanceId);
+			advanceService.updateIncomingWarehouseName(String.join(",", incomingWarehouseNames), advanceId);
 
 			//存入日志
-			packageTrackLogAsyncService.addPackageTrackLog(tenantId,userId, deptId,nickName,orderPackageCodes,warehouseId,warehouseName, WorkNodeEnums.INITIAL_WAREHOUSE_ENTRY.getCode(),"包件"+ IncomingTypeEnum.getValue(incomingType));
+			packageTrackLogAsyncService.addPackageTrackLog(tenantId, userId, deptId, nickName, orderPackageCodes, warehouseId, warehouseName, WorkNodeEnums.INITIAL_WAREHOUSE_ENTRY.getCode(), "包件" + IncomingTypeEnum.getValue(incomingType));
 
 		}
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -1,6 +1,7 @@
 package com.logpm.trunkline.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -2314,10 +2315,29 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		trunklineCarsLoadingLogService.savaLoadingLog(warehouseId, warehouseName, loadId, loadCode, waybillId, waybillNo, orderCode, orderPackageCode, 1,
 			1, isData, isAbnormal, trayId, trayCode, trayName, fromWarehouseId, loadScanId, remark);
 		updateNumByLoadId(loadId);
-
+		// 推送包件装车数据到工厂
+		pushFactoryOrderData(warehouseId, orderPackageCode, orderCode);
 		return R.success("装车成功");
 	}
 
+	private void pushFactoryOrderData(Long warehouseId, String orderPackageCode, String orderCode) {
+		try {
+			// 发送入库消息
+			OrderStatusDTO orderStatusDTO = new OrderStatusDTO();
+			// 通过包件id 查询包件
+			orderStatusDTO.setUnitNo(orderPackageCode);
+			orderStatusDTO.setOrderNo(orderCode);
+			orderStatusDTO.setStatus("3");
+			orderStatusDTO.setOperationTime(DateUtil.now());
+			orderStatusDTO.setCurrentWarehouse(warehouseId.toString());
+			Map<String, Object> map = new HashMap<>();
+			map.put("messageData", orderStatusDTO);
+			rabbitTemplate.convertAndSend(RabbitConstant.HWY_ORDER_STATUS_EXCHANGE, RabbitConstant.HWY_ORDER_STATUS_ROUTING, map);
+		} catch (Exception e) {
+			log.error("入库推送失败：{}", e);
+		}
+	}
+
 	@Override
 	public R loadingZero(Long loadId, Long warehouseId, String waybillNo, String orderCode, String trayCode, Integer enterNum, String remark) {
 
@@ -3724,7 +3744,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						finalOrderCodes1.put(e,orderId);
 					}
 
-
+					List<TrunklineCarsLoadScanEntity> carsLoadScanList = carsLoadScanEntitiesMap.get(e);
 					Long finalOrderId = orderId;
 					carsLoadScanList.forEach(p -> {
 						DistributionParcelListEntity parcelListEntity = parcelListMap.get(p.getScanCode());
@@ -4486,6 +4506,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					warehousePackageTrackLogEntity.setOperator(nickName);
 					addPackageTrackLogList.add(warehousePackageTrackLogEntity);
 					orderPackageCodes.add(orderPackageCode);
+					// 推送包件装车信息到工厂
+					pushFactoryOrderData(warehouseId, orderPackageCode, orderCode);
 				}
 			}
 		});