Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.js =================================================================== diff -u -r22352 -r22438 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.js (.../expensiveGoodsView.js) (revision 22352) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.js (.../expensiveGoodsView.js) (revision 22438) @@ -258,7 +258,7 @@ {header : "参考价",width : 60,dataIndex : 'referencePrice'}, {header : "是否植入物",width : 80,dataIndex : 'isImplant'}, {header : "收费码",width : 60,dataIndex : 'chargeCode'}, - {header : "平台代码",width : 60,dataIndex : 'platformCode'}, +// {header : "平台代码",width : 60,dataIndex : 'platformCode'}, {header : "物资编码",width : 60,dataIndex : 'inventorySerialNumber'}, // {header : "总数",width : 50,dataIndex : 'amount'}, {header : "最大库存",width : 60,dataIndex : 'maxStorage'}, Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java =================================================================== diff -u -r22393 -r22438 --- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java (.../ExpensiveGoodsManagerImpl.java) (revision 22393) +++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java (.../ExpensiveGoodsManagerImpl.java) (revision 22438) @@ -2490,6 +2490,7 @@ model.setBarcode(barcode); } model.setId(modelId); + model.setPlatformCode(jsonObject.getString("platformCode")); model.setModel(jsonObject.getString("model")); model.setDescription(jsonObject.getString("description")); model.setSurfaceStatus(jsonObject.getString("surfaceStatus")); @@ -2513,6 +2514,7 @@ JSONObject jsonObject = new JSONObject(); ExpensiveGoodsModel expensiveGoodsModel = it.next(); jsonObject.put("id", expensiveGoodsModel.getId()); + jsonObject.put("platformCode", expensiveGoodsModel.getPlatformCode()); jsonObject.put("model", expensiveGoodsModel.getModel()); jsonObject.put("description", expensiveGoodsModel.getDescription()); jsonObject.put("surfaceStatus", expensiveGoodsModel.getSurfaceStatus()); @@ -2630,6 +2632,7 @@ while(it.hasNext()){ jsonObject = new JSONObject(); ExpensiveGoodsModelStock expensiveGoodsModelStock = it.next(); + jsonObject.put("platformCode", expensiveGoodsModelStock.getExpensiveGoodsModel().getPlatformCode()); jsonObject.put("model", expensiveGoodsModelStock.getExpensiveGoodsModel().getModel()); jsonObject.put("surfaceStatus", expensiveGoodsModelStock.getExpensiveGoodsModel().getSurfaceStatus()); jsonObject.put("description", expensiveGoodsModelStock.getExpensiveGoodsModel().getDescription()); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/expensivegoods/ExpensiveGoodsModel.java =================================================================== diff -u -r22094 -r22438 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/expensivegoods/ExpensiveGoodsModel.java (.../ExpensiveGoodsModel.java) (revision 22094) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/expensivegoods/ExpensiveGoodsModel.java (.../ExpensiveGoodsModel.java) (revision 22438) @@ -33,7 +33,13 @@ * 表面状态 */ private String surfaceStatus; + /** + * 省平台编码 + */ + private String platformCode; + + /** * 供应商 */ private String supplierName; @@ -98,4 +104,12 @@ this.surfaceStatus = surfaceStatus; } + public String getPlatformCode() { + return platformCode; + } + + public void setPlatformCode(String platformCode) { + this.platformCode = platformCode; + } + } Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsStockView.js =================================================================== diff -u -r22386 -r22438 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsStockView.js (.../expensiveGoodsStockView.js) (revision 22386) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsStockView.js (.../expensiveGoodsStockView.js) (revision 22438) @@ -168,7 +168,7 @@ var warehouseId = records[0].data['warehouseID']; var expensiveGoodsModelStockStore = Ext4.create('top.Ext4.data.Store',{ - fields : [{name : 'model'},{name : 'storage'},{name : 'description'},{name : 'surfaceStatus'}], + fields : [{name : 'model'},{name : 'storage'},{name : 'platformCode'},{name : 'description'},{name : 'surfaceStatus'}], proxy : { type : 'ajax', url : WWWROOT + '/disinfectSystem/expensiveGoodsAction!getExpensiveGoodsModelStock.do', @@ -200,7 +200,7 @@ var detailWindowObj = Ext4.create('top.Ext4.window.Window',{ title: '库存详情', // height: 590, - width: 800, + width: 1000, layout : 'column', modal : true, buttonAlign : 'center', @@ -270,6 +270,7 @@ id : 'chargeCode' },{ fieldLabel : '平台代码', + hidden : true, id : 'platformCode' },{ fieldLabel : '物资编码', @@ -297,10 +298,11 @@ loadMask : false }, columns : [ - {text: '型号规格', dataIndex: 'model', flex : 5}, - {text: '型号库存', dataIndex: 'storage', flex : 5}, - {text: '说明', dataIndex: 'description', flex : 5}, - {text: '表面状态', dataIndex: 'surfaceStatus', flex : 5} + {text: '省平台编码', dataIndex: 'platformCode', flex : 4}, + {text: '型号规格', dataIndex: 'model', flex : 10}, + {text: '型号库存', dataIndex: 'storage', flex : 3}, + {text: '说明', dataIndex: 'description', flex : 3}, + {text: '表面状态', dataIndex: 'surfaceStatus', flex : 3} ] } } @@ -384,7 +386,7 @@ {header : "注册证",width : 150,dataIndex : 'expensiveGoods.certification'}, {header : "是否植入物",width : 80,dataIndex : 'expensiveGoods.isImplant'}, {header : "收费码",width : 100,dataIndex : 'expensiveGoods.chargeCode'}, - {header : "平台代码",width : 100,dataIndex : 'expensiveGoods.platformCode'}, +// {header : "平台代码",width : 100,dataIndex : 'expensiveGoods.platformCode' }, {header : "物资编码",width : 100,dataIndex : 'expensiveGoods.inventorySerialNumber'}, {header : "最大库存",width : 60,dataIndex : 'expensiveGoods.maxStorage'}, {header : "最小库存",width : 60,dataIndex : 'expensiveGoods.minStorage'}, Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsDefinition.js =================================================================== diff -u -r22431 -r22438 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsDefinition.js (.../expensiveGoodsDefinition.js) (revision 22431) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsDefinition.js (.../expensiveGoodsDefinition.js) (revision 22438) @@ -108,6 +108,7 @@ if(expensiveGoodsModelList[i].model == null) continue; var id = expensiveGoodsModelList[i].id; var model = expensiveGoodsModelList[i].model; + var platformCode = expensiveGoodsModelList[i].platformCode; var description = expensiveGoodsModelList[i].description; if(isUndefinedOrNullOrEmpty(description)){ description = ''; @@ -116,7 +117,7 @@ if(isUndefinedOrNullOrEmpty(surfaceStatus)){ surfaceStatus = ''; } - expensiveGoodsModelStore.add({'id': id,'model':model,'description':description,'surfaceStatus':surfaceStatus}); + expensiveGoodsModelStore.add({'id': id,'model':model,'platformCode':platformCode,'description':description,'surfaceStatus':surfaceStatus}); } } @@ -292,7 +293,7 @@ //高值耗材型号store var expensiveGoodsModelStore = Ext4.create('Ext4.data.Store',{ - fields : [{name : 'id'},{name : 'model'},{name : 'description'},{name : 'surfaceStatus'}] + fields : [{name : 'id'},{name : 'platformCode'},{name : 'model'},{name : 'description'},{name : 'surfaceStatus'}] }); var expensiveGoodsTypeStore = Ext4.create('Ext4.data.Store',{ fields : [{name : 'typeName'}], @@ -529,6 +530,7 @@ },{ fieldLabel : '平台代码', maxLength : '16', + hidden : true, id : 'platformCode', name : 'platformCode' }, { @@ -636,30 +638,44 @@ store: expensiveGoodsModelStore, listeners : { validateedit : function(editor,context){ - var valid = true; - if(context.colIdx != 0) //只对第一列进行校验 - return true; - if(context.value == context.originalValue) //值没有改变，不进行校验 - return false; - var judge = []; - expensiveGoodsModelStore.each(function(record){ - var indexOfStore = expensiveGoodsModelStore.indexOf(record); - judge.push(record.data.model); - if(judge.contains(context.value)){ - showResult('已包含相同型号:'+ context.value +',不可重复添加!\n'+'当前编辑行(第'+(context.rowIdx+1)+'行)与第'+(indexOfStore+1)+'行冲突！'); - valid = false; - return false; - } - }); - if(!valid){ - return false; //有重复值，返回false - } - } + var valid = true; + + var judge = []; + if(context.colIdx == 0){ //对第一列进行校验 + if(context.value == context.originalValue) //值没有改变，不进行校验 + return false; + expensiveGoodsModelStore.each(function(record){ + var indexOfStore = expensiveGoodsModelStore.indexOf(record); + judge.push(record.data.platformCode); + if(judge.contains(context.value)){ + showResult('已包含相同省平台代码:"'+ context.value +'",不可重复添加!\n'+'当前编辑行(第'+(context.rowIdx+1)+'行)与第'+(indexOfStore+1)+'行冲突！'); + valid = false; + return false; + } + }); + }else if(context.colIdx == 1){ //对第二列进行校验 + if(context.value == context.originalValue) //值没有改变，不进行校验 + return false; + expensiveGoodsModelStore.each(function(record){ + var indexOfStore = expensiveGoodsModelStore.indexOf(record); + judge.push(record.data.model); + if(judge.contains(context.value)){ + showResult('已包含相同型号规格:"'+ context.value +'",不可重复添加!\n'+'当前编辑行(第'+(context.rowIdx+1)+'行)与第'+(indexOfStore+1)+'行冲突！'); + valid = false; + return false; + } + }); + }else{ //其他列不进行唯一校验 + return true; + } + return valid; + } }, columns: [ - { text: '型号规格', dataIndex: 'model', flex : 10,editor : {xtype : 'textfield', allowBlank : false}}, - { text: '说明', dataIndex: 'description', flex : 3,editor : 'textfield'}, - { text: '表面状态', dataIndex: 'surfaceStatus', flex : 3,editor : 'textfield'} + { text: '省平台编码', dataIndex: 'platformCode', flex : 5, editor : {xtype : 'textfield', allowBlank : false}}, + { text: '型号规格', dataIndex: 'model', flex : 10, editor : {xtype : 'textfield', allowBlank : false}}, + { text: '说明', dataIndex: 'description', flex : 3, editor : 'textfield'}, + { text: '表面状态', dataIndex: 'surfaceStatus', flex : 3, editor : 'textfield'} ], tbar : [{ text : '新增',