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

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionOrderZeroPackafeVO.java

@@ -0,0 +1,117 @@
+/*
+ *      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.vo;
+
+import com.logpm.distribution.entity.DistributionStockArticleEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 配送在库订单 视图实体类
+ *
+ * @author cyz
+ * @since 2023-06-13
+ */
+@Data
+public class DistributionOrderZeroPackafeVO implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private Long Id;
+	/**
+	 * 总数
+	 */
+	private Integer quantity;
+	/**
+	 * 品类
+	 */
+	private String firsts;
+
+	private String warehouseName;
+	/**
+	 * 入库车次
+	 */
+	private String trainNumber;
+	/**
+	 * 订单自编号
+	 */
+	private String orderCode;
+	/**
+	 * 品牌
+	 */
+	private String brandName;
+	/**
+	 * 运单号
+	 */
+	private String waybillNumber;
+	/**
+	 * 入库时间
+	 */
+	private String warehouseEntryTimeEnd;
+	/**
+	 * 发站仓
+	 */
+	private String sendWarehouseName;
+	/**
+	 * 收站仓
+	 */
+	private String acceptWarehouseName;
+	/**
+	 * 托盘
+	 */
+	private String pallet;
+	/**
+	 * 库位
+	 */
+	private String goodsAllocation;
+	/**
+	 * 在库数量
+	 */
+	private Integer handQuantity;
+	/**
+	 * 冻结数量
+	 */
+	private Integer deliveryQuantity;
+	/**
+	 * 出库数量
+	 */
+	private Integer outboundQuantity;
+	/**
+	 * 签收数量
+	 */
+	private Integer signinQuantity;
+	/**
+	 * 品类
+	 */
+	private String aaa;
+	/**
+	 * 品类
+	 */
+	private String bbb;
+	/**
+	 * 品类
+	 */
+	private String ccc;
+
+
+}

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java

