对接湘芯业务修改 添加PO对接

src/main/java/com/uas/eis/serviceImpl/ErpServiceImpl.java

@@ -451,25 +451,30 @@ public class ErpServiceImpl implements ErpService {
         dataMaps.put("deliveryCompany",master.getMa_function());
         //供应商发票
         if(formData[6]!=null&&formData[6]!=""){
-            String fileUrl = "https://uas.cicsc.com/ERP/openSystem/downloadAttachById.action?ids="+formData[6]+"&master="+masterName+"&zipFileName=提货委托书附件";
+            String fileUrl = "https://uas.cicsc.com/ERP/openSystem/downloadAttachById.action?ids="+formData[6]+"&master="+masterName+"&zipFileName=供应商发票";
             dataMaps.put("invoiceFileUrl",fileUrl);
         }else{
             dataMaps.put("invoiceFileUrl","");
         }
         //供应商箱单
         if(formData[7]!=null&&formData[7]!=""){
-            String fileUrl = "https://uas.cicsc.com/ERP/openSystem/downloadAttachById.action?ids="+formData[7]+"&master="+masterName+"&zipFileName=提货委托书附件";
+            String fileUrl = "https://uas.cicsc.com/ERP/openSystem/downloadAttachById.action?ids="+formData[7]+"&master="+masterName+"&zipFileName=供应商箱单";
             dataMaps.put("boxFileUrl",fileUrl);
         }else{
             dataMaps.put("boxFileUrl","");
         }
         //进口货物确认单
         if(formData[8]!=null&&formData[8]!=""){
-            String fileUrl = "https://uas.cicsc.com/ERP/openSystem/downloadAttachById.action?ids="+formData[8]+"&master="+masterName+"&zipFileName=提货委托书附件";
+            String fileUrl = "https://uas.cicsc.com/ERP/openSystem/downloadAttachById.action?ids="+formData[8]+"&master="+masterName+"&zipFileName=进口货物确认单";
             dataMaps.put("confirmFileUrl",fileUrl);
         }else{
             dataMaps.put("confirmFileUrl","");
         }
+        //额外信息
+        Map<String, Object> extraMap = new HashMap<>();
+        extraMap.put("master",master.getMa_user());
+        extraMap.put("poId",poId);
+        dataMaps.put("extraInfo",extraMap);
         while (rs.next()) {
             Map<String, Object> entry = new HashMap<>();
             //型号

src/main/resources/application.yml

@@ -2,9 +2,9 @@ spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: oracle.jdbc.OracleDriver
-        username: ZXGYL_TEST
+        username: N_DATACENTER_TEST2
         password: select!#%*(
-        #url: jdbc:oracle:thin:@10.8.0.19:1521:orcl
+#        url: jdbc:oracle:thin:@10.8.0.19:1521:orcl
         url: jdbc:oracle:thin:@127.0.0.1:1521:orcl
         initialSize: 10
         maxActive: 80