Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.js
===================================================================
diff -u -r21930 -r21982
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.js (.../expensiveGoodsView.js) (revision 21930)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.js (.../expensiveGoodsView.js) (revision 21982)
@@ -393,7 +393,7 @@
listeners : {
select : function(combo, record, index) {
diposableGoodsBatchNumStore.removeAll();
- top.Ext.getCmp("registrationCertification").setValue('');
+ top.Ext.getCmp("certification").setValue('');
var diposableGoodsID = record.data.id+'';
ExpensiveGoodsTableManager.getCertificationsByExpensiveGoodsSupplierId(diposableGoodsID,
function(batchesStr){
@@ -609,8 +609,8 @@
// allowBlank : true,
// anchor : '95%'
xtype : 'combo',
- id : 'registrationCertification',
- name : 'registrationCertification',
+ id : 'certification',
+ name : 'certification',
fieldLabel : '注册证',
valueField : 'certification',
displayField : 'certification',
@@ -627,7 +627,7 @@
blur : function(thiz) {},
select : function(combo, record, index) {
selCertification = {
- id: record.data.id,
+ id: record.data.certificationId,
certification: record.data.certification
}
}
@@ -698,7 +698,7 @@
return;
}
top.Ext.getCmp('certificationId').setValue(selCertification.id);
- top.Ext.getCmp('registrationCertification').setValue(selCertification.certification);
+ top.Ext.getCmp('certification').setValue(selCertification.certification);
}
function setBatchNumbers(batches,fireSelect) {
for(var i = 0;i
+
+
+
+
+
+
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importexpensivegoods/service/ImportExpensiveGoodsManagerImpl.java
===================================================================
diff -u -r21628 -r21982
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importexpensivegoods/service/ImportExpensiveGoodsManagerImpl.java (.../ImportExpensiveGoodsManagerImpl.java) (revision 21628)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importexpensivegoods/service/ImportExpensiveGoodsManagerImpl.java (.../ImportExpensiveGoodsManagerImpl.java) (revision 21982)
@@ -295,18 +295,8 @@
}
}
- //注册证id(Long)
- Long certificationId = null;
- String certificationIdStr = ParerUtils.getCellFormatValue(row, currentColumnNum++);
- if(StringUtils.isNotBlank(certificationIdStr)){
- try{
- certificationId = Long.parseLong(certificationIdStr);
- }catch (Exception e){
- failureCount = appendFailureRowNumAndRecordFailureNum(
- failureCount, sb, currentRowNum,currentColumnNum, com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_NOT_NUMBER);
- continue;
- }
- }
+ //注册证
+ String certification = ParerUtils.getCellFormatValue(row, currentColumnNum++);
//收费码
String chargeCode = ParerUtils.getCellFormatValue(row, currentColumnNum++);
@@ -347,7 +337,7 @@
expensiveGoods.setInventorySerialNumber(inventorySerialNumber);
expensiveGoods.setMaxApplyAmount(maxApplyAmount);
expensiveGoods.setMinApplyAmount(minApplyAmount);
- expensiveGoods.setCertificationId(certificationId);
+ expensiveGoods.setCertification(certification);
expensiveGoods.setPlatformCode(platformCode);
expensiveGoods.setChargeCode(chargeCode);
expensiveGoods.setIsImplant(isImplant);
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/importExpensiveGoods.jsp
===================================================================
diff -u -r21628 -r21982
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/importExpensiveGoods.jsp (.../importExpensiveGoods.jsp) (revision 21628)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/importExpensiveGoods.jsp (.../importExpensiveGoods.jsp) (revision 21982)
@@ -121,9 +121,11 @@
导入文件
- ![]()
导出文件
+-->
取消