Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r31012 -r31061 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 31012) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 31061) @@ -3192,7 +3192,7 @@ // 标识牌的打印 var packed = printTousseByIDcardTaskNode(idCardTaskNode); - if(packed){ + if(packed !== false){ // 清除标识牌信息 clearInputedIDCardInfo(); @@ -3328,7 +3328,8 @@ }] // 装配 packed = packingTousse(false,basketBarcode,basketBarcode,taskId,tousseName,tousseType,1,packageType,sterilingType,supplierName,department,urgentAmount,JSON.stringify(taskIdToAmountMapInfo)); - if(packed){ + if(packed !== false){ + requestPackingTousse(params); addTaskItemsToDelete(tousseItemsToDelete,tousseName,taskId,1); Ext4.getCmp('remark').setValue(); } @@ -3657,6 +3658,7 @@ } } } + var params = []; for(var i=0;i 0){ - Ext4.getCmp('basketTreeGrid').getStore().reload(); - for(var z=0;z 0){ - Ext4.each(selNodes, function(pNode){ - pNode.set("checked", false); - }); } - //刷新待装配列表 - waitPackingTreeGrid.getStore().reload(); - showScanIDCardBarcode(); + isConfirmRequestPackingTousse(params,0,true); }else{ //不回收的物品 var isShow = Ext4.getCmp('save_print').isVisible(); @@ -3854,6 +3838,7 @@ } } } + var params = []; for(var i=0;i 0){ var packingRecordIdArray = []; for (var i = 0; i < result.packingRecordIds.length; i++) { packingRecordIdArray.push(result.packingRecordIds[i]); } setVideoWhenAddPackingRecord(packingRecordIdArray); } - } - } - else{ + } + }else{ //如果返回失败的结果类型为stockNotEnough(即库存不足,则进行提示) if(result.type && (result.type == 'virtualBasketNotEnough')){ // TODO: 需确认是否要判断物品是否为器械包 - Ext4.MessageBox.confirm("请确认", result.message, - function(btn) { - if (btn == 'yes') { - //输入一个true的参数 - params.confirmContinue = 'true'; - Ext4.Ajax.request({ - //async: !isFirstOnLoad, - async: false, - dataType:"json", - url: WWWROOT+"/disinfectSystem/packingController/packingTousse.mhtml", - params : {packingParams : JSON.stringify(params)}, - success: function(rs1) { - var result = Ext4.decode(rs1.responseText); + Ext4.MessageBox.confirm("请确认", result.message,function(btn) { + if (btn == 'yes') { + //输入一个true的参数 + params.confirmContinue = 'true'; + Ext4.Ajax.request({ + //async: !isFirstOnLoad, + async: false, + dataType:"json", + url: WWWROOT+"/disinfectSystem/packingController/packingTousse.mhtml", + params : {packingParams : JSON.stringify(params)}, + success: function(rs1) { + var result = Ext4.decode(rs1.responseText); // - if(result.success){ - processAfterConfirmPacking(printImmediately,result, showName, packAmount); - printLabelsAfterConfirmPacking(result.tousses); - } - //保存装配视频监控 - if(sstsConfig.enableVideoMonitorModule - && setVideoWhenAddPackingRecord){ - if(result.packingRecordIds && result.packingRecordIds.length > 0){ - var packingRecordIdArray = []; - for (var i = 0; i < result.packingRecordIds.length; i++) { - packingRecordIdArray.push(result.packingRecordIds[i]); - } - setVideoWhenAddPackingRecord(packingRecordIdArray); - } - } - }, - error : function(req, textStatus) { - showResult('装配失败!' , null , sstsConfig.messagePauseTimeOnPackingPage); - } - }); - } - }); + if(result.success){ + processAfterConfirmPacking(params.printImmediately,result, showName, params.packAmount); + printLabelsAfterConfirmPacking(result.tousses); + } + //保存装配视频监控 + if(sstsConfig.enableVideoMonitorModule && setVideoWhenAddPackingRecord){ + if(result.packingRecordIds && result.packingRecordIds.length > 0){ + var packingRecordIdArray = []; + for (var i = 0; i < result.packingRecordIds.length; i++) { + packingRecordIdArray.push(result.packingRecordIds[i]); + } + setVideoWhenAddPackingRecord(packingRecordIdArray); + } + } + }, + error : function(req, textStatus) { + showResult('装配失败!' , null , sstsConfig.messagePauseTimeOnPackingPage); + } + }); + } + }); }else{ var message = result.message; if(!message){ @@ -4171,15 +4117,78 @@ showResult(message , null , sstsConfig.messagePauseTimeOnPackingPage); } } - + isConfirmRequestPackingTousse(params,parseInt(index+1),isTrue); }, error : function(req, textStatus) { showResult('装配失败!' , null , sstsConfig.messagePauseTimeOnPackingPage); } }); - return true; } +//BJ307YY-87：外来器械回收分多篮筐入筐后，装配时允许合并装配成一个包 +/** + * + * @param {参数} params + * @param {数组序号} index + * @param {是否回收} isTrue + */ +function isConfirmRequestPackingTousse(params,index,isTrue){ + var len = params.length; + if(index == len){ + if(isTrue){ + printLabelsAfterPacking(); + //刷新篮筐内物品 + var basketBarcodeArr = getBasketBarcode(); + if(basketBarcodeArr.length > 0){ + Ext4.getCmp('basketTreeGrid').getStore().reload(); + for(var z=0;z 0){ + Ext4.each(selNodes, function(pNode){ + pNode.set("checked", false); + }); + } + //刷新待装配列表 + waitPackingTreeGrid.getStore().reload(); + showScanIDCardBarcode(); + }else { + // 一次打印 + var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid'); + printLabelsAfterPacking(); + waitPackingTreeGrid.getStore().reload(); + showScanIDCardBarcode(); + } + }else { + var tousseName = params[index].tousseName; + var splitCount = params[index].basketBarcode.split(";").length; + params[index].splitPackingForeignTousse = ''; + if(sstsConfig.askWhetherMergeAllPartsOfForeignTousseSplitInRecyclingToOneWhenPacking && params[index].basketBarcode.split(';').length > 1){ + hidePackingTousseBtnClick_mask(); + Ext4.MessageBox.confirm("请确认", tousseName+'回收时已经拆分成'+splitCount+'部分，放入了不同的清洗篮筐，是否装配成1个包？',function(btn) { + if (btn == 'yes') { + params[index].splitPackingForeignTousse = false; + showPackingTousseBtnClick_mask(); + requestPackingTousse(params,index,isTrue); + }else { + showPackingTousseBtnClick_mask(); + requestPackingTousse(params,index,isTrue); + } + }); + }else { + requestPackingTousse(params,index,isTrue); + } + } +} + function processAfterPacking(printImmediately,result, showName, packAmount){ var tousses = result.tousses; packingToussesArray = packingToussesArray.concat(tousses);