Index: ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js =================================================================== diff -u -r12633 -r14074 --- ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 12633) +++ ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 14074) @@ -292,7 +292,13 @@ packages.push(tousse); } - top.Ext.getCmp('splitPackages').setValue(JSON.stringify(packages)); + if(packages.length > 0){ + top.Ext.getCmp('splitPackages').setValue(JSON.stringify(packages)); + return true; + }else{ + top.Ext.getCmp('splitPackages').setValue(null); + return false; + } } function loadReviewerByBarcode(barcodeField){ @@ -489,6 +495,11 @@ showResult("待拆分的材料部分未拆分!"); return false; } + v = rightMaterialStore.getCount(); + if(v > 0){ + showResult("已拆分的材料部分未拆分!"); + return false; + } if (!splitforeignPanel.form.isValid()) { showResult('请正确填写表单各值'); @@ -515,8 +526,11 @@ showResult(result + "此包装类型没有相应的失效日期!请设置此包装类型的失效日期!"); return false; } + if(!getSplitForeignTousse()){ + showResult("已拆分的器械包不能为空!"); + return false; + } - getSplitForeignTousse(); operator = top.Ext.getCmp('operator2').getValue(); operatorCode = top.Ext.getCmp('operatorCode2').getValue(); Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r14072 -r14074 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 14072) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 14074) @@ -2558,6 +2558,9 @@ splits = JSONArray.fromObject(splitPackages); currentPackAmount = splits.size(); + if(currentPackAmount == 0){ + throw new RuntimeException("外来器械拆包数量不能为0"); + } PackingRecord packingRecord = createPackingRecord( inspector, operator, wrapper, orgUnitCoding, taskGroup, sterilizerName, sterileFrequency, td, packingDate, currentPackAmount, currentPackingTask);