diff --git a/src/arap/paybill/paybill/card/events/afterEvent.js b/src/arap/paybill/paybill/card/events/afterEvent.js
index b7598262..50a247c8 100644
--- a/src/arap/paybill/paybill/card/events/afterEvent.js
+++ b/src/arap/paybill/paybill/card/events/afterEvent.js
@@ -2,7 +2,7 @@
 import { ajax, promptBox, toast } from 'nc-lightapp-front';
 import { currentTypeAfterFormEvents } from '../../../../public/components/pubUtils/currentTypeAfterEvent';
 import { autoAddLineKeys } from '../../../../public/components/pubUtils/billPubInfo';
-import { checknoDisplayAfterEvent, checktypeAfterEvent,isbillrangeEdit } from '../../../../public/components/pubUtils/specialFieldAfterEvent.js';
+import { checknoDisplayAfterEvent, checktypeAfterEvent, isbillrangeEdit,currtypeAfterEvent } from '../../../../public/components/pubUtils/specialFieldAfterEvent.js';
 import { formulamsgHint, renderData, headAfterEventRenderData, bodyAfterEventRenderData, errorDeal } from '../../../../public/components/afterEventPub/afterEventPubDeal';
 import { getColvalues, getRowIds } from '../../../../public/components/pubUtils/billPubUtil';
 import { moneyAndRateFields } from '../../../../public/components/pubUtils/specialFieldAfterEvent.js';
@@ -94,6 +94,25 @@ export default function afterEvent(props, moduleId, key, value, changedrows, i,
 									errorDeal(this, res, changedrows, key);
 								}
 							});
+							ajax({
+								url: '/nccloud/arap/arappub/ischecknoref.do',
+								data: {
+									autoButton:'autoButton',
+									pk_org: value.key
+								},
+								async: false,
+								success: (res) => {
+									if(res.data){
+										if (status == 'browse') {
+											this.props.button.setButtonVisible('AutoBillrange', false);
+										}else{
+											this.props.button.setButtonVisible('AutoBillrange', true);
+										}
+									}else{
+										this.props.button.setButtonVisible('AutoBillrange', false);
+									}
+								}
+							});
 						},
 						cancelBtnClick: () => {
 							this.props.form.setFormItemsValue(this.formId, { pk_org_v: changedrows });
@@ -227,8 +246,13 @@ export default function afterEvent(props, moduleId, key, value, changedrows, i,
 		}
 	}
 
