修改扣费

ds-wms-service/DS.WMS.Core/Op/Entity/BLIssueManage/BLManageBase.cs

@@ -1,6 +1,7 @@
 using DS.Module.Core.Data;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -49,5 +50,17 @@ namespace DS.WMS.Core.Op.Entity.BLManage
         /// </summary>
         [SqlSugar.SugarColumn(ColumnDescription = "状态名称", Length = 50, IsNullable = true)]
         public string StatusName { get; set; }
+
+        /// <summary>
+        /// 委托单位Id
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "委托单位Id", IsNullable = false)]
+        public long CustomerId { get; set; }
+
+        /// <summary>
+        /// 委托单位
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "委托单位", IsNullable = true, Length = 50)]
+        public string CustomerName { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Op/Method/DJYChargeFee/DJYChargeFeeService.cs

@@ -142,7 +142,7 @@ namespace DS.WMS.Core.Op.Method
 
                 string feeType = $"{(int)model.BSType}_{(int)model.SendType}";
 
-                var c = tenantDb.Queryable<DJYChargeFee>().Filter(null, true).Count(x => x.Id == id && x.FeeType == feeType);
+                var c = tenantDb.Queryable<DJYChargeFee>().Filter(null, true).Count(x => x.BillId == id && x.FeeType == feeType);
                 if (c > 0)
                 {
                     Logger.Log(NLog.LogLevel.Info, $"{batchId}-已存在扣费记录，id：{id}，提单号：{orderInfo.MBLNO} feeType={feeType}");