@@ -274,7 +274,9 @@ public class WarehouseWaybillEntity extends TenantEntity {
 	@ApiModelProperty(value = "预留5")
 	private String reserve5;
 
-	private Integer stats = 0; //运单状态  弃用
+
+	@ApiModelProperty(value = "运单状态")
+	private Integer stats; //运单状态  弃用
 
 	@TableField(exist = false)
 	private String statsStr;

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataWarehouseDTO.java

@@ -20,6 +20,8 @@ import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * 品类 数据传输对象实体类
  *
@@ -33,5 +35,8 @@ public class BasicdataWarehouseDTO extends BasicdataWarehouseEntity {
 
 	private Integer pageType;
 
+	private String warehouseNames;
+
+
 
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataFactoryCategoryMapper.xml

@@ -5,8 +5,8 @@
     <select id="pageList" resultType="com.logpm.basicdata.entity.BasicdataFactoryCategoryEntity">
         select *
         from logpm_basicdata_factory_category
-        where 1=1
-        and is_deleted = 0
+        where
+         is_deleted = 0
         <if test="param.type != null ">
             and type = #{param.type}
         </if>
@@ -28,6 +28,12 @@
         <if test="param.thirds != null and param.thirds != ''">
             and thirds = #{param.thirds}
         </if>
+
+        <if test="param.materielName != null and param.materielName != ''">
+            and materiel_name like concat('%',#{param.materielName},'%')
+        </if>
+
+
     </select>
 
     <select id="findEntityByParam" resultType="com.logpm.basicdata.entity.BasicdataFactoryCategoryEntity">

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.java

@@ -42,7 +42,7 @@ public interface BasicdataWarehouseMapper extends BaseMapper<BasicdataWarehouseE
 	 * @param warehouseWarehouse
 	 * @return
 	 */
-	IPage<BasicdataWarehouseVO> selectWarehouseWarehousePage(IPage page,@Param("param") BasicdataWarehouseDTO warehouseWarehouse);
+	IPage<BasicdataWarehouseVO> selectWarehouseWarehousePage(IPage page,@Param("param") BasicdataWarehouseDTO warehouseWarehouse,@Param("warehouseNameList") List<String> warehouseNameList);
 
 
 	/**
@@ -89,7 +89,7 @@ public interface BasicdataWarehouseMapper extends BaseMapper<BasicdataWarehouseE
 	 * @param warehouseWarehouse
 	 * @return
 	 */
-	IPage<BasicdataWarehouseVO> selectExpireWarehouseWarehousePage(IPage<BasicdataWarehouseVO> page,@Param("param") BasicdataWarehouseDTO warehouseWarehouse);
+	IPage<BasicdataWarehouseVO> selectExpireWarehouseWarehousePage(IPage<BasicdataWarehouseVO> page,@Param("param") BasicdataWarehouseDTO warehouseWarehouse,@Param("warehouseNameList") List<String> warehouseNameList);
 
 	/**
 	 * 查询临期仓库
@@ -97,6 +97,6 @@ public interface BasicdataWarehouseMapper extends BaseMapper<BasicdataWarehouseE
 	 * @param warehouseWarehouse
 	 * @return
 	 */
-	IPage<BasicdataWarehouseVO> selectDeadlineWarehouseWarehousePage(IPage<BasicdataWarehouseVO> page,@Param("param") BasicdataWarehouseDTO warehouseWarehouse);
+	IPage<BasicdataWarehouseVO> selectDeadlineWarehouseWarehousePage(IPage<BasicdataWarehouseVO> page,@Param("param") BasicdataWarehouseDTO warehouseWarehouse,@Param("warehouseNameList") List<String> warehouseNameList);
 
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml

@@ -74,6 +74,13 @@
         select * from logpm_warehouse_warehouse
         <where>
             is_deleted = 0
+            <if test="warehouseNameList != '' and warehouseNameList != null">
+                AND name IN
+                <foreach collection="warehouseNameList" item="item" separator="," close=")" open="(">
+                    #{item}
+                </foreach>
+
+            </if>
         </where>
     </select>
 
@@ -150,6 +157,13 @@
         <where>
             is_deleted = 0
             AND  DATEDIFF(DATE_FORMAT(end_date,'%y%m%d'),DATE_FORMAT(NOW(),'%y%m%d'))  &lt;= 0
+            <if test="warehouseNameList != '' and warehouseNameList != null">
+                AND name IN
+                <foreach collection="warehouseNameList" item="item" separator="," close=")" open="(">
+                    #{item}
+                </foreach>
+
+            </if>
         </where>
     </select>
     <select id="selectDeadlineWarehouseWarehousePage" resultType="com.logpm.basicdata.vo.BasicdataWarehouseVO">
@@ -157,6 +171,13 @@
         <where>
             is_deleted = 0
             AND  DATEDIFF(DATE_FORMAT(end_date,'%y%m%d'),DATE_FORMAT(NOW(),'%y%m%d'))  BETWEEN 1 AND 90
+            <if test="warehouseNameList != '' and warehouseNameList != null">
+                AND name IN
+                <foreach collection="warehouseNameList" item="item" separator="," close=")" open="(">
+                    #{item}
+                </foreach>
+
+            </if>
         </where>
     </select>
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java

@@ -93,16 +93,20 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 		if (!Objects.isNull(warehouseWarehouse.getPageType())){
 			 pageType = warehouseWarehouse.getPageType();
 		}
+		List<String> warehouseNameList = null;
+		if (!Objects.isNull(warehouseWarehouse.getWarehouseNames())){
+			warehouseNameList = Func.toStrList(warehouseWarehouse.getWarehouseNames());
+		}
 		switch (pageType){
 			case 1:
-				IPage<BasicdataWarehouseVO> basicdataWarehouseVOS = baseMapper.selectWarehouseWarehousePage(page, warehouseWarehouse);
+				IPage<BasicdataWarehouseVO> basicdataWarehouseVOS = baseMapper.selectWarehouseWarehousePage(page, warehouseWarehouse,warehouseNameList);
 				return basicdataWarehouseVOS;
 			case 2:
-				IPage<BasicdataWarehouseVO> basicdataDeadlineWarehouseVOS = baseMapper.selectDeadlineWarehouseWarehousePage(page, warehouseWarehouse);
+				IPage<BasicdataWarehouseVO> basicdataDeadlineWarehouseVOS = baseMapper.selectDeadlineWarehouseWarehousePage(page, warehouseWarehouse,warehouseNameList);
 				//临期
 				return basicdataDeadlineWarehouseVOS;
 			case 3:
-				IPage<BasicdataWarehouseVO> basicdataExpireWarehouseVOS = baseMapper.selectExpireWarehouseWarehousePage(page, warehouseWarehouse);
+				IPage<BasicdataWarehouseVO> basicdataExpireWarehouseVOS = baseMapper.selectExpireWarehouseWarehousePage(page, warehouseWarehouse,warehouseNameList);
 				return basicdataExpireWarehouseVOS;
 			default:
 				log.error("未知的pageType>>>>>>>>>>>>>>> {}",pageType);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java

@@ -26,6 +26,7 @@ import com.logpm.distribution.dto.DistributionParcelListDTO;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.excel.DistributionParcelListExcel;
 import com.logpm.distribution.service.IDistributionParcelListService;
+import com.logpm.distribution.vo.DistributionOrderZeroPackafeVO;
 import com.logpm.distribution.vo.DistributionParcelListBaseVO;
 import com.logpm.distribution.vo.DistributionParcelListVO;
 import com.logpm.distribution.vo.DistributionParcelListZeroVO;
@@ -90,6 +91,15 @@ public class DistributionParcelListController extends BladeController  {
 		return R.data(DistributionParcelListWrapper.build().pageVO(pages));
 	}
 
+
+	@GetMapping("/zeroList")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入distributionParcelList")
+	public R zeroList(@ApiIgnore @RequestParam Long orderId) {
+		List<DistributionOrderZeroPackafeVO> pages = distributionParcelListService.pageOweZeroList(orderId);
+		return R.data(pages);
+	}
+
 	/**
 	 * 在库订单包件清单 分页
 	 */

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

@@ -317,4 +317,13 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
     void deleteListByParcelListIds(@Param("parceListIds") List<Long> deleteParcelListIds);
 
 	List<JSONObject> findPackageGoodsListByWaybillNoAndWarehouseId(@Param("waybillNo") String waybillNo, @Param("warehouseId") Long warehouseId);
+
+	/**
+	 * 查询零担包件详情
+	 * @param page
+	 * @param distributionParcelListDTO
+	 * @return
+	 */
+	List<DistributionOrderZeroPackafeVO> pageOweZeroList(Long orderId);
+
 }

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

@@ -1982,5 +1982,65 @@
         where lwwd.waybill_no = #{waybillNo}
         and ldpl.warehouse_id = #{warehouseId}
     </select>
+    <select id="pageOweZeroList" resultType="com.logpm.distribution.vo.DistributionOrderZeroPackafeVO">
+        SELECT
+        t.id AS id,
+        t.warehouse AS warehouseName,
+        t.firsts AS firsts,
+        t.quantity AS quantity,
+        t.train_number AS train_number,
+        t.order_code AS orderCode,
+        t.brand_name AS brandName,
+        t.waybill_number AS waybillNumber,
+        t.warehouse_entry_time_end AS warehouseEntryTimeEnd,
+        t.send_warehouse_name AS sendWarehouseName,
+        t.accept_warehouse_name AS acceptWarehouseName,
+        t.pallet AS  pallet,
+        t.goodsAllocation AS  goodsAllocation,
+        t.hand_quantity AS handQuantity,
+        t.delivery_quantity AS deliveryQuantity,
+        t.outbound_quantity AS outboundQuantity,
+        t.signin_quantity AS signinQuantity,
+        t.aaa,
+        t.bbb,
+        t.ccc
+        FROM
+        (
+        SELECT
+        ldpl.id,
+        ldpl.warehouse,
+        ldpl.firsts,
+        ldpl.train_number,
+        ldpl.order_code,
+        ldpl.brand_name,
+        ldpl.waybill_number,
+        ldpl.warehouse_entry_time_end,
+        ldpl.send_warehouse_name,
+        ldpl.accept_warehouse_name,
+        ldsa.trays pallet,
+        ldsa.allocation goodsAllocation,
+        ldpn.hand_quantity,
+        ldpn.quantity,
+        ldpn.delivery_quantity,
+        ldpn.outbound_quantity,
+        ldpn.signin_quantity,
+        IF(ldpn.outbound_quantity > 0,IF(ldpn.outbound_quantity = ldpn.quantity,'已出库','部分出库'),'未出库') AS aaa,
+        IF(ldpn.signin_quantity > 0,IF(ldpn.signin_quantity = ldpn.quantity,'已签收','部分签收'),'未签收') AS bbb,
+        IF((ldpn.quantity - ldpn.delivery_quantity -ldpn.outbound_quantity) = 0,'已配送',IF((ldpn.quantity - ldpn.delivery_quantity -ldpn.outbound_quantity) > 0,'部分配送','未配送')) AS ccc
+        FROM
+        logpm_distribution_parcel_list ldpl
+        LEFT JOIN logpm_distribution_stock_article AS ldsa ON ldpl.stock_article_id = ldsa.id
+        LEFT JOIN logpm_distribution_parcel_number AS ldpn ON ldpn.parcel_list_id = ldpl.id
+        WHERE
+        ldpl.conditions = '3'
+        AND ldpl.is_deleted = 0
+        AND ldpl.stock_article_id = #{orderId}
+        GROUP BY
+        ldpl.id
+        ) AS t
+
+
+
+    </select>
 
 </mapper>

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

@@ -477,8 +477,9 @@
             <if test="o != '' and o != null">
                and ldpl.id = #{o}
             </if>
-
         </where>
+        GROUP BY
+        ldpl.id
     </select>
 
     <select id="fingListByServiceNumber" resultType="java.util.Map">

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/pros/DistributionProperties.java

@@ -18,6 +18,10 @@ public class DistributionProperties {
 	 */
 	private String name;
 
+	/**
+	 * 配送作业节点是否发送广播通知
+	 */
+	private Boolean sendFanoutMsg = false;
 
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillReViewReportListener.java

@@ -71,6 +71,7 @@ public class BillReViewReportListener {
 					.orderPackageCode(detail.getPackageCode())
 					.reviewUserName(bean.getOperator())
 					.reviewTime(bean.getOperatorTime())
+					.bizCode(detail.getPickupBatch())
 					.bizStatus(100)
 					.build();
 				if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.CMP)) {

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillSignforReportListener.java

@@ -72,6 +72,7 @@ public class BillSignforReportListener {
 					.signUserName(bean.getOperator())
 					.signTime(bean.getOperatorTime())
 					.signReservationCode(vo.getPickupBatch())
+					.bizCode(vo.getPickupBatch())
 					.bizStatus(90)
 					.build();
 				if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.CMP)) {

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/CarStartReportListener.java

@@ -5,15 +5,12 @@ import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.logpm.distribution.dto.ReportQualityDeliverDTO;
 import com.logpm.distribution.entity.QualityDeliverEntity;
 import com.logpm.distribution.service.IQualityDeliverService;
 import com.logpm.factorydata.feign.IFactoryDataClient;
-import com.logpm.factorydata.vo.SendMsg;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.broadcast.FanoutConstants;
-import org.springblade.common.constant.report.ReportConstants;
 import org.springblade.common.enums.BizOperationEnums;
 import org.springblade.common.model.CarStartVO;
 import org.springblade.common.model.NodeFanoutMsg;
@@ -63,6 +60,7 @@ public class CarStartReportListener {
 				.set(QualityDeliverEntity::getStartCarUserName, null)
 				.set(QualityDeliverEntity::getStartCarTime, null)
 				.eq(QualityDeliverEntity::getLoadTrainNumber, vo.getTrainNumber())
+				.eq(QualityDeliverEntity::getLoadLicensePlate, vo.getVehicleName())
 				.ne(QualityDeliverEntity::getBizStatus, 110);
 			qualityDeliverService.update(wrapper);
 		}
@@ -71,6 +69,7 @@ public class CarStartReportListener {
 				.set(QualityDeliverEntity::getStartCarUserName, vo.getDriverName())
 				.set(QualityDeliverEntity::getStartCarTime, bean.getOperatorTime())
 				.eq(QualityDeliverEntity::getLoadTrainNumber, vo.getTrainNumber())
+				.eq(QualityDeliverEntity::getLoadLicensePlate, vo.getVehicleName())
 				.ne(QualityDeliverEntity::getBizStatus, 110);
 			qualityDeliverService.update(wrapper);
 		}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ConsigneeArriveReportListener.java

@@ -5,15 +5,12 @@ import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.logpm.distribution.dto.ReportQualityDeliverDTO;
 import com.logpm.distribution.entity.QualityDeliverEntity;
 import com.logpm.distribution.service.IQualityDeliverService;
 import com.logpm.factorydata.feign.IFactoryDataClient;
-import com.logpm.factorydata.vo.SendMsg;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.broadcast.FanoutConstants;
-import org.springblade.common.constant.report.ReportConstants;
 import org.springblade.common.enums.BizOperationEnums;
 import org.springblade.common.model.ConsigneeArriveVO;
 import org.springblade.common.model.NodeFanoutMsg;
@@ -85,6 +82,7 @@ public class ConsigneeArriveReportListener {
 				.set(QualityDeliverEntity::getArriveAddress, vo.getAddress())
 				.set(QualityDeliverEntity::getArrivePositioning, vo.getPositioning())
 				.eq(QualityDeliverEntity::getLoadTrainNumber, vo.getTrainNumber())
+				.eq(QualityDeliverEntity::getLoadLicensePlate, vo.getVehicleName())
 				.eq(QualityDeliverEntity::getBizCode, vo.getReservationCode())
 				.ne(QualityDeliverEntity::getBizStatus, 110);
 			qualityDeliverService.update(wrapper);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/LoadingReportListener.java

@@ -74,6 +74,7 @@ public class LoadingReportListener {
 					.loadTrainNumber(vo.getTrainNumber())
 					.loadTime(bean.getOperatorTime())
 					.loadLicensePlate(vo.getVehicleName())
+					.bizCode(vo.getReservationCode())
 					.build();
 				if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.CMP)) {
 					qualityDeliverEntity.setConditions(1);
@@ -81,7 +82,6 @@ public class LoadingReportListener {
 					sendReport(bizOperation, qualityDeliverEntity);
 				} else if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.LTL)) {
 					qualityDeliverEntity.setOrderCode(detail.getOrderCode());
-					qualityDeliverEntity.setBizCode(vo.getReservationCode());
 					qualityDeliverEntity.setCategory(detail.getProductName());
 					qualityDeliverEntity.setConditions(2);
 					sendReport(bizOperation, qualityDeliverEntity);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/PlanReportListener.java

@@ -33,7 +33,9 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -73,31 +75,32 @@ public class PlanReportListener {
 			List<PlanDriverbindCarVO> planDriverbindCars = vo.getPlanDriverbindCars();
 			String vehicleName = "";
 			String driverName = "";
-			if(CollUtil.isNotEmpty(planDriverbindCars)){
+			if (CollUtil.isNotEmpty(planDriverbindCars)) {
 				// 用逗号拼接 车辆和司机
 				vehicleName = planDriverbindCars.stream().map(PlanDriverbindCarVO::getCarPlate).collect(Collectors.joining(","));
 				driverName = planDriverbindCars.stream().map(PlanDriverbindCarVO::getDriverName).collect(Collectors.joining(","));
 			}
 			Map<String, QualityDeliverEntity> invMap = new HashMap<>();
+			if (BizOperationEnums.MODIFY.equals(bizOperation) || BizOperationEnums.DELETE.equals(bizOperation)) {
+				// 根据预约单号查询出所有这个预约单下的数据 先置空
+				LambdaUpdateWrapper<QualityDeliverEntity> wrapper = Wrappers.<QualityDeliverEntity>lambdaUpdate()
+					.set(QualityDeliverEntity::getDeliveryTime, null)
+					.set(QualityDeliverEntity::getDeliveryType, null)
+					.set(QualityDeliverEntity::getDeliveryKind, null)
+					.set(QualityDeliverEntity::getVehicleName, null)
+					.set(QualityDeliverEntity::getDriverName, null)
+					.set(QualityDeliverEntity::getDistributionCompany, null)
+					.set(QualityDeliverEntity::getDeliveryPlanTime, null)
+					.set(QualityDeliverEntity::getDeliveryCreateUserName, null)
+					.eq(QualityDeliverEntity::getPlanTrainNumber, vo.getTrainNumber())
+					.ne(QualityDeliverEntity::getBizStatus, 110);
+				if (BizOperationEnums.DELETE.equals(bizOperation)) {
+					wrapper.set(QualityDeliverEntity::getPlanTrainNumber, null);
+				}
+				qualityDeliverService.update(wrapper);
+			}
 			for (ReservationVO reservationVO : reservationVOList) {
 				List<PackageData> details = reservationVO.getPackageDataList();
-				if (BizOperationEnums.MODIFY.equals(bizOperation) || BizOperationEnums.DELETE.equals(bizOperation)) {
-					// 根据预约单号查询出所有这个预约单下的数据 先置空
-					LambdaUpdateWrapper<QualityDeliverEntity> wrapper = Wrappers.<QualityDeliverEntity>lambdaUpdate()
-						.set(QualityDeliverEntity::getPlanTrainNumber, null)
-						.set(QualityDeliverEntity::getDeliveryTime, null)
-						.set(QualityDeliverEntity::getDeliveryType, null)
-						.set(QualityDeliverEntity::getDeliveryKind, null)
-						.set(QualityDeliverEntity::getVehicleName, null)
-						.set(QualityDeliverEntity::getDriverName, null)
-						.set(QualityDeliverEntity::getDistributionCompany, null)
-						.set(QualityDeliverEntity::getDeliveryPlanTime, null)
-						.set(QualityDeliverEntity::getDeliveryCreateUserName, null)
-						.eq(QualityDeliverEntity::getPlanTrainNumber, vo.getTrainNumber())
-						.eq(QualityDeliverEntity::getBizCode, reservationVO.getReservationCode())
-						.ne(QualityDeliverEntity::getBizStatus, 110);
-					qualityDeliverService.update(wrapper);
-				}
 				if (CollUtil.isNotEmpty(details)) {
 					for (PackageData detail : details) {
 						QualityDeliverEntity qualityDeliverEntity = QualityDeliverEntity.builder()
@@ -113,6 +116,7 @@ public class PlanReportListener {
 							.distributionCompany(vo.getDistributionCompany())
 							.deliveryPlanTime(bean.getOperatorTime())
 							.deliveryCreateUserName(bean.getOperator())
+							.bizCode(reservationVO.getReservationCode())
 							.build();
 						if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.CMP)) {
 							qualityDeliverEntity.setConditions(1);
@@ -141,7 +145,7 @@ public class PlanReportListener {
 									.build());
 							}
 						} else if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.INV)) {
-							invMap.put(detail.getMallName()+detail.getMaterialCode(), qualityDeliverEntity);
+							invMap.put(detail.getMallName() + detail.getMaterialCode(), qualityDeliverEntity);
 							qualityDeliverEntity.setBizCode(reservationVO.getReservationCode());
 							qualityDeliverEntity.setIncomingBatch(detail.getPickupBatch());
 							qualityDeliverEntity.setMallName(detail.getMallName());
@@ -150,7 +154,7 @@ public class PlanReportListener {
 							qualityDeliverEntity.setConditions(3);
 							qualityDeliverEntity.setPlanNum(1);
 							if (BizOperationEnums.ADD.equals(bizOperation) || BizOperationEnums.MODIFY.equals(bizOperation)) {
-								invMap.put(detail.getMallName()+detail.getMaterialCode(), qualityDeliverEntity);
+								invMap.put(detail.getMallName() + detail.getMaterialCode(), qualityDeliverEntity);
 							}
 						}
 					}
@@ -160,9 +164,10 @@ public class PlanReportListener {
 				for (Map.Entry<String, QualityDeliverEntity> entry : invMap.entrySet()) {
 					QualityDeliverEntity qualityDeliverEntity = entry.getValue();
 					qualityDeliverService.update(qualityDeliverEntity, Wrappers.<QualityDeliverEntity>lambdaUpdate()
-						.eq(QualityDeliverEntity::getPlanReservationCode,qualityDeliverEntity.getPlanReservationCode())
-						.eq(QualityDeliverEntity::getMallName,qualityDeliverEntity.getMallName())
-						.eq(QualityDeliverEntity::getMaterielCode,qualityDeliverEntity.getMaterielCode())
+						.eq(QualityDeliverEntity::getPlanTrainNumber, qualityDeliverEntity.getPlanTrainNumber())
+						.eq(QualityDeliverEntity::getMallName, qualityDeliverEntity.getMallName())
+						.eq(QualityDeliverEntity::getMaterielCode, qualityDeliverEntity.getMaterielCode())
+						.eq(QualityDeliverEntity::getConditions, 3)
 						.lt(QualityDeliverEntity::getBizStatus, 110)
 					);
 				}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/QualityDeliverListener.java

@@ -178,10 +178,10 @@ public class QualityDeliverListener {
 					wrapper.eq(QualityDeliverEntity::getMaterielName, qualityDeliverEntity.getMaterielName());
 				}
 			}
-		}
-		if (StrUtil.isNotEmpty(qualityDeliverEntity.getBizCode())) {
-			// 有预约单号时加上预约单号过滤：存在同一个库存品在多个预约单中，只根据库存品本身的信息无法查询出对应的数据的情况。
-			wrapper.eq(QualityDeliverEntity::getBizCode, qualityDeliverEntity.getBizCode());
+			if (StrUtil.isNotEmpty(qualityDeliverEntity.getBizCode())) {
+				// 有预约单号时加上预约单号过滤：存在同一个库存品在多个预约单中，只根据库存品本身的信息无法查询出对应的数据的情况。
+				wrapper.eq(QualityDeliverEntity::getBizCode, qualityDeliverEntity.getBizCode());
+			}
 		}
 		return wrapper;
 	}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReViewReportListener.java

@@ -71,6 +71,7 @@ public class ReViewReportListener {
 					.orderPackageCode(detail.getPackageCode())
 					.reviewUserName(bean.getOperator())
 					.reviewTime(bean.getOperatorTime())
+					.bizCode(vo.getReservationCode())
 					.bizStatus(100)
 					.build();
 				if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.CMP)) {
@@ -78,7 +79,6 @@ public class ReViewReportListener {
 					qualityDeliverEntity.setLoadNum(1);
 					sendReport(bizOperation, qualityDeliverEntity);
 				} else if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.LTL)) {
-					qualityDeliverEntity.setBizCode(vo.getReservationCode());
 					qualityDeliverEntity.setOrderCode(detail.getOrderCode());
 					qualityDeliverEntity.setCategory(detail.getProductName());
 					qualityDeliverEntity.setConditions(2);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReservationPlanReportListener.java

@@ -77,7 +77,6 @@ public class ReservationPlanReportListener {
 				.set(QualityDeliverEntity::getPlanReservationTime, null)
 				.set(QualityDeliverEntity::getPlanReservationUser, null)
 				.set(QualityDeliverEntity::getPlanNum, null)
-				// .set(QualityDeliverEntity::getServiceType, null)
 				.set(QualityDeliverEntity::getReservationConsignee, null)
 				.set(QualityDeliverEntity::getReservationConsigneePhone, null)
 				.set(QualityDeliverEntity::getReservationConsigneeAddr, null)

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReturnWarehouseReportListener.java

@@ -71,13 +71,13 @@ public class ReturnWarehouseReportListener {
 					.orderPackageCode(detail.getPackageCode())
 					.reviewUserName(bean.getOperator())
 					.reviewTime(bean.getOperatorTime())
+					.bizCode(vo.getReservationCode())
 					.bizStatus(100)
 					.build();
 				if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.CMP)) {
 					qualityDeliverEntity.setConditions(1);
 					sendReport(bizOperation, qualityDeliverEntity);
 				} else if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.LTL)) {
-					qualityDeliverEntity.setBizCode(vo.getReservationCode());
 					qualityDeliverEntity.setOrderCode(detail.getOrderCode());
 					qualityDeliverEntity.setCategory(detail.getProductName());
 					qualityDeliverEntity.setConditions(2);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/SignforReportListener.java

@@ -78,6 +78,7 @@ public class SignforReportListener {
 					.signTrainNumber(vo.getTrainNumber())
 					.signReservationCode(vo.getReservationCode())
 					.signType(vo.getOperatMode())
+					.bizCode(vo.getReservationCode())
 					.bizStatus(90)
 					.build();
 				if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.CMP)) {
@@ -85,7 +86,6 @@ public class SignforReportListener {
 					qualityDeliverEntity.setSignNum(1);
 					sendReport(bizOperation, qualityDeliverEntity);
 				} else if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.LTL)) {
-					qualityDeliverEntity.setBizCode(vo.getReservationCode());
 					qualityDeliverEntity.setOrderCode(detail.getOrderCode());
 					qualityDeliverEntity.setCategory(detail.getProductName());
 					qualityDeliverEntity.setSignNum(detail.getNumber());

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/StockReportListener.java

@@ -75,6 +75,7 @@ public class StockReportListener {
 					.stockupFinishTime(vo.getStockupDate())
 					.stockupCreateTime(bean.getOperatorTime())
 					.stockAllocation(vo.getStockupArea())
+					.bizCode(vo.getReferenceCode())
 					.build();
 				if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.CMP)) {
 					qualityDeliverEntity.setConditions(1);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java

@@ -290,4 +290,12 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 	void deleteListByParcelListIds(List<Long> deleteParcelListIds);
 
 	List<JSONObject> findPackageGoodsListByWaybillNoAndWarehouseId(String waybillNo, Long warehouseId);
+
+	/**
+	 * 查询零担品类信息
+	 * @return
+	 */
+	List<DistributionOrderZeroPackafeVO> pageOweZeroList(Long orderId);
+
+
 }

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

