Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/model/pojo/mst/GoodsSku.java

@@ -39,7 +39,7 @@ public class GoodsSku extends PageInfo<GoodsSku> implements Serializable {
      * 错误信息
      */
     @Excel(name = "错误提示")
-    @ApiModelProperty(value = "错误提示")
+    @TableField(exist = false)
     private String errorMessage;
 
     /*
@@ -101,39 +101,35 @@ public class GoodsSku extends PageInfo<GoodsSku> implements Serializable {
      * 品牌名称
      */
     @Excel(name = "商品品牌")
-    @ApiModelProperty(value = "商品品牌")
-    @TableField(typeHandler = UuidTypeHandler.class)
+    @TableField(exist = false)
     private String brandName;
 
     /**
      * 商品种类
      */
     @Excel(name = "商品种类")
-    @ApiModelProperty(value = "商品种类")
-    @TableField(typeHandler = UuidTypeHandler.class)
+    @TableField(exist = false)
     private String categoryName;
 
     /**
      * 计量单位
      */
     @Excel(name = "计量单位")
-    @ApiModelProperty(value = "计量单位")
-    @TableField(typeHandler = UuidTypeHandler.class)
+    @TableField(exist = false)
     private String unitName;
 
     /**
      * 辅助单位
      */
     @Excel(name = "辅助单位")
-    @ApiModelProperty(value = "辅助单位")
-    @TableField(typeHandler = UuidTypeHandler.class)
+    @TableField(exist = false)
     private String subUnitName;
 
     /**
      * 商品系列
      */
     @Excel(name = "商品系列")
-    @ApiModelProperty(value = "商品系列")
+    @TableField(exist = false)
     private String seriesName;
 
     /**

src/main/java/com/dk/mdm/service/mst/GoodsSkuService.java

@@ -187,56 +187,75 @@ public class GoodsSkuService extends BaseService<GoodsSku> {
 			goodsSku.setCpId(cpId);
 			goodsSku.setErrorMessage("");
 			//TODO 校验规则
+			//商品编号不能为空
+			if(goodsSku.getSkuCode()==null){
+				goodsSku.setErrorMessage("商品编号不能为空,");
+				importMessage = true;
+			}
+			//商品型号不能为空
+			if(goodsSku.getSkuModel()==null){
+				goodsSku.setErrorMessage("商品型号不能为空,");
+				importMessage = true;
+			}
 			//品牌
-			if (goodsSku.getBrandName()!=null ||goodsSku.getBrandName()!= "") {
+			if (goodsSku.getBrandName()!=null) {
 				String brandName = goodsSku.getBrandName();
 				GoodsBrandResponse goodsBrandResponse = goodsBrandMapper.selectByUuId(new GoodsBrandQuery().setBrandName(brandName).setCpId(goodsSku.getCpId()));
 				if(goodsBrandResponse == null){
-					goodsSku.setErrorMessage("1.商品品牌填写错误");
+					goodsSku.setErrorMessage("商品品牌填写错误,");
 					importMessage = true;
 				}else{
 					goodsSku.setBrandId(goodsBrandResponse.getBrandId());
 				}
+			}else{
+				goodsSku.setErrorMessage("商品品牌不能为空,");
+				importMessage = true;
 			}
 			//种类
-			if (goodsSku.getCategoryName()!=null ||goodsSku.getCategoryName()!= "") {
+			if (goodsSku.getCategoryName()!=null) {
 				String CatagoryName = goodsSku.getCategoryName();
 				GoodsCategoryResponse goodsCategoryResponse = goodsCategoryMapper.selectByUuId(new GoodsCategoryQuery().setCatName(CatagoryName).setCpId(goodsSku.getCpId()));
 				if(goodsCategoryResponse == null){
-					goodsSku.setErrorMessage(goodsSku.getErrorMessage() + "2.商品种类填写错误");
+					goodsSku.setErrorMessage(goodsSku.getErrorMessage() + "商品种类填写错误,");
 					importMessage = true;
 				}else{
 					goodsSku.setCategoryId(goodsCategoryResponse.getCatId());
 				}
+			}else{
+				goodsSku.setErrorMessage(goodsSku.getErrorMessage() + "商品种类不能为空,");
+				importMessage = true;
 			}
 			//计量单位
-			if (goodsSku.getUnitName()!=null ||goodsSku.getUnitName()!= "") {
+			if (goodsSku.getUnitName()!=null) {
 				String unintName = goodsSku.getUnitName();
 				UnitResponse unitResponse = unitMapper.selectByUuId(new UnitQuery().setUnitName(unintName).setCpId(goodsSku.getCpId()));
 				if(unitResponse == null){
-					goodsSku.setErrorMessage(goodsSku.getErrorMessage() + "3.计量单位填写错误");
+					goodsSku.setErrorMessage(goodsSku.getErrorMessage() + "计量单位填写错误,");
 					importMessage = true;
 				}else{
 					goodsSku.setUnitId(unitResponse.getUnitId());
 				}
+			}else{
+				goodsSku.setErrorMessage(goodsSku.getErrorMessage() + "计量单位不能为空,");
+				importMessage = true;
 			}
 			//辅助单位
-			if (goodsSku.getSubUnitName()!=null ||goodsSku.getSubUnitName()!= "") {
+			if (goodsSku.getSubUnitName()!=null) {
 				String subUnintName = goodsSku.getSubUnitName();
 				UnitResponse unitResponse = unitMapper.selectByUuId(new UnitQuery().setUnitName(subUnintName).setCpId(goodsSku.getCpId()));
 				if(unitResponse == null){
-					goodsSku.setErrorMessage(goodsSku.getErrorMessage()  + "4.辅助单位填写错误");
+					goodsSku.setErrorMessage(goodsSku.getErrorMessage()  + "辅助单位填写错误,");
 					importMessage = true;
 				}else{
 					goodsSku.setSubUnitId(unitResponse.getUnitId());
 				}
 			}
 			//商品系列
-			if (goodsSku.getSeriesName()!=null ||goodsSku.getSeriesName()!= "") {
+			if (goodsSku.getSeriesName()!=null) {
 				String seriesName = goodsSku.getSeriesName();
 				GoodsSeriesResponse goodsSeriesResponse = goodsSeriesMapper.selectByUuId(new GoodsSeriesQuery().setSeriesName(seriesName).setCpId(goodsSku.getCpId()));
 				if(goodsSeriesResponse == null){
-					goodsSku.setErrorMessage(goodsSku.getErrorMessage() + "5.商品系列填写错误");
+					goodsSku.setErrorMessage(goodsSku.getErrorMessage() + "商品系列填写错误,");
 					importMessage = true;
 				}else{
 					goodsSku.setSubUnitId(goodsSeriesResponse.getSeriesId());