Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java =================================================================== diff -u -r16080 -r16085 --- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java (.../QualityMonitoringInstanceManagerImpl.java) (revision 16080) +++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java (.../QualityMonitoringInstanceManagerImpl.java) (revision 16085) @@ -257,6 +257,11 @@ if(nameAndAmount.length > 2){ position = nameAndAmount[2]; } + //器械入筐 + if(qmInstance.getId() == null || material.length > 1){ + materialIntoBasket(basket, name, amount); + } + if(copyQMInstance == null){ setPositionMsg(qmInstance, positionMsg, position); qmInstance.setMaterial(name); @@ -274,20 +279,6 @@ newMonitoring.setMaterial(name); newMonitoring.setAmount(Integer.parseInt(amount)); setPositionMsg(newMonitoring, positionMsg, position); - if (basket != null) { - ClassifiedItem item = new ClassifiedItem(); - item.setItemType(ClassifiedItem.TYPE_MATERIAL); - item.setAmount(Integer.parseInt(amount)); - item.setName(name); - JSONObject obj = CssdUtils.getGoodsNameAndSp(name); - String tempName = obj.optString("materialName"); - String specification = obj.optString("specification"); - MaterialDefinition md = materialDefinitionManager - .getMaterialDefinitionByName(tempName, - specification); - item.setMaterialDefinition(md); - basket.getClassfiedItems().add(item); - } saveOrUpdate(newMonitoring); } if (basket != null) { @@ -305,6 +296,24 @@ } } + private void materialIntoBasket(ClassifyBasket basket, String name, + String amount) { + if (basket != null) { + ClassifiedItem item = new ClassifiedItem(); + item.setItemType(ClassifiedItem.TYPE_MATERIAL); + item.setAmount(Integer.parseInt(amount)); + item.setName(name); + JSONObject obj = CssdUtils.getGoodsNameAndSp(name); + String tempName = obj.optString("materialName"); + String specification = obj.optString("specification"); + MaterialDefinition md = materialDefinitionManager + .getMaterialDefinitionByName(tempName, + specification); + item.setMaterialDefinition(md); + basket.getClassfiedItems().add(item); + } + } + /** * 定期监测关联质量监测 * @param qmInstance