Browse Source

11111

master
liupopo 2 years ago
parent
commit
b4a54d72df
  1. 7
      supervise-customer-ui/src/api/supervise/purchaserequisition.js
  2. 27
      supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue
  3. 2
      yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisition.java
  4. 111
      yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProCheckVo.java
  5. 77
      yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/PurchaseRequisitionCheckVo.java
  6. 9
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/productinformation/ProductInformationService.java
  7. 19
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionRest.java
  8. 5
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java
  9. 2
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionpro/PurchaseRequisitionProRest.java
  10. 74
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionpro/PurchaseRequisitionProService.java
  11. 10
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedbrand/RestrictedBrandService.java
  12. 23
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedcategory/RestrictedCategoryService.java
  13. 19
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java

7
supervise-customer-ui/src/api/supervise/purchaserequisition.js

@ -55,5 +55,12 @@ export default {
method: 'post',
data: params
})
},
// 检测供应商信息状态
checkSupplier: function(sid) {
return request({
baseURL:'/api/customer',
url: '/v1/purchaserequisition/checkSupplier/' + sid
})
}
}

27
supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue

@ -155,7 +155,20 @@
<el-button style="float: right; padding: 3px 0" type="text" @click="handleDownload">重新检测</el-button>
</div>
<div>
商品信息检测
<div v-if="proChecklist.length>0">
<el-table :data="proChecklist" :index="index" border style="width: 100%">
<el-table-column fixed label="序号" width="60px" type="index" :index="index + 1" align="center" />
<el-table-column label="商品代码" align="center" width="100" prop="productCode" />
<el-table-column label="商品名称" align="center" prop="productName" />
<el-table-column label="品类编码" align="center" width="100" prop="categoryCode" />
<el-table-column label="品类名称" align="center" width="100" prop="categoryName" />
<el-table-column label="品牌编码" align="center" width="100" prop="brandCode" />
<el-table-column label="品牌名称" align="center" width="100" prop="brandName" />
<el-table-column label="状态" align="center" width="150" prop="resState" />
<el-table-column label="检测结果" align="center" width="100" prop="msg" />
</el-table>
</div>
<div v-else> <el-alert title="所有商品信息正常!" show-icon type="success" effect="dark" :closable="false" /></div>
</div>
</el-card>
</div>
@ -205,6 +218,7 @@
pros: [] //
},
prolist: [],
proChecklist: [],
rules: {}
}
},
@ -370,15 +384,8 @@
checkPro() {
if (this.formobj.sid) {
reqPro.checkByMainSid(this.formobj.sid).then(resp => {
this.prolist = resp.data
this.totalQuantity = this.prolist.length
var aa = 0
for (var i = 0; i < this.prolist.length; i++) {
if (this.prolist[i].totalPrice !== '') {
aa = parseFloat(aa) + parseFloat(this.prolist[i].totalPrice)
}
}
this.amountInTotal = aa
this.proChecklist = resp.data
this.loadProList()
})
}
},

2
yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisition.java

