chenjingyong
/
ds8-solution-pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

Browse Source
dev
douhandong 1 month ago
parent abbc2d9477 496f491c78
commit 65c368891b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File

2
ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs
Unescape Escape View File

@ -4209,7 +4209,7 @@ namespace DS.WMS.Core.Op.Method
// 1. 【舱位基础表】与【箱子表】做关联，并根据【舱位主键】、【箱型】做分组，统计出【总的箱量】，作为queryable1 // 1. 【舱位基础表】与【箱子表】做关联，并根据【舱位主键】、【箱型】做分组，统计出【总的箱量】，作为queryable1
var queryable1 = tenantDb.Queryable<BookingSlotBase>().InnerJoin<BookingSlotCtn>((bas, ctn) => bas.Id == ctn.SlotId) var queryable1 = tenantDb.Queryable<BookingSlotBase>().InnerJoin<BookingSlotCtn>((bas, ctn) => bas.Id == ctn.SlotId)
.Where(whereList) .Where(whereList)
.WhereIF(!string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition), (bas, ctn) => bas.SlotBookingNo == querySearch.OtherQueryCondition || bas.SlotNo == querySearch.OtherQueryCondition) .WhereIF(!string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition), (bas, ctn) => bas.SlotBookingNo.Contains(querySearch.OtherQueryCondition) || bas.SlotNo.Contains(querySearch.OtherQueryCondition))
.Where(bas => bas.IsCancellation == false) .Where(bas => bas.IsCancellation == false)
.WhereIF(ctnCodeArr != null && ctnCodeArr.Count > 0, (a, b) => b != null .WhereIF(ctnCodeArr != null && ctnCodeArr.Count > 0, (a, b) => b != null
&& !string.IsNullOrWhiteSpace(b.CtnCode) && !string.IsNullOrWhiteSpace(b.CtnCode)

Write Preview
Loading…
Cancel
Save