Merge remote-tracking branch 'origin/settle-test-20230110' into settle-test-20230110

src/business/brtlat/event/buildCommons.js

@@ -27,9 +27,12 @@ export default {
     }
     let dataObj = {
       rec: {
-        objtyp: 'LID',
+       objtyp: 'BRD',
+       objinr: model.brdgrp.rec.inr,
        ownref: model.brdgrp.rec.ownref,
        expdat: model.lidgrp.rec.expdat,
+       doccur: model.setmod.doccur,
+       docamt: model.setmod.docamt,
 
        },
       cbsMap: {

src/business/brtlat/model/index.js

@@ -43,7 +43,7 @@ export default class Brtlat{
 					},
 					opn1:{
 						cur:"",			//  单据余额		.brdgrp.cbs.opn1.cur
-						amt:"",			//  Balance		.brdgrp.cbs.opn1.amt
+						amt:"0.0",			//  Balance		.brdgrp.cbs.opn1.amt
 					},
 				},
 				apl:{

src/business/litdav/event/buildCommons.js

@@ -31,10 +31,11 @@ export default {
     let dataObj = {
       rec: {
         objtyp: 'BRD',
-        ownref: model.lidgrp.rec.ownref,
-        opndat: model.lidgrp.rec.opndat,
-        expdat: model.lidgrp.rec.expdat,
-        branchInr: model.lidgrp.rec.branchInr,
+        objinr: model.brdgrp.rec.inr,
+        ownref: model.brdgrp.rec.ownref,
+        opndat: model.brdgrp.rec.opndat,
+        expdat: model.brdgrp.rec.expdat,
+        branchInr: model.brdgrp.rec.branchinr,
         hndtyp: model.lidgrp.rec.hndtyp,
         gartyp: model.lidgrp.rec.gartyp,
         fingua: model.lidgrp.rec.fingua,
@@ -50,17 +51,14 @@ export default {
         advtyp: model.brdgrp.rec.advtyp,
       },
       cbsMap: {
-        MAX: model.lidgrp.cbs.max,
-
-        OLDMAX: model.lidgrp.cbs.oldmax,
-        MAX2: model.lidgrp.cbs.max2,
-        NOM1: model.lidgrp.cbs.nom1,
-
-        OPN1: model.lidgrp.cbs.opn1,
-        MAC: model.lidgrp.cbs.mac,
-        MAC2: model.lidgrp.cbs.mac2,
-        OPC2: model.lidgrp.cbs.opc2,
-        CNF: model.lidgrp.cbs.cnf,
+        // MAX: model.lidgrp.cbs.max,
+        // OLDMAX: model.lidgrp.cbs.oldmax,
+        // MAX2: model.lidgrp.cbs.max2,
+        // NOM1: model.lidgrp.cbs.nom1,
+        // OPN1: model.lidgrp.cbs.opn1,
+        MAX: model.brdgrp.cbs.max,
+        MAX2: model.brdgrp.cbs.max2,
+        OPN2: model.brdgrp.cbs.opn1,
       },
       ptsList: ptsptaList,
       transName: trnName,