Merge branch 'linshi' into uat

# Conflicts:
#	suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/HanaOrderComponent.java

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/HanaOrderComponent.java

@@ -597,6 +597,7 @@ public class HanaOrderComponent {
                                 +"$$"+result.getString("VBELN")
                                 +"$$"+result.getString("DATUM")
                                 + "\r\n");
+
                 fw.flush();
                 i++;
                 if (i%50000==0){
@@ -615,12 +616,11 @@ public class HanaOrderComponent {
             }
             Long endTime = System.currentTimeMillis();
             log.info("生成selfDeliverOrder-TXT用时：" + (endTime - startTime) + "毫秒");
-
-            conn = getMysqlConnection();
+            /* conn = getMysqlConnection();
             //生产表
             String sql = "TRUNCATE TABLE meta_hana_self_deliver_order";
             pstm = conn.prepareStatement(sql);
-            pstm.execute();
+            pstm.execute();*/
         }catch (Exception e){
             e.printStackTrace();
         }finally {
@@ -678,44 +678,44 @@ public class HanaOrderComponent {
             while (result.next()){
 
                 fw.write(
-                result.getString("VBELN")
-                +"$$"+result.getString("POSNR")
-                +"$$"+result.getString("VGBEL")
-                +"$$"+result.getString("VGPOS")
-                +"$$"+result.getString("VKORG")
-                +"$$"+result.getString("VKORG_TXT")
-                +"$$"+result.getString("VTWEG")
-                +"$$"+result.getString("KUNAG")
-                +"$$"+result.getString("KUNAG_TXT")
-                +"$$"+result.getString("SPART")
-                +"$$"+result.getString("VKGRP")
-                +"$$"+result.getString("WERKS")
-                +"$$"+result.getString("WERKS_NAME")
-                +"$$"+result.getString("AUART_S")
-                +"$$"+result.getString("LFART")
-                +"$$"+result.getString("MATNR")
-                +"$$"+result.getString("ZMAKTXX")
-                +"$$"+result.getString("GROES")
-                +"$$"+result.getString("ZTKNUM")
-                +"$$"+""
-                +"$$"+result.getString("ZSTREET")
-                +"$$"+result.getString("ERDAT_S")
-                +"$$"+result.getString("ZERDAT2")
-                +"$$"+result.getString("ERDAT")
-                +"$$"+result.getString("WADAT_IST")
-                +"$$"+""
-                +"$$"+""
-                +"$$"+""
-                +"$$"+result.getString("STATUS")
-                +"$$"+result.getBigDecimal("ZKWMENG")
-                +"$$"+result.getBigDecimal("NTGEW_VBAP")
-                +"$$"+result.getBigDecimal("LFIMG")
-                +"$$"+result.getBigDecimal("NTGEW")
-                +"$$"+result.getBigDecimal("KZWI4")
-                +"$$"+result.getString("WADAT_IST")
-                +"$$"+result.getString("BOLNR")
-                +"$$"+result.getString("ERZET")
-                + "\r\n");
+                        result.getString("VBELN")
+                                +"$$"+result.getString("POSNR")
+                                +"$$"+result.getString("VGBEL")
+                                +"$$"+result.getString("VGPOS")
+                                +"$$"+result.getString("VKORG")
+                                +"$$"+result.getString("VKORG_TXT")
+                                +"$$"+result.getString("VTWEG")
+                                +"$$"+result.getString("KUNAG")
+                                +"$$"+result.getString("KUNAG_TXT")
+                                +"$$"+result.getString("SPART")
+                                +"$$"+result.getString("VKGRP")
+                                +"$$"+result.getString("WERKS")
+                                +"$$"+result.getString("WERKS_NAME")
+                                +"$$"+result.getString("AUART_S")
+                                +"$$"+result.getString("LFART")
+                                +"$$"+result.getString("MATNR")
+                                +"$$"+result.getString("ZMAKTXX")
+                                +"$$"+result.getString("GROES")
+                                +"$$"+result.getString("ZTKNUM")
+                                +"$$"+""
+                                +"$$"+result.getString("ZSTREET")
+                                +"$$"+result.getString("ERDAT_S")
+                                +"$$"+result.getString("ZERDAT2")
+                                +"$$"+result.getString("ERDAT")
+                                +"$$"+result.getString("WADAT_IST")
+                                +"$$"+""
+                                +"$$"+""
+                                +"$$"+""
+                                +"$$"+result.getString("STATUS")
+                                +"$$"+result.getBigDecimal("ZKWMENG")
+                                +"$$"+result.getBigDecimal("NTGEW_VBAP")
+                                +"$$"+result.getBigDecimal("LFIMG")
+                                +"$$"+result.getBigDecimal("NTGEW")
+                                +"$$"+result.getBigDecimal("KZWI4")
+                                +"$$"+result.getString("WADAT_IST")
+                                +"$$"+result.getString("BOLNR")
+                                +"$$"+result.getString("ERZET")
+                                + "\r\n");
 
                 fw.flush();
                 i++;
@@ -867,7 +867,7 @@ public class HanaOrderComponent {
 
 
 
-    public int bulkLoadFromInputStream (String loadDataSql,
+    public int bulkLoadFromInputStream(String loadDataSql,
                                        InputStream dataStream) throws Exception {
         if(dataStream==null){
             log.info("InputStream is null ,No data is imported");