diff --git a/TradeManage/bin/TradeManageNew.dll b/TradeManage/bin/TradeManageNew.dll
index cc84a02..2cc5a85 100644
Binary files a/TradeManage/bin/TradeManageNew.dll and b/TradeManage/bin/TradeManageNew.dll differ
diff --git a/TradeManageNew/HT_CustomList.aspx b/TradeManageNew/HT_CustomList.aspx
index 927449a..49b18dc 100644
--- a/TradeManageNew/HT_CustomList.aspx
+++ b/TradeManageNew/HT_CustomList.aspx
@@ -109,7 +109,9 @@
                         $("#a_njprice").html("美金$" + Model.njprice);
                         num2 = Model.njprice;
                         $("#a_hyprice").html("美金$" + Model.hyprice);
-                        num3 = Model.hyprice;
+                        num3 = Model.hyprice; 
+                        $("#txtnjprice").val(Model.njrmbprice);
+                        $("#txthyprice").val(Model.hyrmbprice);
                     }
                     if (Model.feetype == 2) {
                         $("#a_zhprice").html("人民币$" + Model.rmbprice);
@@ -118,6 +120,8 @@
                         num2 = Model.njrmbprice;
                         $("#a_hyprice").html("人民币$" + Model.hyrmbprice);
                         num3 = Model.hyrmbprice;
+                        $("#txtnjprice").val(Model.njprice);
+                        $("#txthyprice").val(Model.hyprice);
                     }
                     ShowFancybox("MainTable");
                 }
@@ -620,14 +624,14 @@
                 Model.njrmbprice = $("#txtnjprice").val();
                 Model.njprice = num2;
                 Model.hyrmbprice = $("#txthyprice").val();
-                Model.hydprice = num3;
+                Model.hyprice = num3;
             }
             else if (Model.feetype == 2) {
                 Model.usdprice = $("#txtzfprice").val();
                 Model.rmbprice = num;
                 Model.njprice = $("#txtnjprice").val();
                 Model.njrmbprice = num2;
-                Model.hyprice = $("#txthyprice").val();
+                Model.rmbprice = $("#txthyprice").val();
                 Model.hyrmbprice = num3;
             }
 
@@ -784,9 +788,9 @@
 
     <tr>
          <td class="f1" ><font color="red">*</font>利率</td>
-        <td><input id='txtllrate' type='text' style='width: 90%' precision="2" min="0" max="99999" columnname="llrate" columndesc="利率" columnrequired="true"  value="0.005" />/天</td>
+        <td><input id='txtllrate' type='text' style='width: 90%' precision="3" min="0" max="99999" columnname="llrate" columndesc="利率" columnrequired="true"  value="0.005" />/天</td>
         <td class="f1" ><font color="red">*</font>汇率</td>
-        <td><input id='txthlrate' type='text' style='width: 99%' precision="2" min="0" max="99999" columnname="hlrate" columndesc="美金汇率" columnrequired="true" /></td>
+        <td><input id='txthlrate' type='text' style='width: 99%' precision="3" min="0" max="99999" columnname="hlrate" columndesc="美金汇率" columnrequired="true" /></td>
     </tr>
                 <tr>
 
diff --git a/TradeManageNew/SysManageServiceNew.asmx.cs b/TradeManageNew/SysManageServiceNew.asmx.cs
index 4d9bd3c..4d129b7 100644
--- a/TradeManageNew/SysManageServiceNew.asmx.cs
+++ b/TradeManageNew/SysManageServiceNew.asmx.cs
@@ -18189,13 +18189,20 @@ where a.storeid in  (6,9,11)  and a.OrderGoodsId=0 and a.KCNum>0  " + tj + "  gr
                     {
                       if (md.days2>=0)
                         md.lxprice2 =  md.lxprice * md.llrate * md.days2;
-                      else md.lxprice2 = md.lxprice * md.llrate * md.days;
+                        else if (md.days>= 0)
+                            md.lxprice2 = md.lxprice * md.llrate * md.days;
                         // md.leftprice = md.lxprice - md.yfprice;
                     }
                     else
                     {
                         md.leftprice = 0;
                     }
+                    if (md.days2 >= 0)
+                        md.days = md.days2;
+                    if (md.days < 0)
+                        md.days = 0;
+                    if (md.days2 < 0)
+                        md.days2 = 0;
                     md.feeflag = "￥";
                     if (md.feetype == 2)
                         md.feeflag = "$";
diff --git a/TradeManageNew/bin/TradeManageNew.dll b/TradeManageNew/bin/TradeManageNew.dll
index 2cc5a85..309c4ca 100644
Binary files a/TradeManageNew/bin/TradeManageNew.dll and b/TradeManageNew/bin/TradeManageNew.dll differ
diff --git a/TradeManageNew/bin/TradeManageNew.pdb b/TradeManageNew/bin/TradeManageNew.pdb
index e41a5dc..6af44d5 100644
Binary files a/TradeManageNew/bin/TradeManageNew.pdb and b/TradeManageNew/bin/TradeManageNew.pdb differ
diff --git a/TradeManageNew/obj/Debug/TradeManageNew.dll b/TradeManageNew/obj/Debug/TradeManageNew.dll
index 2cc5a85..309c4ca 100644
Binary files a/TradeManageNew/obj/Debug/TradeManageNew.dll and b/TradeManageNew/obj/Debug/TradeManageNew.dll differ
diff --git a/TradeManageNew/obj/Debug/TradeManageNew.pdb b/TradeManageNew/obj/Debug/TradeManageNew.pdb
index e41a5dc..6af44d5 100644
Binary files a/TradeManageNew/obj/Debug/TradeManageNew.pdb and b/TradeManageNew/obj/Debug/TradeManageNew.pdb differ