Merge branch 'dev' into pre-production

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java

@@ -117,6 +117,7 @@ public class OpenOrderDTO implements Serializable {
 
 	private Integer trunklineCompleteOrNot;//干线是否整车 0否 1是
 
+	private Long trunklineVehicleTypeId;//提货车型id
 	private String trunklineVehicleType;//提货车型
 
 	private String pickupVehicleType;//提货车型

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

@@ -468,6 +468,9 @@ public class WarehouseWaybillEntity extends TenantEntity {
 	@ApiModelProperty(value = "干线是否整车 0否 1是")
 	private Integer trunklineCompleteOrNot;
 
+	@ApiModelProperty(value = "干线车型 ")
+	private Long trunklineVehicleTypeId;
+
 	@ApiModelProperty(value = "干线车型 ")
 	private String trunklineVehicleType;
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java

@@ -759,10 +759,10 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 
 		for (ReceivingOrderEntity receivingOrderEntity : list) {
 
-			if (!ArrayUtil.contains(ouPaiProperties.getJidiCanshu(), receivingOrderEntity.getFromWarehouseName())) {
+//			if (!ArrayUtil.contains(ouPaiProperties.getJidiCanshu(), receivingOrderEntity.getFromWarehouseName())) {
-				log.info(FactoryConstant.OUPAI, "推送老系统失败，当前仓库不是双流仓，推送失败 {}", receivingOrderEntity.getCurrentWarehouseName());
+//				log.info(FactoryConstant.OUPAI, "推送老系统失败，当前仓库不是双流仓，推送失败 {}", receivingOrderEntity.getCurrentWarehouseName());
-				continue;
+//				continue;
-			}
+//			}
 			// 查询这个派车单下面的订单
 			List<FactoryOrderEntity> factoryOrderEntities = factoryOrderService.lambdaQuery().eq(FactoryOrderEntity::getReceivingId, receivingOrderEntity.getId()).eq(FactoryOrderEntity::getTurnStatus, 0).list();
 			log.info(">>>>>>>>>>>>>>>>>>>>>handlerOuPaiDataToHt 派车单 {} 派车单下面订单集合长度 {}", receivingOrderEntity.getCode(), factoryOrderEntities.size());

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

@@ -568,6 +568,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		waybillEntity.setPickupCompleteOrNot(openOrderDTO.getPickupCompleteOrNot());
 		waybillEntity.setTrunklineCompleteOrNot(openOrderDTO.getTrunklineCompleteOrNot());
 		waybillEntity.setTrunklineVehicleType(openOrderDTO.getTrunklineVehicleType());
+		waybillEntity.setTrunklineVehicleTypeId(openOrderDTO.getTrunklineVehicleTypeId());
 		waybillEntity.setPickupVehicleType(openOrderDTO.getPickupVehicleType());
 		waybillEntity.setAbolishStatus(0);
 		waybillEntity.setFreezeStatus(0);
@@ -746,6 +747,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		waybillEntity.setPickupCompleteOrNot(openOrderDTO.getPickupCompleteOrNot());
 		waybillEntity.setTrunklineCompleteOrNot(openOrderDTO.getTrunklineCompleteOrNot());
 		waybillEntity.setTrunklineVehicleType(openOrderDTO.getTrunklineVehicleType());
+		waybillEntity.setTrunklineVehicleTypeId(openOrderDTO.getTrunklineVehicleTypeId());
 		waybillEntity.setPickupVehicleType(openOrderDTO.getPickupVehicleType());
 		waybillEntity.setDepartureWarehouseId(openOrderDTO.getDepartureWarehouseId());
 		waybillEntity.setDepartureWarehouseName(openOrderDTO.getDepartureWarehouseName());

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

@@ -252,6 +252,7 @@ public class WarehouseWaybillController extends BladeController {
 				List<BasicdataWarehouseEntity> myWatchWarehouse = warehouseClient.getMyWatchWarehouse();
 				myWatchWarehouse.forEach(warehouseEntity -> warehouseIds.add(warehouseEntity.getId()));
 			}
+			waybillDTO.setWarehouseIds(warehouseIds);
 
 			IPage<WarehouseWaybillVO> pages = warehouseWaybillService.pageList(waybillDTO);
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

@@ -912,7 +912,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 		map.put("备注", warehouseWaybillEntity.getRemark());
 		map.put("填票人", warehouseWaybillEntity.getAgent());
 
-		map.put("托运日期", DateUtil.format(warehouseWaybillEntity.getCreateTime(),"yyyy-MM-dd hh:mm:ss"));
+		map.put("托运日期", DateUtil.format(warehouseWaybillEntity.getCreateTime(),"yyyy-MM-dd"));
 		// 格式化费用 保留2位小数
 		map.put("运费总计", formatToTwoDecimalPlaces(sumFreight(warehouseWaybillEntity)));