Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressIntoBasket.js =================================================================== diff -u -r25721 -r25773 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressIntoBasket.js (.../expressIntoBasket.js) (revision 25721) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressIntoBasket.js (.../expressIntoBasket.js) (revision 25773) @@ -921,6 +921,7 @@ var isAllTousseInTheBasket = true; var urgentAmountError = false; var recyclingRecordId = $('#recyclingApplicationId').val(); + var isApplicationAmount =true; if (isTousseItemTableEmpty() && recyclingRecordId == ''){ alert("空白的回收单不能保存!"); return false; @@ -933,7 +934,11 @@ var tousseType = $('#tousseType'+index).val(); var recyclingAmount = parseInt($('#recycleAmount'+index).val(),10); var loadedAmount = parseInt($('#loadedAmount'+index).val(),10); - + var applicationAmount = parseInt($('#applicationAmount'+index).val(),10); + if(applicationAmount != loadedAmount){ + isApplicationAmount =false; + return false; + } if(loadedAmount > 0 && recyclingAmount > loadedAmount){ isAllTousseInTheBasket = false; return false; @@ -969,7 +974,10 @@ } } }); - + if(!isApplicationAmount){ + alertDiv('还有部分材料没有回收,不能保存。'); + return false; + } if(!isAllTousseInTheBasket){ alertDiv('部分器械包回收数量大于装载数量,不能保存。'); return false; @@ -1188,7 +1196,7 @@ submitFormFunction(confirmation,saveAndNew,false,print,recyclingAmountConfirm); },800 , 500); }else{ - submitFormFunction(confirmation,saveAndNew,false,print,recyclingAmountConfirm); + submitFormFunction(confirmation,saveAndNew,false,print,recyclingAmountConfirm); } } /** @@ -1199,8 +1207,28 @@ * @param print 保存并打印回收记录操作 * Annie 如果tally为true是清点确认 否则就是false */ -function submitFormFunction(confirmation,saveAndNew,autoReturnTheBorrowingTousse,print,recyclingAmountConfirm,IntheBoxState){ +/* + * 获取材料的数据源 +*/ +var msgItmeGood; +function addItmeGoods(msg){ + msgItmeGood = msg; +} +var maxLen = 0; +function updateProgressBar(val){ + progress(val * (100 / maxLen)); + if(parseInt(val) < maxLen){ + setTimeout("submintApplication(" + parseInt(val) + ")",50); + }else{ + location.href = "awaitForRecycleList.jsp?resolution=" + 1908; + } +} + +//用于保存提交一单之后剩余的个数 +var istousseJson = true; +var residueGood = [];//剩余之后的数量 +function submintApplication(i,confirmation,saveAndNew,autoReturnTheBorrowingTousse,print,recyclingAmountConfirm,IntheBoxState){ alertDiv("保存中,请稍候......", true); var jsonStr = getJsonParams(confirmation); var jSONe= JSON.parse(jsonStr) @@ -1209,32 +1237,299 @@ }else{ jSONe.tally = false; } - var id = document.getElementById('id').value; - var app_id = document.getElementById('recyclingApplicationId').value; - var departCode = document.getElementById('departCode').value; - var recyclingUser = document.getElementById('recyclingUser').value; - var operator = document.getElementById('operator').value; - var depart = document.getElementById('depart').value; - var recyclingTime = document.getElementById('recyclingTime').value; + var recyclingItemArray =[]; + var urgentTousseItems =[]; + var tousseIntoBasketInfo =[]; + var msgItmeGoodBox =msgItmeGood[i]; + var isbaskGoodamount = true;//当baskGoodamount数量为0是false + var isbaskGoodamountnoe = true;//当isbaskGoodamountnoe数量为0是false + var baskGoodamount =0; + var tousseJsonGood=[];//存当前单的数量 + var msgItmeGoods= msgItmeGoodBox.tousses; + for(var j = 0;j= baskGoodamount){ + if(isbaskGoodamount == true){ + tousseJsonGood.push({ + basketBarcode: jSONe.tousseJson[f].basketBarcode, + basketId:jSONe.tousseJson[f].basketId, + classifiedItemId: '', + tousseDefinitionID: jSONe.tousseJson[f].tousseDefinitionID, + tousseName: jSONe.tousseJson[f].tousseName, + amount: baskGoodamount, + tousseAmountForMaterial: baskGoodamount, + itemType: jSONe.tousseJson[f].itemType, + tousseNameForMaterial: jSONe.tousseJson[f].tousseNameForMaterial, + idCardBarcode: jSONe.tousseJson[f].idCardBarcode, + basketGroupBarcodes: jSONe.tousseJson[f].basketGroupBarcodes, + basketSequence: jSONe.tousseJson[f].basketSequence + }) + } + if(parseInt(jSONe.tousseJson[f].amount - baskGoodamount) !=0){ + residueGood.push({ + basketBarcode: jSONe.tousseJson[f].basketBarcode, + amount:parseInt(jSONe.tousseJson[f].amount - baskGoodamount), + basketId:jSONe.tousseJson[f].basketId, + classifiedItemId: '', + tousseDefinitionID: jSONe.tousseJson[f].tousseDefinitionID, + tousseName: jSONe.tousseJson[f].tousseName, + tousseAmountForMaterial: parseInt(jSONe.tousseJson[f].amount - baskGoodamount), + itemType: jSONe.tousseJson[f].itemType, + tousseNameForMaterial: jSONe.tousseJson[f].tousseNameForMaterial, + idCardBarcode: jSONe.tousseJson[f].idCardBarcode, + basketGroupBarcodes: jSONe.tousseJson[f].basketGroupBarcodes, + basketSequence: jSONe.tousseJson[f].basketSequence + }) + baskGoodamount = 0; + isbaskGoodamount = false; + istousseJson =false; + }else{ + baskGoodamount = 0; + isbaskGoodamount = false; + istousseJson =false; + } + + } + //如果入筐循环第一次的数量小于当前申请单的数量,就将申请单的数量减当前入筐的数量 + if(jSONe.tousseJson[f].amount < baskGoodamount){ + baskGoodamount = parseInt(baskGoodamount - jSONe.tousseJson[f].amount); + if(isbaskGoodamount == true){ + tousseJsonGood.push({ + basketBarcode: jSONe.tousseJson[f].basketBarcode, + basketId:jSONe.tousseJson[f].basketId, + classifiedItemId: '', + tousseDefinitionID: jSONe.tousseJson[f].tousseDefinitionID, + tousseName: jSONe.tousseJson[f].tousseName, + amount: jSONe.tousseJson[f].amount, + tousseAmountForMaterial: jSONe.tousseJson[f].amount, + itemType: jSONe.tousseJson[f].itemType, + tousseNameForMaterial: jSONe.tousseJson[f].tousseNameForMaterial, + idCardBarcode: jSONe.tousseJson[f].idCardBarcode, + basketGroupBarcodes: jSONe.tousseJson[f].basketGroupBarcodes, + basketSequence: jSONe.tousseJson[f].basketSequence + }) + } + istousseJson =false; + } + }else{ + residueGood.push({ + basketBarcode: jSONe.tousseJson[f].basketBarcode, + amount:jSONe.tousseJson[f].amount, + basketId:jSONe.tousseJson[f].basketId, + classifiedItemId: '', + tousseDefinitionID: jSONe.tousseJson[f].tousseDefinitionID, + tousseName: jSONe.tousseJson[f].tousseName, + tousseAmountForMaterial: jSONe.tousseJson[f].amount, + itemType: jSONe.tousseJson[f].itemType, + tousseNameForMaterial: jSONe.tousseJson[f].tousseNameForMaterial, + idCardBarcode: jSONe.tousseJson[f].idCardBarcode, + basketGroupBarcodes: jSONe.tousseJson[f].basketGroupBarcodes, + basketSequence: jSONe.tousseJson[f].basketSequence + }) + } + + + } + }else{ + for(var k = 0;k= baskGoodamount){ + if(isbaskGoodamountnoe == true || baskGoodamount !=0){ + tousseJsonGood.push({ + basketBarcode: residueGood[k].basketBarcode, + basketId:residueGood[k].basketId, + classifiedItemId: '', + tousseDefinitionID: residueGood[k].tousseDefinitionID, + tousseName: residueGood[k].tousseName, + amount: baskGoodamount, + tousseAmountForMaterial: baskGoodamount, + itemType: residueGood[k].itemType, + tousseNameForMaterial: residueGood[k].tousseNameForMaterial, + idCardBarcode: residueGood[k].idCardBarcode, + basketGroupBarcodes: residueGood[k].basketGroupBarcodes, + basketSequence: residueGood[k].basketSequence + }) + + } + if(parseInt(residueGood[k].amount - baskGoodamount) !=0 || parseInt(residueGood[k].amount - baskGoodamount) ==0){ + residueGood[k].basketBarcode = residueGood[k].basketBarcode; + residueGood[k].basketId =residueGood[k].basketId; + residueGood[k].classifiedItemId = ''; + residueGood[k].tousseDefinitionID = residueGood[k].tousseDefinitionID; + residueGood[k].tousseName = residueGood[k].tousseName; + residueGood[k].amount = parseInt(residueGood[k].amount - baskGoodamount); + residueGood[k].tousseAmountForMaterial = parseInt(residueGood[k].amount - baskGoodamount); + residueGood[k].itemType = residueGood[k].itemType; + residueGood[k].tousseNameForMaterial = residueGood[k].tousseNameForMaterial; + residueGood[k].idCardBarcode = residueGood[k].idCardBarcode; + residueGood[k].basketGroupBarcodes = residueGood[k].basketGroupBarcodes; + residueGood[k].basketSequence = residueGood[k].basketSequence; + } + baskGoodamount =0; + isbaskGoodamountnoe = false; + } + } + } + } + + } + } + + } + } + for(var r = 0;r 0){ printRecyclingDetail(result.recyclingPrintData); @@ -1257,11 +1553,6 @@ voluntarilyUrgentItems && voluntarilyUrgentItems.length > 0) { voluntarilyUrgentItemsString = JSON.stringify(voluntarilyUrgentItems); } - if(saveAndNew){ - location.href = "expressIntoBasket.jsp?resolution=" + 1908 + "&rememberRecycleUser=" + rememberRecycleUser; - }else{ - location.href = "awaitForRecycleList.jsp?resolution=" + 1908 + "&voluntarilyUrgentItems=" + voluntarilyUrgentItemsString; - } }else{ if(result.versionNotMatch){ closeDiv(); @@ -1291,6 +1582,11 @@ } }); } +function submitFormFunction(confirmation,saveAndNew,autoReturnTheBorrowingTousse,print,recyclingAmountConfirm,IntheBoxState){ + maxLen = msgItmeGood.length + submintApplication(0,confirmation,saveAndNew,autoReturnTheBorrowingTousse,print,recyclingAmountConfirm,IntheBoxState); +} + function cancel() { window.close(); } Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressIntoBasket.jsp =================================================================== diff -u -r25711 -r25773 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressIntoBasket.jsp (.../expressIntoBasket.jsp) (revision 25711) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressIntoBasket.jsp (.../expressIntoBasket.jsp) (revision 25773) @@ -127,14 +127,6 @@ - - - - - - - - @@ -182,7 +174,6 @@ initConfigControl(); var msgGoods; var applicationItemsGood =[]; - <%--tousseIntoBasketInfo.parseJson(param_tousseIntoBasketInfo);--%> $("#tousseItemTable").empty(); $("#basketsUl").empty(); document.onkeydown = showKeyDown; @@ -193,22 +184,15 @@ success : function(msg) { var msgGood; for(var i =0; i