Index: forgon-tools/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r31356 -r31358 --- forgon-tools/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 31356) +++ forgon-tools/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 31358) @@ -26,7 +26,7 @@ "4.9.7","4.9.8","4.9.9","4.9.10","4.9.11","4.9.12","4.9.13","4.9.14","4.9.15","4.9.16","4.9.17","4.9.18","4.9.19","4.9.20","4.9.21","4.9.22","4.9.23","4.9.24", "4.9.25","4.9.26","4.9.27","4.9.28","4.9.29","4.9.30","4.9.31","4.9.32","4.9.33","4.9.34","4.9.35","4.9.36","4.9.37","4.9.38","4.9.39","4.9.40","4.9.41","4.9.42","4.9.43","4.9.44", "4.9.45","4.9.46","4.9.47","4.9.48","4.9.49","4.9.50","4.9.51","4.9.52","4.9.53","4.9.54","4.9.55","4.9.56","4.9.57","4.9.58","4.9.59","4.9.60","4.9.61","4.9.62", - "4.9.63","4.9.64","4.9.65","4.9.66","4.9.67","4.9.68","4.9.69","4.9.70","4.9.71","4.9.72","4.9.73","4.9.74","4.9.75","4.9.76"}; + "4.9.63","4.9.64","4.9.65","4.9.66","4.9.67","4.9.68","4.9.69","4.9.70","4.9.71","4.9.72","4.9.73","4.9.74","4.9.75"}; // 版本列表(4.0版本升级4.1版需要分两步:先从4.0升到4.1.0、然后从4.1.0升级4.1最新版本) /*public final static String[] SOFTWARE_VERSION_ARRAY = new String[] { Fisheye: Tag 31358 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/dataUpdater/sqls/4.9.75_4.9.76.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r31356 -r31358 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 31356) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 31358) @@ -7059,6 +7059,9 @@ tousseInstanceAmountValidata(comboTousseInstance,tousseJson.optLong("id"), tousseJson.optInt("packAmount")); } + comboTousseInstance.setMaterialAmount(tousseDefinitionManager.queryMaterialInstanceCountOfComboTousseInstance(comboTousseInstance.getId())); + comboTousseInstance.setMaterialSplitAmount(tousseDefinitionManager.queryMaterialInstanceSplitAmountOfComboTousseInstance(comboTousseInstance.getId())); + objectDao.saveOrUpdate(comboTousseInstance); //页面返回值处理 JSONObject result = buildReturnResult(comboTousseInstance,systemConfig,comboTousseJson); jsonArray.add(result); @@ -7535,8 +7538,6 @@ tousseInstance.setOrgUnitName(orgUnitName); tousseInstance.setPackingRecord_id(packingRecord.getId()); tousseInstance.setComboTousseDefinitionId(comboTousseTD.getId()); - tousseInstance.setMaterialAmount(comboTousseTD.getMaterialAmount()); - tousseInstance.setMaterialSplitAmount(comboTousseTD.getMaterialSplitAmount()); double price = comboTousseTD.getPrice(); double fluctuationPrice = supplyRoomConfigManager .getTousseFluctuationPrice(price); Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java =================================================================== diff -u -r31356 -r31358 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java (.../TousseDefinitionManager.java) (revision 31356) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java (.../TousseDefinitionManager.java) (revision 31358) @@ -882,15 +882,15 @@ */ public JSONArray getDistinctNameByTousseType(String spell, String tousseType, boolean isForeignOrSplitTousse); /** - * 查询聚合包下的材料总数 + * 查询聚合包实例下的材料总数 * @param comboTousseId * @return */ - public Integer queryMaterialInstanceCountOfComboTousse(Long comboTousseId); + public Integer queryMaterialInstanceCountOfComboTousseInstance(Long comboTousseInstanceId); /** - * 查询聚合包下的材料拆分总数 + * 查询聚合包实例下的材料拆分总数 * @param comboTousseId * @return */ - public Integer queryMaterialInstanceSplitAmountOfComboTousse(Long comboTousseId); + public Integer queryMaterialInstanceSplitAmountOfComboTousseInstance(Long comboTousseInstanceId); } Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r31356 -r31358 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 31356) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 31358) @@ -4032,9 +4032,6 @@ cssdHandleTousse.setWbCode(GB2WB.getWBCode(tousseDefinition.getName())); cssdHandleTousse.setTaskGroup(taskGroup); cssdHandleTousse.setTousseDefinitionId(id); - tousseDefinition.setMaterialAmount(queryMaterialInstanceCountOfComboTousse(tousseDefinition.getId())); - tousseDefinition.setMaterialSplitAmount(queryMaterialInstanceSplitAmountOfComboTousse(tousseDefinition.getId())); - objectDao.saveOrUpdate(tousseDefinition); cssdHandleTousse.setTousseName(tousseDefinition.getName()); cssdHandleTousseManager.save(cssdHandleTousse); }else { @@ -5205,18 +5202,18 @@ return arr; } @Override - public Integer queryMaterialInstanceCountOfComboTousse(Long comboTousseId) { - if(!DatabaseUtil.isPoIdValid(comboTousseId)){ + public Integer queryMaterialInstanceCountOfComboTousseInstance(Long comboTousseInstanceId) { + if(!DatabaseUtil.isPoIdValid(comboTousseInstanceId)){ return 0; } - return objectDao.countBySql("select sum(c.tousseAmount*mi.count) amount from " + ComboTousseComposite.class.getSimpleName() + " c join " + MaterialInstance.class.getSimpleName() + " mi on mi.tousse_id=c.tousseDefinitionId where c.comboTousseDefinitionId= " + comboTousseId); + return objectDao.countBySql("select sum(case when ti.materialAmount is null then 0 else ti.materialAmount end) from " + TousseInstance.class.getSimpleName() + " ti where ti.comboTousseInstanceId= " + comboTousseInstanceId); } @Override - public Integer queryMaterialInstanceSplitAmountOfComboTousse( - Long comboTousseId) { - if(!DatabaseUtil.isPoIdValid(comboTousseId)){ + public Integer queryMaterialInstanceSplitAmountOfComboTousseInstance( + Long comboTousseInstanceId) { + if(!DatabaseUtil.isPoIdValid(comboTousseInstanceId)){ return 0; } - return objectDao.countBySql("select sum(c.tousseAmount* (case when md.splitAmount is null then 1 else md.splitAmount end * mi.count)) amount from " + ComboTousseComposite.class.getSimpleName() + " c join " + MaterialInstance.class.getSimpleName() + " mi on mi.tousse_id=c.tousseDefinitionId join "+ MaterialDefinition.class.getSimpleName() +" md on md.id=mi.materialDefinition_id where c.comboTousseDefinitionId= " + comboTousseId); + return objectDao.countBySql("select sum(case when ti.materialSplitAmount is null then 0 else ti.materialSplitAmount end) from " + TousseInstance.class.getSimpleName() + " ti where ti.comboTousseInstanceId= " + comboTousseInstanceId); } }