@@ -3,6 +3,7 @@ package com.logpm.distribution.service.impl;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
+import com.logpm.distribution.pros.DistributionProperties;
 import com.logpm.distribution.service.IDistributionNodeWorkService;
 import com.logpm.factorydata.enums.BrandEnums;
 import com.logpm.factorydata.util.FactoryDataMessageSender;
@@ -11,7 +12,16 @@ import com.logpm.factorydata.vo.PushData;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.WorkNodeEnums;
 import org.springblade.common.constant.broadcast.FanoutConstants;
-import org.springblade.common.model.*;
+import org.springblade.common.model.CarStartVO;
+import org.springblade.common.model.ConsigneeArriveVO;
+import org.springblade.common.model.DistributionLoadVO;
+import org.springblade.common.model.DistributionReCheckSignVO;
+import org.springblade.common.model.DistributionSignforVO;
+import org.springblade.common.model.DistributionTaskVO;
+import org.springblade.common.model.FanoutMsg;
+import org.springblade.common.model.NodeFanoutMsg;
+import org.springblade.common.model.ReservationVO;
+import org.springblade.common.model.StockUpVO;
 import org.springblade.common.model.workNode.DeliveryOfPickupPlanVO;
 import org.springblade.common.model.workNode.FinishDistributionTrainVO;
 import org.springblade.common.model.workNode.PickUpByReCheckVO;
