Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
===================================================================
diff -u -r36466 -r37751
--- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 36466)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 37751)
@@ -1477,7 +1477,26 @@
 		buttons : [{
 			text : '装配并打印标签',
 			handler : function() {
-				submitPacking('');
+				var packingMode_id = Ext.getCmp('packingMode_id').getValue();
+				if(packingMode_id == 'repacking'){
+					if (!formObj.form.isValid()) {
+						showResult('请正确填写表单各值');
+						return false;
+					}
+					if(Ext.getCmp('isThereIdentificationCard').getValue() == '是' && Ext.getCmp('idCardBarcode').getValue() == ''){
+						showResult('该器械包需要扫描标识牌条码');
+						return false;
+					}
+					var tousseBarcode = Ext.getCmp('tousseBarcode').getValue();
+					var tousseName = Ext.getCmp('tousseName').getRawValue();
+					Ext4.MessageBox.confirm("请确认", '重新装配后，原条码'+tousseBarcode+'的【'+tousseName+'】会被废弃，是否继续？',function(btn) {
+						if (btn == 'yes') {
+							submitPacking('');
+						}
+					});
+				}else {
+					submitPacking('');
+				}
 			}
 		}]
 	});