Merge branch 'test' of D:\桌面\山能\pt with conflicts.

dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java

@@ -263,6 +263,8 @@ public class SDNYMainProcessController extends AbstractController {
             log.info("查验结果为:{}", checkInvoiceResult);
             } catch (Exception e) {
                 e.printStackTrace();
+                log.error("查验失败，errormsg:{}",e.getMessage());
+                return ResponseEntity.ok(JSONObject.toJSONString(R.error("查验失败，"+e.getMessage())));
             }
 
             if (!checkInvoiceResult.containsKey("code")) {
@@ -452,6 +454,9 @@ public class SDNYMainProcessController extends AbstractController {
         for (int i = 0; i < detailList.size(); i++) {
             String taxRateDetail = "";
             JSONObject detail = (JSONObject) detailList.get(i);
+            if(StringUtils.isNotEmpty(detail.getString("goodsName")) && detail.getString("goodsName").contains("详见销货清单")){
+                continue;
+            }
             Map<String, String> snDetailMap = new HashMap<String, String>();
             snDetailMap.put("rowNo", i + 1 + "");
             snDetailMap.put("commodityCode", detail.getString("goodsNum"));

dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java

@@ -451,7 +451,8 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
                 jsonObject.put("tonnage", invoiceData.get("dw"));
                 jsonObject.put("limitPeople", invoiceData.get("xcrs"));
                 String taxRate = "";
-                if ("免税".equals(invoiceData.get("sl"))) {
+                if (invoiceData.get("sl")==null||StringUtils.isBlank(invoiceData.get("sl").toString())||
+                        "免税".equals(invoiceData.get("sl").toString())|| "不征税".equals(invoiceData.get("sl").toString()) || "***".equals(invoiceData.get("sl").toString())) {
                     taxRate = "0";
                     jsonObject.put("taxRate", taxRate);
                 } else {
@@ -726,6 +727,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
             reimburse.setTaxRate("0%");
             reimburse.setTaxCode(getTaxCode(reimburse.getTaxRate()));
         }
+
         reimburse.setIsDeduction(invoice.getIsDeductible());
 
         if (StringUtils.isNoneBlank(reimburse.getInvoiceCode())) {