@@ -36,14 +46,17 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer
 	private RabbitTemplate rabbitTemplate;
 	@Autowired
 	private FactoryDataMessageSender factoryDataMessageSender;
-
+	@Autowired
+	private DistributionProperties distributionProperties;
 
 
 	@Override
 	public void planReservation(NodeFanoutMsg<ReservationVO> nodeFanoutMsg, BladeUser user) {
 
 		try {
-//			rabbitTemplate.convertAndSend(FanoutConstants.reservation.OwnReservation.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			if (distributionProperties.getSendFanoutMsg()) {
+				rabbitTemplate.convertAndSend(FanoutConstants.reservation.OwnReservation.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			}
 		} catch (AmqpException e) {
 			log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 消息推送失败~ 请联系管理员！ ", e);
 		}
@@ -53,18 +66,21 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer
 	@Override
 	public void planDelivery(NodeFanoutMsg<DistributionTaskVO> nodeFanoutMsg, BladeUser user) {
 		try {
-//			rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndPlan.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			if (distributionProperties.getSendFanoutMsg()) {
+				rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndPlan.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			}
 		} catch (AmqpException e) {
 			log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 消息推送失败~ 请联系管理员！ ", e);
 		}
 	}
 
 
-
 	@Override
 	public void cancelReservation(NodeFanoutMsg<ReservationVO> nodeFanoutMsg, BladeUser user) {
 		try {
-//			rabbitTemplate.convertAndSend(FanoutConstants.reservation.OwnReservation.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			if (distributionProperties.getSendFanoutMsg()) {
+				rabbitTemplate.convertAndSend(FanoutConstants.reservation.OwnReservation.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			}
 		} catch (AmqpException e) {
 			log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 消息推送失败~ 请联系管理员！ ", e);
 		}
@@ -74,7 +90,9 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer
 	public void planStock(NodeFanoutMsg<StockUpVO> nodeFanoutMsg, BladeUser user) {
 		// 备货信息主表
 		try {
-//			rabbitTemplate.convertAndSend(FanoutConstants.distribution.stock.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			if (distributionProperties.getSendFanoutMsg()) {
+				rabbitTemplate.convertAndSend(FanoutConstants.distribution.stock.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			}
 		} catch (AmqpException e) {
 			log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 消息推送失败~ 请联系管理员！ ", e);
 		}
@@ -84,7 +102,9 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer
 	@Override
 	public void nodeLoading(NodeFanoutMsg<DistributionLoadVO> nodeFanoutMsg, BladeUser user) {
 		try {
-//			rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndLoading.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			if (distributionProperties.getSendFanoutMsg()) {
+				rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndLoading.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			}
 		} catch (AmqpException e) {
 			log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 消息推送失败~ 请联系管理员！ ", e);
 		}
@@ -93,7 +113,9 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer
 	@Override
 	public void abnormalLoading(NodeFanoutMsg<DistributionLoadVO> nodeFanoutMsg, BladeUser user) {
 		try {
-//			rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndLoading.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			if (distributionProperties.getSendFanoutMsg()) {
+				rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndLoading.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			}
 		} catch (AmqpException e) {
 			log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 消息推送失败~ 请联系管理员！ ", e);
 		}
@@ -107,7 +129,9 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer
 	@Override
 	public void carStart(NodeFanoutMsg<CarStartVO> nodeFanoutMsg, BladeUser user) {
 		try {
-//			rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndCarStart.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			if (distributionProperties.getSendFanoutMsg()) {
+				rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndCarStart.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			}
 		} catch (AmqpException e) {
 			log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 消息推送失败~ 请联系管理员！ ", e);
 		}
@@ -116,7 +140,9 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer
 	@Override
 	public void carArrived(NodeFanoutMsg<ConsigneeArriveVO> nodeFanoutMsg, BladeUser user) {
 		try {
-//			rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndConsigneeArrive.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			if (distributionProperties.getSendFanoutMsg()) {
+				rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndConsigneeArrive.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			}
 		} catch (AmqpException e) {
 			log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 消息推送失败~ 请联系管理员！ ", e);
 		}
@@ -125,11 +151,13 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer
 	@Override
 	public void signFor(NodeFanoutMsg<DistributionSignforVO> nodeFanoutMsg, BladeUser user) {
 		try {
-			if(nodeFanoutMsg==null){
+			if (nodeFanoutMsg == null) {
 				log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> nodeFanoutMsg is null！ ");
 				return;
 			}
-//			rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndSignfor.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			if (distributionProperties.getSendFanoutMsg()) {
+				rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndSignfor.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			}
 		} catch (AmqpException e) {
 			log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 签收节点消息推送失败~ 请联系管理员！ ", e);
 		}
@@ -168,19 +196,21 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer
 	@Override
 	public void signForCheck(NodeFanoutMsg<DistributionReCheckSignVO> nodeFanoutMsg, BladeUser user) {
 		try {
-//			rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndrecheck.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			if (distributionProperties.getSendFanoutMsg()) {
+				rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndrecheck.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			}
 		} catch (AmqpException e) {
 			log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 签收复核消息推送失败~ 请联系管理员！ ", e);
 		}
 	}
 
 
-
-
 	@Override
 	public void planOfBill(NodeFanoutMsg<DeliveryOfPickupPlanVO> nodeFanoutMsg, BladeUser user) {
 		try {
-//			rabbitTemplate.convertAndSend(FanoutConstants.DeliveryOfPickup.BillPlan.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			if (distributionProperties.getSendFanoutMsg()) {
+				rabbitTemplate.convertAndSend(FanoutConstants.DeliveryOfPickup.BillPlan.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			}
 		} catch (AmqpException e) {
 			log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 自提计划消息推送失败~ 请联系管理员！ ", e);
 		}
@@ -189,7 +219,9 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer
 	@Override
 	public void signByBill(NodeFanoutMsg<PickUpByScanVO> nodeFanoutMsg, BladeUser user) {
 		try {
-//			rabbitTemplate.convertAndSend(FanoutConstants.DeliveryOfPickup.BillSign.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			if (distributionProperties.getSendFanoutMsg()) {
+				rabbitTemplate.convertAndSend(FanoutConstants.DeliveryOfPickup.BillSign.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			}
 		} catch (AmqpException e) {
 			log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 自提签收消息推送失败~ 请联系管理员！ ", e);
 		}
@@ -198,7 +230,9 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer
 	@Override
 	public void billofladingSignforCheck(NodeFanoutMsg<PickUpByReCheckVO> nodeFanoutMsg, BladeUser user) {
 		try {
-//			rabbitTemplate.convertAndSend(FanoutConstants.DeliveryOfPickup.BillSignReview.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			if (distributionProperties.getSendFanoutMsg()) {
+				rabbitTemplate.convertAndSend(FanoutConstants.DeliveryOfPickup.BillSignReview.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			}
 		} catch (AmqpException e) {
 			log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 自提复核消息推送失败~ 请联系管理员！ ", e);
 		}
@@ -207,7 +241,9 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer
 	@Override
 	public void finishDistributionTrain(NodeFanoutMsg<FinishDistributionTrainVO> nodeFanoutMsg, BladeUser user) {
 		try {
-//			rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndFinish.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			if (distributionProperties.getSendFanoutMsg()) {
+				rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndFinish.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+			}
 		} catch (AmqpException e) {
 			log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 车次完成消息推送失败~ 请联系管理员！ ", e);
 		}

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

@@ -309,24 +309,6 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 			} else {
 				distributionParcelListDTO.setStockArticleIdsLike(trim);
 			}
-			//转库存品限制
-			/*if(ObjectUtils.isNotNull(o) && String.valueOf(o).equals("2")){
-				//查询包件上架状态
-				//查询包件有没有上架，打托信息
-				List<DistributionStockArticleGroundingVO> list2 = distributionStockArticleMapper.selectListGrounding(list);
-				if(!list2.isEmpty()){
-					boolean b = list2.stream().anyMatch(i -> i.getGroundingStatus().equals(OrderPackageGroundingStatusConstant.yishangjia.getValue()));
-					if(b){
-						throw new ServiceException("选择的订单有上架的包件，请下架后在操作！");
-					}else{
-						boolean b1 = list2.stream().anyMatch(i -> ObjectUtils.isNotNull(i.getAssociationType()));
-						if(b1){
-							throw new ServiceException("选择的订单在托盘上面有包件，请解托后在操作！");
-						}
-					}
-				}
-			}*/
-
 		}
 		return baseMapper.pageOweList(page, distributionParcelListDTO);
 	}
@@ -1530,4 +1512,11 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 	public List<JSONObject> findPackageGoodsListByWaybillNoAndWarehouseId(String waybillNo, Long warehouseId) {
 		return baseMapper.findPackageGoodsListByWaybillNoAndWarehouseId(waybillNo,warehouseId);
 	}
+
+	@Override
+	public List<DistributionOrderZeroPackafeVO> pageOweZeroList(Long orderId) {
+
+
+		return baseMapper.pageOweZeroList(orderId);
+	}
 }

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

@@ -372,7 +372,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 //	}
 
 	private int calculateWeiqianshouFromZeroPackage(Map<Long, List<DistributionReservationZeroPackageEntity>> zeroPackageMap, DistributionSignforVO d) {
-		if (!zeroPackageMap.containsKey(d.getReservationId())){
+		if (!zeroPackageMap.containsKey(d.getReservationId())) {
 			return 0;
 		}
 		List<DistributionReservationZeroPackageEntity> entities = zeroPackageMap.get(d.getReservationId());
@@ -408,7 +408,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 //	}
 
 	private int calculateQianshouFromZeroPackage(Map<Long, List<DistributionReservationZeroPackageEntity>> zeroPackageMap, DistributionSignforVO d) {
-		if (!zeroPackageMap.containsKey(d.getReservationId())){
+		if (!zeroPackageMap.containsKey(d.getReservationId())) {
 			return 0;
 		}
 		List<DistributionReservationZeroPackageEntity> entities = zeroPackageMap.get(d.getReservationId());
@@ -697,7 +697,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			return null;
 		}
 		WarehouseConfigEntity warehouseConfig = warehouseConfigClient.getWarehouseConfig(myCurrentWarehouse.getId());
-		Integer isAutoRelease = warehouseConfig!=null ? warehouseConfig.getIsAutoRelease():0;
+		Integer isAutoRelease = warehouseConfig != null ? warehouseConfig.getIsAutoRelease() : 0;
 		if (Integer.parseInt(IsOrNoConstant.no.getValue()) == isAutoRelease) {
 			//进行异常判断拦截
 			//查询是否存在异常
@@ -880,7 +880,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		}
 		WarehouseConfigEntity warehouseConfig = warehouseConfigClient.getWarehouseConfig(myCurrentWarehouse.getId());
 
-		Integer isAutoRelease = warehouseConfig!=null ?  warehouseConfig.getIsAutoRelease() : 0;
+		Integer isAutoRelease = warehouseConfig != null ? warehouseConfig.getIsAutoRelease() : 0;
 		if (Integer.parseInt(IsOrNoConstant.no.getValue()) == isAutoRelease) {
 			//进行异常判断拦截
 			//查询是否存在异常
@@ -4839,7 +4839,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		Boolean driver = distributionDeliveryListService.judgeIsDriver(user);
 		String positioning = distributionSignfor.getPositioning();
 		GAddressVo add = GaoDeApiUtil.getAdd(positioning);
-		if (!Objects.isNull(add)){
+		if (!Objects.isNull(add)) {
 			DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListService.getById(distributionSignforEntity.getDeliveryId());
 			DistributionReservationEntity reservationEntity = distributionReservationService.getById(distributionSignforEntity.getReservationId());
 			DistributionPositioningEntity distributionPositioning = createdDistributionPositioningEntity(deliveryListEntity, reservationEntity, AuthUtil.getUser(), driver, positioning);
@@ -4851,7 +4851,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			NodeFanoutMsg<ConsigneeArriveVO> nodeFanoutMsg = buildConsigneeArriveVO(deliveryListEntity, reservationEntity, add, user);
 			iDistributionNodeWorkService.carArrived(nodeFanoutMsg, user);
 			return Resp.scanSuccess("打卡成功", "打卡成功");
-		}else{
+		} else {
 			return Resp.scanSuccess("打卡失败", "打卡失败，请重试");
 		}
 
@@ -4894,24 +4894,20 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		nodeFanoutMsg.setOperator(AuthUtil.getTenantId());
 		nodeFanoutMsg.setOperatorTime(deliveryListEntity.getCreateTime());
 
-		List<PlanDriverbindCarVO> planDriverbindCarVOS = distributionDeliveryListService.buildDeliveryCarDriverInfor(deliveryListEntity);
+//		List<PlanDriverbindCarVO> planDriverbindCarVOS = distributionDeliveryListService.buildDeliveryCarDriverInfor(deliveryListEntity);
+
+
+		Boolean isDriver = distributionDeliveryListService.judgeIsDriver(user);
+		DistributionDeliverySelfEntity driver = distributionDeliveryListService.getDriver(deliveryListEntity, user, null, isDriver);
 
 		String driverName = deliveryListEntity.getDriverName();
 		String vehicleName = deliveryListEntity.getVehicleName();
-		//  如果是自主配送 需要去获取当前司机绑定的车牌
-		if ("1".equals(deliveryListEntity.getKind())) {
-			BasicdataDriverArteryEntity driverArteryById = basicdataDriverArteryClient.getDriverArtery(AuthUtil.getUserId());
-			if (driverArteryById != null) {
 
-				for (int i = 0; i < planDriverbindCarVOS.size(); i++) {
-					if (planDriverbindCarVOS.get(i).getDriverName().equals(driverArteryById.getName())) {
-						driverName = planDriverbindCarVOS.get(i).getDriverName();
-						vehicleName = planDriverbindCarVOS.get(i).getCarPlate();
-						break;
-					}
-				}
-			}
+		if(driver!=null){
+			driverName = driver.getDriverName();
+			vehicleName = driver.getVehicleNub();
 		}
+
 		ConsigneeArriveVO consigneeArriveVO = new ConsigneeArriveVO();
 		consigneeArriveVO.setTrainNumber(deliveryListEntity.getTrainNumber());
 		consigneeArriveVO.setReservationCode(reservationEntity.getReservationCode());
@@ -6074,7 +6070,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 //		DistributionTaskVO taskVO = buildDistributionTaskVO(distributionDeliveryListEntity, AuthUtil.getUserId());
 		org.springblade.common.model.DistributionSignforVO distributionLoadVO = new org.springblade.common.model.DistributionSignforVO();
-		if(distributionLoadscanEntityLists.isEmpty()){
+		if (distributionLoadscanEntityLists.isEmpty()) {
 			return null;
 		}
 
@@ -9145,7 +9141,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionLoadscanEntity.setSigningUserId(user.getUserId());
 		distributionLoadscanEntity.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getValue());
 		distributionLoadscanEntity.setSignforState(LoadScanSigningStatusConstant.weiqianshou.getValue());
-		if (Objects.equals(loadscanEntity.getLoadedNub(),distributionLoadscanEntity.getReceivedQuantity())) {
+		if (Objects.equals(loadscanEntity.getLoadedNub(), distributionLoadscanEntity.getReceivedQuantity())) {
 			distributionLoadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue());
 		}
 		return distributionLoadscanEntity;

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

@@ -3207,7 +3207,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(reservationId);
 		String mallName = "";
 		if (!Objects.isNull(distributionReservationEntity)){
-			mallName = distributionReservationEntity.getReceivingUnit();
+			mallName = distributionReservationEntity.getMallName();
 		}
 		//查询自提
 		DistrilbutionBillLadingEntity billLadingEntity = distrilbutionBillLadingService.getById(reservationId);
@@ -3230,7 +3230,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			if (jsonArray != null) {
 				for (int i = 0; i < jsonArray.size(); i++) {
 					JSONObject jsonObject = jsonArray.getJSONObject(i);
-					WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity = JSONObject.parseObject(jsonObject.toJSONString(), WarehouseUpdownGoodsEntity.class);
+					WarehouseUpdownGoodsEntity	warehouseUpdownGoodsEntity = JSONObject.parseObject(jsonObject.toJSONString(), WarehouseUpdownGoodsEntity.class);
 					if ("3".equals(warehouseUpdownGoodsEntity.getAssociationType()) && warehouseUpdownGoodsEntity.getAssociationValue().equals(orderPackageCode)) {
 						// 得到的的是包件 通过包件 查询  通过包件码查询
 						Map<String, Object> map = distributionStockListInfoMapper.selectDistributionStockByOrderPackageCodeAndWarehourseIdAndCargoNumber(warehouseUpdownGoodsEntity.getAssociationValue(), warehouseUpdownGoodsEntity.getWarehouseId(), cargoNumber);
@@ -3357,7 +3357,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			lambdaQueryWrapper.eq(DistributionStockListEntity::getCargoNumber, cargoNumber);
 			lambdaQueryWrapper.eq(DistributionStockListEntity::getMarketName, mallName);
 			// 入库 时间先进的先出
-			lambdaQueryWrapper.orderByAsc(DistributionStockListEntity::getCreateTime);
+ 		lambdaQueryWrapper.orderByAsc(DistributionStockListEntity::getCreateTime);
 			List<DistributionStockListEntity> distributionStockListEntities = distributionStockListMapper.selectList(lambdaQueryWrapper);
 			return distributionStockListEntities.get(0).getId();
 

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

@@ -383,6 +383,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			if (ObjectUtils.isNotNull(billLadingEntity) && billLadingEntity.getConditions().equals(BillLadingStatusConstant.yiqianshou.getValue())) {
 				throw new ServiceException("已签收，无法修改计划！！！");
 			}
+			distrilbutionBillLading.setPickupBatch(billLadingEntity.getPickupBatch());
 			las = true;
 			//修改
 			if (!distrilbutionBillLading.getBillPackageEntityList().isEmpty() || !distrilbutionBillLading.getUnBillPackageEntityList().isEmpty()) {

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java

@@ -987,11 +987,12 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 			opPackagePushLogEntity.setRefId(refId);
 			opPackagePushLogEntity.setPushOupaiNode(data.getString("Operate"));
 
-
-			String token = buildToken();
-			HttpResponse httpResponse = HttpRequest.post(url).header("Authorization", token).body(data.toJSONString()).execute();
-			String result = httpResponse.body();
-			opPackagePushLogEntity.setResp(result);
+			if(ouPaiProperties.getSendFactory()){
+				String token = buildToken();
+				HttpResponse httpResponse = HttpRequest.post(url).header("Authorization", token).body(data.toJSONString()).execute();
+				String result = httpResponse.body();
+				opPackagePushLogEntity.setResp(result);
+			}
 			opPackagePushLogService.save(opPackagePushLogEntity);
 			return opPackagePushLogEntity;
 		} else {

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java

@@ -87,8 +87,9 @@ public class WarehouseWaybillController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入warehouseWaybill")
 	public R<WarehouseWaybillVO> detail(WarehouseWaybillEntity warehouseWaybill) {
-		WarehouseWaybillEntity detail = warehouseWaybillService.getOne(Condition.getQueryWrapper(warehouseWaybill));
-		return R.data(WarehouseWaybillWrapper.build().entityVO(detail));
+//		WarehouseWaybillEntity detail = warehouseWaybillService.getOne(Condition.getQueryWrapper(warehouseWaybill));
+		WarehouseWaybillEntity byWaybillNo = warehouseWaybillService.findByWaybillNo(warehouseWaybill.getWaybillNo());
+		return R.data(WarehouseWaybillWrapper.build().entityVO(byWaybillNo));
 	}
 
 	/**
@@ -117,6 +118,7 @@ public class WarehouseWaybillController extends BladeController {
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入warehouseWaybill")
 	public R<IPage<WarehouseWaybillVO>> page(WarehouseWaybillVO warehouseWaybill, Query query) {
+
 		IPage<WarehouseWaybillVO> pages = warehouseWaybillService.selectWarehouseWaybillPage(Condition.getPage(query), warehouseWaybill);
 		return R.data(pages);
 	}