Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r14236 -r14296 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 14236) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 14296) @@ -615,6 +615,7 @@ {name : 'tousseID'}, {name : 'unPackingAmount'}, {name : 'amount'}, + {name : 'urgentAmount'}, {name : 'tousseType'}, {name : 'packageType'}, {name : 'sterilingMethod'}, @@ -681,6 +682,23 @@ } } },{ + header: '加急数量', + width : 70, + align:'center', + sortable: true, + dataIndex: 'urgentAmount', + renderer: function(v,p,record,rowIndex, columnIndex, store,view){ + if(v > 0){ + if(record.get("leaf")){ + return null ; + }else{ + return "

" + v + "

"; + } + }else{ + return null; + } + } + },{ header: '清洗篮筐', width : 110, align:'center', @@ -971,6 +989,11 @@ }else{ node.set('amount',node.get('unPackingAmount') - packAmount); node.set('unPackingAmount',node.get('unPackingAmount') - packAmount); + var urgentAmount = node.get('urgentAmount') - packAmount; + if(urgentAmount < 0){ + urgentAmount = 0; + } + node.set('urgentAmount',urgentAmount); var taskNodes = node.childNodes; var delNodes = new Array(); @@ -1500,7 +1523,7 @@ return; } //请求后台装配方法 - packingTousse(basketBarcode,taskIdArray.join(";"),tousseName,tousseType,pNode.get('amount'),packageType,sterilingType,supplierName,departmentArray.join(";")); + packingTousse(basketBarcode,taskIdArray.join(";"),tousseName,tousseType,pNode.get('amount'),packageType,sterilingType,supplierName,departmentArray.join(";"),pNode.get('urgentAmount')); }); //删除篮筐内物品 deleteBasketItems(delBasketItems); @@ -1524,11 +1547,23 @@ return true;//在each(jquery、ext都如此)循环中,return true表示continue,return false表示break } var packingAmount = pNode.get('amount'); + var urgentAmount = pNode.get("urgentAmount"); + + var taskIdArray = []; + var tousseName; + var tousseType; + var packageType; + var sterilingType; + var supplierName; + var department; + var departmentArray = []; + var status; + Ext4.each(pNode.childNodes, function(cNode) { if(packingAmount <= 0){ return; } - var tousseName = cNode.get("tousseName"); + tousseName = cNode.get("tousseName"); var haveIDCard = pNode.get('haveIDCard'); // 跳过有标识牌的器械包 if(haveIDCard){ @@ -1540,32 +1575,32 @@ showResult("【"+tousseName+"】有器械丢失，请先确认！"); return false; } - - var basketBarcode = cNode.get("basketBarcode"); var taskId = cNode.get("taskId"); var amount = cNode.get("amount"); if(amount > packingAmount){ amount = packingAmount; } - var packageType = cNode.get("packageType"); + packageType = cNode.get("packageType"); if(selLength == 1){ packageType = Ext4.getCmp('packageType').getValue(); } - var sterilingType = cNode.get("sterilingMethod"); + sterilingType = cNode.get("sterilingMethod"); if(selLength == 1){ sterilingType = Ext4.getCmp('sterilingType').getValue(); } - var sType = Ext4.getCmp('sterilingType'); - var tousseType = cNode.get("tousseType"); - var supplierName = cNode.get("supplierName"); - var damages = cNode.get("damages"); - var errors = cNode.get("errors"); - var department = cNode.get("department"); - var printed = packingTousse(basketBarcode,taskId,tousseName,tousseType,amount,packageType,sterilingType,supplierName,department); - if(printed != false){ - packingAmount -= amount; - } - }) + tousseType = cNode.get("tousseType"); + supplierName = cNode.get("supplierName"); + department = cNode.get("department"); + departmentArray.push(department); + + if(packingAmount > 0){ + taskIdArray.push(taskId); + packingAmount -= amount; + } + }); + + packingTousse('',taskIdArray.join(";"),tousseName,tousseType,pNode.get('amount'),packageType,sterilingType,supplierName,departmentArray.join(";"),urgentAmount); + }); waitPackingTreeGrid.getStore().reload(); }else{ @@ -1800,7 +1835,7 @@ function addTaskNode(taskId,td_id,videoNames,tousseName,amount,washTime,basketBarcode,basketName, taskStatus,department,tousseType, packageType, sterilingMethod,recyclingTime,isTraceable,isPrint,isReview,errors, - damages,replenishMaterils,taskType,supplierName,haveIDCard){ + damages,replenishMaterils,taskType,supplierName,haveIDCard,urgentAmount){ var leaf = false; if(taskId != ''){ leaf = true; @@ -1810,6 +1845,7 @@ tousseID : td_id, tousseName : tousseName, amount : amount, + urgentAmount : urgentAmount, unPackingAmount:amount, washTime : washTime, basketBarcode : basketBarcode, @@ -2004,8 +2040,9 @@ var damages = taskNode.get("damages"); var errors = taskNode.get("errors"); var department = taskNode.get("department"); + var urgentAmount = taskNode.get("urgentAmount"); // 装配 - packed = packingTousse(basketBarcode,taskId,tousseName,tousseType,1,packageType,sterilingType,supplierName,department); + packed = packingTousse(basketBarcode,taskId,tousseName,tousseType,1,packageType,sterilingType,supplierName,department,urgentAmount); if(packed){ addTaskItemsToDelete(tousseItemsToDelete,tousseName,taskId,1); } @@ -2070,7 +2107,8 @@ var damages = cNode.get("damages"); var errors = cNode.get("errors"); var department = cNode.get("department"); - packed = packingTousse(basketBarcode,taskId,tousseName,tousseType,amount,packageType,sterilingType,supplierName,department); + var urgentAmount = cNode.get("urgentAmount"); + packed = packingTousse(basketBarcode,taskId,tousseName,tousseType,amount,packageType,sterilingType,supplierName,department,urgentAmount); if(packed){ packingAmount -= amount; addTaskItemsToDelete(tousseItemsToDelete,tousseName,taskId,amount); @@ -2115,7 +2153,7 @@ } // 装配器械包 -function packingTousse(basketBarcode,taskIds,tousseName,tousseType,packAmount,packageType,sterilingType,supplierName,department){ +function packingTousse(basketBarcode,taskIds,tousseName,tousseType,packAmount,packageType,sterilingType,supplierName,department,urgentAmount){ if(!validateFormParamsForPack()){ return false; } @@ -2173,7 +2211,7 @@ // 调用服务端的装配器械包的代码 PackingTableManager.packingTousse2(taskIds,inspector,inspectorCode,operator,operatorCode,reviewer,reviewerCode,wrapper,wrapperCode,packageType, sterilingType,sterileDate,stock,packAmount,taskGroup,null,basketBarcode,idCardInstanceID, - sterilizer,frequency,"",function(rs){ + sterilizer,frequency,"",urgentAmount,function(rs){ if(rs != null){ var result = Ext4.decode(rs); var showName = tousseName; @@ -2188,7 +2226,7 @@ //输入一个true的参数 PackingTableManager.packingTousse2(taskIds,operator,operatorCode,reviewer,reviewerCode,packageType, sterilingType,sterileDate,stock,packAmount,taskGroup,null,basketBarcode,idCardBarcode, - sterilizer,frequency,"true",function(rs1){ + sterilizer,frequency,"true",urgentAmount,function(rs1){ if(rs1 != null){ var result = Ext4.decode(rs1); @@ -2375,6 +2413,7 @@ var videoNames = taskVO.uuid_vedioNames; var tousseName = taskVO.tousseName; var amount = taskVO.amount; + var urgentAmount = taskVO.urgentAmount; var tousseType = taskVO.tousseType; var packageType = taskVO.packageType; var sterilingMethod = taskVO.sterilingMethod; @@ -2394,7 +2433,7 @@ if(parentNode == null){ parentNode = addTaskNode('',td_id,videoNames,tousseName,0,'','','', '','',tousseType, packageType, - sterilingMethod,'',isTraceable,isPrint,isReview,'','',rMaterils,'','',haveIDCard); + sterilingMethod,'',isTraceable,isPrint,isReview,'','',rMaterils,'','',haveIDCard,urgentAmount); newParentNode = true; } var cLength = taskVO.children.length; @@ -2403,6 +2442,7 @@ var taskId = task.taskId; var tousseName = task.tousseName; var amount = task.amount; + var childUrgentAmount = task.urgentAmount; var washTime = task.washTime; var basketBarcode = task.basketBarcode; var basketName = task.basketName; @@ -2430,7 +2470,7 @@ if(sigle){ var childNode = addTaskNode(taskId,td_id,videoNames,tousseName,amount,washTime,basketBarcode,basketName, taskStatus,department,tousseType, packageType, - sterilingMethod,dateTime,isTraceable,isPrint,isReview,errors,damages,replenishMaterils,taskType,supplierName,task.haveIDCard); + sterilingMethod,dateTime,isTraceable,isPrint,isReview,errors,damages,replenishMaterils,taskType,supplierName,task.haveIDCard,childUrgentAmount); parentNode.appendChild(childNode); var pNewAmount = parentNode.get('amount') + amount; parentNode.set('amount',pNewAmount);