Merge remote-tracking branch 'origin/master'

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/mservice/SyncSapFIUtils.java

@@ -73,7 +73,7 @@ public class SyncSapFIUtils {
     }
 
 
-    public static  JSONObject convertCosmicVoucherToSAPForEntry(DynamicObject voucher,String maincfitemNumber,Map<String, String> auxpropertiesMap) {
+    public static  JSONObject convertCosmicVoucherToSAPForEntry(DynamicObject voucher,String maincfitemNumber,String projectNumber,Map<String, String> auxpropertiesMap) {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
 
@@ -127,14 +127,15 @@ public class SyncSapFIUtils {
         String VBUND = "";
         String ZFBDT = sdf.format(voucher.getDate(GlVoucherConstantInfo.BOOKEDDATE));  //到期日 取记账日期
 
-        String XREF1 = getXREF1(HKONT);  //凭证辅助项1
+        ///申请人
+        String XREF1 = StringUtils.isEmpty(voucher.getString("entries.nckd_applierv")) ? "" : voucher.getString("entries.nckd_applierv");  //凭证辅助项1  nckd_applierv
         String XREF2 = "";
         //交易流水号
         String XREF3 = StringUtils.isEmpty(voucher.getString("entries.nckd_detailseqid")) ? "" : voucher.getString("entries.nckd_detailseqid");
         logger.info ("SAP凭证辅助项1:"+voucher.getString("entries.nckd_detailseqid"));
         String ZZATTRI1 = "";
         String ZZATTRI2 = "";
-        String ZZATTRI3 = "";
+        String ZZATTRI3 = projectNumber;
 
         //现金流量项目    科目HKONT为1002*行项目需填写，现金流量表项
         if(StringUtils.isNotEmpty(HKONT)  && (HKONT.startsWith("1002"))) {

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/mservice/impl/SynSapFIServiceImpl.java

@@ -53,6 +53,7 @@ public class SynSapFIServiceImpl implements SynSapService {
             JSONObject HEADERITEMINFO = new JSONObject();  //凭证表头
             //现金流量项目编码 不在现金科目行上，需要单独处理下
             String maincfitemNumber = "";
+            String projectNumber = "";
             String voucherInfo = "";
             //List<String> cashBillIDs =  new ArrayList<>();
             /**
@@ -65,11 +66,11 @@ public class SynSapFIServiceImpl implements SynSapService {
                 if (StringUtils.isNotEmpty(auxpropertiesMap.get("maincfitemNumber"))) {
                     maincfitemNumber = auxpropertiesMap.get("maincfitemNumber");
                 }
-                //String entriesId = voucherRow.getString("entries.id");
-                //cashBillIDs.add(entriesId);
+                if (StringUtils.isNotEmpty(auxpropertiesMap.get("bd_project"))) {
+                    projectNumber = auxpropertiesMap.get("bd_project");
+                }
             }
 
-
             //voucherDyns 凭证表头与分录平铺
             for (DynamicObject voucherRow : voucherDyns) {
                 String billid = voucherRow.getString("id");
@@ -80,7 +81,7 @@ public class SynSapFIServiceImpl implements SynSapService {
 
                 ////处理凭证表头
                 HEADERITEMINFO = SyncSapFIUtils.convertCosmicVoucherToSAPForHead(voucherRow);
-                JSONObject entry = SyncSapFIUtils.convertCosmicVoucherToSAPForEntry(voucherRow, maincfitemNumber, auxpropertiesMap);
+                JSONObject entry = SyncSapFIUtils.convertCosmicVoucherToSAPForEntry(voucherRow, maincfitemNumber,projectNumber, auxpropertiesMap);
                 ENTRY_ITEM.add(entry);
 
             }