@ -38,6 +38,8 @@ public class PurchaseRequisition extends BaseEntity {
private String supplierName; // 供应商名称
@ApiModelProperty("供应商编码")
private String supplierCode; // 供应商编码
@ApiModelProperty("供应商唯一编码")
private String supplierOnlyCode; // 供应商编码
@ApiModelProperty("物流公司名称")
private String logisticsCompanyName; // 物流公司名称
@ApiModelProperty("物流公司编码")

111
yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProCheckVo.java

@ -0,0 +1,111 @@
package com.yxt.supervise.customer.api.purchaserequisitionpro;
import com.yxt.common.core.vo.Vo;
public class PurchaseRequisitionProCheckVo implements Vo {
public PurchaseRequisitionProCheckVo() {
}
public PurchaseRequisitionProCheckVo(int resState) {
this.resState = resState;
}
public PurchaseRequisitionProCheckVo(String prSid, String prCode, String productCode, String productName, int resState) {
this.prSid = prSid;
this.prCode = prCode;
this.productCode = productCode;
this.productName = productName;
this.resState = resState;
}
private String prSid;
private String prCode;
private String productCode;
private String productName;
private String brandName;
private String brandCode;
private String categoryName;
private String categoryCode;
private int resState = 0; // 0=正常;1=商品不存在;2=品牌不符;3=品类不符
private String msg;
public String getPrSid() {
return prSid;
}
public void setPrSid(String prSid) {
this.prSid = prSid;
}
public String getPrCode() {
return prCode;
}
public void setPrCode(String prCode) {
this.prCode = prCode;
}
public String getProductCode() {
return productCode;
}
public void setProductCode(String productCode) {
this.productCode = productCode;
}
public String getProductName() {
return productName;
}
public void setProductName(String productName) {
this.productName = productName;
}
public String getBrandName() {
return brandName;
}
public void setBrandName(String brandName) {
this.brandName = brandName;
}
public String getBrandCode() {
return brandCode;
}
public void setBrandCode(String brandCode) {
this.brandCode = brandCode;
}
public String getCategoryName() {
return categoryName;
}
public void setCategoryName(String categoryName) {
this.categoryName = categoryName;
}
public String getCategoryCode() {
return categoryCode;
}
public void setCategoryCode(String categoryCode) {
this.categoryCode = categoryCode;
}
public int getResState() {
return resState;
}
public void setResState(int resState) {
this.resState = resState;
}
public String getMsg() {
return msg;
}
public void setMsg(String msg) {
this.msg = msg;
}
}

77
yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/PurchaseRequisitionCheckVo.java

@ -0,0 +1,77 @@
package com.yxt.supervise.customer.api.supplierbankinfo;
public class PurchaseRequisitionCheckVo {
public PurchaseRequisitionCheckVo() {
}
public PurchaseRequisitionCheckVo(String prSid, String prCode, int resState) {
this.prSid = prSid;
this.prCode = prCode;
this.resState = resState;
}
private String prSid;
private String prCode;
private String supplierCode;
private String supplierName;
private String supplierCodeUnified;
private int resState = 0; // 0=正常;1=无供应商信息;2=供应商编码不符;3=有在途
private String msg;
public String getPrSid() {
return prSid;
}
public void setPrSid(String prSid) {
this.prSid = prSid;
}
public String getPrCode() {
return prCode;
}
public void setPrCode(String prCode) {
this.prCode = prCode;
}
public String getSupplierCode() {
return supplierCode;
}
public void setSupplierCode(String supplierCode) {
this.supplierCode = supplierCode;
}
public String getSupplierName() {
return supplierName;
}
public void setSupplierName(String supplierName) {
this.supplierName = supplierName;
}
public String getSupplierCodeUnified() {
return supplierCodeUnified;
}
public void setSupplierCodeUnified(String supplierCodeUnified) {
this.supplierCodeUnified = supplierCodeUnified;
}
public int getResState() {
return resState;
}
public void setResState(int resState) {
this.resState = resState;
}
public String getMsg() {
return msg;
}
public void setMsg(String msg) {
this.msg = msg;
}
}

9
yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/productinformation/ProductInformationService.java

@ -536,4 +536,13 @@ public class ProductInformationService extends MybatisBaseService<ProductInforma
public ProductInformationVo limitJudgement(String code) {
return baseMapper.limitJudgement(code);
}
public ProductInformation fetchByCode(String proCode) {
QueryWrapper<ProductInformation> qw = new QueryWrapper<>();
qw.eq("code",proCode);
List<ProductInformation> list = baseMapper.selectList(qw);
if(list==null||list.isEmpty())
return null;
return list.get(0);
}
}

19
yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionRest.java

@ -4,11 +4,10 @@ import com.alibaba.excel.EasyExcel;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.supervise.customer.api.gdwholesalegd.GdWholesaleGdExcelVo;
import com.yxt.supervise.customer.api.gdwholesalegd.GdWholesaleGdQuery;
import com.yxt.supervise.customer.api.purchaserequisition.*;
import com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrandQuery;
import com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrandVo;
import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionPro;
import com.yxt.supervise.customer.api.supplierbankinfo.PurchaseRequisitionCheckVo;
import com.yxt.supervise.customer.biz.supplierbankinfo.SupplierBankInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@ -33,7 +32,9 @@ import java.util.List;
public class PurchaseRequisitionRest implements PurchaseRequisitionFeign {
@Autowired
PurchaseRequisitionService purchaseRequisitionService;
private PurchaseRequisitionService purchaseRequisitionService;
@Autowired
private SupplierBankInfoService supplierBankInfoService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
@ -79,4 +80,12 @@ public class PurchaseRequisitionRest implements PurchaseRequisitionFeign {
log.debug("--checkCodeByFileName---{}", filename);
return purchaseRequisitionService.checkCodeByFileName(filename);
}
@ApiOperation("检测供应商信息状态")
@GetMapping("/checkSupplier/{sid}")
public ResultBean<List<PurchaseRequisitionPro>> checkSupplier(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
List<PurchaseRequisitionCheckVo> list = supplierBankInfoService.checkPurchaseRequisition(sid);
return rb.success().setData(list);
}
}

