Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r23805 -r23807 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 23805) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 23807) @@ -250,10 +250,12 @@ .getSerialNumberStr(SerialNum.TYPE_RECYCLINGAPPLICATION)); } //simon-delete -// application.setHandleDepart(systemParams -// .getDptNameOfForeignTousse()); -// application.setHandleDepartCoding(systemParams -// .getDptCodeOfForeignTousse()); + //simon-waitfor:L254-257代码需要删除,等福哥那边处理好了再更改 + application.setHandleDepart(systemParams + .getDptNameOfForeignTousse()); + application.setHandleDepartCoding(systemParams + .getDptCodeOfForeignTousse()); + application.setSequence(supplyRoomConfigManager .getOrgUnitSequence(application.getDepartCoding())); application.setRecyclingStatus(InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVE); Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java =================================================================== diff -u -r23805 -r23807 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 23805) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 23807) @@ -388,9 +388,12 @@ public String saveForeignTousseApplication() { JSONObject jsonObject = new JSONObject(); String foreignTousseInfo = StrutsParamUtils.getPraramValue("foreignTousseInfo", ""); - //simon-add handleDepart handleDepartCoding + //simon-add-begin handleDepart handleDepartCoding + /*simon-waitfor:等福哥那边处理好了再提交 String handleDepart= StrutsParamUtils.getPraramValue("handleDepart", ""); String handleDepartCoding= StrutsParamUtils.getPraramValue("handleDepartCoding", ""); + //simon-add-end + */ String actionType = StrutsParamUtils.getPraramValue("actionType", ""); jsonObject.put("success",true); jsonObject.put("message","保存成功!"); @@ -403,8 +406,10 @@ .parse(operationTimeStr)); } //simon-add + /*simon-waitfor:等福哥那边处理好了再提交 foreignTousseApplication.setHandleDepart(handleDepart); foreignTousseApplication.setHandleDepartCoding(handleDepartCoding); + */ foreignTousseApplicationManager.saveOrUpdate(foreignTousseApplication, foreignTousseInfo, actionType); jsonObject.put("id", foreignTousseApplication.getId()); //供前台打印 jsonObject.put("applicationTime", ForgonDateUtils.safelyFormatDate(foreignTousseApplication.getApplicationTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDD, "")); //供前台打印 Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r23805 -r23807 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 23805) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 23807) @@ -1473,7 +1473,7 @@ {name : 'name',mapping : 'name'} ] }); - +/*simon-waitfor:等福哥那边处理好了再提交 //simon-add:处理科室数据源 handleDepartmentStore = new Ext4.data.JsonStore({ autoLoad: true, @@ -1491,7 +1491,7 @@ {name : 'taskGroup',mapping : 'taskGroup'} ] }); - +*/ //处理方式的store var processTypeJsonStore = new Ext4.data.Store({ fields : [ 'typeName' ], @@ -1541,7 +1541,9 @@ {xtype : 'hidden',fieldLabel : '科室编号 ',name : 'departCoding',id : 'departCoding'}, {xtype : 'hidden',fieldLabel : '结算科室编号',name : 'settleAccountsDepartCoding',id : 'settleAccountsDepartCoding'}, //simon-add + /*simon-waitfor:等福哥那边处理好了再提交 {xtype : 'hidden',fieldLabel : '处理科室编号',name : 'handleDepartCoding',id : 'handleDepartCoding'}, + */ {xtype : 'hidden',name : 'foreignTousseInfo',id : 'foreignTousseInfo'}, {xtype : 'hidden',name : 'barcodeStr',id : 'barcodeStr'}, { @@ -1662,6 +1664,8 @@ } } }, + //simon-add + /*simon-waitfor:等福哥那边处理好了再提交 { xtype : 'combo', fieldLabel : '处理科室', @@ -1694,6 +1698,7 @@ } } }, + */ { xtype : 'combo', fieldLabel : '处理方式',