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

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

@@ -293,6 +293,7 @@ public class ERPServiceImpl implements ERPService {
         String appSecret = donlimConfig.getAppSecret();
         String token =  donlimConfig.getToken();
         String taxnum=  donlimConfig.getTaxnum();
+        logger.info("ElecI-getElecInvoicesById：master {} isProd {}",SpObserver.getSp(),donlimConfig.isProd());
         if(donlimConfig.isProd()){
             appKey =  obs[0].toString();
             appSecret =  obs[1].toString();

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

@@ -79,6 +79,7 @@ public class NuoNuoSDKServiceImpl implements NuoNuoSDKService {
         logger.info("ElecI-findOrderRelationInvoice：master {} content {}",SpObserver.getSp(),content);
         String senid = UUID.randomUUID().toString().replace("-", ""); // 唯一标识，32位随机码，无需修改，保持默认即可
         String result = sdk.sendPostSyncRequest(url, senid, appKey, appSecret, token, taxnum, method, content);
+        logger.info("ElecI-findOrderRelationInvoice：master {} result {}",SpObserver.getSp(),result);
         FindOrderRelationInvoiceResp resp = JSON.parseObject(result , new TypeReference<FindOrderRelationInvoiceResp>() {});
         return resp;
     }

src/main/java/com/uas/eis/task/ElecInvoiceTask.java

@@ -123,7 +123,8 @@ public class ElecInvoiceTask {
                 String master = obs[4].toString();
                 logger.info("ElecI-AttachSave: master: {} Begin ",master);
                 SpObserver.putSp(master);
-                SqlRowList ioList = baseDao.queryForRowSet("select * from (select ei_id,ei_pdfurl,ei_refno,ei_ioid from ELECINVOICE " +
+                SqlRowList ioList = baseDao.queryForRowSet("select * from (select ei_id,ei_pdfurl,ei_refno,ei_ioid,cu_name " +
+                        " from ELECINVOICE LEFT JOIN InvoiceOrder ON io_id = ei_ioid LEFT JOIN CUSTOMER ON CU_CODE = io_cucode " +
                         "where (ei_pdfurl is not null and ei_pdfattach is null) " +
                         " order by ei_id ) where rownum <= 100 ");//一次最多500
                 logger.info("ElecI-AttachSave: master: {} size: {} ",master,ioList.getResultList().size());
@@ -132,7 +133,7 @@ public class ElecInvoiceTask {
                     //下载地址
                     String fileUrl = ioList.getGeneralString("ei_pdfurl"); // "https://inv.jss.com.cn/fp2/2zpnwyKkdvu9dWzE8BhmSnER0Iux3xQRMLidDJhiIE2PziVXY4lL3k83OsK0K06YctW5cf1FFHxraffj-bf16A.pdf";
                     // 定义要保存的文件的路径
-                    String fileName = ioList.getGeneralString("ei_refno")+".pdf";//发票号码
+                    String fileName = ioList.getGeneralString("cu_name")+ioList.getGeneralString("ei_refno")+".pdf";//发票号码
                     String fileBasePath = "C:\\invoice\\"+fileName;//发票号码
                     fileBasePath = "/usr/local/uas/invoice/"+fileName;//发票号码
                     try {
@@ -289,7 +290,8 @@ public class ElecInvoiceTask {
                 String master = obs[4].toString();
                 logger.info("ElecI-AttachSave: master: {} Begin ",master);
                 SpObserver.putSp(master);
-                SqlRowList ioList = baseDao.queryForRowSet("select * from (select ei_id,ei_redpdfurl,ei_relativerefno,ei_ioid from ELECINVOICE " +
+                SqlRowList ioList = baseDao.queryForRowSet("select * from (select ei_id,ei_redpdfurl,ei_relativerefno,ei_ioid,cu_name" +
+                        " from ELECINVOICE LEFT JOIN InvoiceOrder ON io_id = ei_ioid LEFT JOIN CUSTOMER ON CU_CODE = io_cucode " +
                         "where ei_redpdfurl is not null and ei_redpdfattach is null " +
                         " order by ei_id ) where rownum <= 100 ");//一次最多500
                 logger.info("ElecI-AttachSave: master: {} size: {} ",master,ioList.getResultList().size());
@@ -298,7 +300,7 @@ public class ElecInvoiceTask {
                     //下载地址
                     String fileUrl = ioList.getGeneralString("ei_redpdfurl"); // "https://inv.jss.com.cn/fp2/2zpnwyKkdvu9dWzE8BhmSnER0Iux3xQRMLidDJhiIE2PziVXY4lL3k83OsK0K06YctW5cf1FFHxraffj-bf16A.pdf";
                     // 定义要保存的文件的路径
-                    String fileName = ioList.getGeneralString("ei_relativerefno")+".pdf";//发票号码
+                    String fileName = ioList.getGeneralString("cu_name")+ioList.getGeneralString("ei_relativerefno")+".pdf";//发票号码
                     String fileBasePath = "C:\\invoice\\"+fileName;//发票号码
                     fileBasePath = "/usr/local/uas/invoice/"+fileName;//发票号码
                     try {