Эх сурвалжийг харах

将pcb类目筛选移入产品导入时给kindid赋值

wangyc 7 жил өмнө
parent
commit
9591f6b24f

+ 10 - 10
src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -2612,20 +2612,20 @@ public class GoodsServiceImpl implements GoodsService {
                     String[] kindIds = kindUuid.split(",");
                     Long[] listkids = (Long[]) ConvertUtils.convert(kindIds,Long.class);
                     if (listkids != null && listkids.length > 0) {
-                        List<Long> productIds = pcbDao.findByKindIds(listkids);
-                        if (!CollectionUtils.isEmpty(productIds)) {
-                            pageInfo.expression(PredicateUtils.in("productid",productIds,false));
-                        } else {
+//                        List<Long> productIds = pcbDao.findByKindIds(listkids);
+//                        if (!CollectionUtils.isEmpty(productIds)) {
+//                            pageInfo.expression(PredicateUtils.in("productid",productIds,false));
+//                        } else {
                             pageInfo.expression(PredicateUtils.in("kindUuid", kindIds, false));
-                        }
+//                        }
                     }
                 } else {
-                    List<Long> productId = pcbDao.findProductIdByKindid(Long.parseLong(kindUuid));
-                    if (!CollectionUtils.isEmpty(productId)) {
-                        pageInfo.expression(PredicateUtils.eq("productid",productId.get(0),false));
-                    } else {
+//                    List<Long> productId = pcbDao.findProductIdByKindid(Long.parseLong(kindUuid));
+//                    if (!CollectionUtils.isEmpty(productId)) {
+//                        pageInfo.expression(PredicateUtils.eq("productid",productId.get(0),false));
+//                    } else {
                         pageInfo.expression(PredicateUtils.eq("kindUuid", kindUuid, false));
-                    }
+//                    }
                 }
             }
         }

+ 1 - 1
src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ReleaseProductByBatchServiceImpl.java

@@ -1014,7 +1014,7 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 			if (kindInfo != null && kindInfo.getId() != null && (kindInfoDao.existsChildByParentId(UploadConstant.PCB_PARENTID, kindInfo.getId()) > 0)) {
 				aProduct.setKindUuid(kindInfo.getId());
 			} else {
-				aProduct.setErrmsg(ErrorInfoConstant.KIND_UNSTANDARD.getInfo());
+				aProduct.addErrmsg(ErrorInfoConstant.KIND_UNSTANDARD.getInfo());
 			}
 		}