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

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTrayVO.java

@@ -49,4 +49,7 @@ public class BasicdataTrayVO extends BasicdataTrayEntity {
 	@ApiModelProperty(value = "打托方式显示")
 	private String trayTypeString;
 
+	@ApiModelProperty(value = "串货条件")
+	private String filterValue;
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml

@@ -61,7 +61,8 @@
         tray.tray_status,
         warehouse.name AS warehouseName,
         tray.`type`,
-        lwtt.tray_type
+        lwtt.tray_type,
+        lwtt.filter_value
         FROM
         logpm_warehouse_tray AS tray
         left join logpm_warehouse_tray_type lwtt on tray.id = lwtt.tray_id and lwtt.is_deleted=0

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

@@ -2931,7 +2931,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			forEach((k, v) -> {
 //				List<Long> di = new ArrayList<>();
 //				AtomicReference<Integer> s = new AtomicReference<>(0); //已扫数量
-				v.stream().forEach(i -> {
+				v.forEach(i -> {
 					DistributionParcelListEntity byId = distributionParcelListService.getById(i.getAssociationId());
 					if (ObjectUtils.isNotNull(byId)) {
 						if (!vo.getStockArticleId().contains(byId.getStockArticleId().toString())) {