diff --git a/.gitignore b/.gitignore
index 02299d65..ab6c5d63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,4 +53,5 @@ BookingWeb/Properties/PublishProfiles/FolderProfile.pubxml.user
DSWeb/DSWeb.csproj.user
BookingJieFeng/BookingJieFeng.csproj.user
DispatchWeb/DispatchWeb.csproj.user
-DSWeb/Properties/PublishProfiles/FolderProfile.pubxml
\ No newline at end of file
+DSWeb/Properties/PublishProfiles/FolderProfile.pubxml
+/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs
diff --git a/DSWeb/Areas/Account/Models/Chfee_recvapplication/Chfee_Recvapplication.cs b/DSWeb/Areas/Account/Models/Chfee_recvapplication/Chfee_Recvapplication.cs
index 439a0c5a..523bde47 100644
--- a/DSWeb/Areas/Account/Models/Chfee_recvapplication/Chfee_Recvapplication.cs
+++ b/DSWeb/Areas/Account/Models/Chfee_recvapplication/Chfee_Recvapplication.cs
@@ -158,7 +158,7 @@ namespace DSWeb.Areas.Account.Models.Chfee_Recvapplication
set { _settlerate = value; }
}
- [ModelDB]
+ [ModelDB(MDBType = ModelDBOprationType.Insert)]
public string APPLICANT
{
get { return _applicant; }
diff --git a/DSWeb/Areas/Dispatch/Views/Dispatch/DispatchFeeList.aspx b/DSWeb/Areas/Dispatch/Views/Dispatch/DispatchFeeList.aspx
index 917d4bee..b207e917 100644
--- a/DSWeb/Areas/Dispatch/Views/Dispatch/DispatchFeeList.aspx
+++ b/DSWeb/Areas/Dispatch/Views/Dispatch/DispatchFeeList.aspx
@@ -15,7 +15,7 @@
diff --git a/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs
index dec2e127..50ee2bcc 100644
--- a/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs
+++ b/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs
@@ -6680,9 +6680,8 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
///
金额
///
数量
///
- public static ch_fee_md getChFee(string USERID, string BSNO, string CUSTOMERNAME, int FEETYPE, string FEENAME, decimal AMOUNT, string UNIT, decimal QUANTITY = 1,string remark="",string sale="")
- {
-
+ public static ch_fee_md getChFee(string USERID, string BSNO, string CUSTOMERNAME, int FEETYPE, string FEENAME, decimal AMOUNT, string UNIT, decimal QUANTITY = 1, string SALE = "", string remark = "")
+ {
var result = getNewChfee();
result.BSNO = BSNO;
result.CUSTOMERNAME = CUSTOMERNAME;
@@ -6703,8 +6702,8 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
result.EXCHANGERATE = 1M;
result.UNIT = UNIT;
+
result.REMARK = remark;
- result.MANAGER = sale;
//
CommonDataContext cdc = new CommonDataContext();
var codefeelist = cdc.code_fee.Where(x => 1 == 1).ToList();
@@ -6765,7 +6764,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
{
if (AMOUNT != 0)
{
- var newfee = getChFee(USERID, BSNO, CUSTOMERNAME, FEETYPE, FEENAME, AMOUNT,UNIT, QUANTITY,"",SALE);
+ var newfee = getChFee(USERID, BSNO, CUSTOMERNAME, FEETYPE, FEENAME, AMOUNT,UNIT, QUANTITY);
CommonDataContext cdc = new CommonDataContext();