From 04119ba67d2d785e108f4d6fe01b96a5812cd553 Mon Sep 17 00:00:00 2001
From: ddlucky <ddlucky@sina.com>
Date: Thu, 1 Dec 2022 10:34:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=80=8D=E9=80=9A=E5=85=AC=E4=BC=97?=
 =?UTF-8?q?=E5=8F=B7=E5=8F=B8=E6=9C=BA=E8=B4=B9=E7=94=A8=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E8=8B=B9=E6=9E=9C=E6=89=8B=E6=9C=BA=E6=A0=B7=E5=BC=8F=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dispatch/Views/Dispatch/DispatchFeeList.aspx     |  2 +-
 DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs    | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

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 @@
             <div class="weui-form-preview">
                 <div class="weui-form-preview__bd">
                     <div class="weui-form-preview__item">
-                        <label class="weui-form-preview__label">陆运费</label>
+                        <label class="weui-form-preview__label" style="text-align:left !important;text-align-last:left !important;">陆运费</label>
                         <span class="weui-form-preview__value"><%=truckFee %></span>
                     </div>
                 </div>
diff --git a/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs
index 4c2c4db0..e7245255 100644
--- a/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs
+++ b/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs
@@ -6680,9 +6680,9 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
         /// <param name="AMOUNT">金额</param>
         /// <param name="QUANTITY">数量</param>
         /// <returns></returns>
-        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="")
-        {
 
+        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,7 +6703,11 @@ 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();
@@ -6756,7 +6760,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
             return result;
         }
 
-        public static DBResult MakeNewFee(string USERID, string BSNO, string CUSTOMERNAME, string CUSTOMERTYPE, int FEETYPE, string FEENAME, decimal AMOUNT,string UNIT, decimal QUANTITY = 1)
+        public static DBResult MakeNewFee(string USERID, string BSNO, string CUSTOMERNAME, string CUSTOMERTYPE, int FEETYPE, string FEENAME, decimal AMOUNT,string UNIT, decimal QUANTITY = 1,string SALE="")
         {
             var result = new DBResult();
             result.OK("");
@@ -6764,7 +6768,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
             {
                 if (AMOUNT != 0)
                 {
-                    var newfee = getChFee(USERID, BSNO, CUSTOMERNAME, FEETYPE, FEENAME, AMOUNT,UNIT, QUANTITY);
+                    var newfee = getChFee(USERID, BSNO, CUSTOMERNAME, FEETYPE, FEENAME, AMOUNT,UNIT, QUANTITY,SALE);
 
                     CommonDataContext cdc = new CommonDataContext();
                 

From d47e01f0c8ca2bd97b804468fb7228b55833fa4f Mon Sep 17 00:00:00 2001
From: ddlucky <ddlucky@sina.com>
Date: Fri, 2 Dec 2022 10:00:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=B6=E8=B4=B9=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E7=9A=84=E7=94=B3=E8=AF=B7=E4=BA=BA=E6=94=B9=E4=B8=BA=E4=BB=85?=
 =?UTF-8?q?insert=EF=BC=8C=E4=B8=8D=E5=8F=AF=E4=BF=AE=E6=94=B9=EF=BC=88?=
 =?UTF-8?q?=E9=98=B2=E6=AD=A2=E4=B8=A2=E6=94=B6=E8=B4=B9=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BA=BA=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Models/Chfee_recvapplication/Chfee_Recvapplication.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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; }