Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/Packing.java =================================================================== diff -u --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/Packing.java (revision 0) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/Packing.java (revision 41660) @@ -0,0 +1,7 @@ +package com.forgon.disinfectsystem.common.sstsconfig; + +/** + * {@link SstsConfig}中的装配模块部分的配置 + */ +public class Packing { +} Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/Review.java =================================================================== diff -u --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/Review.java (revision 0) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/Review.java (revision 41660) @@ -0,0 +1,7 @@ +package com.forgon.disinfectsystem.common.sstsconfig; + +/** + * {@link SstsConfig}中的审核模块部分的配置 + */ +public class Review { +} Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java =================================================================== diff -u -r41258 -r41660 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 41258) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 41660) @@ -99,8 +99,8 @@ /*** * - * @author Terry Kwan - * + * @author Terry Kwan
+ * 推荐改为使用{@link com.forgon.disinfectsystem.common.sstsconfig.SstsConfig SstsConfig},避免直接使用这个类的方法
* Date:2014-12-30下午12:20:51 */ public class CssdUtils { Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/Washing.java =================================================================== diff -u --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/Washing.java (revision 0) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/Washing.java (revision 41660) @@ -0,0 +1,7 @@ +package com.forgon.disinfectsystem.common.sstsconfig; + +/** + * {@link SstsConfig}中的清洗消毒模块部分的配置 + */ +public class Washing { +} Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/Recycling.java =================================================================== diff -u --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/Recycling.java (revision 0) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/Recycling.java (revision 41660) @@ -0,0 +1,7 @@ +package com.forgon.disinfectsystem.common.sstsconfig; + +/** + * {@link SstsConfig}中的回收模块部分的配置 + */ +public class Recycling { +} Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/SstsConfig.java =================================================================== diff -u --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/SstsConfig.java (revision 0) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/SstsConfig.java (revision 41660) @@ -0,0 +1,40 @@ +package com.forgon.disinfectsystem.common.sstsconfig; + +/** + * 前端项目目录下config.js中的配置处理。
+ * 这样可以避免在业务各地方直接硬编码属性名,并且方便根据方法查找使用的地方;
+ */ +public class SstsConfig { + /** + * 科室申领模块 + */ + public static final Apply apply = new Apply(); + /** + * 回收模块 + */ + public static final Recycling recycling = new Recycling(); + /** + * 清洗模块 + */ + public static final Washing washing = new Washing(); + /** + * 装配模块 + */ + public static final Packing packing = new Packing(); + /** + * 审核模块 + */ + public static final Review review = new Review(); + /** + * 灭菌模块 + */ + public static final Sterile sterile = new Sterile(); + /** + * 发票模块 + */ + public static final Invoice invoice = new Invoice(); + /** + * 使用记录模块 + */ + public static final UseRecord useRecord = new UseRecord(); +} Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/Invoice.java =================================================================== diff -u --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/Invoice.java (revision 0) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/Invoice.java (revision 41660) @@ -0,0 +1,7 @@ +package com.forgon.disinfectsystem.common.sstsconfig; + +/** + * {@link SstsConfig}中的发货模块部分的配置 + */ +public class Invoice { +} Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/UseRecord.java =================================================================== diff -u --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/UseRecord.java (revision 0) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/UseRecord.java (revision 41660) @@ -0,0 +1,7 @@ +package com.forgon.disinfectsystem.common.sstsconfig; + +/** + * {@link SstsConfig}中的使用记录模块部分的配置 + */ +public class UseRecord { +} Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r41600 -r41660 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 41600) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 41660) @@ -15,6 +15,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import com.forgon.disinfectsystem.common.sstsconfig.SstsConfig; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import net.sf.json.JsonConfig; @@ -5379,8 +5380,10 @@ String code = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig(); SupplyRoomConfig cssd = supplyRoomConfigManager.getFirstSupplyRoomConfig(); if (committedStatus && !StringTools.equals(code, cssd.getOrgUnitCoding()) - && application.readed() && !StringUtils.equals(application.getType(), InvoicePlan.TYPE_GOODS_RESERVATION_FORM)) { - throw new SystemException("该申请单已被阅读过,不能修改。如果需要修改,请联系管理员!"); + && !StringUtils.equals(application.getType(), InvoicePlan.TYPE_GOODS_RESERVATION_FORM)) { + if(application.readed() && !SstsConfig.apply.allowEditApplyFormAfterRead()){ + throw new SystemException("该申请单已被阅读过,不能修改。如果需要修改,请联系管理员!"); + } } String message = committedStatus ? "提交成功" Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r41606 -r41660 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 41606) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 41660) @@ -1909,8 +1909,14 @@ } //临床科室用户 }else{ - //已提交已阅读、已打印不能修改 - if((committedStatus && isReaded) || printed != unPrint){ + //已提交并且已阅读,根据配置项是否可修改 + if((committedStatus)){ + if(isReaded && !sstsConfig.allowEditApplyFormAfterRead) { + hiddenCommitButton = true; + } + } + // 已打印不能修改 + if(printed != unPrint){ hiddenCommitButton = true; } //DGZYY-170:临床科室用户提交申请单后,如果该申请单没有被打印并且发货状态为待发货,则应该允许用户进行修改 Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/Apply.java =================================================================== diff -u --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/Apply.java (revision 0) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/Apply.java (revision 41660) @@ -0,0 +1,17 @@ +package com.forgon.disinfectsystem.common.sstsconfig; + +import com.forgon.disinfectsystem.common.CssdUtils; + +/** + * {@link SstsConfig}中的科室申领模块部分的配置 + */ +public class Apply { + /** + * 非供应室用户在申请单被供应室用户读取后,是否还能修改申请单 + * 详细需求查看GDSFYBJY-30 + * @return 如果配置了allowEditApplyFormAfterRead:true,则返回true;否则false + */ + public boolean allowEditApplyFormAfterRead() { + return CssdUtils.getSystemSetConfigByNameBool("allowEditApplyFormAfterRead"); + } +} Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/Sterile.java =================================================================== diff -u --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/Sterile.java (revision 0) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/sstsconfig/Sterile.java (revision 41660) @@ -0,0 +1,7 @@ +package com.forgon.disinfectsystem.common.sstsconfig; + +/** + * {@link SstsConfig}中的灭菌模块部分的配置 + */ +public class Sterile { +}