Browse Source

更新支付申请字段信息

fyz 2 months ago
parent
commit
8ea713a0ad

+ 1 - 1
mjava-jiuyousimu/src/main/java/com/malk/jiuyousimu/entity/payment/PaymentMain.java

@@ -56,7 +56,7 @@ public class PaymentMain {
     /**
      * 所属公司主体-采购组织
      */
-//    private FNumber FSETTLEORGID;
+    private FNumber FPURCHASEORGID;
 
     /**
      * 采购部门

+ 8 - 2
mjava-jiuyousimu/src/main/java/com/malk/jiuyousimu/service/Impl/DocumentServiceImpl.java

@@ -433,7 +433,9 @@ public class DocumentServiceImpl implements DocumentService {
                                     case "发票类型": costDetail.setFInvoiceType(UtilMap.getString(jsonObject,"label"));break;
                                     case "税额": costDetail.setFTaxAmt(UtilMap.getDouble(jsonObject,"value"));break;
                                     case "非税金额": costDetail.setFTaxSubmitAmt(UtilMap.getDouble(jsonObject,"value"));break;
-                                    case "申请报销金额": costDetail.setFExpenseAmount(UtilMap.getDouble(jsonObject,"value"));break;
+                                    case "申请报销金额": costDetail.setFExpenseAmount(UtilMap.getDouble(jsonObject,"value"));
+//                                        costDetail.setFTaxSubmitAmt(UtilMap.getDouble(jsonObject,"value"));
+                                    break;
                                 }
                             }
                             costDetails.add(costDetail);
@@ -615,6 +617,7 @@ public class DocumentServiceImpl implements DocumentService {
             }
         });
         Save save = new Save();
+        save.setIsAutoAdjustField(true);
 
         paymentMain.setFBUSINESSTYPE("FY");
         paymentMain.setFBillTypeID(new BillTypeID("YFD02_SYS"));
@@ -623,7 +626,10 @@ public class DocumentServiceImpl implements DocumentService {
         paymentMain.setFDOCUMENTSTATUS("A");//单据状态为创建
         paymentMain.setFCURRENCYID(new FNumber(UtilMap.getString(ALL_ENUM,UtilMap.getString(mainData,"币别"))));
         paymentMain.setFPAYORGID(new FNumber(UtilMap.getString(ALL_ENUM,UtilMap.getString(mainData,"选择支付主体"))));
-        paymentMain.setFSETTLEORGID(new FNumber(UtilMap.getString(ALL_ENUM,UtilMap.getString(mainData,"选择支付主体"))));
+        //结算组织默认久有私募
+        paymentMain.setFSETTLEORGID(new FNumber("100"));
+//        paymentMain.setFSETTLEORGID(new FNumber(UtilMap.getString(ALL_ENUM,UtilMap.getString(mainData,"选择支付主体"))));
+        paymentMain.setFPURCHASEORGID(new FNumber(UtilMap.getString(ALL_ENUM,UtilMap.getString(mainData,"选择支付主体"))));
         paymentMain.setFPURCHASEDEPTID(new FNumber(userDeptId));
         paymentMain.setFAP_Remark(UtilMap.getString(mainData,"备注"));
 //        paymentMain.setFPURCHASERID(new FNumber());