节点广播

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;
 	/**
 	 * 数量
 	 */

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<DistributionD
     Boolean checkDeliveryStart(@Param("deliveryId")Long deliveryId);
 
 
+
+    List<PackageData> getBroadcastData(@Param("deliveryId")Long deliveryId,@Param("warehouseId") Long warehouseId);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml

@@ -2249,5 +2249,10 @@
     <select id="checkDeliveryStart" resultType="java.lang.Boolean">
         SELECT IF(departure_time is null,true,false) FROM  logpm_distribution_delivery_self WHERE delivery_id  = #{deliveryId}   AND is_master = 2
     </select>
+    <select id="getBroadcastData" resultType="org.springblade.common.model.PackageData">
+
+
+
+    </select>
 
 </mapper>

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<Distributi
 	 */
 	void mallClientSignfor(String trainNumber, Long warehouseId, String orderPackageCode);
 
+	/**
+	 * 查询车次计划内所有包件信息
+	 * @param id
+	 * @param warehouseId
+	 * @return
+	 */
+    List<PackageData> getBroadcastData(Long id, Long warehouseId);
 
 
-
-
-	/**
+    /**
 	 * 查询签收预约客户包件信息
 	 * @param reservationId
 	 * @param scanBarCode

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<Distrib
 
 	}
 
+	@Override
+	public List<PackageData> getBroadcastData(Long deliveryId, Long warehouseId) {
+
+
+
+		return baseMapper.getBroadcastData(deliveryId, warehouseId);
+	}
+
 	private void handleAbnormalTurnDown(Long deliveryId, String orderPackageCode, Long warehouseId) {
 		List<DistributionLoadscanAbnormalEntity> list = distributionLoadscanAbnormalService.list(Wrappers.<DistributionLoadscanAbnormalEntity>query().lambda()
 			.eq(DistributionLoadscanAbnormalEntity::getDeliveryListId, deliveryId)

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<Distribu
 		distributionDeliveryListService.updateById(distributionDeliveryListEntity);
 		String content = "包件在" + myCurrentWarehouse.getName() + "由" + AuthUtil.getUser().getNickName() + "转车次任务,操作方式:批量预约任务转配送,车次号:" + distributionDeliveryListEntity.getTrainNumber();
 		distributionAsyncService.recordsReservationDeliveryLog(reservationEntityList, myCurrentWarehouse, user, distributionDeliveryListEntity, WorkNodeEnums.PLAN_DISTRIBUTION.getCode(), content);
+		//处理广播数据
+		handleBroadcast(distributionDeliveryListEntity,AuthUtil.getUser().getNickName(),new Date());
 		return R.status(true);
 	}
 
+	/**
+	 * 处理广播数据
+	 * @param distributionDeliveryListEntity
+	 */
+	private void handleBroadcast(DistributionDeliveryListEntity distributionDeliveryListEntity,String operatorName,Date date) {
+		NodeFanoutMsg nodeFanoutMsg = new NodeFanoutMsg();
+		nodeFanoutMsg.setNode(WorkNodeEnums.PLAN_DELIVERY);
+		nodeFanoutMsg.setWarehouse(distributionDeliveryListEntity.getWarehouseName());
+		nodeFanoutMsg.setOperator(operatorName);
+		nodeFanoutMsg.setOperatorTime(date);
+		DistributionDeliveryListEntity newEntity = new DistributionDeliveryListEntity();
+		newEntity.setId(distributionDeliveryListEntity.getId());
+		newEntity.setTrainNumber(distributionDeliveryListEntity.getTrainNumber());
+		newEntity.setVehicleName(distributionDeliveryListEntity.getVehicleName());
+		newEntity.setVehicleId(distributionDeliveryListEntity.getVehicleId());
+		newEntity.setDriverName(distributionDeliveryListEntity.getDriverName());
+		newEntity.setDriverId(distributionDeliveryListEntity.getDriverId());
+		newEntity.setTaskTime(distributionDeliveryListEntity.getTaskTime());
+		newEntity.setType(distributionDeliveryListEntity.getType());
+		newEntity.setKind(distributionDeliveryListEntity.getKind());
+		newEntity.setDistributionCompany(distributionDeliveryListEntity.getDistributionCompany());
+		String jsonString = JSONObject.toJSONString(newEntity);
+		nodeFanoutMsg.setMain(jsonString);
+		List<PackageData> packageDataList = distributionDeliveryListService.getBroadcastData(distributionDeliveryListEntity.getId(),distributionDeliveryListEntity.getWarehouseId());
+
+
+
+	}
+
 	@Override
 	public R<DistributionReservationVO> getReservationInfo(String reservationId) {
 		//查询出预约信息
@@ -1901,7 +1934,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 						List<DisStockListDetailEntity> disStockListDetailEntities = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>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());