供应商问题修改

采购申请调整

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java

@@ -106,19 +106,10 @@ public class BaseSupplierInfoService extends MybatisBaseService<BaseSupplierInfo
 			return rb.success();
         } 
 		this.updateByDto(dto);
+		baseSupplierBankService.deleteBySupplierSid(dtoSid);
 		for (BaseSupplierBankDto baseSupplierBankDto : baseSupplierBankDtoList) {
-			String bankSid = baseSupplierBankDto.getSid();
-			if(StringUtils.isNotBlank(bankSid)){
-				BaseSupplierBank baseSupplierBank = baseSupplierBankService.fetchBySid(bankSid);
-				BeanUtil.copyProperties(baseSupplierBankDto,baseSupplierBank,"sid");
-				baseSupplierBank.setSupplierSid(dtoSid);
-				baseSupplierBankService.updateById(baseSupplierBank);
-			}else{
-				BaseSupplierBank baseSupplierBank = new BaseSupplierBank();
-				BeanUtil.copyProperties(baseSupplierBankDto,baseSupplierBank,"sid");
-				baseSupplierBank.setSupplierSid(dtoSid);
-				baseSupplierBankService.insert(baseSupplierBank);
-			}
+			baseSupplierBankDto.setSupplierSid(dtoSid);
+			baseSupplierBankService.saveOrUpdateDto(baseSupplierBankDto);
 		}
 		return rb.success();
 	}

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java

@@ -33,6 +33,7 @@ import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailDetailsVo;
 import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailDto;
 import com.yxt.pms.biz.pms.pmspurchasebillextend.PmsPurchaseBillExtendDetailsVo;
 import com.yxt.pms.biz.pms.pmspurchasebillextend.PmsPurchaseBillExtendDto;
+import com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceDto;
 import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayDetailsVo;
 import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayDto;
 import io.swagger.annotations.ApiModel;
