Index: ssts-web/src/main/webapp/systemmanage/operationNameView.js
===================================================================
diff -u -r18224 -r18225
--- ssts-web/src/main/webapp/systemmanage/operationNameView.js (.../operationNameView.js) (revision 18224)
+++ ssts-web/src/main/webapp/systemmanage/operationNameView.js (.../operationNameView.js) (revision 18225)
@@ -26,48 +26,24 @@
{name : 'type'}
]);
-function addUseTousseItem(){
- var goodsName = top.Ext.getCmp('goodsSearch').getRawValue();
- var amount = top.Ext.getCmp('amount').getValue();
- if(goodsName == ""){
- showResult("请选择物品!");
- return ;
+/**
+ * 从常用的器械包或者追加的器械包的grid视图列表添加器械包
+ * @param type 值为“常用物品”或者“追加物品”
+ */
+function addUseTousseItem(type){
+ var store = useTousseStore;
+ var goodsObj = top.Ext.getCmp('goodsSearch');
+ var amountObj = top.Ext.getCmp('amount');
+
+ if (type == appendGoods) {
+ store = useTousseStoreOfAppendTousse;
+ goodsObj = top.Ext.getCmp('goodsSearchOfAppendTousse');
+ amountObj = top.Ext.getCmp('amountOfAppendTousse');
}
- if(amount == ""){
- showResult("请输入数量!");
- return ;
- }
- var isExist = false;
- var count = useTousseStore.getCount();
- for(var i = 0 ; i < count ; i++){
- var record = useTousseStore.getAt(i);
- if(record.get("name") == goodsName){
- isExist = true;
- break;
- }
- }
- if(!isExist){
- var index = tousseAndDiposableGoodsStore.find("name",goodsName);
- var id = tousseAndDiposableGoodsStore.getAt(index).data['id'];
- var record = new goodsRecord({
- itemId : "",
- tousseDefinitionId : id,
- name : goodsName,
- amount : amount,
- type : commonGoods
- });
- useTousseStore.add(record);
- top.Ext.getCmp('goodsSearch').setValue();
- top.Ext.getCmp('amount').setValue();
- top.Ext.getCmp('goodsSearch').focus();
- }else{
- showResult(goodsName + "，已添加！");
- }
-}
-
-function addUseTousseItemOfAppendTousse() {
- var goodsName = top.Ext.getCmp('goodsSearchOfAppendTousse').getRawValue();
- var amount = top.Ext.getCmp('amountOfAppendTousse').getValue();
+
+ var goodsName = goodsObj.getRawValue();
+ var amount = amountObj.getValue();
+
if(goodsName == ""){
showResult("请选择物品!");
return ;
@@ -77,47 +53,48 @@
return ;
}
var isExist = false;
- var count = useTousseStoreOfAppendTousse.getCount();
+ var count = store.getCount();
for(var i = 0 ; i < count ; i++){
- var record = useTousseStoreOfAppendTousse.getAt(i);
+ var record = store.getAt(i);
if(record.get("name") == goodsName){
isExist = true;
break;
}
}
if(!isExist){
- var index = tousseAndDiposableGoodsStore.find("name",goodsName);
+ var index = tousseAndDiposableGoodsStore.find("name", goodsName);
var id = tousseAndDiposableGoodsStore.getAt(index).data['id'];
var record = new goodsRecord({
itemId : "",
tousseDefinitionId : id,
name : goodsName,
amount : amount,
- type : appendGoods
+ type : type
});
- useTousseStoreOfAppendTousse.add(record);
- top.Ext.getCmp('goodsSearchOfAppendTousse').setValue();
- top.Ext.getCmp('amountOfAppendTousse').setValue();
- top.Ext.getCmp('goodsSearchOfAppendTousse').focus();
+ store.add(record);
+ goodsObj.setValue();
+ amountObj.setValue();
+ goodsObj.focus();
}else{
showResult(goodsName + "，已添加！");
}
}
-function deleteGoodsItem(tousseDefinitionId){
- for(var i = 0;i < useTousseStore.getCount();i++){
- var record = useTousseStore.getAt(i);
- if(record.data.tousseDefinitionId == tousseDefinitionId){
- useTousseStore.remove(record);
- break;
- }
+/**
+ * 从常用的器械包或者追加的器械包的grid视图列表删除器械包
+ * @param type 值为“常用物品”或者“追加物品”
+ * @param tousseDefinitionId 器械包定义的id
+ */
+function deleteGoodsItem(type, tousseDefinitionId){
+ var store = useTousseStore;
+ if (type == appendGoods) {
+ store = useTousseStoreOfAppendTousse;
}
-}
-function deleteGoodsItemOfAppendTousse(tousseDefinitionId){
- for(var i = 0;i < useTousseStoreOfAppendTousse.getCount();i++){
- var record = useTousseStoreOfAppendTousse.getAt(i);
+ var length = store.getCount();
+ for(var i = 0; i < length; i++){
+ var record = store.getAt(i);
if(record.data.tousseDefinitionId == tousseDefinitionId){
- useTousseStoreOfAppendTousse.remove(record);
+ store.remove(record);
break;
}
}
@@ -158,7 +135,7 @@
menuDisabled: true,
dataIndex:'button',
renderer: function(v,p,record,rowIndex){
- return "
";
+ return "";
}
}]);
var cmOfAppendTousse = new top.Ext.grid.ColumnModel([new top.Ext.grid.RowNumberer({header:"序号",width:40}),{
@@ -183,7 +160,7 @@
menuDisabled: true,
dataIndex:'button',
renderer: function(v,p,record,rowIndex){
- return "";
+ return "";
}
}]);
@@ -238,14 +215,14 @@
listeners : {
specialkey : function(field, e) {
if (e.getKey() == Ext.EventObject.ENTER) {
- addUseTousseItem();
+ addUseTousseItem(commonGoods);
}
}
}
},{
text : '添加',
handler:function(){
- addUseTousseItem();
+ addUseTousseItem(commonGoods);
}
}];
@@ -283,14 +260,14 @@
listeners : {
specialkey : function(field, e) {
if (e.getKey() == Ext.EventObject.ENTER) {
- addUseTousseItemOfAppendTousse();
+ addUseTousseItem(appendGoods);
}
}
}
},{
text : '添加',
handler:function(){
- addUseTousseItemOfAppendTousse();
+ addUseTousseItem(appendGoods);
}
}];
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
===================================================================
diff -u -r18165 -r18225
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 18165)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 18225)
@@ -494,7 +494,7 @@
/**
* 方法改造:根据所传的barcode验证输入类型并进行返回
* barcode可以为单个条码(灭菌架、灭菌篮筐、灭菌炉、灭菌程序、器械包等)或虚拟篮筐名称。如:010000225
- * 也可以为器械包条码或虚拟篮筐段,用分号分隔。如:010000225;010000227或001;004
+ * 也可以为器械包条码或虚拟篮筐段,用分号分隔。如:010000225;010000227或001;004（注意：不支持扫描灭菌篮筐的首尾条码）
* since 2015-10-24
*/
public void getBarcodeType() {