Index: ssts-web/src/main/java/com/forgon/disinfectsystem/systemexamination/action/OrgUnitExaminationAction.java
===================================================================
diff -u -r28940 -r29438
--- ssts-web/src/main/java/com/forgon/disinfectsystem/systemexamination/action/OrgUnitExaminationAction.java (.../OrgUnitExaminationAction.java) (revision 28940)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/systemexamination/action/OrgUnitExaminationAction.java (.../OrgUnitExaminationAction.java) (revision 29438)
@@ -22,6 +22,7 @@
import com.forgon.disinfectsystem.entity.goodsdepartshareconfig.GoodsDepartShareConfig;
import com.forgon.disinfectsystem.entity.invoicemanager.InvoiceDepartment;
import com.forgon.disinfectsystem.entity.printRecyclingApplicationConfig.PrintConfig;
+import com.forgon.disinfectsystem.entity.printinvoiceconfig.PrintInvoiceConfig;
import com.forgon.disinfectsystem.entity.recycledepartmentgroup.DepartmentGroup;
import com.forgon.tools.StrutsResponseUtils;
import com.forgon.tools.hibernate.ObjectDao;
@@ -91,6 +92,9 @@
//发货科室分组设置(原来的名字叫做【科室发货计划设置】)
JSONArray invoiceDepartArray = new JSONArray();
invoiceDepartArray = configExamination(InvoiceDepartment.class.getSimpleName());
+ //发货单的打印配置
+ JSONArray printInvoiceConfigArray = new JSONArray();
+ printInvoiceConfigArray = configExamination(PrintInvoiceConfig.class.getSimpleName());
data.put("applicationDepartArray", applicationDepartArray);
data.put("settleAccountsDepartArray", settleAccountsDepartArray);
@@ -101,6 +105,7 @@
data.put("reviewDepartmentGroupArray", reviewDepartmentGroupArray);
data.put("goodsDepartShareConfigArray", goodsDepartShareConfigArray);
data.put("invoiceDepartArray", invoiceDepartArray);
+ data.put("printInvoiceConfigArray", printInvoiceConfigArray);
JSONObject result = JSONUtil.buildJsonObject(true, data);
StrutsResponseUtils.output(true, result);
@@ -179,6 +184,8 @@
objects = objectDao.findAllObjects(GoodsDepartShareConfig.class.getSimpleName());
}else if(InvoiceDepartment.class.getSimpleName().equals(className)){
objects = objectDao.findAllObjects(InvoiceDepartment.class.getSimpleName());
+ }else if(PrintInvoiceConfig.class.getSimpleName().equals(className)){
+ objects = objectDao.findAllObjects(PrintInvoiceConfig.class.getSimpleName());
}else{
return configArray;
}
@@ -214,6 +221,11 @@
departCodes = config.getDepartCodes();
departNames = config.getDepartNames();
configName = config.getName();
+ }else if(PrintInvoiceConfig.class.getSimpleName().equals(className)){
+ PrintInvoiceConfig config = (PrintInvoiceConfig) object;
+ departCodes = config.getDepartCodes();
+ departNames = config.getDepartNames();
+ configName = config.getShift();
} else {
continue;
}
Index: ssts-web/src/main/webapp/systemmanage/system/departInfoCheck.jsp
===================================================================
diff -u -r28917 -r29438
--- ssts-web/src/main/webapp/systemmanage/system/departInfoCheck.jsp (.../departInfoCheck.jsp) (revision 28917)
+++ ssts-web/src/main/webapp/systemmanage/system/departInfoCheck.jsp (.../departInfoCheck.jsp) (revision 29438)
@@ -29,10 +29,12 @@
var reviewDepartmentGroupArray = result.data.data.reviewDepartmentGroupArray;
var goodsDepartShareConfigArray = result.data.data.goodsDepartShareConfigArray;
var invoiceDepartArray = result.data.data.invoiceDepartArray;
+ var printInvoiceConfigArray = result.data.data.printInvoiceConfigArray;
var html = '';
html += returnHtml(applicationDepartArray,'applicationDepartArray');
html += returnHtml(settleAccountsDepartArray,'settleAccountsDepartArray');
html += returnHtml(printConfigArray,'printConfigArray');
+ html += returnHtml(printInvoiceConfigArray,'printInvoiceConfigArray');
html += returnHtml(departmentAppTemplateArray,'departmentAppTemplateArray');
html += returnHtml(recycleDepartmentGroupArray,'recycleDepartmentGroupArray');
html += returnHtml(reviewDepartmentGroupArray,'reviewDepartmentGroupArray');
@@ -66,24 +68,28 @@
html += '| 3 | ';
html += '控制面板 | ';
html += '参数设置——打印发货计划设置 | ';
- }else if(arrayType == 'departmentAppTemplateArray'){
+ }else if(arrayType == 'printInvoiceConfigArray'){
html += '4 | ';
html += '控制面板 | ';
+ html += '发货管理——打印发货单设置 | ';
+ }else if(arrayType == 'departmentAppTemplateArray'){
+ html += '5 | ';
+ html += '控制面板 | ';
html += '参数设置——科室申领模板 | ';
}else if(arrayType == 'recycleDepartmentGroupArray'){
- html += '5 | ';
+ html += '6 | ';
html += '控制面板 | ';
html += '参数设置——回收科室分组设置 | ';
}else if(arrayType == 'reviewDepartmentGroupArray'){
- html += '6 | ';
+ html += '7 | ';
html += '控制面板 | ';
html += '参数设置——审核科室分组设置 | ';
}else if(arrayType == 'goodsDepartShareConfigArray'){
- html += '7 | ';
+ html += '8 | ';
html += '控制面板 | ';
html += '参数设置——物品科室共用配置 | ';
}else if(arrayType == 'invoiceDepartArray'){
- html += '8 | ';
+ html += '9 | ';
html += '控制面板 | ';
html += '发货管理——发货科室分组设置 | ';
}
@@ -108,24 +114,28 @@
html += '3 | ';
html += '控制面板 | ';
html += '参数设置——打印发货计划设置 | ';
- }else if(arrayType == 'departmentAppTemplateArray'){
+ }else if(arrayType == 'printInvoiceConfigArray'){
html += '4 | ';
html += '控制面板 | ';
+ html += '发货管理——打印发货单设置 | ';
+ }else if(arrayType == 'departmentAppTemplateArray'){
+ html += '5 | ';
+ html += '控制面板 | ';
html += '参数设置——科室申领模板 | ';
}else if(arrayType == 'recycleDepartmentGroupArray'){
- html += '5 | ';
+ html += '6 | ';
html += '控制面板 | ';
html += '参数设置——回收科室分组设置 | ';
}else if(arrayType == 'reviewDepartmentGroupArray'){
- html += '6 | ';
+ html += '7 | ';
html += '控制面板 | ';
html += '参数设置——审核科室分组设置 | ';
}else if(arrayType == 'goodsDepartShareConfigArray'){
- html += '7 | ';
+ html += '8 | ';
html += '控制面板 | ';
html += '参数设置——物品科室共用配置 | ';
}else if(arrayType == 'invoiceDepartArray'){
- html += '8 | ';
+ html += '9 | ';
html += '控制面板 | ';
html += '发货管理——发货科室分组设置 | ';
}