导入功能

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/entity/DeliveryItems.java

@@ -267,6 +267,9 @@ public class DeliveryItems implements Serializable {
 	    @ApiModelProperty(value = "产品描述")
 	    private String productDesc;
 
+		@ApiModelProperty(value = "商品类别名称")
+		private String priceCategoryNames;
+
 
 
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/OrderItems.java

@@ -316,4 +316,10 @@ public class OrderItems implements Serializable {
 	 */
 	@ApiModelProperty(value = "折扣")
 	private BigDecimal discount;
+
+	/**
+	 * 商品类别名称
+	 */
+	@ApiModelProperty(value = "商品类别名称")
+	private String priceCategoryNames;
 }

blade-service-api/trade-finance-api/src/main/java/com/trade/finance/entity/Settlement.java

@@ -26,6 +26,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -200,5 +201,9 @@ public class Settlement  implements Serializable {
 	@TableField(exist = false)
 	private List<Items> itemsList;
 
+	@ApiModelProperty(value = "回显客户中文名")
+	@TableField(exist = false)
+	private List<Map<String,Object>> customerModel;
+
 
 }

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/entity/OrderItems.java

@@ -295,4 +295,10 @@ public class OrderItems extends OrderBase {
 	 */
 	@ApiModelProperty(value = "折扣")
 	private BigDecimal discount;
+
+	/**
+	 * 商品类别名称
+	 */
+	@ApiModelProperty(value = "商品类别名称")
+	private String priceCategoryNames;
 }

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/vo/OrderVO.java

@@ -89,5 +89,8 @@ public class OrderVO extends Order {
 	private List<Map<String,Object>> corpsName;
 
 
+	@ApiModelProperty(value = "回显客户中文名")
+	@TableField(exist = false)
+	private List<Map<String,Object>> purchaserName;
 
 }

blade-service/blade-client/pom.xml

@@ -73,6 +73,14 @@
             <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-excel</artifactId>
+        </dependency>
     </dependencies>
 
 

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsDescController.java

@@ -7,16 +7,20 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
+import org.springblade.client.corps.excel.CorpsExcel;
+import org.springblade.client.corps.excel.CorpsImport;
 import org.springblade.client.corps.service.ICorpsDescService;
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.vo.CorpsDescVO;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
 
@@ -131,4 +135,15 @@ public class CorpsDescController extends BladeController {
 	}
 
 
+	/**
+	 * 导入用户
+	 */
+	@PostMapping("/import-desc")
+	@ApiOperationSupport(order = 12)
+	@ApiOperation(value = "导入客户资料", notes = "传入excel")
+	public R importUser(MultipartFile file) {
+		CorpsImport corpsImport = new CorpsImport(corpsDescService,false);
+		ExcelUtil.save(file, corpsImport, CorpsExcel.class);
+		return R.success("操作成功");
+	}
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/excel/CorpsExcel.java

@@ -0,0 +1,54 @@
+package org.springblade.client.corps.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class CorpsExcel implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@ExcelProperty("客户编号")
+	private String code;
+
+	@ExcelProperty("客户名称")
+	private String cname;
+
+	@ExcelProperty("联系人")
+	private String attn;
+
+	@ExcelProperty("电话")
+	private String tel;
+
+	@ExcelProperty("公司地址")
+	private String addr;
+
+	@ExcelProperty("账户名称")
+	private String accountName;
+
+	@ExcelProperty("开户银行")
+	private String accountBank;
+
+	@ExcelProperty("银行账号")
+	private String accountNo;
+
+	@ExcelProperty("外币账户名称")
+	private String accountNameFcy;
+
+	@ExcelProperty("外币开户银行")
+	private String accountBankFcy;
+
+	@ExcelProperty("外币银行账号")
+	private String accountNoFcy;
+
+	@ExcelProperty("类型id")
+	private String typeId;
+}

blade-service/blade-client/src/main/java/org/springblade/client/corps/excel/CorpsImport.java

@@ -0,0 +1,26 @@
+package org.springblade.client.corps.excel;
+
+import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
+import org.springblade.client.corps.service.ICorpsAttnService;
+import org.springblade.client.corps.service.ICorpsDescService;
+import org.springblade.core.excel.support.ExcelImporter;
+
+
+import java.util.List;
+
+/**
+ * 库存数据导入类
+ *
+ * @author Chill
+ */
+@RequiredArgsConstructor
+@AllArgsConstructor
+public class CorpsImport implements ExcelImporter<CorpsExcel> {
+	private ICorpsDescService corpsDescService;//库存服务
+	private final Boolean isCovered;
+	@Override
+	public void save(List<CorpsExcel> data) {
+		corpsDescService.importUser(data,isCovered);
+	}
+}

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/ICorpsDescService.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.client.corps.service;
 
