1.修复打托的问题

2.修复干线参数问题
3.修复同步数据库位带上完整库位

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

@@ -20,10 +20,10 @@ public class BillladingDTO extends TrunklineBillladingEntity {
 
 	private Integer type;//1开始提货 2提货完成 3取消完成
 
-	private String billladingCode;//批次号
-	private String driverName;//司机名称
-	private String driverPhone;//司机电话
-	private String carNumber;//车牌号
+//	private String billladingCode;//批次号
+//	private String driverName;//司机名称
+//	private String driverPhone;//司机电话
+//	private String carNumber;//车牌号
 	private String waybillNo;//运单号
 	private String orderPackageCode;//包件码
 	private String orderCode;//订单号

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingPackageVO.java

@@ -13,7 +13,6 @@ public class TrunklineBillladingPackageVO extends TrunklineBillladingPackageEnti
 	private String waybillNo;//运单号
 	private String orderCode;//订单号
 	private String destination;//到站
-	private Integer incomingType;//入库类型
 	private String trayName;//托盘名称
 	private String trayCode;//托盘编码
 	private String firstPickName;//一级品类

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncWarehouseData.java

@@ -137,6 +137,7 @@ public class SyncWarehouseData {
 							entity.setAllocationStatus("1");
 							entity.setLayerNum(locationEntity.getFloor());
 							entity.setColumnNum(locationEntity.getRow());
+							entity.setQrCode(shelfEntity.getTitle()+"排"+locationEntity.getFloor()+"层"+locationEntity.getRow()+"列");
 							entity.setOldId(locationId);
 							Long newLocationId = basicdataGoodsAllocationClient.addLocation(entity);
 							if(Objects.isNull(newLocationId)){

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

@@ -448,6 +448,9 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		String tt = trayTypeEntity.getTrayType();
 		Long filterId = trayTypeEntity.getFilterId();
 		String filterValue = trayTypeEntity.getFilterValue();
+		if(StringUtil.isBlank(filterValue)){
+			filterValue = "";
+		}
 		Long trayTypeId = trayTypeEntity.getId();
 		Long trayTypeEntityWarehouseId = trayTypeEntity.getWarehouseId();
 
@@ -642,6 +645,9 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		String tt = trayTypeEntity.getTrayType();
 		Long filterId = trayTypeEntity.getFilterId();
 		String filterValue = trayTypeEntity.getFilterValue();
+		if(StringUtil.isBlank(filterValue)){
+			filterValue = "";
+		}
 		Long trayTypeId = trayTypeEntity.getId();
 		Long trayTypeEntityWarehouseId = trayTypeEntity.getWarehouseId();