@@ -142,6 +143,8 @@ public class PmsPurchaseBillDetailsVo implements Vo {
 
     @ApiModelProperty("付款信息")
     private PmsPurchasePayDetailsVo purchasePay;
+    @ApiModelProperty("发票信息")
+    private PmsPurchaseBillInvoiceDto purchaseBillInvoice;
     @ApiModelProperty("采购单商品明细")
     private List<PmsPurchaseBillDetailDetailsVo> pmsPurchaseBillDetailList;
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java

@@ -31,6 +31,7 @@ import com.yxt.common.core.dto.Dto;
 
 import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailDto;
 import com.yxt.pms.biz.pms.pmspurchasebillextend.PmsPurchaseBillExtendDto;
+import com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceDto;
 import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -139,6 +140,8 @@ public class PmsPurchaseBillDto implements Dto {
 
     @ApiModelProperty("付款信息")
     private PmsPurchasePayDto purchasePay;
+    @ApiModelProperty("发票信息")
+    private PmsPurchaseBillInvoiceDto purchaseBillInvoice;
     @ApiModelProperty("采购单商品明细")
     private List<PmsPurchaseBillDetailDto> pmsPurchaseBillDetailList;
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java

@@ -35,6 +35,10 @@ import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailService;
 import com.yxt.pms.biz.pms.pmspurchasebillextend.PmsPurchaseBillExtendDetailsVo;
 import com.yxt.pms.biz.pms.pmspurchasebillextend.PmsPurchaseBillExtendDto;
 import com.yxt.pms.biz.pms.pmspurchasebillextend.PmsPurchaseBillExtendService;
+import com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceDto;
+import com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceService;
+import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayDto;
+import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayService;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -66,6 +70,10 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
 
 	@Autowired
 	private PmsPurchaseBillDetailService pmsPurchaseBillDetailService;
+	@Autowired
+	private PmsPurchaseBillInvoiceService pmsPurchaseBillInvoiceService;
+	@Autowired
+	private PmsPurchasePayService pmsPurchasePayService;
 
 	public PagerVo<PmsPurchaseBillVo> listPageVo(PagerQuery<PmsPurchaseBillQuery> pq) {
 		PmsPurchaseBillQuery query = pq.getParams();
@@ -115,9 +123,15 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
 
 	public String saveOrUpdateDto(PmsPurchaseBillDto dto){
         String dtoSid = dto.getSid();
+		PmsPurchasePayDto purchasePay = dto.getPurchasePay();
+		PmsPurchaseBillInvoiceDto purchaseBillInvoice = dto.getPurchaseBillInvoice();
 		List<PmsPurchaseBillDetailDto> pmsPurchaseBillDetailList = dto.getPmsPurchaseBillDetailList();
 		if (StringUtils.isBlank(dtoSid)) {
 			String sid = this.insertByDto(dto);
+			purchasePay.setBillSid(sid);
+			pmsPurchasePayService.saveOrUpdateDto(purchasePay);
+			purchaseBillInvoice.setBillSid(sid);
+			pmsPurchaseBillInvoiceService.saveOrUpdateDto(purchaseBillInvoice);
 			for (PmsPurchaseBillDetailDto pmsPurchaseBillDetailDto : pmsPurchaseBillDetailList) {
 				pmsPurchaseBillDetailDto.setBillSid(sid);
 				pmsPurchaseBillDetailService.saveOrUpdateDto(pmsPurchaseBillDetailDto);
@@ -126,6 +140,12 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
         }
 		this.updateByDto(dto);
 		pmsPurchaseBillDetailService.delByMainSid(dtoSid);
+		pmsPurchasePayService.delByMainSid(dtoSid);
+		pmsPurchaseBillInvoiceService.delByMainSid(dtoSid);
+		purchasePay.setBillSid(dtoSid);
+		pmsPurchasePayService.saveOrUpdateDto(purchasePay);
+		purchaseBillInvoice.setBillSid(dtoSid);
+		pmsPurchaseBillInvoiceService.saveOrUpdateDto(purchaseBillInvoice);
 		for (PmsPurchaseBillDetailDto pmsPurchaseBillDetailDto : pmsPurchaseBillDetailList) {
 			pmsPurchaseBillDetailDto.setBillSid(dtoSid);
 			pmsPurchaseBillDetailService.saveOrUpdateDto(pmsPurchaseBillDetailDto);

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceMapper.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -57,4 +58,7 @@ public interface PmsPurchaseBillInvoiceMapper extends BaseMapper<PmsPurchaseBill
 	
 	@Select("select * from pms_purchase_bill_invoice")
 	List<PmsPurchaseBillInvoiceVo> selectListVo();
+
+	@Delete("delete from pms_purchase_bill_invoice where billSid = #{dtoSid}")
+    void delByMainSid(String dtoSid);
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceService.java

@@ -99,4 +99,8 @@ public class PmsPurchaseBillInvoiceService extends MybatisBaseService<PmsPurchas
 		BeanUtil.copyProperties(entity, vo);
 		return vo;
 	}
+
+	public void delByMainSid(String dtoSid) {
+		baseMapper.delByMainSid(dtoSid);
+	}
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayDetailsVo.java

@@ -77,6 +77,6 @@ public class PmsPurchasePayDetailsVo implements Vo {
 	@ApiModelProperty("付款备注")
     private String payRemark; // 付款备注
 	@ApiModelProperty("附件")
-    private List<String> filePath; // 附件
+    private List<String> filePaths; // 附件
 
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayDto.java

@@ -78,6 +78,6 @@ public class PmsPurchasePayDto implements Dto {
 	@ApiModelProperty("付款备注")
     private String payRemark; // 付款备注
     @ApiModelProperty("附件")
-    private List<String> filePath = new ArrayList<>(); // 附件
+    private List<String> filePaths = new ArrayList<>(); // 附件
 
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayMapper.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -57,4 +58,7 @@ public interface PmsPurchasePayMapper extends BaseMapper<PmsPurchasePay> {
 	
 	@Select("select * from pms_purchase_pay")
 	List<PmsPurchasePayVo> selectListVo();
+
+	@Delete("delete from pms_purchase_pay where billSid = #{dtoSid}")
+    void delByMainSid(String dtoSid);
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayService.java

@@ -28,14 +28,18 @@ package com.yxt.pms.biz.pms.pmspurchasepay;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.vo.PagerVo;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * Project: yxt-pms(采购) <br/>
  * File: PmsPurchasePayService.java <br/>
@@ -51,6 +55,10 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class PmsPurchasePayService extends MybatisBaseService<PmsPurchasePayMapper, PmsPurchasePay> {
+
+	@Autowired
+	private FileUploadComponent fileUploadComponent;
+
 	private QueryWrapper<PmsPurchasePay> createQueryWrapper(PmsPurchasePayQuery query) {
 		// todo: 这里根据具体业务调整查询条件
 		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -79,6 +87,13 @@ public class PmsPurchasePayService extends MybatisBaseService<PmsPurchasePayMapp
 	public void insertByDto(PmsPurchasePayDto dto){
 		PmsPurchasePay entity = new PmsPurchasePay();
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		List<String> filePaths = dto.getFilePaths();
+		String url = "";
+		for (String filePath : filePaths) {
+			filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+			url = url + filePath + ",";
+		}
+		entity.setFilePath(url);
 		baseMapper.insert(entity);
 	}
 	
@@ -89,6 +104,13 @@ public class PmsPurchasePayService extends MybatisBaseService<PmsPurchasePayMapp
         } 
 		PmsPurchasePay entity = fetchBySid(dtoSid);
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		List<String> filePaths = dto.getFilePaths();
+		String url = "";
+		for (String filePath : filePaths) {
+			filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+			url = url + filePath + ",";
+		}
+		entity.setFilePath(url);
 		baseMapper.updateById(entity);
 	}
 	
@@ -98,4 +120,8 @@ public class PmsPurchasePayService extends MybatisBaseService<PmsPurchasePayMapp
 		BeanUtil.copyProperties(entity, vo);
 		return vo;
 	}
+
+	public void delByMainSid(String dtoSid) {
+		baseMapper.delByMainSid(dtoSid);
+	}
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java

@@ -89,6 +89,11 @@ public class PmsSupplierInfoService extends MybatisBaseService<PmsSupplierInfoMa
 		qw.eq("isDelete",0);
 		IPage<PmsSupplierInfo> page = PagerUtil.queryToPage(pq);
 		IPage<PmsSupplierInfoVo> pagging = baseMapper.selectPageVo(page, qw);
+		List<PmsSupplierInfoVo> records = pagging.getRecords();
+		for (PmsSupplierInfoVo record : records) {
+			PmsSupplierInfo pmsSupplierInfo = fetchBySid(record.getSid());
+			record.setAddress(pmsSupplierInfo.getProvince() + pmsSupplierInfo.getCity() + pmsSupplierInfo.getCounty() + record.getAddress());
+		}
 		PagerVo<PmsSupplierInfoVo> p = PagerUtil.pageToVo(pagging, null);
 		return p;
 	}