5
yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java

@ -12,10 +12,7 @@ import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisition;
import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionExcelVo;
import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionQuery;
import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionVo;
import com.yxt.supervise.customer.api.purchaserequisition.*;
import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionPro;
import com.yxt.supervise.customer.biz.purchaserequisitionpro.PurchaseRequisitionProService;
import com.yxt.supervise.customer.tools.StrTool;

2
yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionpro/PurchaseRequisitionProRest.java

@ -69,7 +69,7 @@ public class PurchaseRequisitionProRest implements PurchaseRequisitionProFeign {
@GetMapping("/checkByMainSid/{mainsid}")
public ResultBean<List<PurchaseRequisitionPro>> checkByMainSid(@PathVariable("mainsid") String mainsid) {
ResultBean rb = ResultBean.fireFail();
List<String> list = purchaseRequisitionProService.checkByMainSid(mainsid);
List<PurchaseRequisitionProCheckVo> list = purchaseRequisitionProService.checkByMainSid(mainsid);
return rb.success().setData(list);
}
}

74
yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionpro/PurchaseRequisitionProService.java

@ -1,21 +1,25 @@
package com.yxt.supervise.customer.biz.purchaserequisitionpro;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionPro;
import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionProExcelVo;
import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionProQuery;
import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionProVo;
import com.yxt.supervise.customer.api.productinformation.ProductInformation;
import com.yxt.supervise.customer.api.purchaserequisitionpro.*;
import com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrand;
import com.yxt.supervise.customer.api.restrictedcategory.RestrictedCategory;
import com.yxt.supervise.customer.biz.productinformation.ProductInformationService;
import com.yxt.supervise.customer.biz.restrictedbrand.RestrictedBrandService;
import com.yxt.supervise.customer.biz.restrictedcategory.RestrictedCategoryService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -29,6 +33,10 @@ public class PurchaseRequisitionProService extends MybatisBaseService<PurchaseRe
@Autowired
private ProductInformationService productInformationService;
@Autowired
private RestrictedCategoryService restrictedCategoryService;
@Autowired
private RestrictedBrandService restrictedBrandService;
public PagerVo<PurchaseRequisitionProVo> listPageVo(PagerQuery<PurchaseRequisitionProQuery> pq) {
PurchaseRequisitionProQuery query = pq.getParams();
@ -110,7 +118,61 @@ public class PurchaseRequisitionProService extends MybatisBaseService<PurchaseRe
return baseMapper.selectList(qw);
}
public List<String> checkByMainSid(String mainsid) {
return null;
public List<PurchaseRequisitionProCheckVo> checkByMainSid(String mainsid) {
List<PurchaseRequisitionProCheckVo> voList = new ArrayList<>();
List<PurchaseRequisitionPro> prolist = this.listByMainSid(mainsid);
for (PurchaseRequisitionPro pro : prolist) {
String proCode = pro.getProCode();
String proName = pro.getProName();
String mainSid = pro.getMainSid();
String preqCode = pro.getPreqCode();
ProductInformation pi = productInformationService.fetchByCode(proCode);
if (pi == null) {
PurchaseRequisitionProCheckVo vo = new PurchaseRequisitionProCheckVo(mainSid, preqCode, proCode, proName, 1);
vo.setMsg("商品档案无此商品");
voList.add(vo);
continue;
}
String brand = pi.getBrand();
String brandSid = pi.getBrandSid();
String category = pi.getCategory();
String categoryKey = pi.getCategoryKey();
RestrictedBrand rb = restrictedBrandService.fetchByCode(brandSid);
if (rb == null) {
PurchaseRequisitionProCheckVo vo = new PurchaseRequisitionProCheckVo(mainSid, preqCode, proCode, proName, 2);
vo.setBrandCode(brandSid);
vo.setBrandName(brand);
vo.setCategoryCode(categoryKey);
vo.setCategoryName(category);
vo.setMsg("品牌【" + brand + "】不属于监管品牌");
voList.add(vo);
}
RestrictedCategory rc = restrictedCategoryService.fetchByCode(categoryKey);
if (rc == null) {
PurchaseRequisitionProCheckVo vo = new PurchaseRequisitionProCheckVo(mainSid, preqCode, proCode, proName, 3);
vo.setBrandCode(brandSid);
vo.setBrandName(brand);
vo.setCategoryCode(categoryKey);
vo.setCategoryName(category);
vo.setMsg("品类【" + category + "】不属于监管品类");
voList.add(vo);
}
String brandCode = pro.getBrandCode();
if (StringUtils.isBlank(brandCode)) {
this.updateBrandCateBySid(pro.getSid(), brandSid, brand, categoryKey, category);
}
}
return voList;
}
private void updateBrandCateBySid(String sid, String brandSid, String brand, String categoryKey, String category) {
UpdateWrapper<PurchaseRequisitionPro> uw = new UpdateWrapper<>();
uw.set("brandCode", brandSid);
uw.set("brand", brand);
uw.set("categoryKey", categoryKey);
uw.set("category", category);
uw.eq("sid", sid);
this.update(uw);
}
}

