Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java
===================================================================
diff -u -r28968 -r28970
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java	(.../DepartmentAppTemplateAction.java)	(revision 28968)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java	(.../DepartmentAppTemplateAction.java)	(revision 28970)
@@ -568,7 +568,6 @@
 			}
 
 		}
-		System.out.println(sb.toString());
 		return sb.append("]").toString();
 	}
 	
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
===================================================================
diff -u -r28966 -r28970
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java	(.../DiposableGoodsAction.java)	(revision 28966)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java	(.../DiposableGoodsAction.java)	(revision 28970)
@@ -208,7 +208,7 @@
 			throw new ParameterException("申领单位转换单位系数大于0!");
 		}
 		//如果管理人员修改一次性物品定义的申领单位，保存前要检查是否还有申请单上有该物品未发货，如果有，则不允许修改(GDSZYY-15)
-		if(diposableGoods != null && StringUtils.equals(diposableGoods.getOrginalMiddlePackageUnit(), diposableGoods.getMiddlePackageUnit())){
+		if(diposableGoods != null && !StringUtils.equals(diposableGoods.getOrginalMiddlePackageUnit(), diposableGoods.getMiddlePackageUnit())){
 			List<InvoicePlan> invoicePlans = diposableGoodsManager.getInvoicePlanByDisposableGoods(diposableGoods, InvoicePlan.DELIVERSTATUS_AWAITDELIVER);
 			if(CollectionUtils.isNotEmpty(invoicePlans)){
 				String message = "【不能修改申领单位，有如下申请单上还有该物品未完成发货，请发完货再修改！单号如下：";