【英唐电子发票】

src/main/java/com/uas/eis/UasEisApplication.java

@@ -12,7 +12,7 @@ import com.uas.eis.core.support.TokenPropertiesListener;
 @SpringBootApplication
 @EnableCaching
 /*@EnableScheduling*/
-/*@Import({DynamicDataSourceRegister.class})*/
+@Import({DynamicDataSourceRegister.class})
 public class UasEisApplication {
 	public static void main(String[] args) {
 		SpringApplication application = new SpringApplication(UasEisApplication.class);

src/main/java/com/uas/eis/controller/ERPController.java

@@ -19,42 +19,11 @@ public class ERPController {
     private ERPService erpService;
 
     /**
-     * 物料资料
-     * @param data
-     * @return
+     *开票订单对接
      */
-    @RequestMapping("/erp/syncProduct")
-    public ApiResult<String> syncProduct(String data){
-        return erpService.syncProduct(data);
+    @RequestMapping("/erp/pushInvoiceOrder")
+    public ApiResult<String> pushInvoiceOrder(String master,int id){
+        return erpService.pushInvoiceOrder(master,id);
     }
 
-    /**
-     * 工单资料
-     * @param data
-     * @return
-     */
-    @RequestMapping("/erp/syncMakeBase")
-    public ApiResult<String> syncMakeBase(String data){
-        return erpService.syncMakeBase(data);
-    }
-
-    /**
-     *工单BOM资料
-     * @param data
-     * @return
-     */
-    @RequestMapping("/erp/syncMakeBaseDetail")
-    public ApiResult<String> syncMakeBaseDetail(String data){
-        return erpService.syncMakeBaseDetail(data);
-    }
-
-    /**
-     *推送领料单
-     * @param data
-     * @return
-     */
-    @RequestMapping("/erp/syncUpdateReceiveByErp")
-    public ApiResult<String> syncUpdateReceiveByErp(String data){
-        return erpService.syncUpdateReceiveByErp(data);
-    }
 }

src/main/java/com/uas/eis/service/ERPService.java

@@ -12,9 +12,5 @@ public interface ERPService {
 
     ApiResult<String> syncProduct(String data);
 
-    ApiResult<String> syncMakeBase(String data);
-
-    ApiResult<String> syncMakeBaseDetail(String data);
-
-    ApiResult<String> syncUpdateReceiveByErp(String data);
+    ApiResult<String> pushInvoiceOrder(String master,int id);
 }

src/main/resources/application-dev.yml

@@ -2,7 +2,7 @@ spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: oracle.jdbc.OracleDriver
-        username: N_HUASL_SZ
+        username: YITOA_DATACENTER
         password: select!#%*(
         url: jdbc:oracle:thin:@10.1.81.208:11756:orcl
         initialSize: 1
@@ -31,6 +31,4 @@ action:
 
 extral:
     panasonic:
-        route: https://sandbox.nuonuocs.cn/open/v1/services
-        appKey : SDG6bvh0ke
-        appSecret : SD7C288389DB4AF1
+        route: https://sandbox.nuonuocs.cn/open/v1/services

src/main/resources/application-prod.yml

@@ -31,6 +31,4 @@ action:
 
 extral:
     panasonic:
-        route: https://sdk.nuonuo.com/open/v1/services
-        APPKey: SDG6bvh0ke
-        Appsecret: SD7C288389DB4AF1
+        route: https://sdk.nuonuo.com/open/v1/services

src/test/java/com/uas/eis/UasEisApplicationTests.java

@@ -1,11 +1,10 @@
 package com.uas.eis;
 
-import com.uas.eis.beans.result.CrmQueryResult;
+
+import com.uas.eis.core.config.SpObserver;
 import com.uas.eis.dao.BaseDao;
-import com.uas.eis.listener.UasProdInOutListener;
-import com.uas.eis.task.PnsDataSyncTask;
+import com.uas.eis.service.ERPService;
 import nuonuo.open.sdk.NNOpenSDK;
-import nuonuo.open.sdk.demo.OpenToken;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,24 +20,15 @@ import java.util.UUID;
 public class UasEisApplicationTests {
 	@Autowired
 	private BaseDao baseDao;
+	@Autowired
+	private ERPService erpService;
 	@Test
 	public void Test() {
 		System.out.println("test");
 		System.out.println(new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(new Date()));
 		Object ob=baseDao.getFieldDataByCondition("enterprise","EN_WHICHSYSTEM","1=1");
-		//账套 id
 		System.out.println(ob.toString());
-		NNOpenSDK sdk = NNOpenSDK.getIntance();
-		String taxnum = "339901999999142"; // 授权企业税号
-		String appKey = "SD47646161";
-		String appSecret = "SD681C05C3EA4408";
-		String method = "nuonuo.ElectronInvoice.getPDF"; // API方法名
-		String token = "3792fb46bc927024c7f6a50btcogafcs"; // 访问令牌
-		String content = "{\"inTaxAmount\": \"1288.80\",\"exTaxAmount\": \"687.99\",\"invoiceNo\": \"12345678\",\"invoiceCode\": \"123456789012\"}";
-		String url = "https://sandbox.nuonuocs.cn/open/v1/services"; // SDK请求地址
-		String senid = UUID.randomUUID().toString().replace("-", ""); // 唯一标识，32位随机码，无需修改，保持默认即可
-		String result = sdk.sendPostSyncRequest(url, senid, appKey, appSecret, token, taxnum, method, content);
-		System.out.println(result);
+		erpService.pushInvoiceOrder("N_HUASL_SZ",0);
 	}
 	@Test
 	public void Test1() {