Merge branch 'master_sample_order' into master_after0225

@@ -73,37 +73,38 @@ public class CustomerCreditChangeImportListener extends ExcelImportListener<Cust
     checkList.add(data.getCode());
     QueryCustomerCreditVo vo = new QueryCustomerCreditVo();
     vo.setSerialNumber(data.getCode());
-    vo.setStatus("PASS");
     CustomerCreditService customerCreditService = ApplicationUtil.getBean(CustomerCreditService.class);
     List<CustomerCredit> query = customerCreditService.query(vo);
-    if (CollectionUtils.isEmpty(query)) {
-      throw new DefaultClientException(
-              "第" + context.readRowHolder().getRowIndex() + "行“编号”系统中不存在或未审核通过");
-    }
-    CustomerCredit customerCredit = query.get(0);
-    if (StringUtil.isBlank(data.getAnnualTotalSales())) {
-      data.setAnnualTotalSales(customerCredit.getAnnualTotalSales());
-    }
-    if (StringUtil.isBlank(data.getMainIndustry())) {
-      data.setMainIndustry(customerCredit.getMainIndustry());
-    }
-    if (StringUtil.isBlank(data.getCompanySettlementPeriod())) {
-      data.setCompanySettlementPeriod(customerCredit.getCompanySettlementPeriod());
-    }
-    if (StringUtil.isBlank(data.getCompanyCreditLimit())) {
-      data.setCompanyCreditLimit(customerCredit.getCompanyCreditLimit());
-    } else {
-        if (!isNumeric(data.getCompanyCreditLimit())) {
+    if (CollectionUtils.isNotEmpty(query)) {
+      CustomerCredit customerCredit = query.get(0);
+      if ("PASS".equals(customerCredit.getStatus())) {
+        if (StringUtil.isBlank(data.getAnnualTotalSales())) {
+          data.setAnnualTotalSales(customerCredit.getAnnualTotalSales());
+        }
+        if (StringUtil.isBlank(data.getMainIndustry())) {
+          data.setMainIndustry(customerCredit.getMainIndustry());
+        }
+        if (StringUtil.isBlank(data.getCompanySettlementPeriod())) {
+          data.setCompanySettlementPeriod(customerCredit.getCompanySettlementPeriod());
+        }
+        if (StringUtil.isBlank(data.getCompanyCreditLimit())) {
+          data.setCompanyCreditLimit(customerCredit.getCompanyCreditLimit());
+        } else {
+          if (!isNumeric(data.getCompanyCreditLimit())) {
             throw new DefaultClientException("第" + context.readRowHolder().getRowIndex() + "行“授信额度”必须是数字！");
+          }
         }
+        if (StringUtil.isBlank(data.getCompanyMaterialSupplyPlan())) {
+          data.setCompanyMaterialSupplyPlan(customerCredit.getCompanyMaterialSupplyPlan());
+        }
+        if (StringUtil.isBlank(data.getCompanySuggestedCategory())) {
+          data.setCompanySuggestedCategory(customerCredit.getCompanySuggestedCategory());
+        }
+      } else {
+        throw new DefaultClientException(
+                "第" + context.readRowHolder().getRowIndex() + "行“编号”系统中未审核通过");
+      }
     }
-    if (StringUtil.isBlank(data.getCompanyMaterialSupplyPlan())) {
-      data.setCompanyMaterialSupplyPlan(customerCredit.getCompanyMaterialSupplyPlan());
-    }
-    if (StringUtil.isBlank(data.getCompanySuggestedCategory())) {
-      data.setCompanySuggestedCategory(customerCredit.getCompanySuggestedCategory());
-    }
-
   }
 
   @Override
@@ -112,6 +113,13 @@ public class CustomerCreditChangeImportListener extends ExcelImportListener<Cust
     List<CustomerCreditChangeImportModel> datas = this.getDatas();
     for (int i = 0; i < datas.size(); i++) {
       CustomerCreditChangeImportModel data = datas.get(i);
+      QueryCustomerCreditVo vo1 = new QueryCustomerCreditVo();
+      vo1.setSerialNumber(data.getCode());
+      List<CustomerCredit> query1 = customerCreditService.query(vo1);
+      //系统中不存在的编码直接跳过
+      if (CollectionUtils.isEmpty(query1)) {
+        continue;
+      }
       QueryCustomerCreditVo vo = new QueryCustomerCreditVo();
       vo.setSerialNumber(data.getCode());
       vo.setStatus("PASS");