1.bug修复

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

@@ -692,7 +692,7 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 		Integer totalCount = warehouseWaybillEntity.getTotalCount();
 		Long departureWarehouseId = warehouseWaybillEntity.getDepartureWarehouseId();
 		Integer billladingNum = warehouseWaybillEntity.getBillladingNum();
-		if(departureWarehouseId.equals(warehouseId)){
+		if(!departureWarehouseId.equals(warehouseId)){
 			log.warn("#############addWaybillToBillladingId: 运单始发仓不是当前仓 waybillNo={}",waybillNo);
 			return R.fail(405,"运单始发仓不是当前仓");
 		}

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

@@ -861,12 +861,25 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			log.warn("#############cancelArriveCarByLoadId: 当前节点不是到车状态 nodeStatus={}", nodeStatus);
 			throw new CustomerException(400, "当前节点不是到车状态");
 		}
+
+		Integer planLoadingNumber = currentCarsLoadLineEntity.getPlanLoadingNumber();
+		Integer realLoadingNumber = currentCarsLoadLineEntity.getRealLoadingNumber();
 		Integer unloadNumber = currentCarsLoadLineEntity.getUnloadNumber();
 		if (unloadNumber > 0) {
 			log.warn("#############cancelArriveCarByLoadId: 当前节点已卸车 unloadNumber={}", unloadNumber);
 			throw new CustomerException(400, "当前节点已卸车");
 		}
 
+		if(realLoadingNumber > 0){
+			log.warn("#############cancelArriveCarByLoadId: 当前节点已做装车,不能取消到车 realLoadingNumber={}", realLoadingNumber);
+			throw new CustomerException(400, "当前节点已做装车,不能取消到车");
+		}
+
+		if(planLoadingNumber > 0){
+			log.warn("#############cancelArriveCarByLoadId: 当前节点已做计划,不能取消到车 planLoadingNumber={}", planLoadingNumber);
+			throw new CustomerException(400, "当前节点已做计划,不能取消到车");
+		}
+
 		TrunklineCarsLoadLineEntity startCarsLoadLineEntity = trunklineCarsLoadLineService.findStartNodeByLoadId(loadId);
 		if (Objects.isNull(startCarsLoadLineEntity)) {
 			log.warn("#############cancelArriveCarByLoadId: 起始节点信息不存在 loadId={}", loadId);