Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r14825 -r14922 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 14825) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 14922) @@ -582,6 +582,7 @@ .getDptNameOfForeignTousse()); tousseDefinition.setSupplierName(supplierName); tousseDefinition.setIsCleanedEntirely(cleanedEntirely); + tousseDefinition.setIsReview(config.getForeignTousseNeedReview()); List foreignMaterialDefinitions = new ArrayList(); JSONArray materialsJsonArray = obj.optJSONArray("materials"); Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r14913 -r14922 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 14913) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 14922) @@ -3041,6 +3041,14 @@ List currentPackingTaskAsList = new ArrayList(); int packingAmountForThisTask = needPackingAmount;//本任务装配数量 + // 如果该器械包为不追溯并且为器械包,则将该器械包设置为已审核状态并设为不打印标签 + if (TousseDefinition.STR_NO.equals(td.getIsPrint())) { + isPrint = false; + } + // 如果器械包定义设置不审核,则将对应的变量设置为false + if (TousseDefinition.STR_NO.equals(td.getIsReview())) { + isReview = false; + } // 外来器械包(拆分成多个包) if (StringUtils.isNotBlank(splitPackages)) { @@ -3086,7 +3094,6 @@ tousseAmount = td.getTousseAmount(); // 如果该器械包为不追溯并且为器械包,则将该器械包设置为已审核状态并设为不打印标签 if (TousseDefinition.STR_NO.equals(td.getIsPrint())) { - isPrint = false; isTraceable = false; } else { if (TousseDefinition.STR_NO.equals(td @@ -3097,10 +3104,6 @@ isPrintOrg = true; } } - // 如果器械包定义设置不审核,则将对应的变量设置为false - if (TousseDefinition.STR_NO.equals(td.getIsReview())) { - isReview = false; - } // logger.debug("Thread " + // Thread.currentThread().getName() + ",准备批量装配器械包:" @@ -3403,6 +3406,7 @@ newTousseDefinition.setTousseAmount(tousseAmount); newTousseDefinition.setMaterialInstances(materialInstanceList); newTousseDefinition.setTousseType(TousseDefinition.PACKAGE_TYPE_SPLIT); + newTousseDefinition.setIsReview(td.getIsReview()); newTousseDefinition.setHandlerDepartCode(td.getHandlerDepartCode()); newTousseDefinition.setHandlerDepartName(td.getHandlerDepartName()); tousseDefinitionManager.saveOrUpdate(newTousseDefinition); Index: forgon-tools/src/main/java/com/forgon/tools/Constants.java =================================================================== diff -u -r14851 -r14922 --- forgon-tools/src/main/java/com/forgon/tools/Constants.java (.../Constants.java) (revision 14851) +++ forgon-tools/src/main/java/com/forgon/tools/Constants.java (.../Constants.java) (revision 14922) @@ -97,5 +97,9 @@ public static final String SOURCE_SYNC = "同步"; public static final String SOURCE_IMPORT = "导入"; + public static final String STR_YES = "是"; + public static final String STR_NO = "否"; + public static final String STR_CAN = "能"; + public static final Long ZERO_LONG = 0L; } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java =================================================================== diff -u -r14710 -r14922 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java (.../SupplyRoomConfig.java) (revision 14710) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java (.../SupplyRoomConfig.java) (revision 14922) @@ -13,6 +13,8 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; +import com.forgon.tools.Constants; + /** * @author WangYi * @@ -122,6 +124,8 @@ private String foreignTousseCleanedEntirely;//外来器械整包清洗 + private String foreignTousseNeedReview = com.forgon.Constants.STR_YES;//外来器械是否审核 + private Boolean secondWashCountWorkload = false; private Integer basketLoadeTousseAmount; //清洗筐装载器械包数量上限 @@ -512,5 +516,13 @@ public void setForeignTousseCleanedEntirely(String foreignTousseCleanedEntirely) { this.foreignTousseCleanedEntirely = foreignTousseCleanedEntirely; } + + public String getForeignTousseNeedReview() { + return foreignTousseNeedReview; + } + + public void setForeignTousseNeedReview(String foreignTousseNeedReview) { + this.foreignTousseNeedReview = foreignTousseNeedReview; + } } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java =================================================================== diff -u -r14543 -r14922 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java (.../SupplyRoomConfigAction.java) (revision 14543) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java (.../SupplyRoomConfigAction.java) (revision 14922) @@ -28,6 +28,7 @@ import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.systemsetting.service.HttpOptionManager; +import com.forgon.tools.Constants; import com.forgon.tools.StrutsParamUtils; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.json.JSONUtil; @@ -461,6 +462,13 @@ String isCustomTousseCleanEntirely = rq.getParameter("isCustomTousseCleanEntirely"); supplyRoomConfig.setIsCustomTousseCleanEntirely(isCustomTousseCleanEntirely); supplyRoomConfig.setForeignTousseCleanedEntirely(rq.getParameter("foreignTousseCleanedEntirely")); + String foreignTousseNeedReview = StrutsParamUtils.getPraramValue("foreignTousseNeedReview", Constants.STR_YES); + supplyRoomConfig.setForeignTousseNeedReview(foreignTousseNeedReview); + // 同步修改外来器械包定义的是否审核属性 + { + String sql = String.format("update %s set isReview='%s' where tousseType in('%s','%s')", TousseDefinition.class.getSimpleName(),foreignTousseNeedReview,TousseDefinition.PACKAGE_TYPE_FOREIGN,TousseDefinition.PACKAGE_TYPE_SPLIT); + objectDao.executeUpdate(sql); + } supplyRoomConfigManager.saveOrUpdate(supplyRoomConfig); }