+import org.springblade.client.corps.excel.CorpsExcel;
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.entity.GoodsDesc;
 import org.springblade.client.vo.CorpsDescVO;
@@ -85,4 +86,13 @@ public interface ICorpsDescService extends IService<CorpsDesc> {
 	 */
 	CorpsDesc getCorpByName(String cname, String tenantId);
 
+	/**
+	 * 导入客户联系人
+	 *
+	 * @param data
+	 * @param
+	 * @return
+	 */
+	void importUser(List<CorpsExcel> data,Boolean isCovered);
+
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/impl/CorpsDescServiceImpl.java

@@ -7,15 +7,19 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
+import org.springblade.client.corps.excel.CorpsExcel;
 import org.springblade.client.corps.mapper.CorpsDescMapper;
 import org.springblade.client.corps.mapper.CorpsTypeDescMapper;
 import org.springblade.client.corps.mapper.CorpsTypeMapper;
 import org.springblade.client.corps.service.ICorpsDescService;
 import org.springblade.client.entity.*;
 import org.springblade.client.vo.CorpsDescVO;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.system.entity.Dept;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -43,6 +47,8 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, CorpsDesc
 	private CorpsTypeDescServiceImpl corpsTypeDescService;//客户与客户类别对应表
 	private CorpsTypeDescMapper corpsTypeDescMapper;
 	private CorpsTypeServiceImpl corpsTypeService;
+	@Autowired
+	private CorpsTypeDescMapper middleMapper;
 
 	@Override
 	public IPage<CorpsDescVO> selectCorpsDescPage(IPage<CorpsDescVO> page, CorpsDescVO corpsDesc) {
@@ -157,6 +163,57 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, CorpsDesc
 		return baseMapper.selectCorpsDescCname(cname,tenantId);
 	}
 
+	@Override
+	@Transactional
+	public void importUser(List<CorpsExcel> data, Boolean isCovered)
+	{
+		if(org.springframework.util.CollectionUtils.isEmpty(data))
+		{
+			throw new SecurityException("导入数据不能为空");
+		}
+		data.forEach(e->{
+			CorpsDesc corpsDesc=new CorpsDesc();
+			corpsDesc.setCode(e.getCode());
+			corpsDesc.setCname(e.getCname());
+			corpsDesc.setAttn(e.getAttn());
+			corpsDesc.setAttn(e.getAttn());
+			corpsDesc.setTel(e.getTel());
+			corpsDesc.setAddr(e.getAddr());
+			corpsDesc.setAccountBank(e.getAccountBank());
+			corpsDesc.setAccountName(e.getAccountName());
+			corpsDesc.setAccountNo(e.getAccountNo());
+			corpsDesc.setAccountBankFcy(e.getAccountBankFcy());
+			corpsDesc.setAccountNameFcy(e.getAccountNameFcy());
+			corpsDesc.setTenantId(AuthUtil.getTenantId());
+			corpsDesc.setAccountNoFcy(e.getAccountNoFcy());
+			QueryWrapper<CorpsDesc> queryWrapper = Condition.getQueryWrapper(corpsDesc);
+			CorpsDesc selectOne = baseMapper.selectOne(queryWrapper);
+			if(selectOne==null)
+			{
+				corpsDesc.setCreateTime(new Date());
+				corpsDesc.setCreateUser(AuthUtil.getUserId());
+				corpsDesc.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+				baseMapper.insert(corpsDesc);
+
+				CorpsTypeDesc middle=new CorpsTypeDesc();
+				middle.setCorpId(corpsDesc.getId());
+				middle.setCorpTypeId(Long.valueOf(e.getTypeId()));
+				middle.setCreateTime(new Date());
+				middle.setCreateUser(AuthUtil.getUserId());
+				middle.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+				middleMapper.insert(middle);
+			}
+			else
+			{
+				selectOne.setUpdateTime(new Date());
+				selectOne.setUpdateUser(AuthUtil.getUserId());
+				baseMapper.updateById(selectOne);
+			}
+
+		});
+	}
+
+
 	/**
 	 * 保护客户联系人信息
 	 *
@@ -333,4 +390,6 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, CorpsDesc
 	}
 
 
+
+
 }

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

@@ -27,13 +27,18 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import org.springblade.client.corps.excel.CorpsExcel;
+import org.springblade.client.corps.excel.CorpsImport;
 import org.springblade.client.entity.GoodsDesc;
 import org.springblade.client.entity.GoodsFiles;
 import org.springblade.client.entity.GoodsPrice;
 import org.springblade.client.entity.GoodsType;
 import org.springblade.client.goods.enums.GoodsTypeEnum;
+import org.springblade.client.goods.excel.GoodsExcel;
+import org.springblade.client.goods.excel.GoodsImport;
 import org.springblade.client.goods.service.IGoodsFilesService;
 import org.springblade.client.goods.service.IGoodsPriceService;
+import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -46,6 +51,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.client.vo.GoodsDescVO;
 import org.springblade.client.goods.service.IGoodsDescService;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -252,5 +258,16 @@ public class GoodsDescController extends BladeController {
 		return R.data(goodsDescService.selectGoods(Condition.getPage(query),goodsDesc));
 	}
 
+	/**
+	 * 导入商品
+	 */
+	@PostMapping("/import-desc")
+	@ApiOperationSupport(order = 12)
+	@ApiOperation(value = "导入商品资料", notes = "传入excel")
+	public R importUser(MultipartFile file) {
+		GoodsImport corpsImport = new GoodsImport(goodsDescService,false);
+		ExcelUtil.save(file, corpsImport, GoodsExcel.class);
+		return R.success("操作成功");
+	}
 
 }

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

