【英唐电子发票】

src/main/java/com/uas/eis/service/Impl/ERPServiceImpl.java

@@ -112,12 +112,16 @@ public class ERPServiceImpl implements ERPService {
             if(status !=null && "0000".equals(status.toString())){//调用成功
                 baseDao.execute("update invoiceOrder set io_dockstatus='对接成功',IO_INVOICESTATUS=0 where io_id="+id);
                 commonService.logSRecord("开票订单对接",id);
+            }else if(status !=null && "9999".equals(status.toString()) && message != null && message.toString().contains("已存在原始订单")){
+                baseDao.execute("update invoiceOrder set io_dockstatus='对接成功',IO_INVOICESTATUS=0 where io_id="+id);
+                commonService.logFRecord("开票订单对接","("+status+")"+message,id);
             }else{
                 baseDao.execute("update invoiceOrder set io_dockstatus='对接失败' where io_id="+id);
                 commonService.logFRecord("开票订单对接","("+status+")"+message,id);
             }
             logger.info("pushInvoiceOrder master {} ,id {} status {} message {}",master,id,status,message);
             map.put("success", true);
+            map.put("status", status);
             map.put("message", message);
             return map;
         }else{//数据无效
@@ -263,10 +267,10 @@ public class ERPServiceImpl implements ERPService {
                 map.put("success", false);
                 map.put("message", "("+status+")"+message);
             }
-            logger.info("pushInvoiceOrder master {} ,id {} status {} message {}",master,id,status,message);
+            logger.info("cancelInvoiceOrder master {} ,id {} status {} message {}",master,id,status,message);
             return map;
         }else{//数据无效
-            logger.info("findOrderState err {对接源信息无效} ,master {} , id {} status {} message {}",master,id);
+            logger.info("cancelInvoiceOrder err {对接源信息无效} ,master {} , id {} status {} message {}",master,id);
         }
         return null;
     }
@@ -377,6 +381,7 @@ public class ERPServiceImpl implements ERPService {
                 redInvoiceReq.setBuyerName(rs_main.getGeneralString("cu_name"));//购方名称
                 redInvoiceReq.setBuyerTaxNo(rs_main.getGeneralString("ei_taxno"));
                 redInvoiceReq.setRedReason(rs_main.getGeneralString("io_redreason"));
+                //redInvoiceReq.setAutoInvoice("1");//测试是否能自动红冲目前参数无效
                 redInvoiceReq.setBlueElecInvoiceNumber(rs_main.getGeneralString("ei_allelectronicinvoicenumber"));
                 NNOpenSDK sdk = NNOpenSDK.getIntance();
                 String content =sdk.convertToUtf8(JSONArray.toJSONString(redInvoiceReq));
@@ -397,7 +402,7 @@ public class ERPServiceImpl implements ERPService {
                     map.put("message", "("+code+")"+describe);
                     return map;
                 }
-                logger.info("pushInvoiceOrder master {} ,id {} code {} describe {} applycode{}",master,id,code,describe,result);
+                logger.info("rushRed master {} ,id {} code {} describe {} applycode{}",master,id,code,describe,result);
             }
         }else{//数据无效
             logger.info("rushRed err {对接源信息无效} ,master {} , id {} status {} message {}",master,id);