Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r30294 -r30296
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 30294)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 30296)
@@ -1405,7 +1405,12 @@
if(responsibilityPart == '装配管理'){
Ext.getCmp('responsiblePerson').setValue(newTousseItems[0].data['operator']);
Ext.getCmp('tousseDefinitionId').setValue(newTousseItems[0].data['tousseDefinition.id']);
- Ext.getCmp('tousseName').setValue(newTousseItems[0].data['tousseDefinition.name']);
+ var barcode = newTousseItems[0].data['barcode'] || '';
+ if(barcode == ''){
+ Ext.getCmp('tousseName').setValue(newTousseItems[0].data['tousseDefinition.name']);
+ }else {
+ Ext.getCmp('tousseName').setValue(newTousseItems[0].data['tousseDefinition.name']+'('+barcode+')');
+ }
}
newTousseItems = [];
}else {
Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp
===================================================================
diff -u -r30253 -r30296
--- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp (.../reviewView.jsp) (revision 30253)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp (.../reviewView.jsp) (revision 30296)
@@ -119,6 +119,7 @@
+
<%@ include file="/disinfectsystem/print/print.jsp"%>