From ec3c7b35bcd692249c17b9128e8dfbccfc6cf3a6 Mon Sep 17 00:00:00 2001
From: admin <admin@DESKTOP-M120RON.sinopharmholding.com>
Date: Mon, 6 Aug 2018 18:32:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BA=A7=E5=93=81=E5=B8=A6?=
 =?UTF-8?q?=E5=87=BA=E6=89=8B=E7=BB=AD=E8=B4=B9=E7=B1=BB=E5=9E=8B=E7=9A=84?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 calc/com/tenwa/reckon/product/ProductConditionService.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/calc/com/tenwa/reckon/product/ProductConditionService.java b/calc/com/tenwa/reckon/product/ProductConditionService.java
index e2d0601b1..e173af405 100644
--- a/calc/com/tenwa/reckon/product/ProductConditionService.java
+++ b/calc/com/tenwa/reckon/product/ProductConditionService.java
@@ -93,6 +93,13 @@ public class ProductConditionService {
 					doTemp.setColumnAttribute("CAUTION_MONEY_METHOD","sortno",oder+doTemp.getColumnAttribute("CAUTION_MONEY_METHOD", "sortno"));
 				}
 			}
+			//根据产品,带出手续费分摊方式
+			if(col.equals("HANDLING_CHARGE_MONEY")) {
+				String oneOrMore = map.get(col).get("oneOrMore");
+				//System.err.println(oneOrMore);
+				doTemp.setDefaultValue("HANDLING_CHARGE_MONEY_TYPE", oneOrMore == null ? "" : oneOrMore);
+			}
+				
 			
 			String groupId = doTemp.getColumnAttribute(col, "groupid");
 			if("0070".equals(groupId)) {