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

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/GoodsDesc.java

@@ -191,6 +191,24 @@ public class GoodsDesc implements Serializable {
 	 * */
 	private String threeGuarantees;
 
+	private String levelOne;
+
+	private String masterUnit;
+
+	private String slaveUnit;
+
+	private BigDecimal swapRate;
+
+	private int tinyNumber;
+
+	private BigDecimal tax;
+
+	private int effectiveDay;
+
+	private String company;
+
+
+
 
 
 

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -295,7 +295,7 @@ public class GoodsDescController extends BladeController {
 	@ApiOperation(value = "导出模板")
 	public void exportPrice(HttpServletResponse response) {
 		List<GoodsExcel> list = new ArrayList<>();
-		ExcelUtil.export(response, "商品导入模板", "商品导入数据表", list, GoodsExcel.class);
+		ExcelUtil.export(response, "导入模板", "导入数据表", list, GoodsExcel.class);
 	}
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/goods/excel/GoodsExcel.java

@@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 @Data
 @ColumnWidth(25)
@@ -24,59 +25,54 @@ public class GoodsExcel implements Serializable {
 	@ExcelProperty("分类(必填)")
 	private String type;
 
-	@ExcelProperty("英文名称")
-	private String ename;
+	@ExcelProperty("花纹(必填)")
+	private String brandItem;
 
-	@ExcelProperty("中文描述")
-	private String nameDescription;
+	@ExcelProperty("品牌")
+	private String brand;
 
-	@ExcelProperty("英文描述")
-	private String cnameDescription;
+	@ExcelProperty("规格(必填)")
+	private String typeNo;
 
-	@ExcelProperty("海关编码")
-	private String customCode;
+	@ExcelProperty("规格1(必填)")
+	private String specsOne;
 
-	@ExcelProperty("海关中文")
-	private String customName;
+	@ExcelProperty("级别(必填)")
+	private String level;
 
-	@ExcelProperty("海关英文")
-	private String customEname;
+	@ExcelProperty("级别1")
+	private String levelOne;
 
-	@ExcelProperty("退税率(小数 或者 整数)")
-	private String customRate;
+	@ExcelProperty("大单位(必填)")
+	private String masterUnit;
 
-	@ExcelProperty("规格编码(必填)")
-	private String typeNo;
+	@ExcelProperty("小单位(必填)")
+	private String slaveUnit;
 
-	@ExcelProperty("品牌")
-	private String brand;
-
-	@ExcelProperty("花纹")
-	private String brandItem;
+	@ExcelProperty("换算率(必填)")
+	private BigDecimal swapRate;
 
-	@ExcelProperty("规格尺寸")
-	private String specs;
+	@ExcelProperty("小包装数量")
+	private int tinyNumber;
 
+	@ExcelProperty("税率(必填)")
+	private BigDecimal tax;
 
-	@ExcelProperty("产品类型")
-	private String category;
+	@ExcelProperty("标准价格")
+	private BigDecimal price;
 
-	@ExcelProperty("产品分类")
-	private String categoryitem;
+	@ExcelProperty("有效天数")
+	private int effectiveDay;
 
+	@ExcelProperty("产地")
+	private String placeProduction;
 
-	@ExcelProperty("计量单位")
-	private String unit;
-
-	@ExcelProperty("包装单位")
-	private String packgeunit;
+	@ExcelProperty("公司名称(必填)")
+	private String company;
 
 	@ExcelProperty("备注")
 	private String remarks;
 
-	@ExcelProperty("分类id,不用填写")
-	private String typeId;
-
 
 
 

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsDescServiceImpl.java

@@ -340,28 +340,24 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 					GoodsDesc goodsDesc=new GoodsDesc();
 					goodsDesc.setCode(e.getCode());
 					goodsDesc.setCname(e.getCname());
-					goodsDesc.setTypeno(e.getTypeNo());
-					goodsDesc.setBrand(e.getBrand());
 					goodsDesc.setBrandItem(e.getBrandItem());
-					goodsDesc.setSpecs(e.getSpecs());
-					goodsDesc.setType(0L);
-					goodsDesc.setCategory(e.getCategory());
-					goodsDesc.setCategoryitem(e.getCategoryitem());
-					goodsDesc.setUnit(e.getUnit());
-					goodsDesc.setPackgeunit(e.getPackgeunit());
+					goodsDesc.setBrand(e.getBrand());
+					goodsDesc.setTypeno(e.getTypeNo());
+					goodsDesc.setSpecsOne(e.getSpecsOne());
+					goodsDesc.setLevel(e.getLevel());
+					goodsDesc.setLevelOne(e.getLevelOne());
+					goodsDesc.setMasterUnit(e.getMasterUnit());
+					goodsDesc.setSlaveUnit(e.getSlaveUnit());
+					goodsDesc.setSwapRate(e.getSwapRate());
+					goodsDesc.setTinyNumber(e.getTinyNumber());
+					goodsDesc.setTax(e.getTax());
+					goodsDesc.setPrice(e.getPrice());
+					goodsDesc.setEffectiveDay(e.getEffectiveDay());
+					goodsDesc.setPlaceProduction(e.getPlaceProduction());
+					goodsDesc.setCompany(e.getCompany());
 					goodsDesc.setRemarks(e.getRemarks());
-					goodsDesc.setGoodsTypeId(e.getTypeId());
-					goodsDesc.setEname(e.getEname());
-					goodsDesc.setNameDescription(e.getNameDescription());
-					goodsDesc.setCnameDescription(e.getCnameDescription());
-					goodsDesc.setCustomCode(e.getCustomCode());
-					goodsDesc.setCustomName(e.getCustomName());
-					goodsDesc.setCustomEname(e.getCustomEname());
+					goodsDesc.setType(0L);
 					goodsDesc.setGoodsTypeId(String.valueOf(goodsType.getId()));
-					if(e.getCustomRate()!=null)
-					{
-						goodsDesc.setCustomRate(new BigDecimal(e.getCustomRate()));
-					}
 					//如果名称相等 就认为重复
 					LambdaQueryWrapper<GoodsDesc> queryWrapper = new LambdaQueryWrapper<>();
 					queryWrapper.eq(GoodsDesc::getTenantId,AuthUtil.getTenantId());