fix:修改节点作业缺少订单号的情况

add:增加商场入库零担的场景

blade-service-api/logpm-business-api/src/main/java/com/logpm/business/dto/BusinessSanDTO.java

@@ -9,9 +9,9 @@ public class BusinessSanDTO {
 	@ApiModelProperty(value = "配送车次")
 	private String distrCarNumber;
 	@ApiModelProperty(value = "包间码")
-	String orderPackageCode;
+	private String orderPackageCode;
 	@ApiModelProperty(value = "预约单号")
-	String reservationCode;
+	private String reservationCode;
 	@ApiModelProperty(value = "异常入库 0 正常  1 异常")
 	private Integer inWarehouseException;
 
@@ -30,4 +30,14 @@ public class BusinessSanDTO {
 	@ApiModelProperty(value = "打托方式")
 	private String trayType;//打托方式
 
+	@ApiModelProperty(value = "订单号")
+	private String orderCode;
+
+	@ApiModelProperty(value = "零担品类")
+	private String firsts;
+
+	@ApiModelProperty(value = "卸车数量")
+	private Integer unloadNum;
+
+
 }

blade-service-api/logpm-business-api/src/main/java/com/logpm/business/entity/BusinessPreOrderEntity.java

@@ -169,7 +169,7 @@ public class BusinessPreOrderEntity extends TenantEntity {
     @ApiModelProperty(value = "物料单位")
     private String materialUnit;
     /**
-     * 数量
+     * 计划数量
      */
     @ApiModelProperty(value = "数量")
     private Integer quantity;

blade-service-api/logpm-business-api/src/main/java/com/logpm/business/vo/DistributionBusinessPreCarDetalPackageVO.java

@@ -24,5 +24,13 @@ public class DistributionBusinessPreCarDetalPackageVO {
 	private Integer inWarehouse;
 	@ApiModelProperty(value = "操作状态 0 正常操作 1.补录操作")
 	private Integer operationStatus;
+	@ApiModelProperty(value = "计划数量")
+	private Integer quantity;
+	@ApiModelProperty(value = "卸车数量")
+	private Integer unloadNum;
+	@ApiModelProperty(value = "预约单号")
+	private String reservationCode;
+
+
 
 }

blade-service/logpm-business/src/main/java/com/logpm/business/api/BusinessPreOrderApi.java

@@ -23,6 +23,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Objects;
 
 @RestController
@@ -37,7 +38,7 @@ public class BusinessPreOrderApi {
 	@PostMapping("/list")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "模糊查询", notes = "传入trayTypeDTO")
-	public R list(@RequestBody BusinessPreListDTO queryrderDTO){
+	public R list(@RequestBody BusinessPreListDTO queryrderDTO) {
 
 		DistributionBusinessPreOrderListVO data = distributionIBusinessPreOrderService.list(queryrderDTO);
 
@@ -47,7 +48,7 @@ public class BusinessPreOrderApi {
 
 	@PostMapping("/scanOrderPackageCode")
 	@ApiOperationSupport(order = 1)
-	public R scanOrderPackageCode(@RequestBody BusinessSanDTO businessSanDTO){
+	public R scanOrderPackageCode(@RequestBody BusinessSanDTO businessSanDTO) {
 
 		Resp resp = null;
 		try {
@@ -59,14 +60,28 @@ public class BusinessPreOrderApi {
 		return resp;
 	}
 
+	@PostMapping("/inputZeroOrderData")
+	@ApiOperationSupport(order = 1)
+	public R inputZeroOrderData(@RequestBody List<BusinessSanDTO> businessSanDTOincentices) {
+
+		log.info(" >> 请求参数 {}", businessSanDTOincentices);
+
+		// 传入的集合对象 中获取
+
+
+
+
+
+		return R.success("操作成功");
+	}
 
 
 	@GetMapping("/listCarNum")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "条件查询", notes = "传入trayTypeDTO")
-	public R  listCarNum(DistributionBusinessPreCarNumerPageQueryVO distributionBusinessPreCarNumerPageQueryVO, Query query){
+	public R listCarNum(DistributionBusinessPreCarNumerPageQueryVO distributionBusinessPreCarNumerPageQueryVO, Query query) {
 
-		IPage<DistributionBusinessPreCarNumerPageVO> data = distributionIBusinessPreOrderService.listCarNum(Condition.getPage(query),distributionBusinessPreCarNumerPageQueryVO);
+		IPage<DistributionBusinessPreCarNumerPageVO> data = distributionIBusinessPreOrderService.listCarNum(Condition.getPage(query), distributionBusinessPreCarNumerPageQueryVO);
 
 		return R.data(data);
 	}
@@ -74,7 +89,7 @@ public class BusinessPreOrderApi {
 	@GetMapping("/preCarInfoDetailByCarNum")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "条件查询", notes = "传入trayTypeDTO")
-	public R  preCarInfoDetailByCarNum(DistributionBusinessPreCarNumerPageQueryVO distributionBusinessPreCarNumerPageQueryVO){
+	public R preCarInfoDetailByCarNum(DistributionBusinessPreCarNumerPageQueryVO distributionBusinessPreCarNumerPageQueryVO) {
 
 		DistributionBusinessPreCarDetalVO distributionBusinessPreCarDetalVO = distributionIBusinessPreOrderService.preCarInfoDetailByCarNumber(distributionBusinessPreCarNumerPageQueryVO);
 
@@ -82,5 +97,4 @@ public class BusinessPreOrderApi {
 	}
 
 
-
 }

blade-service/logpm-business/src/main/java/com/logpm/business/mapper/BusinessPreOrderMapper.xml

@@ -160,9 +160,9 @@
         SELECT distr_car_number,
         waybill_number,
         order_code,
-        COUNT(1) as totalNum,
+        sum(quantity) as totalNum,
-        COUNT(CASE WHEN in_warehouse = 1 THEN 1 END) as inNum,
+        sum(unload_num) as inNum,
-        COUNT(1)-COUNT(CASE WHEN in_warehouse = 1 THEN 1 END) as restNum
+        sum(quantity)-sum(unload_num) as restNum
         from logpm_business_pre_order
 
         <where>

blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java

@@ -98,6 +98,7 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrde
 				// 更新成功
 				// 更新入库状态
 				distributionBusinessPreOrderEntity.setInWarehouse(1);
+				distributionBusinessPreOrderEntity.setUnloadNum(1);
 				baseMapper.updateById(distributionBusinessPreOrderEntity);
 				Object o = bladeRedis.get(RedisKeyConstant.BUSINESS_IN_CARNUMBER + distributionBusinessPreOrderEntity.getDistrCarNumber());
 				if (!Objects.isNull(o)) {
@@ -295,6 +296,7 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrde
 		R r = inOrderWarehourseByFeign(businessSanDTO);
 		if (r.isSuccess()) {
 			selectD.setInWarehouse(1);
+			selectD.setUnloadNum(1);
 			this.updateById(selectD);
 			int a = 0;
 
@@ -389,6 +391,7 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrde
 		R r = inOrderWarehourseByFeign(businessSanDTO);
 		if (r.isSuccess() && t != null) {
 			t.setInWarehouse(1);
+			t.setUnloadNum(1);
 			this.updateById(t);
 			int a = 0;
 
@@ -493,10 +496,18 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrde
 
 		// todo 这里的计算存在问题，没有计算零担的数据
 
+		// 计算 entities 集合中 对象 的quantity 的和值
+		int planNum = entities.stream().mapToInt(BusinessPreOrderEntity::getQuantity).sum();
 
-		int planNum = entities.size();
+		// 装车数量
-		int loadNum = (int) entities.stream().filter(e -> "20".equals(e.getOrderPackageLoadingStatus())).count();
+		int loadNum = entities.stream().mapToInt(BusinessPreOrderEntity::getLoadNum).sum();
-		int inNum = (int) entities.stream().filter(e -> e.getInWarehouse() == 1).count();
+
+		// 卸车数量== 入库数量
+		int inNum =entities.stream().mapToInt(BusinessPreOrderEntity::getUnloadNum).sum();
+
+		/**
+		 * 零担无法进行异常卸车
+		 */
 		int inExceNum = (int) entities.stream().filter(e -> e.getOperationStatus() == 1).count();
 
 

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

@@ -181,9 +181,17 @@ public interface DistributionLoadscanMapper extends BaseMapper<DistributionLoads
 	/**
 	 * 判断零担订单是否完成签收
 	 * @param reservationId
-	 * @param parcelListId
+	 * @param packageId
 	 * @param reservationNum
 	 * @return
 	 */
     Boolean judgmentZeroPackageIsSign(@Param("reservationId") Long reservationId,@Param("packageId") Long packageId,@Param("num") Integer reservationNum);
+
+	/**
+	 * 根据预约单ID和包间Id查询装车/签收数据
+	 * @param reservationId
+	 * @param parcelListId
+	 * @return
+	 */
+    DistributionLoadscanEntity findLoadDataByRelationIdAndParcelListId(@Param("reservationId") Long reservationId, @Param("parcelListId")Long parcelListId);
 }

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

@@ -147,4 +147,13 @@
         WHERE
             reservation_id = #{reservationId} AND package_id = #{packageId}
     </select>
+    <select id="findLoadDataByRelationIdAndParcelListId"
+            resultType="com.logpm.distribution.entity.DistributionLoadscanEntity">
+        SELECT
+            *
+        FROM
+            logpm_distribution_loadscan
+        WHERE
+            reservation_id = #{reservationId} AND parcel_list_id = #{parcelListId}
+    </select>
 </mapper>

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

@@ -41,6 +41,7 @@ public class BusinessPreOrderDataQueueHandler {
 	private final ISysClient sysClient;
 	private final IBusinessPreOrderClient businessPreOrderClient;
 	private final IExtractedDataClient extractedDataClient;
+	private final IDistributionLoadscanService distributionLoadscanService;
 
 
 	private final IDistributionAsyncService distributionAsyncService;
@@ -108,6 +109,10 @@ public class BusinessPreOrderDataQueueHandler {
 					DistributionParcelListEntity byId = distributionParcelListService.getById(distributionReservationPackageEntity.getParceListId());
 					BusinessPreOrderEntity data = BeanUtil.copy(byId, BusinessPreOrderEntity.class);
 
+					// 判断包件是否装车
+					if ("20".equals(byId.getOrderPackageLoadingStatus())) {
+						data.setLoadNum(1);
+					}
 					data.setDriverName(distributionDeliveryListEntity.getDriverName());
 					data.setVehicleName(distributionDeliveryListEntity.getVehicleName());
 					data.setDistrCarNumber(distributionDeliveryListEntity.getTrainNumber());
@@ -132,7 +137,16 @@ public class BusinessPreOrderDataQueueHandler {
 					DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(distributionReservationZeroPackageEntity.getParcelListId());
 					if (parcelListEntity != null) {
 						BusinessPreOrderEntity data = BeanUtil.copy(parcelListEntity, BusinessPreOrderEntity.class);
+						// 计划数量
 						data.setQuantity(distributionReservationZeroPackageEntity.getQuantity());
+
+						// 获取装车数量
+						DistributionLoadscanEntity distributionLoadscanEntity = distributionLoadscanService.findLoadDataByRelationIdAndParcelListId(distributionReservationZeroPackageEntity.getReservationId(), distributionReservationZeroPackageEntity.getParcelListId());
+						if(distributionLoadscanEntity != null){
+							//设置装车数量
+							data.setLoadNum(distributionLoadscanEntity.getLoadedNub());
+						}
+
 						data.setDriverName(distributionDeliveryListEntity.getDriverName());
 						data.setVehicleName(distributionDeliveryListEntity.getVehicleName());
 						data.setDistrCarNumber(distributionDeliveryListEntity.getTrainNumber());

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

@@ -56,4 +56,12 @@ public interface IDistributionLoadscanService extends BaseService<DistributionLo
 	 * @return
 	 */
     String selectDriverNameByOrderId(Long id);
+
+	/**
+	 * 根据预约单ID和包间ID 查询装车数据
+	 * @param reservationId
+	 * @param parcelListId
+	 * @return
+	 */
+	DistributionLoadscanEntity findLoadDataByRelationIdAndParcelListId(Long reservationId, Long parcelListId);
 }

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

@@ -3274,8 +3274,11 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 									for (DistributionBillLadingScanEntity ladingScanEntity : ladingScanEntities) {
 										OrderStatusDTO orderStatusDTO = new OrderStatusDTO();
 										// 通过包件id 查询包件
+										DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(ladingScanEntity.getStockArticleId());
+										if(stockArticleEntity !=null){
+											orderStatusDTO.setOrderNo(stockArticleEntity.getOrderCode());
+										}
 										orderStatusDTO.setUnitNo(ladingScanEntity.getPacketBarCode());
-										orderStatusDTO.setOrderNo(ladingScanEntity.getOrderSelfNumbering());
 										orderStatusDTO.setStatus("7");
 										orderStatusDTO.setOperationTime(DateUtil.now());
 										orderStatusDTO.setCurrentWarehouse(warehouse.getId().toString());

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

@@ -57,4 +57,8 @@ public class DistributionLoadscanServiceImpl extends BaseServiceImpl<Distributio
 		return baseMapper.selectDriverNameByOrderId(id);
 	}
 
+	@Override
+	public DistributionLoadscanEntity findLoadDataByRelationIdAndParcelListId(Long reservationId, Long parcelListId) {
+		return baseMapper.findLoadDataByRelationIdAndParcelListId(reservationId, parcelListId);
+	}
 }

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

@@ -3666,8 +3666,14 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						log.error("推送失败：{}", e);
 					}
 					for (DistributionBillLadingScanEntity ladingScanEntity : ladingScanEntities) {
-						// 签收发送消息到工厂
+						if(ladingScanEntity.getStockArticleId()!=null){
-						pushFactoryOrderData(myCurrentWarehouse.getId(), ladingScanEntity.getParcelListId().toString(), ladingScanEntity.getOrderSelfNumbering());
+							DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(ladingScanEntity.getStockArticleId());
+							if(stockArticleEntity!=null){
+								// 签收发送消息到工厂
+								pushFactoryOrderData(myCurrentWarehouse.getId(), ladingScanEntity.getParcelListId().toString(), stockArticleEntity.getOrderCode());
+							}
+						}
+
 					}
 				}
 				//修改订单状态

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

@@ -454,28 +454,31 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 		}
 
 
-		// 需要判断当前操作的码 是否是和包码
-		LambdaQueryWrapper<FactoryPackageEntity> queryWrapper = new LambdaQueryWrapper<>();
-		queryWrapper.eq(FactoryPackageEntity::getCosourcingCode, unitNo);
-		List<FactoryPackageEntity> list = factoryPackageService.list(queryWrapper);
-		if (list.isEmpty()) {
-			return doPackageInfo(orderStatusDTO, isRetry, unitNo, status);
-		} else {
-			try {
-				for (FactoryPackageEntity factoryPackageEntity : list) {
 
-					R r = doPackageInfo(orderStatusDTO, isRetry, factoryPackageEntity.getCode(), status);
+		if(unitNo.startsWith("HB")){
+			// 需要判断当前操作的码 是否是和包码
+			LambdaQueryWrapper<FactoryPackageEntity> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.eq(FactoryPackageEntity::getCosourcingCode, unitNo);
+			List<FactoryPackageEntity> list = factoryPackageService.list(queryWrapper);
+			if (list.isEmpty()) {
+				return doPackageInfo(orderStatusDTO, isRetry, unitNo, status);
+			} else {
+				try {
+					for (FactoryPackageEntity factoryPackageEntity : list) {
 
-				}
+						R r = doPackageInfo(orderStatusDTO, isRetry, factoryPackageEntity.getCode(), status);
-			} catch (Exception e) {
-				log.error("合包码推送出现异常", e);
-			}
-			return Resp.success("物流状态传递成功");
 
+					}
+				} catch (Exception e) {
+					log.error("合包码推送出现异常", e);
+				}
+				return Resp.success("物流状态传递成功");
 
+			}
+		}else{
+			return doPackageInfo(orderStatusDTO, isRetry, unitNo, status);
 		}
 
-
 	}
 
 	@NotNull

blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/HwyOrderStatusHandler.java

@@ -15,6 +15,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.RabbitConstant;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
@@ -53,6 +54,10 @@ public class HwyOrderStatusHandler {
 		String orderSelfNum = orderStatusDTO.getOrderNo();//订单自编号
 		String unitNo = orderStatusDTO.getUnitNo();
 		//通过订单自编号去查询该条订单是属于哪个工厂
+		if(StringUtil.isEmpty(orderSelfNum)){
+			log.warn(">>>>>>> 订单号是null  hwyOrderStatusHandler {}",orderStatusDTO);
+			return ;
+		}
 		TrunklineAdvanceEntity advanceLimitOneByOrderCode = trunklineAdvanceClient.findAdvanceLimitOneByOrderCode(orderSelfNum);
 		if (Objects.isNull(advanceLimitOneByOrderCode)) {
 			log.info("##################hwyOrderStatusHandler: 未找到对应订单 orderNo={}", orderSelfNum);