Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java =================================================================== diff -u -r20534 -r20603 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 20534) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 20603) @@ -246,6 +246,12 @@ */ private String returnedGoods = com.forgon.Constants.STR_NO; + /** + * 仓库编码(一次性物品发完货回写的仓库编码,目前只适用于“中山大学中山眼科中心”) + */ + private String storeCode; + + public final static Integer SIGNED_TRUE = 1; public final static Integer SIGNED_FALSE = 0; @@ -1002,5 +1008,13 @@ public void setOperationRoom(String operationRoom) { this.operationRoom = operationRoom; } + + public String getStoreCode() { + return storeCode; + } + + public void setStoreCode(String storeCode) { + this.storeCode = storeCode; + } } Index: ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js =================================================================== diff -u -r20566 -r20603 --- ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js (.../config.js) (revision 20566) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js (.../config.js) (revision 20603) @@ -51,6 +51,15 @@ showProjectNameComboWhenApplyDiposableGoods : true, //申领物品时需要填写与显示项目的申请科室,如果后续还有其它科室,可以继续加,多个科室之间用分号分隔 departsForInvoicePlanSelectProject : "科教项目经费;自筹科教配套", + //是否启用申请单的“仓库编码”属性 + enableStoreCode: true, + //一次性物品发完货回写的仓库编码(注意:这个属性只有enableStoreCode等于true才有意义) + storeCodeValues: { + 3001:[{3: '供应室库房'}], //供应室的仓库 + 2002:[{47: '手术室仓库七'},{48: '手术室仓库八'},{49: '手术室仓库九'},{40: '手术室公共库'}], //手术室的仓库 + 2003:[{9: '麻醉科库房'}], //麻醉科的仓库 + other:[{60: '科室'}] //其他的科室的仓库 + }, //使用记录转申请单备注信息(如巡回护士:张三;病人:李四) useRecordConvertRecyclingApplicationRemark : '@circuitNurseLabelName:@circuitNurse;病人:@patientName', // 发货计划列表的类型参数是否应用到发货界面