退舱改配修改

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

@@ -250,9 +250,13 @@ namespace DS.WMS.Core.Op.Method
                 //data.CustomerNo = data.CustomerNo +"-GP";
                 data.BusinessStatus = "YSTC";
                 data.BusinessStatusName = "退舱已审";
-                var entity = await tenantDb.Insertable(data).ExecuteReturnEntityAsync();
-
+                var entity = await tenantDb.Insertable(data).ExecuteReturnEntityAsync(); 
                 var newKey = entity.Id;
+                #region 初始化费用
+                var feeStatus = BusinessFeeStatus.Init(newKey);
+                await tenantDb.Insertable(feeStatus).ExecuteCommandAsync();
+                #endregion
+
                 var edi = await tenantDb.Queryable<SeaExportEdi>().FirstAsync(x => x.BusinessId == req.Id);
 
                 if (edi.IsNotNull())

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

@@ -112,7 +112,7 @@ public partial class SeaExportService : ISeaExportService
         var whereList = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(request.QueryCondition);
         //var result = tenantDb.Queryable<SeaExport>()
         var statusList = tenantDb.Queryable<BookingStatus>().Select<BookingStatusRes>().ToList();
-        var result = query
+        var result = query.Where(a => (a.IsRefund == false && a.IsChangeETD == false))
            .InnerJoin<BusinessFeeStatus>((a, b) => a.Id == b.BusinessId)
             //.LeftJoin<SysOrg>((a, b, c) => a.SaleOrgId == c.Id, "shippingweb8_dev.sys_org")
             //.LeftJoin<SysOrg>((a, b, c) => a.SaleDeptId == c.Id, "shippingweb8_dev.sys_org")