Index: ssts-web/src/main/webapp/disinfectsystem/thirdPartyTousse/thirdPartyTousseForm.js
===================================================================
diff -u -r39316 -r39446
--- ssts-web/src/main/webapp/disinfectsystem/thirdPartyTousse/thirdPartyTousseForm.js	(.../thirdPartyTousseForm.js)	(revision 39316)
+++ ssts-web/src/main/webapp/disinfectsystem/thirdPartyTousse/thirdPartyTousseForm.js	(.../thirdPartyTousseForm.js)	(revision 39446)
@@ -88,10 +88,11 @@
 	for (var i = 0; i < leftGrid.getCount(); i++) {
 		var item = leftGrid.getAt(i);
 		var invoiceAfterReceive = '否';
-		if(barcodeArr && barcodeArr.indexOf(item.data.barcode) >= 0){
+		if (barcodeArr && barcodeArr.indexOf(item.data.barcode) >= 0) {
 			invoiceAfterReceive = '是';
 		}
-		thirdPartyTousseInstances.push({
+
+		var record = {
 			barcode: item.data.barcode,
 			tousseName: item.data.tousseName,
 			orgUnitId: item.data.orgUnitId,
@@ -101,7 +102,22 @@
 			sterileTime: item.data.sterileTime,
 			invoiceAfterReceive: invoiceAfterReceive,
 			validUntil: item.data.validUntil
-		})
+		}
+
+		if(sstsConfig.enabledCreateNewDefinitionOnReceiving){
+			var materialInstanceVos = item.data.materialInstanceVos;
+			var events = item.data.events;
+			var itemDefinitionID = item.data.itemDefinitionID;
+			var instanceID = item.data.instanceID;
+			var itemBaseTypeId = item.data.itemBaseTypeId;
+			record.materialInstanceVos = materialInstanceVos;
+			record.events = events;
+			record.itemDefinitionID = itemDefinitionID;
+			record.instanceID = instanceID;
+			record.itemBaseTypeId = itemBaseTypeId;
+		}
+
+		thirdPartyTousseInstances.push(record)
 	}
 	var params = {
 		receiverId: receiverId,
@@ -113,6 +129,11 @@
 		id: id,
 		thirdPartyTousseInstances: thirdPartyTousseInstances
 	}
+
+	params.dataSource = '东昇';
+	if(sstsConfig.enabledCreateNewDefinitionOnReceiving){
+		params.dataSource = '老肯';
+	}
 	var url = WWWROOT + '/disinfectSystem/baseData/thirdPartyTousseReceiveRecordController/receiveThirdPartyTousse.mhtml';
 	if (barcodeArr) {
 		url = WWWROOT + '/disinfectSystem/invoice/invoiceController/receiveAndInvoiceThirdPartyTousse.mhtml';
@@ -128,9 +149,9 @@
 			if (result.success) {
 				configWin.close();
 				listStore.load();
-				if(barcodeArr){
+				if (barcodeArr) {
 					showResult('保存并发货成功');
-				}else {
+				} else {
 					showResult('保存成功');
 				}
 			} else {
@@ -213,7 +234,12 @@
 			{ name: 'validUntil' },
 			{ name: 'operator' },
 			{ name: 'reviewer' },
-			{ name: 'orgUnitName' }
+			{ name: 'orgUnitName' },
+			{ name: 'materialInstanceVos' },
+			{ name: 'events' },
+			{ name: 'itemDefinitionID' },
+			{ name: 'instanceID' },
+			{ name: 'itemBaseTypeId' }
 		],
 		data: []
 	});
@@ -246,48 +272,88 @@
 				render: function (c) {
 					c.getEl().on('keypress', function (e) {
 						if (e.getKey() == 13) {
-							var res = top.Ext4.getCmp('scanBarcode').getValue(); // '011985628@@水管接头@@2024-04-03 18:12:48@@2024-09-30@@肖宝松@@陈妙玲@@手术室';
-							if (res == '' || res.indexOf('@@') == -1) {
-								showResult('请扫描正确的二维码！');
-								top.Ext4.getCmp('scanBarcode').setValue('');
-								return
-							}
+							if (sstsConfig.enabledCreateNewDefinitionOnReceiving) {
+								var barcode = top.Ext4.getCmp('scanBarcode').getValue();
+								Ext4.Ajax.request({
+									url: WWWROOT + '/disinfectSystem/baseData/thirdPartyTousseReceiveRecordController/getLaoKenTurnaroundInformation.mhtml',
+									params: {
+										barcode: barcode
+									},
+									success: function (response, options) {
+										var result = Ext4.decode(response.responseText);
+										if (result.success) {
+											var data = result.data;
+											if(data.barcode){
+												var record = [{
+													barcode: data.barcode,
+													tousseName: data.tousseName,
+													sterileTime: data.sterileTime,
+													validUntil: data.validUntil,
+													operator: data.operator,
+													reviewer: data.reviewer,
+													orgUnitName: data.orgUnitName,
+													materialInstanceVos:data.materialInstanceVos,
+													events:data.events,
+													itemDefinitionID:data.itemDefinitionID,
+													instanceID:data.instanceID,
+													itemBaseTypeId:data.itemBaseTypeId
+												}];
+				
+												validateThirdPartyTousse(record);
+											}else {
+												showResult('条码不存在，请重新输入！');
+												top.Ext4.getCmp('scanBarcode').setValue('');
+											}
+										} else {
+											showResult(result.message);
+											top.Ext4.getCmp('scanBarcode').setValue('');
+										}
+									}
+								});
+							} else {
+								var res = top.Ext4.getCmp('scanBarcode').getValue(); // '011985628@@水管接头@@2024-04-03 18:12:48@@2024-09-30@@肖宝松@@陈妙玲@@手术室';
+								if (res == '' || res.indexOf('@@') == -1) {
+									showResult('请扫描正确的二维码！');
+									top.Ext4.getCmp('scanBarcode').setValue('');
+									return
+								}
 
-							var barcode = res.split('@@')[0];
-							if (barcode == '') {
-								showResult('条码不能为空！');
-								top.Ext4.getCmp('scanBarcode').setValue('');
-								return
-							}
+								var barcode = res.split('@@')[0];
+								if (barcode == '') {
+									showResult('条码不能为空！');
+									top.Ext4.getCmp('scanBarcode').setValue('');
+									return
+								}
 
-							var tousseName = res.split('@@')[1];
-							if (tousseName == '') {
-								showResult('器械包不能为空！');
-								top.Ext4.getCmp('scanBarcode').setValue('');
-								return
-							}
+								var tousseName = res.split('@@')[1];
+								if (tousseName == '') {
+									showResult('器械包不能为空！');
+									top.Ext4.getCmp('scanBarcode').setValue('');
+									return
+								}
 
-							var sterileTime = res.split('@@').length > 2 ? res.split('@@')[2] : '';
-							var validUntil = res.split('@@').length > 3 ? res.split('@@')[3] : '';
-							var operator = res.split('@@').length > 4 ? res.split('@@')[4] : '';
-							var reviewer = res.split('@@').length > 5 ? res.split('@@')[5] : '';
-							var orgUnitName = res.split('@@').length > 6 ? res.split('@@')[6] : '';
+								var sterileTime = res.split('@@').length > 2 ? res.split('@@')[2] : '';
+								var validUntil = res.split('@@').length > 3 ? res.split('@@')[3] : '';
+								var operator = res.split('@@').length > 4 ? res.split('@@')[4] : '';
+								var reviewer = res.split('@@').length > 5 ? res.split('@@')[5] : '';
+								var orgUnitName = res.split('@@').length > 6 ? res.split('@@')[6] : '';
 
-							if (orgUnitName !== '' && orgUnitName.indexOf('市二医') >= 0) {
-								orgUnitName = orgUnitName.substring(3);
-							}
+								if (orgUnitName !== '' && orgUnitName.indexOf('市二医') >= 0) {
+									orgUnitName = orgUnitName.substring(3);
+								}
 
-							var record = [{
-								barcode: barcode,
-								tousseName: tousseName,
-								sterileTime: sterileTime,
-								validUntil: validUntil,
-								operator: operator,
-								reviewer: reviewer,
-								orgUnitName: orgUnitName
-							}];
+								var record = [{
+									barcode: barcode,
+									tousseName: tousseName,
+									sterileTime: sterileTime,
+									validUntil: validUntil,
+									operator: operator,
+									reviewer: reviewer,
+									orgUnitName: orgUnitName
+								}];
 
-							validateThirdPartyTousse(record);
+								validateThirdPartyTousse(record);
+							}
 						}
 					});
 				}