Browse Source

客户资料:excel模板中“结算天数”没有限制,输入负数、0等都可以导入。建议限制为正整数
供应商/客户:excel模板中“币别”随便输入都可以导入,应限制只能是系统中存在的币别--基础资料>币别资料

guq 6 years ago
parent
commit
694b25d471

+ 19 - 0
applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/CustomerServiceImpl.java

@@ -67,6 +67,8 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
     private CustAramountService custAramountService;
     @Autowired
     private CustAramountMapper custAramountMapper;
+    @Autowired
+    private CurrencyMapper currencyMapper;
 
     @Override
     public PageInfo<CustomerList> getListData(PageRequest page, ListReqDTO req) {
@@ -488,6 +490,23 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
                     customerDTO.setCu_sellercode(employees.get(0).getEm_code());
                     customerDTO.setCu_sellername(employees.get(0).getEm_name());
                 }
+                //验证结算天数
+                Double promise = customerDTO.getCu_promisedays();
+                if (!StringUtils.isEmpty(promise)) {
+                    if (promise <= 0 || (promise - promise.intValue() != 0)) {
+                        err.append("客户编号为: " + customerDTO.getCu_code() + " 的结算天数: "+ promise +" 不为正整数,请确认数据是否正确");
+                        break;
+                    }
+                }
+                //币别验证
+                String currency = customerDTO.getCu_currency();
+                if (!StringUtils.isEmpty(currency)) {
+                    Integer count = currencyMapper.selectCountByName(currency, BaseContextHolder.getCompanyId());
+                    if (count == 0) {
+                        err.append("客户编号为: " + customerDTO.getCu_code() + " 的币别: "+ currency +" 在系统中不存在,请确认数据是否正确");
+                        break;
+                    }
+                }
                 customerDTO.setCu_status(Status.ENABLE.getDisplay());
                 customerDTO.setCu_statuscode(Status.ENABLE.name());
                 //编号不存在

+ 11 - 0
applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/VendorServiceImpl.java

@@ -75,6 +75,9 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
     private  VendApamountService vendApamountService;
     @Autowired
     private VendApamountMapper vendApamountMapper;
+    @Autowired
+    private CurrencyMapper currencyMapper;
+
     @Value("${b2b.baseUrl.common}")
     private String b2bUrl;
 
@@ -479,6 +482,14 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
                 Vendor vendor = JSONObject.parseObject(main.getDd_maindata(), Vendor.class);
                 vendor.setVe_status(Status.ENABLE.getDisplay());
                 vendor.setVe_statuscode(Status.ENABLE.name());
+                //币别验证
+                String currency = vendor.getVe_currency();
+                if (!StringUtils.isEmpty(currency)) {
+                    Integer count = currencyMapper.selectCountByName(currency, companyId);
+                    if (count == 0) {
+                        throw new BizException(70110582, "供应商: " + vendor.getVe_code() + " 的币别: "+ currency +" 在系统中不存在,请确认数据是否正确");
+                    }
+                }
                 if (!StringUtils.isEmpty(vendor.getVe_type())) {
                     Vendorkind type = vendorkindService.getTypeByname(vendor.getVe_type());
                     if (null == type) {