20230415 15:31

blade-service-api/blade-sales-part-api/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>blade-service</artifactId>
+        <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
         <version>2.8.2.RELEASE</version>
     </parent>

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/vo/CorpsTypeVO.java

@@ -20,7 +20,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "CorpsTypeVO对象", description = "客户类别表")
-public class CorpsTypeVO extends CorpsType {
+public class CorpsTypeVO extends CorpsType implements INode<CorpsTypeVO>{
 	/**
 	 * 父级中文名
 	 */
@@ -52,4 +52,11 @@ public class CorpsTypeVO extends CorpsType {
 	@JsonInclude(JsonInclude.Include.NON_EMPTY)
 	private Boolean hasChildren;
 
+	@Override
+	public List<CorpsTypeVO> getChildren() {
+		if (this.children == null) {
+			this.children = new ArrayList<>();
+		}
+		return this.children;
+	}
 }

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/vo/GoodsTypeVO.java

@@ -20,7 +20,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "GoodsTypeVO对象", description = "商品类别表")
-public class GoodsTypeVO extends GoodsType{
+public class GoodsTypeVO extends GoodsType implements INode<GoodsTypeVO>{
 	private static final long serialVersionUID = 1L;
 
 	/**
@@ -54,4 +54,11 @@ public class GoodsTypeVO extends GoodsType{
 	@JsonInclude(JsonInclude.Include.NON_EMPTY)
 	private Boolean hasChildren;
 
+	@Override
+	public List<GoodsTypeVO> getChildren() {
+		if (this.children == null) {
+			this.children = new ArrayList<>();
+		}
+		return this.children;
+	}
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/controller/GoodsDescController.java

@@ -98,7 +98,7 @@ public class GoodsDescController extends BladeController {
 			.like(StringUtils.isNotBlank(goods.getSpecificationAndModel()), GoodsDesc::getSpecificationAndModel, goods.getSpecificationAndModel())//规格型号
 			.like(StringUtils.isNotBlank(goods.getBrandItem()), GoodsDesc::getBrandItem, goods.getBrandItem())//花纹
 			.like(StringUtils.isNotBlank(goods.getCname()), GoodsDesc::getCname, goods.getCname())//商品名称
-			.like(StringUtils.isNotBlank(goods.getBrand()), GoodsDesc::getBrand, goods.getBrand())//品牌
+			.like(ObjectUtils.isNotEmpty(goods.getBrandId()), GoodsDesc::getBrandId, goods.getBrandId())//品牌
 			.eq(ObjectUtils.isNotEmpty(goods.getSalesCompanyId()), GoodsDesc::getSalesCompanyId, goods.getSalesCompanyId())//所属公司
 			.eq(ObjectUtils.isNotEmpty(goods.getWhether()), GoodsDesc::getWhether, goods.getWhether())//是否管理到批次号
 			.eq(ObjectUtils.isNotEmpty(goods.getExplosionProof()), GoodsDesc::getExplosionProof, goods.getExplosionProof());//是否防爆

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/service/impl/GoodsDescServiceImpl.java

@@ -165,7 +165,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 				goodsDesc.setGoodsTypeId(String.valueOf(goodsType.getId()));
 				goodsDesc.setGoodsTypeName(e.getGoodsTypeName());
 				goodsDesc.setUnit(e.getUnit());
-				goodsDesc.setBrand(e.getBrand());
+				//goodsDesc.setBrand(e.getBrand());
 				goodsDesc.setSpecificationAndModel(e.getSpecificationAndModel());
 				goodsDesc.setBrandItem(e.getBrandItem());
 				goodsDesc.setPlaceProduction(e.getPlaceProduction());