Merge remote-tracking branch 'origin/release' into release

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

@@ -1011,7 +1011,14 @@ public class SDNYMainProcessController extends AbstractController {
                 || "08".equals(snInvoice.getInvoiceType()) || "10".equals(snInvoice.getInvoiceType()) || "11".equals(snInvoice.getInvoiceType()) || "14".equals(snInvoice.getInvoiceType())
                 || "15".equals(snInvoice.getInvoiceType()) || "31".equals(snInvoice.getInvoiceType()) || "32".equals(snInvoice.getInvoiceType())) {
             //可查验发票,
-            info.setZCYZT("1");
+            log.info("发票类型为:{}",snInvoice.getInvoiceType());
+            //0608 区块链发票 并且 checkStatus = 3 的时候 提交sap状态为3（刘振和谈楚才提出需求）
+            if("10".equals(snInvoice.getInvoiceType()) && "3".equals(snInvoice.getCheckStaus())){
+                log.info("区块链发票 传输状态checkStatus = 3");
+                info.setZCYZT("3");
+            }else {
+                info.setZCYZT("1");
+            }
         } else {
             //不可查验发票
             info.setZCYZT("3");

dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SNInvoice.java

@@ -317,7 +317,7 @@ public class SNInvoice {
     /**
      * 查验状态
      */
-    private String checkStaus;
+    private String checkStatus;
 
     /**
      * 查验时间