1修复物料名称重复

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

@@ -6455,18 +6455,33 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	 * @return
 	 */
 	private String getUnit(Long stockArticleId) {
-		List<DistributionParcelListEntity> list = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().select("DISTINCT  material_unit").lambda().eq(DistributionParcelListEntity::getStockArticleId, stockArticleId));
+		List<DistributionParcelListEntity> list = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId, stockArticleId));
-		if (!list.isEmpty()) {
+
+		Set<String> tes = new HashSet<>();
+
+		if(!list.isEmpty()){
 			StringBuffer str = new StringBuffer();
-			list.forEach(i -> {
+
-				if (ObjectUtils.isNotNull(i.getMaterialUnit())) {
+			for (DistributionParcelListEntity distributionParcelListEntity : list) {
-					str.append(i.getMaterialUnit());
+				if(ObjectUtils.isNotNull(distributionParcelListEntity.getMaterialUnit())){
+					tes.add(distributionParcelListEntity.getMaterialUnit());
 				}
-			});
+			}
+
+			for (String te : tes) {
+				if(!str.toString().isEmpty()){
+					str.append(",");
+				}
+				str.append(te);
+			}
 			return str.toString();
-		} else {
+
+
+		}else{
 			return "无";
 		}
+
+
 	}
 
 	public String reservationMa() {