Merge branch 'BMD销售部组织订单-2598' of http://git.dgtis.com/qxp/suishenbang-oneportal into uat

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

@@ -116,6 +116,7 @@ public class HanaOrderComponent {
                 "               T.UEPOS, \n"+
                 "               T.MAABC, \n"+
                 "               T.ZCODE8, \n"+
+                "               T.ZBEZEI1,"+
                 "\t replace(replace(T.BSTKD_E,CHAR(10),''),CHAR(13),'') BSTKD_E \n" +
                 "FROM (\n" +
                 "\n" +
@@ -174,12 +175,14 @@ public class HanaOrderComponent {
                 "               A.UEPOS,"+
                 "               A.MAABC,"+
                 "               A.ZCODE8,"+
+                 "               A.ZBEZEI1,"+
                 "                A.BSTKD_E "+
                 "FROM \"_SYS_BIC\".\"com.sd/CAL_SALES\"" +
                 "('PLACEHOLDER' = ('$$IP_ENDDATE$$',\n" +
                 "\t '"+DateUtils.dateTime()+"'),\n" +
                 "\t 'PLACEHOLDER' = ('$$IP_STATDATE$$',\n" +
-                "\t '"+DateUtils.getThreeMonthDate()+"')) A  LEFT JOIN ERP.MARA B ON B.MATNR = A.MATNR \n" +
+                "\t '"+DateUtils.getThreeMonthDate()+"'),\n" +
+                "\t 'PLACEHOLDER' = ('$$language$$', '1')) A  LEFT JOIN ERP.MARA B ON B.MATNR = A.MATNR \n" +
                 "\t LEFT JOIN ERP.T001W C ON C.WERKS = A.WERKS \n" +
                 "\t LEFT JOIN ERP.ZHANAMATDOWN D ON D.MATNR = A.MATNR \n" +
                 "\t LEFT JOIN ERP.T001L E ON E.WERKS = A.WERKS AND E.LGORT = A.LGORT \n" +
@@ -629,6 +632,7 @@ public class HanaOrderComponent {
                                 +"$$"+ result.getString("UEPOS")
                                 +"$$"+ result.getString("MAABC")
                                 +"$$"+ result.getString("ZCODE8")
+                                +"$$"+ result.getString("ZBEZEI1")
                                 +"$$"+ result.getString("BSTKD_E")
                                 + "\r\n");