10
yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedbrand/RestrictedBrandService.java

@ -181,4 +181,14 @@ public class RestrictedBrandService extends MybatisBaseService<RestrictedBrandMa
public RestrictedBrand selectByBrands(String brandCode) {
return baseMapper.selectByBrands(brandCode);
}
public RestrictedBrand fetchByCode(String code) {
QueryWrapper<RestrictedBrand> qw = new QueryWrapper<>();
qw.eq("code", code);
List<RestrictedBrand> list = baseMapper.selectList(qw);
if (list == null || list.isEmpty())
return null;
return list.get(0);
}
}

23
yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedcategory/RestrictedCategoryService.java

@ -164,13 +164,13 @@ public class RestrictedCategoryService extends MybatisBaseService<RestrictedCate
pr.setCategorys(value);
}
}
/*if (i == 2) {//名称
brandIdHSSFCell.setCellType(CellType.STRING);
if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
String value = brandIdHSSFCell.getStringCellValue();
pr.setBrands(value);
}
}*/
/*if (i == 2) {//名称
brandIdHSSFCell.setCellType(CellType.STRING);
if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
String value = brandIdHSSFCell.getStringCellValue();
pr.setBrands(value);
}
}*/
} else {
System.err.println("rowNum=" + rowNum + ",i=" + i + ",value=null");
}
@ -192,6 +192,15 @@ public class RestrictedCategoryService extends MybatisBaseService<RestrictedCate
//return message;
}
public RestrictedCategory fetchByCode(String categoryKey) {
QueryWrapper<RestrictedCategory> qw = new QueryWrapper<>();
qw.eq("categoryKey", categoryKey);
List<RestrictedCategory> list = baseMapper.selectList(qw);
if (list == null || list.isEmpty())
return null;
return list.get(0);
}
/* public Map<String, String> limitJudgement(String categoryKey, String brandCode) {
Map<String, String> result = new HashMap<>();
RestrictedCategory r = baseMapper.selectByCategorys(categoryKey);

19
yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java

@ -33,12 +33,15 @@ import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisition;
import com.yxt.supervise.customer.api.supplierbankinfo.*;
import com.yxt.supervise.customer.api.suppliercontractinfo.SupplierContractInfoDto;
import com.yxt.supervise.customer.api.supplierindex.SupplierIndexQuery;
import com.yxt.supervise.customer.biz.purchaserequisition.PurchaseRequisitionService;
import com.yxt.supervise.customer.biz.suppliercontractinfo.SupplierContractInfoService;
import com.yxt.supervise.customer.biz.supplierindex.SupplierIndexService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -64,6 +67,9 @@ public class SupplierBankInfoService extends MybatisBaseService<SupplierBankInfo
@Resource
private SupplierIndexService supplierIndexService;
@Autowired
private PurchaseRequisitionService purchaseRequisitionService;
private QueryWrapper<SupplierBankInfo> createQueryWrapper(SupplierBankInfoQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@ -239,4 +245,17 @@ public class SupplierBankInfoService extends MybatisBaseService<SupplierBankInfo
public SupplierBankInfo selectByCode(String codeUnified) {
return baseMapper.selectByCode(codeUnified);
}
public List<PurchaseRequisitionCheckVo> checkPurchaseRequisition(String purchaseRequisitionSid) {
List<PurchaseRequisitionCheckVo> list = new ArrayList<>();
PurchaseRequisition pr = purchaseRequisitionService.fetchBySid(purchaseRequisitionSid);
if(pr==null)
return list;
String supplierCode = pr.getSupplierCode();
String supplierName = pr.getSupplierName();
String supplierOnlyCode = pr.getSupplierOnlyCode();
return list;
}
}
Loading…
Cancel
Save