@@ -0,0 +1,54 @@
+package org.springblade.client.goods.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class GoodsExcel implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@ExcelProperty("商品编码")
+	private String code;
+
+	@ExcelProperty("商品名称")
+	private String cname;
+
+	@ExcelProperty("规格编码")
+	private String Typeno;
+
+	@ExcelProperty("品牌")
+	private String brand;
+
+	@ExcelProperty("花纹")
+	private String brandItem;
+
+	@ExcelProperty("规格尺寸")
+	private String specs;
+
+	@ExcelProperty("产品类型")
+	private String category;
+
+	@ExcelProperty("产品分类")
+	private String categoryitem;
+
+
+	@ExcelProperty("计量单位")
+	private String unit;
+
+	@ExcelProperty("包装单位")
+	private String packgeunit;
+
+	@ExcelProperty("备注")
+	private String remarks;
+
+	@ExcelProperty("类型id")
+	private String typeId;
+}

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

@@ -0,0 +1,26 @@
+package org.springblade.client.goods.excel;
+
+import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
+import org.springblade.client.corps.excel.CorpsExcel;
+import org.springblade.client.corps.service.ICorpsDescService;
+import org.springblade.client.goods.service.IGoodsDescService;
+import org.springblade.core.excel.support.ExcelImporter;
+
+import java.util.List;
+
+/**
+ * 库存数据导入类
+ *
+ * @author Chill
+ */
+@RequiredArgsConstructor
+@AllArgsConstructor
+public class GoodsImport implements ExcelImporter<GoodsExcel> {
+	private IGoodsDescService goodsDescService;//库存服务
+	private final Boolean isCovered;
+	@Override
+	public void save(List<GoodsExcel> data) {
+		goodsDescService.importUser(data,isCovered);
+	}
+}

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

@@ -16,11 +16,15 @@
  */
 package org.springblade.client.goods.service;
 
+import org.springblade.client.corps.excel.CorpsExcel;
 import org.springblade.client.entity.GoodsDesc;
+import org.springblade.client.goods.excel.GoodsExcel;
 import org.springblade.client.vo.GoodsDescVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+
 /**
  * 商品详情表 服务类
  *
@@ -79,4 +83,13 @@ public interface IGoodsDescService extends IService<GoodsDesc> {
 	GoodsDescVO selectGoodsMessage(Long Id);
 
 	void modify(GoodsDesc goodsDesc);
+
+	/**
+	 * 导入商品
+	 *
+	 * @param data
+	 * @param
+	 * @return
+	 */
+	void importGoods(List<GoodsExcel> data, Boolean isCovered);
 }

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

