Merge branch '自动要货-按公司层级和C类产品2547' of http://git.dgtis.com/qxp/suishenbang-oneportal into uat

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

@@ -114,6 +114,8 @@ public class HanaOrderComponent {
                 "               T.PSTYV,\n"+
                 "               T.UEPOS, \n"+
                 "               T.MAABC, \n"+
+                "               T.ZCODE1, \n"+
+                "               T.ZCODE8, \n"+
                 "\t replace(replace(T.BSTKD_E,CHAR(10),''),CHAR(13),'') BSTKD_E \n" +
                 "FROM (\n" +
                 "\n" +
@@ -171,6 +173,8 @@ public class HanaOrderComponent {
                 "               A.PSTYV,"+
                 "               A.UEPOS,"+
                 "               A.MAABC,"+
+                "               A.ZCODE1,"+
+                "               A.ZCODE8,"+
                 "                A.BSTKD_E "+
                 "FROM \"_SYS_BIC\".\"com.sd/CAL_SALES\"" +
                 "('PLACEHOLDER' = ('$$IP_ENDDATE$$',\n" +
@@ -626,6 +630,8 @@ public class HanaOrderComponent {
                                 +"$$"+ result.getString("PSTYV")
                                 +"$$"+ result.getString("UEPOS")
                                 +"$$"+ result.getString("MAABC")
+                                +"$$"+ result.getString("ZCODE1")
+                                +"$$"+ result.getString("ZCODE8")
                                 +"$$"+ result.getString("BSTKD_E")
                                 + "\r\n");