Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r19443 -r19445 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 19443) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 19445) @@ -2626,7 +2626,7 @@ // 包实例 TousseInstance tousseInstance = createTousseInstance(operator, operatorCode, reviewer, reviewerCode,sterileUserName, sterileUserCode, packageType, - sterilingType, stock,washBasket, sterilizer, frequency, sterileStartTime, validUntil, warningUntil, packingRecord.getId(), + sterilingType, stock,washBasket, sterilizer, frequency, sterileStartTime, validUntil, warningUntil, packingRecord, tousseDefinition, tousseType, tousseName, foreignTousseApplication, packingDate, foreignTprice, fluctuationPrice, tousseAmount, orgUnitCoding, orgUnitName, @@ -3588,7 +3588,7 @@ JSONObject result = batchCreateTousseInstance( operator, operatorCode, reviewer,reviewerCode,sterileUserName,sterileUserCode, packageType, sterilingType, stock,idCardDefinitionId,idCardInstanceID, washBasket,sterilizerName, sterileFrequency,sterileStartTime, - validUntil, warningUntil,currentPackingTaskAsList,packignRecordId, + validUntil, warningUntil,currentPackingTaskAsList,packingRecord, td, tousseType,tousseName,foreignTousseApplication,packingDate, packingAmountForThisTask, toussePrice, fluctuationPrice,tousseAmount, orgUnitCoding,orgUnitName,basketBarcode, !isTraceable, confirmContinue,tousseInstances,withoutReviewingAndSterilingTousseInstanceList, @@ -4047,7 +4047,7 @@ private JSONObject batchCreateTousseInstance(String operator, String operatorCode, String reviewer, String reviewerCode,String sterileUserName, String sterileUserCode,String packageType, String sterilingType, String stock, String idCardDefinitionId,String idCardInstanceID, String washBasket,String sterilizerName, String sterileFrequency, - Date sterileStartTime, Date validUntil, Date warningUntil,List packingTaskList, Long packingRecordId, + Date sterileStartTime, Date validUntil, Date warningUntil,List packingTaskList, PackingRecord packingRecord, TousseDefinition tousseDefinition,String tousseType, String tousseName,ForeignTousseApplication foreignTousseApplication,Date packingDate, Integer currentPackAmount, double toussePrice,double fluctuationPrice, Integer tousseAmount,String orgUnitCoding, String orgUnitName, String basketBarcode,boolean unTraceableTousse, String confirmContinue,List tousseInstances, @@ -4143,7 +4143,7 @@ TousseInstance tousseInstance = createTousseInstance(operator, operatorCode, reviewer, reviewerCode,sterileUserName,sterileUserCode, packageType,sterilingType, stock, - washBasket, sterilizerName, sterileFrequency, sterileStartTime, validUntil, warningUntil, packingRecordId, + washBasket, sterilizerName, sterileFrequency, sterileStartTime, validUntil, warningUntil, packingRecord, tousseDefinition, tousseType, tousseName,foreignTousseApplication, packingDate, toussePrice, fluctuationPrice, tousseAmount, orgUnitCoding, orgUnitName,unTraceableTousse, barcodeStr, tousseWeight,remark, prePackingTask,idToWashRecordMap,idToRecyclingRecordMap,washJson,comboTousseInstanceId,comboTousseInstanceStatus); @@ -4466,7 +4466,7 @@ String sterilingType, String stock, String washBasket, String sterilizerName, String sterileFrequency, Date sterileStartTime, Date validUntil, Date warningUntil, - Long packingRecordId, TousseDefinition td, String tousseType, + PackingRecord packingRecord, TousseDefinition td, String tousseType, String tousseName, ForeignTousseApplication foreignTousseApplication, Date packingDate, double toussePrice, double fluctuationPrice, @@ -4478,6 +4478,7 @@ JSONObject washJson, Long comboTousseInstanceId,String comboTousseStatus) { TousseInstance tousseInstance = new TousseInstance(); + tousseInstance.setTaskGroup(packingRecord.getTaskGroup()); tousseInstance.setBarcode(barcodeStr); tousseInstance.setWeight(tousseWeight); tousseInstance.setRemark(remark); @@ -4634,7 +4635,7 @@ tousseInstance.setRecyclingOperator(currentPackingTask.getRpRecyclingOperator()); tousseInstance.setRecyclingUser(currentPackingTask.getRpRecyclingOperator()); } - tousseInstance.setPackingRecord_id(packingRecordId); + tousseInstance.setPackingRecord_id(packingRecord.getId()); // 外来器械包,外来器械拆分小包关联外来器械申请单 if (TousseDefinition.PACKAGE_TYPE_FOREIGN.equals(tousseType) || TousseDefinition.PACKAGE_TYPE_SPLIT.equals(tousseType)) { Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js =================================================================== diff -u -r19302 -r19445 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 19302) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 19445) @@ -183,7 +183,7 @@ {header : "清洗时间",width : 125,dataIndex : 'washStartTime',sortable: false}, {header : "失效日期",width : 80,dataIndex : 'validUntil',renderer : checkDate}, {header : "预警日期",hidden : true,width : 80,dataIndex : 'warningUntil',renderer : myDateFormat}, - {header : "任务组",width : 100,dataIndex : 'tousseDefinition.taskGroup',sortable: false}, + {header : "任务组",width : 100,dataIndex : 'taskGroup',sortable: false}, {header : "装配人",width : 60,dataIndex : 'operator',sortable: false}, {header : "装配时间",width : 125,dataIndex : 'operationTime',renderer : myDateFormatBySecond}, {header : "审核人",width : 60,dataIndex : 'reviewer',sortable: false}, Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java =================================================================== diff -u -r19302 -r19445 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 19302) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 19445) @@ -791,11 +791,10 @@ return this.tousseDefinition.getName(); } - @Transient public String getTaskGroup() { - if(StringUtils.isNotBlank(taskGroup)){ - taskGroup = tousseDefinition.getTaskGroup(); - } +// if(StringUtils.isNotBlank(taskGroup)){ +// taskGroup = tousseDefinition.getTaskGroup(); +// } return taskGroup; } Index: forgon-core/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r19302 -r19445 --- forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 19302) +++ forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 19445) @@ -21,7 +21,7 @@ "4.2.3","4.2.4","4.2.5","4.2.6","4.2.7","4.2.8","4.2.9","4.3.0","4.3.1","4.3.2","4.3.3","4.3.4","4.3.5","4.3.6","4.3.7","4.3.8","4.3.9", "4.4.0","4.4.1","4.4.2","4.4.3","4.4.4","4.4.5","4.4.6","4.4.7","4.4.8","4.4.9","4.5.0","4.5.1","4.5.2","4.5.3","4.5.4","4.5.5","4.5.6","4.5.7","4.5.8", "4.5.9","4.6.0","4.6.1","4.6.2","4.6.3","4.6.4","4.6.5","4.6.6","4.6.7","4.6.8","4.6.9","4.7.0","4.7.1","4.7.2","4.7.3","4.7.4","4.7.5","4.7.6","4.7.7", - "4.7.8","4.7.9","4.8.0","4.8.1","4.8.2","4.8.3","4.8.4","4.8.5","4.8.6","4.8.7"};// 版本列表 + "4.7.8","4.7.9","4.8.0","4.8.1","4.8.2","4.8.3","4.8.4","4.8.5","4.8.6","4.8.7","4.8.8"};// 版本列表 public final static List SOFTWARE_VERSION_LIST = Arrays .asList(SOFTWARE_VERSION_ARRAY); public final static String SOFTWARE_VERSION = SOFTWARE_VERSION_ARRAY[SOFTWARE_VERSION_ARRAY.length - 1];// 软件最新版本