Browse Source

[feat]采购管理

添加采购报价物料之前加上对供应商ID和税率的校验
客户报价历史数据查询加上空指针校验
dev
liuxiaoxu 3 days ago
parent
commit
eeb26e0a9b
  1. 2
      ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java
  2. 5
      ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/add.html

2
ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java

@ -477,7 +477,7 @@ public class SysCustomerQuoteController extends BaseController
sysCustomerQuoteHistory.setMaterialCode(materialNo);
sysCustomerQuoteHistory.setCustomerCode(customerCode);
List<SysCustomerQuoteHistory> sysCustomerQuoteHistories = quoteHistoryService.selectSysCustomerQuoteHistoryList(sysCustomerQuoteHistory);
List<SysCustomerQuoteHistory> filterCustomerQuoteHistories = sysCustomerQuoteHistories.stream().filter(item -> item.getIsLatest().equals("1")).collect(Collectors.toList());
List<SysCustomerQuoteHistory> filterCustomerQuoteHistories = sysCustomerQuoteHistories.stream().filter(item -> "1".equals(item.getIsLatest())).collect(Collectors.toList());
if (filterCustomerQuoteHistories.size() == 0)
{
SysCustomerQuoteHistory temp = new SysCustomerQuoteHistory();

5
ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/add.html

@ -328,7 +328,10 @@
$.modal.alertWarning("请先选择供应商ID");
return;
}
if ($("#taxRate").val() == null || $("#taxRate").val() == '') {
$.modal.alertWarning("请先填写税率");
return;
}
var url = ctx + "erp/material/select";

Loading…
Cancel
Save