| '+
''+
''+
+ '' +
''+
'' +
''+
@@ -488,6 +491,7 @@
obj.tousseAmountForMaterial = json.tousseAmount;
obj.tousseDefinitionID = json.tousseDefinitionID;
obj.idCardBarcode = json.idCardBarcode;
+ obj.putBasketMaxAmount = json.putBasketMaxAmount;
var isExist = false;
var len = array.length;
for(var j = 0;j < len;j++){
@@ -550,10 +554,11 @@
var tousseDefinitionID = msg[i].tousseDefinitionID;
var tousseAmount = msg[i].tousseAmountForMaterial;
var idCardBarcode = msg[i].idCardBarcode;
+ var putBasketMaxAmount = msg[i].putBasketMaxAmount;
if(materialAmount <= 0){
continue;
}
- addToussItem(i,tousseName,materialName,materialAmount,tousseDefinitionID,tousseAmount,idCardBarcode);
+ addToussItem(i,tousseName,materialName,materialAmount,tousseDefinitionID,tousseAmount,idCardBarcode,putBasketMaxAmount);
}
},
error : function() {
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r16230 -r16252
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 16230)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 16252)
@@ -2297,6 +2297,7 @@
obj.put("tousseDefinitionID", tousseId);
obj.put("tousseAmountForMaterial", recycleAmount);
obj.put("idCardBarcode", idCardBarcode);
+ obj.put("putBasketMaxAmount", md.getIntoBasketMaxAmount() == null ? 0 : md.getIntoBasketMaxAmount());
result.add(obj);
}
}
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js
===================================================================
diff -u -r14551 -r16252
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js (.../sterilizationRecordInfoView.js) (revision 14551)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js (.../sterilizationRecordInfoView.js) (revision 16252)
@@ -116,15 +116,6 @@
name : 'name'
} ]);
- var inspectItemStore = new Ext.data.SimpleStore({
- fields : [ 'inspectItem' ],
- url : WWWROOT + '/disinfectSystem/qualityMonitoringConfigAction!getInspectItem.do'
- });
- inspectItemStore.on("beforeload", function(thiz, options) {
- thiz.baseParams["selectAll"] = 'true';
- thiz.baseParams["type"] = Ext.getCmp('monitoringType').getValue();
- });
-
var materialDefinitionStore = new Ext.data.Store({
proxy : new Ext.data.HttpProxy({
url : WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getMaterialDefinitionDataForMaterial.do',
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r16230 -r16252
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 16230)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 16252)
@@ -525,6 +525,7 @@
var idCardBarcode = basketItem.idCardBarcode;
var tousseDefinitionID = basketItem.tousseDefinitionID;
var basketGroupBarcodes = basketItem.basketGroupBarcodes;
+ var putBasketMaxAmount = basketItem.putBasketMaxAmount;
var isExist = false;
var basketElement = $('dl[class="sed clearfix"]:eq(0)');
var basketHidenValue = $("#basketsUl li:first").find('input').val();
@@ -580,7 +581,7 @@
element += '' + amount + '';
element += '删除';
- var json = getBasketItemJSON(ci_id,type,orgUnitName,tousseName,materialName,amount,tousseAmount,idCardBarcode,tousseDefinitionID,basketGroupBarcodes);
+ var json = getBasketItemJSON(ci_id,type,orgUnitName,tousseName,materialName,amount,tousseAmount,idCardBarcode,tousseDefinitionID,basketGroupBarcodes,putBasketMaxAmount);
basketElement.prepend($(element));
basketElement.find("input:first").val(json);
}
@@ -1208,7 +1209,7 @@
return JSON.stringify(json);
}
-function getBasketItemJSON(ci_id,type,orgUnitName,tousseName,materialName,amount,tousseAmount,idCardBarcode,tousseDefinitionID,basketGroupBarcodes){
+function getBasketItemJSON(ci_id,type,orgUnitName,tousseName,materialName,amount,tousseAmount,idCardBarcode,tousseDefinitionID,basketGroupBarcodes,putBasketMaxAmount){
var json = {};
json.classifiedItemId = ci_id;
json.type = type;
@@ -1219,6 +1220,7 @@
json.tousseAmount = tousseAmount;//材料相对的包数量
json.idCardBarcode = idCardBarcode;
json.tousseDefinitionID = tousseDefinitionID;
+ json.putBasketMaxAmount = putBasketMaxAmount;
json.useBasketBarcodes = new Array();
json.basketGroupBarcodes = basketGroupBarcodes;
return JSON.stringify(json);
@@ -1246,7 +1248,8 @@
name:name,
tousseDefinitionID:json.tousseDefinitionID,
type:json.type,
- amount:json.amount
+ amount:json.amount,
+ putBasketMaxAmount:json.putBasketMaxAmount
});
}
}
@@ -1298,7 +1301,8 @@
tousseAmount: loadedAmount,
basketBarcode: item.basketBarcode,
idCardBarcode: idCardBarcode,
- basketGroupBarcodes:item.basketGroupBarcodes
+ basketGroupBarcodes:item.basketGroupBarcodes,
+ putBasketMaxAmount : item.putBasketMaxAmount
};
addBasketItemElement(basketItem);
}
@@ -1315,9 +1319,10 @@
tousseAmount: loadedAmount,
basketBarcode: "",
idCardBarcode: idCardBarcode,
- basketGroupBarcodes: ''
- };
- addBasketItemElement(basketItem);
+ basketGroupBarcodes: '',
+ putBasketMaxAmount : jsonObj.putBasketMaxAmount
+ };
+ addBasketItemElement(basketItem);
}
}
});
@@ -2007,6 +2012,7 @@
tousseAmount: item.tousseAmountForMaterial,
basketBarcode: item.basketBarcode,
idCardBarcode: item.idCardBarcode,
+ putBasketMaxAmount:item.putBasketMaxAmount,
basketGroupBarcodes:basketGroupBarcodeArray.join(";")
};
addBasketItemElement(basketItem);
@@ -2397,6 +2403,10 @@
}
if(ci.itemType == '材料'){
var materialName = ci.materialDefinition.name;
+ var putBasketMaxAmount = ci.materialDefinition.intoBasketMaxAmount;
+ if(putBasketMaxAmount == null){
+ putBasketMaxAmount = 0;
+ }
if(ci.materialDefinition.specification != null && ci.materialDefinition.specification != ''){
materialName += '['+ci.materialDefinition.specification+']';
}
@@ -2414,7 +2424,7 @@
element += '删除';
$('dl[class="sed clearfix"]:eq(0)').prepend(element);
- var json = getBasketItemJSON(ci.id,'材料',ci.orgUnitName,tousseNameForMaterial,materialName,ci.amount,ci.tousseAmountForMaterial,ci.idCardBarcode,ci.tousseDefinitionID,ci.basketGroupBarcodes);
+ var json = getBasketItemJSON(ci.id,'材料',ci.orgUnitName,tousseNameForMaterial,materialName,ci.amount,ci.tousseAmountForMaterial,ci.idCardBarcode,ci.tousseDefinitionID,ci.basketGroupBarcodes,putBasketMaxAmount);
$('dl[class="sed clearfix"]:eq(0)').find("input:first").val(json);
$('td[axis="materialName"]').each(function(){
@@ -2424,14 +2434,18 @@
}
});
}else{
+ var putBasketMaxAmount = ci.tousseDefinition.intoBasketMaxAmount;
+ if(putBasketMaxAmount == null){
+ putBasketMaxAmount = 0;
+ }
var element = '';
element += ''+ci.tousseDefinition.name+'';
element += ' '+ci.idCardBarcode+'';
element += ''+ci.amount+'';
element += '删除';
$('dl[class="sed clearfix"]:eq(0)').prepend(element);
- var json = getBasketItemJSON(ci.id,"器械包",ci.orgUnitName,ci.tousseDefinition.name,"",ci.amount,ci.tousseAmountForMaterial,ci.idCardBarcode,ci.tousseDefinitionID,ci.basketGroupBarcodes);
+ var json = getBasketItemJSON(ci.id,"器械包",ci.orgUnitName,ci.tousseDefinition.name,"",ci.amount,ci.tousseAmountForMaterial,ci.idCardBarcode,ci.tousseDefinitionID,ci.basketGroupBarcodes,putBasketMaxAmount);
$('dl[class="sed clearfix"]:eq(0)').find("input:first").val(json);
}
}
|