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

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

@@ -300,7 +300,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 	public R findOrderDetails(OrderDetailsDTO orderDetailsDTO) {
 
 		//判断orderDetailsDTO中的订单号 运单号 包件码 服务号 客户车次号至少有一个有值
-		if (StringUtil.isBlank(orderDetailsDTO.getOrderCode()) && StringUtil.isBlank(orderDetailsDTO.getWaybillNo()) && StringUtil.isBlank(orderDetailsDTO.getOrderPackageCode()) && StringUtil.isBlank(orderDetailsDTO.getServiceNumber()) && StringUtil.isBlank(orderDetailsDTO.getTrunklineCarsNo())) {
+		if (StringUtil.isBlank(orderDetailsDTO.getDeliveryTrainNumber()) && StringUtil.isBlank(orderDetailsDTO.getTrainNumber()) && StringUtil.isBlank(orderDetailsDTO.getOrderCode()) && StringUtil.isBlank(orderDetailsDTO.getWaybillNo()) && StringUtil.isBlank(orderDetailsDTO.getOrderPackageCode()) && StringUtil.isBlank(orderDetailsDTO.getServiceNumber()) && StringUtil.isBlank(orderDetailsDTO.getTrunklineCarsNo())) {
 			return R.fail("订单号 运单号 包件码 服务号 客户车次号至少有一个有值");
 		}
 

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

@@ -1748,9 +1748,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				removeCarsLoadScan(ids,warehouseId);
 			}
 			carsLoadEntity.setLoadStatus("40");
+		}else{
+			Long startWarehouseId = Long.parseLong(split[0]);
+			if(startWarehouseId.equals(warehouseId)){
+				carsLoadEntity.setLoadStatus("0");
 			}else{
 				carsLoadEntity.setLoadStatus("20");
 			}
+		}
 
 		updateById(carsLoadEntity);