单据收退换功能

1.公司取费用承担公司逻辑调整

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/plugin/form/HandInReceiveTicketPlugin.java

@@ -151,7 +151,7 @@ public class HandInReceiveTicketPlugin extends AbstractFormPlugin implements Row
         if(BillTypeConstants.ER_CHECKINGPAYBILL.equals(billlType)){
             companyField = "company";
         }
-        String selector = String.join(",",ErReimBurseBillConstant.ID,ErReimBurseBillConstant.KEY_BILLNO,ErReimBurseBillConstant.KEY_COMPANY,
+        String selector = String.join(",",ErReimBurseBillConstant.ID,ErReimBurseBillConstant.KEY_BILLNO,companyField,
                 ErReimBurseBillConstant.KEY_NCKD_HANDIN_PERSON,ErReimBurseBillConstant.KEY_NCKD_RECEIPT_PERSON);
         DataEntityPropertyCollection properties = EntityMetadataCache.getDataEntityType(billlType).getProperties();
         if(properties.containsKey(ErReimBurseBillConstant.KEY_NCKD_PAGEID)){
@@ -168,7 +168,7 @@ public class HandInReceiveTicketPlugin extends AbstractFormPlugin implements Row
 
             addScanBillEntry(tripReimBurseBill.getString(ErReimBurseBillConstant.KEY_BILLNO),getReceiptStatus(tripReimBurseBill),
                     tripReimBurseBill.get(ErReimBurseBillConstant.ID), billlType,
-                    tripReimBurseBill.getDynamicObject(ErReimBurseBillConstant.KEY_COMPANY).getPkValue(),
+                    tripReimBurseBill.getDynamicObject(companyField).getPkValue(),
                     pageId);
             return true;
         }