Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r16907 -r16916 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 16907) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 16916) @@ -5739,11 +5739,13 @@ /** * 验证生成的普通器械包实例跟页面上填写的数量是否一致 - * @param comboTousseInstance - * @param tousseJson + * @param comboTousseInstance 聚合包实例 + * @param id 聚合包内普通器械包ID + * @param customAmount 普通包装配数量 */ private void tousseInstanceAmountValidata( TousseInstance comboTousseInstance,Long id, int customAmount) { + //验证生成的普通包实例数量 int count = objectDao.countObjectBySql( TousseInstance.class.getSimpleName(), "where po.comboTousseInstanceId = " @@ -5752,6 +5754,13 @@ if (count != customAmount) { throw new RuntimeException("装配数据异常,装配失败!"); } + //更新聚合包内普通器械包相关属性 + String updateSQL = String.format("update %s set comboTousseDefinitionId = %s," + + "comboTousseDefinitionName = '%s' where comboTousseInstanceId = %s " + + "and tousseDefinition_id = %s", TousseInstance.class.getSimpleName(), + comboTousseInstance.getComboTousseDefinitionId(),comboTousseInstance.getTousseName(), + comboTousseInstance.getId(),id); + objectDao.excuteSQL(updateSQL); }