@@ -24,14 +24,13 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
-import org.springblade.client.entity.GoodsDesc;
-import org.springblade.client.entity.GoodsFiles;
-import org.springblade.client.entity.GoodsPrice;
-import org.springblade.client.entity.GoodsTypeDesc;
+import org.springblade.client.entity.*;
+import org.springblade.client.goods.excel.GoodsExcel;
 import org.springblade.client.goods.mapper.*;
 import org.springblade.client.goods.service.IGoodsDescService;
 import org.springblade.client.vo.GoodsDescVO;
 import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -286,4 +285,51 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 		}
 	}
 
+	@Override
+	@Transactional
+	public void importGoods(List<GoodsExcel> data, Boolean isCovered)
+	{
+		if(org.springframework.util.CollectionUtils.isEmpty(data))
+		{
+			throw new SecurityException("导入数据不能为空");
+		}
+		data.forEach(e->{
+			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.setCategory(e.getCategory());
+			goodsDesc.setCategoryitem(e.getCategoryitem());
+			goodsDesc.setUnit(e.getUnit());
+			goodsDesc.setPackgeunit(e.getPackgeunit());
+			goodsDesc.setRemarks(e.getRemarks());
+			QueryWrapper<GoodsDesc> queryWrapper = Condition.getQueryWrapper(goodsDesc);
+			GoodsDesc one = goodsDescMapper.selectOne(queryWrapper);
+			if(one==null)
+			{
+				goodsDesc.setCreateTime(new Date());
+				goodsDesc.setCreateUser(AuthUtil.getUserId());
+				goodsDesc.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+				goodsDescMapper.insert(goodsDesc);
+
+				GoodsTypeDesc goodsTypeDes=new GoodsTypeDesc();
+				goodsTypeDes.setGoodsId(goodsDesc.getId());
+				goodsTypeDes.setGoodsTypeId(Long.valueOf(e.getTypeId()));
+				goodsTypeDes.setCreateTime(new Date());
+				goodsTypeDes.setCreateUser(AuthUtil.getUserId());
+				goodsTypeDes.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+				goodsTypeDescMapper.insert(goodsTypeDes);
+			}
+			else
+			{
+				one.setUpdateTime(new Date());
+				one.setUpdateUser(AuthUtil.getUserId());
+				goodsDescMapper.updateById(one);
+			}
+		});
+	}
+
 }

blade-service/trade-finance/src/main/java/com/trade/finance/controller/SettlementController.java

@@ -30,6 +30,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -39,6 +40,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.boot.ctrl.BladeController;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 结算表 控制器
@@ -56,6 +58,7 @@ public class SettlementController extends BladeController {
 
 	private final IItemsService itemsService;
 
+	private ICorpsDescClient corpsDescClient;//获取客户信息
 	/**
 	 * 详情
 	 */
@@ -68,6 +71,13 @@ public class SettlementController extends BladeController {
 		itemsLambdaQueryWrapper.eq(Items::getPid,detail.getId());
 		List<Items> list = itemsService.list(itemsLambdaQueryWrapper);
 		detail.setItemsList(list);
+		//获取客户中文名
+		if (detail.getCorpId() != null){
+			R<List<Map<String,Object>>> corpMessage = corpsDescClient.getCorpsMessage(detail.getCorpId().toString());
+			if (corpMessage.isSuccess() && corpMessage.getData() != null){
+				detail.setCustomerModel(corpMessage.getData());
+			}
+		}
 		return R.data(detail);
 	}
 

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -19,6 +19,7 @@ import com.trade.purchase.order.enums.OrderStatusEnum;
 import com.trade.purchase.order.enums.OrderTypeEnum;
 import com.trade.purchase.order.mapper.OrderMapper;
 import com.trade.purchase.order.service.IOrderService;
+import com.trade.purchase.order.vo.OrderItemsVO;
 import com.trade.purchase.order.vo.OrderVO;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.CorpsDesc;
@@ -183,6 +184,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				vo.setCorpsName(corpMessage.getData());
 			}
 		}
+		//获取客户中文名
+		if (orderMessage.getPurchaserId() != null){
+			R<List<Map<String,Object>>> corpMessage = corpsDescClient.getCorpsMessage(orderMessage.getPurchaserId().toString());
+			if (corpMessage.isSuccess() && corpMessage.getData() != null){
+				vo.setPurchaserName(corpMessage.getData());
+			}
+		}
 		//获取订单明细信息
 		List<OrderItems> orderItemsList = this.getOrderItems(vo.getId(),null);
 		if (CollectionUtils.isNotEmpty(orderItemsList)) {