Merge branch 'dev' of http://git.echepei.com/lazhaoqian/bladex into dev

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

@@ -309,7 +309,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);
 	}
 
 
@@ -321,7 +321,7 @@ public class GoodsDescController extends BladeController {
 	@ApiOperation(value = "导出模板")
 	public void exportGoodsInfo(HttpServletResponse response) {
 		List<GoodsInfoExcel> list = new ArrayList<>();
-		ExcelUtil.export(response, "导出模板", "导出数据表", list, GoodsInfoExcel.class);
+		ExcelUtil.export(response, "导入模板-产品信息", "导出数据表", list, GoodsInfoExcel.class);
 	}
 
 	/**

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

@@ -37,32 +37,29 @@ public class GoodsInfoExcel implements Serializable {
 	@ExcelProperty("规格(必填)")
 	private String typeNo;
 
-	@ExcelProperty("规格1(必填)")
+	@ExcelProperty("负荷/速级(必填)")
 	private String specsOne;
 
-	@ExcelProperty("规格2(必填)")
+	@ExcelProperty("加强型(必填)")
 	private String specsTwo;
 
-	@ExcelProperty("级别(必填)")
-	private String level;
-
 	@ExcelProperty("产地(必填)")
 	private String placeProduction;
+	@ExcelProperty("供应商(必填)")
+	private String corpName;
+	@ExcelProperty("箱体积(必填)")
+	private BigDecimal cntrVolumn;
+
+	@ExcelProperty("箱重量(必填)")
+	private BigDecimal cartonWeight;
 
 	@ExcelProperty("三包")
 	private String threeGuarantees;
 
-	@ExcelProperty("供应商(必填)")
-	private String corpName;
-
 	@ExcelProperty("备注")
 	private String remarks;
 
-	@ExcelProperty("箱体积(必填)")
-	private BigDecimal cntrVolumn;
 
-	@ExcelProperty("箱重量(必填)")
-	private BigDecimal cartonWeight;
 
 
 

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/PriceItemController.java

@@ -149,7 +149,7 @@ public class PriceItemController extends BladeController {
 	@ApiOperation(value = "导出模板")
 	public void exportPrice(HttpServletResponse response) {
 		List<PriceItemExcel> list = new ArrayList<>();
-		ExcelUtil.export(response, "价格库", "价格管理数据表", list, PriceItemExcel.class);
+		ExcelUtil.export(response, "导入模板-运维管理-价格管理", "价格管理数据表", list, PriceItemExcel.class);
 	}
 	/**
 	 * 导入价格

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/excel/PriceItemExcel.java

@@ -19,13 +19,33 @@ public class PriceItemExcel implements Serializable {
 	/**
 	 * 大字(规格编码)
 	 */
-	@ExcelProperty("大字(规格编码)")
+	@ExcelProperty("商品编码")
 	private String code;
 	/**
-	 * 名称
+	 * 供应商
+	 */
+	@ExcelProperty("供应商")
+	private String corpName;
+	/**
+	 * 品牌
+	 */
+	@ExcelProperty("品牌")
+	private String brand;
+	/**
+	 * 产品分类
+	 */
+	@ExcelProperty("产品分类")
+	private String productCategory;
+	/**
+	 * 花纹
+	 */
+	@ExcelProperty("花纹")
+	private String brandItem;
+	/**
+	 * 规格
 	 */
-	@ExcelProperty("名称")
-	private String cname;
+	@ExcelProperty("规格")
+	private String typeno;
 	/**
 	 * 销售价格
 	 */
@@ -36,9 +56,4 @@ public class PriceItemExcel implements Serializable {
 	 */
 	@ExcelProperty("采购价格")
 	private BigDecimal purchasePrice;
-	/**
-	 * 供应商
-	 */
-	@ExcelProperty("供应商")
-	private String corpName;
 }

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/PriceItemServiceImpl.java

@@ -75,20 +75,15 @@ public class PriceItemServiceImpl extends ServiceImpl<PriceItemMapper, PriceItem
 			PriceItem priceItem = new PriceItem();
 			priceItem.setPurchasePrice(priceItemExcel.getPurchasePrice());
 			priceItem.setSalesPrice(priceItemExcel.getSalesPrice());
+			priceItem.setBrand(priceItemExcel.getBrand());
+			priceItem.setBrandItem(priceItemExcel.getBrandItem());
+			priceItem.setTypeno(priceItemExcel.getTypeno());
+			priceItem.setProductCategory(priceItemExcel.getProductCategory());
 			//获取商品信息
 			if (StringUtils.isNotBlank(priceItemExcel.getCode())){
 				priceItem.setCode(priceItemExcel.getCode());
 				R<GoodsDesc> goodsDesc = goodsDescClient.GoodsByCode(priceItemExcel.getCode());
 				if (goodsDesc.isSuccess() && goodsDesc.getData() != null){
-					if (StringUtils.isNotBlank(goodsDesc.getData().getBrand())){
-						priceItem.setBrand(goodsDesc.getData().getBrand());
-					}
-					if (StringUtils.isNotBlank(goodsDesc.getData().getBrandItem())){
-						priceItem.setBrandItem(goodsDesc.getData().getBrandItem());
-					}
-					if (StringUtils.isNotBlank(goodsDesc.getData().getTypeno())){
-						priceItem.setTypeno(goodsDesc.getData().getTypeno());
-					}
 					if (StringUtils.isNotBlank(goodsDesc.getData().getPlaceProduction())){
 						priceItem.setPlaceProduction(goodsDesc.getData().getPlaceProduction());
 					}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderItemsController.java

@@ -137,14 +137,14 @@ public class OrderItemsController extends BladeController {
 		return R.status(orderItemsService.removeByIds(Func.toLongList(ids)));
 	}
 	/**
-	 * 导出订单明细模板
+	 * 导入订单明细模板
 	 */
 	@GetMapping("/exportPrice")
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出订单明细模板")
 	public void exportPrice(HttpServletResponse response) {
 		List<OrderItemsExcel> list = new ArrayList<>();
-		ExcelUtil.export(response, "订单明细", "订单明细数据表", list, OrderItemsExcel.class);
+		ExcelUtil.export(response, "导入模板-销售订单明细", "订单明细数据表", list, OrderItemsExcel.class);
 	}
 	/**
 	 * 导入订单明细

blade-service/blade-stock/src/main/java/org/springblade/stock/controller/StockGoodsController.java

@@ -288,7 +288,7 @@ public class StockGoodsController extends BladeController {
 	@ApiOperation(value = "导出模板")
 	public void exportPrice(HttpServletResponse response) {
 		List<StockGoodsExcel> list = new ArrayList<>();
-		ExcelUtil.export(response, "库存导入模板", "库存导入数据表", list, StockGoodsExcel.class);
+		ExcelUtil.export(response, "导入模板-库存更新", "库存导入数据表", list, StockGoodsExcel.class);
 	}
 	/**
 	 * 导入用户

blade-service/blade-stock/src/main/java/org/springblade/stock/excel/StockGoodsExcel.java

@@ -17,38 +17,24 @@ public class StockGoodsExcel implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	 * 大字(规格编码)
+	 * 商品编码
 	 */
-	@ExcelProperty("大字(规格编码)")
+	@ExcelProperty("商品编码(必填)")
 	private String code;
 	/**
-	 * 名称
-	 */
-	@ExcelProperty("名称")
-	private String cname;
-	/**
-	 * 总库存
-	 */
-	@ExcelProperty("总库存")
-	private BigDecimal balanceQuantity;
-	/**
-	 * 内贸锁定
-	 */
-	@ExcelProperty("内贸锁定")
-	private BigDecimal lockingQuantity;
-	/**
 	 * 可用库存
 	 */
-	@ExcelProperty("可用库存")
+	@ExcelProperty("可用库存(必填)")
 	private BigDecimal surplusRouteQuantity;
 	/**
-	 * 客户名称
-	 */
-	@ExcelProperty("客户名称")
-	private String corpName;
-	/**
 	 * 仓库名称
 	 */
-	@ExcelProperty("仓库名称")
+	@ExcelProperty("仓库名称(必填)")
 	private String storageName;
+	/**
+	 * 客户名称
+	 */
+	@ExcelProperty("供应商名称(选填)")
+	private String corpName;
+
 }

blade-service/blade-stock/src/main/java/org/springblade/stock/service/impl/StockGoodsServiceImpl.java

@@ -122,12 +122,8 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 		StringBuffer storage = new StringBuffer();//未找到仓库的商品
 		for (StockGoodsExcel datum : data) {
 			StockGoods stockGoods = new StockGoods();
-			stockGoods.setLockingQuantity(datum.getLockingQuantity());
-			stockGoods.setBalanceQuantity(datum.getBalanceQuantity());
+			stockGoods.setBalanceQuantity(datum.getSurplusRouteQuantity());
 			stockGoods.setSurplusRouteQuantity(datum.getSurplusRouteQuantity());
-			if (stockGoods.getInQuantity() == null){
-				stockGoods.setInQuantity(datum.getBalanceQuantity());
-			}
 			stockGoods.setTradeType("GN");
 			stockGoods.setTenantId(SecureUtil.getTenantId());
 			//获取商品id
@@ -153,7 +149,7 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 				stockGoods.setCname(goodsDesc.getData().getCname());
 				stockGoods.setCode(goodsDesc.getData().getCode());
 			}else {
-				good.append(datum.getCname());
+				good.append(datum.getCode());
 				continue;
 			}
 			//获取客户id
@@ -167,11 +163,11 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 				stockGoods.setCorpId(goodsDesc.getData().getCorpId());
 				stockGoods.setCorpName(goodsDesc.getData().getCorpName());
 			}else {
-				corp.append(datum.getCname());
+				corp.append(datum.getCode());
 				continue;
 			}
 			if (stockGoods.getCorpId() == null){
-				corp.append(datum.getCname());
+				corp.append(datum.getCode());
 				continue;
 			}
 			//获取仓库id
@@ -179,7 +175,7 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 			if (storageDesc != null){
 				stockGoods.setStorageId(storageDesc.getId());
 			}else {
-				storage.append(datum.getCname());
+				storage.append(datum.getCode());
 				continue;
 			}
 			//查询库存账