-	//表体编辑后事件
+	//表体编辑后事件增加编辑票据号对于子票区间的控制
 	if (moduleId == this.tableId) {
+		//币种
+		if (key == 'pk_currtype') {
+			currtypeAfterEvent(this.props, this.tableId, key, value, i);
+		}
+
 		//票据类型
 		if (key == 'checktype') {
 			checktypeAfterEvent(this.props, this.tableId, key, value, i);
@@ -236,7 +260,7 @@ export default function afterEvent(props, moduleId, key, value, changedrows, i,
 		if (key == 'direct_checkno') {
 			let checkno = this.props.cardTable.getValByKeyAndIndex(this.tableId, i, "checkno");
 			let checknovalue = checkno?checkno.value:null;
-			if(value=="N"&&isbillrangeEdit(checknovalue,value)){
+			if((value=="N"||value==false)&&isbillrangeEdit(checknovalue,value)){
 				this.props.cardTable.setEditableByIndex(this.tableId, i, ['billrangestart','billrangeend'], true);
 			}else{
 				this.props.cardTable.setEditableByIndex(this.tableId, i, ['billrangestart','billrangeend'], false);
@@ -246,17 +270,19 @@ export default function afterEvent(props, moduleId, key, value, changedrows, i,
 		if (key == 'checkno_display') {
 			checknoDisplayAfterEvent(this.props, this.tableId, key, value, i);
 			key = 'checkno';
+			if(value!=null && value.values!=null){
 			let billtypecode = value.values.pk_billtypecode.value;
 			let subcontractcirculation = value.values.subcontractcirculation.value;
 			if(billtypecode=="36H2"){
 				this.isEditbillrangge = false;
-			}else if(billtypecode=="36H1"){
+			}else if(billtypecode=="36H1"||billtypecode=="36HN"){
 				if(subcontractcirculation=="Y"){
 					this.isEditbillrangge = true;
 				}else{
 					this.isEditbillrangge = false;
 				}
 			}
+			}
 		}
 		//科目字段特殊拼接1121\应收票据
 		if(key == "subjcode"){
diff --git a/src/arap/paybill/paybill/card/events/buttonClick.js b/src/arap/paybill/paybill/card/events/buttonClick.js
index fcb60899..6e0b6821 100644
--- a/src/arap/paybill/paybill/card/events/buttonClick.js
+++ b/src/arap/paybill/paybill/card/events/buttonClick.js
@@ -2,6 +2,7 @@
 import { ajax, toast, cardCache, promptBox,metaCache} from 'nc-lightapp-front';
 import { headButton,innerButton, bodyButton } from '../../../../public/components/pubUtils/buttonName';
 import {
+	autoCountBillrange,
 	delLine,
 	copyLine,
 	pasteLine,
@@ -23,8 +24,9 @@ import {
 	billEditProperties,
 	dealCommisionPayFieldBack,
 	cardFieldsEditableWithResetProxy,
-	checkRedType
-} from '../../../../public/components/pubUtils/billFieldEditableUtil.js';
+	checkRedType,
+	directChecknoEditable
+	} from '../../../../public/components/pubUtils/billFieldEditableUtil.js';
 import { getContext, loginContextKeys } from '../../../../public/components/arapInitInfo/loginContext';
 import { moduleEnable, IMAG, SSCIVM } from '../../../../public/components/moduleEnable.js';
 import { throwSagaErrorAgency } from '../../../../public/components/pubUtils/MicroServiceSocket.js';
@@ -678,6 +680,9 @@ export function buttonClick(props, id) {
 				);
 			}
 			break;
+		case bodyButton.AutoBillrange://自动计算子票区间
+			autoCountBillrange(this,dataSource)
+			break;
 		case bodyButton.PasteLine: //粘贴行
 			pasteLine(this);
 			break;
@@ -920,6 +925,8 @@ export function cardBillEdit() {
 				dealCommisionPayField(this.props, this.formId, this.tableId);
 				//处理往来对象的可编辑性
 				objtypeEditable(this.props, this.formId, this.tableId);
+				//处理直联电票的可编辑行
+				directChecknoEditable(this.props, this.formId, this.tableId)
 				if (res.data && res.data.head) {
 					this.props.form.setFormItemsDisabled(this.formId, res.data.head);
 					this.headBack = res.data.headBack
diff --git a/src/arap/paybill/paybill/list/events/buttonClick.js b/src/arap/paybill/paybill/list/events/buttonClick.js
index e9811747..fa3773b8 100644
--- a/src/arap/paybill/paybill/list/events/buttonClick.js
+++ b/src/arap/paybill/paybill/list/events/buttonClick.js
@@ -278,6 +278,9 @@ export default function buttonClick(props, id) {
 			break;
 		case headButton.Print: //打印
 			let printData = this.props.table.getCheckedRows(this.tableId);
+			printData.sort((a, b) => {
+				return a.index - b.index;
+			});
 			if (printData.length == 0) {
 				toast({ color: 'warning', content: this.state.json['paybill-000029'] }); /* 国际化处理： 请选中一行数据!*/
 				return;
diff --git a/src/arap/paybill/paybill/list/index.js b/src/arap/paybill/paybill/list/index.js
index 93bfd306..63954a9f 100644
--- a/src/arap/paybill/paybill/list/index.js
+++ b/src/arap/paybill/paybill/list/index.js
@@ -763,9 +763,9 @@ class List extends Component {
 					cancel={this.tbbLinkcancel.bind(this)}
 				/>
 				{/* {联查发票} */}
-				{this.state.showSSCmodule ? (
+				{/* {this.state.showSSCmodule ? (
 						<InvoiceLink {...this.state.sscivmInvoiceData} table={this.props.table} />
-					) : null}
+					) : null} */}
 				{showUploader && (
 					<NCUploader
 						billId={this.Info.pk_bill}
diff --git a/src/ic/ic/assembly/card/viewController/btnClickController.js b/src/ic/ic/assembly/card/viewController/btnClickController.js
index 8633f699..11adeb78 100644
--- a/src/ic/ic/assembly/card/viewController/btnClickController.js
+++ b/src/ic/ic/assembly/card/viewController/btnClickController.js
@@ -32,6 +32,8 @@ import {
 import { buttonController } from '../viewController';
 import { BUTTONID, AREA, FIELD, COPYPASTEBTNS, URL, UISTATE, DISABLEBTNS, PAGECODE } from '../../constance';
 import printCountQuery from '../../../../../scmpub/scmpub/pub/tool/printCountQuery';
+import { ajax } from 'nc-lightapp-front';
+
 export default function buttonClick(props, key, text, record, index) {
 	let CONSTFIELD = {
 		dataSource: FIELD.dataSource
@@ -166,6 +168,68 @@ export default function buttonClick(props, key, text, record, index) {
 		case BUTTONID.printCountQuery:
 			let CONST = { hid: FIELD.cspecialhid, area: AREA.head };
 			printCountQuery.call(this, props, { type: 2, CONST, modal: 'code-config' });
+			break;
+		// 
+		case "summarize":
+			// let id= props.form.getFormItemsValue(AREA.head, FIELD.cspecialhid).value; // 主键
+            // var thsi1=this;
+			// let allRows = props.cardTable.getVisibleRows(AREA.body);
+			// let data=[];
+            // for (let i = 0; i < allRows.length; i++) {
+			// 	let row = allRows[i];
+			// 	if(row.values.nnum && row.values.cmaterialoid && row.values.type){
+			// 		let row1={nnum:row.values.nnum.value,
+			// 			materialid:row.values.cmaterialoid.value,
+			// 			nassistnum:row.values.nassistnum.value,
+			// 		    type:row.values.type.value,
+			// 		    pk:row.values.cspecialbid.value,
+			// 		    index:i}
+			// 			data.push(row1);
+			// 	}
+			// }
+			// let summarizedata = { pk: id };
+			// ajax({
+			// 	url: '/nccloud/ic/assembly/summarize.do', // 删除
+			// 	data: data,
+			// 	method: 'post',
+			// 	success: function(res) {
+
+            //         if(res.data){
+			// 			for(let i = 0; i < res.data.length; i++){
+			// 				let res1 = res.data[i]
+			// 				props.cardTable.setValByKeyAndIndex(AREA.body, res1.index, FIELD.nnum, { value: ""+res1.nnum,display:""+res1.nnum }); //主数量
+			// 				props.cardTable.setValByKeyAndIndex(AREA.body, res1.index, FIELD.nassistnum, { value:""+res1.nnum,nassistnum:""+res1.nassistnum }); //主数量
+			// 				props.cardTable.setValByKeyAndIndex(AREA.body, res1.index, FIELD.vbdef1, { value: ""+res1.vbdef1,display:""+res1.vbdef1 }); //主数量
+			// 			}
+			// 		}
+					
+			// 		// refreshBtnClick.bind(thsi1, props)();
+			// 	}
+			// });
+			let allRows = props.cardTable.getVisibleRows(AREA.body);
+			let summarize=0;
+            for (let i = 0; i < allRows.length; i++) {
+				let row = allRows[i];
+				if(row.values.type && row.values.type.value == "1" && row.values.vbdef1.value){
+
+					let vbdef1 =Number(row.values.nnum.value) *Number(row.values["cmaterialvid.def28"].value) ;
+					props.cardTable.setValByKeyAndIndex(AREA.body, i, "vbdef1", { value: ""+vbdef1 }); //主数量
+					props.cardTable.setValByKeyAndIndex(AREA.body, i, FIELD.vbdef, [{vbdef1:{ value: ""+vbdef1 }}]); 
+
+					
+					summarize=summarize+Number(vbdef1);
+				}
+			}
+			for (let i = 0; i < allRows.length; i++) {
+				let row = allRows[i];
+				if(row.values.type && row.values.type.value == "0"){
+					props.cardTable.setValByKeyAndIndex(AREA.body, i, FIELD.nnum, { value: ""+summarize,display:""+summarize }); //主数量
+					props.cardTable.setValByKeyAndIndex(AREA.body, i, FIELD.nassistnum, { value:""+summarize,display:""+summarize }); //主数量
+
+				}
+			}
+
+					
 			break;
 	}
 }