diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/MakeCanSettlementService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/MakeCanSettlementService.cs index 3b40dcaf..d3403fdc 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/MakeCanSettlementService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/MakeCanSettlementService.cs @@ -335,77 +335,118 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs var part_group_small = t1.Where(p => p.Amt < 10000000).ToList(); if (part_group_big.Count > 0) { - foreach (var itm in part_group_big) + var partlist = part_group_big.Select(p => p.LU).ToList(); + var ls = bbac_can_list.Where(p => partlist.Contains(p.LU)).ToList(); + var billNum = OrderNumberGenerator.GenerateOrderNumber("N"); + var bbac_sa = new BBAC_CAN_SA(); + bbac_sa.SetId(Guid.NewGuid()); + bbac_sa.BillNum = billNum; + bbac_sa.InvGroupNum = billNum; + bbac_sa.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); + bbac_sa.State = SettleBillState.未结状态; + bbac_sa.SettleBillNum = string.Empty; + bbac_sa.Site = "1046"; + bbac_sa.BusinessType = EnumBusinessType.JisBBAC; + billList.Add(bbac_sa); + foreach (var itm1 in ls) { - var ls = bbac_can_list.Where(p => p.LU == itm.LU).ToList(); - decimal sum = 0; - List details = new List(); - foreach (var itm1 in ls) - { - sum += (itm1.Qty * itm1.Price); - if (sum > 10000000) - { - var billNum = OrderNumberGenerator.GenerateOrderNumber("N"); - var bbac_sa = new BBAC_CAN_SA(); - bbac_sa.SetId(Guid.NewGuid()); - bbac_sa.BillNum = billNum; - bbac_sa.InvGroupNum = billNum; - bbac_sa.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); - bbac_sa.State = SettleBillState.未结状态; - bbac_sa.SettleBillNum = string.Empty; - bbac_sa.Site = "1046"; - bbac_sa.BusinessType = EnumBusinessType.JisBBAC; - billList.Add(bbac_sa); - foreach (var itm2 in details) - { - itm2.SetBillNum(billNum); - itm2.SetGroupNum(billNum); - billDetails.Add(itm2); - } - details = new List(); - sum = itm1.Qty * itm1.Price; - } - var _detailEntity = new BBAC_CAN_SA_DETAIL( - guid: GuidGenerator.Create(), - keyCode: itm1.KeyCode, - version: itm1.Version, - billNum: string.Empty, - settleBillNum: itm1.SettleBillNum, - lU: itm1.LU, - pN: itm1.PN, - site: itm1.Site, - qty: itm1.Qty, - price: itm1.Price, - category: itm1.BusinessType, - isReturn: itm1.IsReturn, - settleDate: itm1.SettleDate, - groupNum: itm1.GroupNum, - invGroupNum: string.Empty, - contactid: itm1.ContractDocID, - invbillnum: string.Empty, - partcode: itm1.PartCode - ); - _detailEntity.RealPartCode = itm1.RealPartCode; - details.Add(_detailEntity); - } - var billNum1 = OrderNumberGenerator.GenerateOrderNumber("N"); - var bbac_sa1 = new BBAC_CAN_SA(); - bbac_sa1.SetId(Guid.NewGuid()); - bbac_sa1.BillNum = billNum1; - bbac_sa1.InvGroupNum = billNum1; - bbac_sa1.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); - bbac_sa1.State = SettleBillState.未结状态; - bbac_sa1.SettleBillNum = string.Empty; - bbac_sa1.Site = "1046"; - bbac_sa1.BusinessType = EnumBusinessType.JisBBAC; - billList.Add(bbac_sa1); - foreach (var detail in details) - { - detail.SetBillNum(billNum1); - detail.SetGroupNum(billNum1); - billDetails.Add(detail); - } + var _detailEntity = new BBAC_CAN_SA_DETAIL( + guid: GuidGenerator.Create(), + keyCode: itm1.KeyCode, + version: itm1.Version, + billNum: billNum, + settleBillNum: itm1.SettleBillNum, + lU: itm1.LU, + pN: itm1.PN, + site: itm1.Site, + qty: itm1.Qty, + price: itm1.Price, + category: itm1.BusinessType, + isReturn: itm1.IsReturn, + settleDate: itm1.SettleDate, + groupNum: itm1.GroupNum, + invGroupNum: billNum, + contactid: itm1.ContractDocID, + invbillnum: string.Empty, + partcode: itm1.PartCode + ); + _detailEntity.RealPartCode = itm1.RealPartCode; + billDetails.Add(_detailEntity); } + + + + //foreach (var itm in part_group_big) + //{ + // var ls = bbac_can_list.Where(p => p.LU == itm.LU).ToList(); + // decimal sum = 0; + // List details = new List(); + // foreach (var itm1 in ls) + // { + // sum += (itm1.Qty * itm1.Price); + // if (sum > 10000000) + // { + // var billNum = OrderNumberGenerator.GenerateOrderNumber("N"); + // var bbac_sa = new BBAC_CAN_SA(); + // bbac_sa.SetId(Guid.NewGuid()); + // bbac_sa.BillNum = billNum; + // bbac_sa.InvGroupNum = billNum; + // bbac_sa.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); + // bbac_sa.State = SettleBillState.未结状态; + // bbac_sa.SettleBillNum = string.Empty; + // bbac_sa.Site = "1046"; + // bbac_sa.BusinessType = EnumBusinessType.JisBBAC; + // billList.Add(bbac_sa); + // foreach (var itm2 in details) + // { + // itm2.SetBillNum(billNum); + // itm2.SetGroupNum(billNum); + // billDetails.Add(itm2); + // } + // details = new List(); + // sum = itm1.Qty * itm1.Price; + // } + // var _detailEntity = new BBAC_CAN_SA_DETAIL( + // guid: GuidGenerator.Create(), + // keyCode: itm1.KeyCode, + // version: itm1.Version, + // billNum: string.Empty, + // settleBillNum: itm1.SettleBillNum, + // lU: itm1.LU, + // pN: itm1.PN, + // site: itm1.Site, + // qty: itm1.Qty, + // price: itm1.Price, + // category: itm1.BusinessType, + // isReturn: itm1.IsReturn, + // settleDate: itm1.SettleDate, + // groupNum: itm1.GroupNum, + // invGroupNum: string.Empty, + // contactid: itm1.ContractDocID, + // invbillnum: string.Empty, + // partcode: itm1.PartCode + // ); + // _detailEntity.RealPartCode = itm1.RealPartCode; + // details.Add(_detailEntity); + // } + // var billNum1 = OrderNumberGenerator.GenerateOrderNumber("N"); + // var bbac_sa1 = new BBAC_CAN_SA(); + // bbac_sa1.SetId(Guid.NewGuid()); + // bbac_sa1.BillNum = billNum1; + // bbac_sa1.InvGroupNum = billNum1; + // bbac_sa1.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); + // bbac_sa1.State = SettleBillState.未结状态; + // bbac_sa1.SettleBillNum = string.Empty; + // bbac_sa1.Site = "1046"; + // bbac_sa1.BusinessType = EnumBusinessType.JisBBAC; + // billList.Add(bbac_sa1); + // foreach (var detail in details) + // { + // detail.SetBillNum(billNum1); + // detail.SetGroupNum(billNum1); + // billDetails.Add(detail); + // } + //} } if (part_group_small.Count > 0) { @@ -635,38 +676,24 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs var part_group_small = t1.Where(p => p.Amt < 10000000).ToList(); if (part_group_big.Count > 0) { - foreach (var itm in part_group_big) + + var partlist = part_group_big.Select(p => p.LU).ToList(); + var ls = hbpo_can_list.Where(p => partlist.Contains(p.LU)).ToList(); + var billNum = OrderNumberGenerator.GenerateOrderNumber("N"); + var hbpo_sa = new HBPO_CAN_SA(); + hbpo_sa.SetId(Guid.NewGuid()); + hbpo_sa.BillNum = billNum; + hbpo_sa.InvGroupNum = billNum; + hbpo_sa.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); + hbpo_sa.State = SettleBillState.未结状态; + hbpo_sa.SettleBillNum = string.Empty; + hbpo_sa.Site = "104T"; + hbpo_sa.BusinessType = EnumBusinessType.JisBBAC; + billList.Add(hbpo_sa); + foreach (var itm1 in ls) { - var ls = hbpo_can_list.Where(p => p.LU == itm.LU).ToList(); - decimal sum = 0; - List details = new List(); - foreach (var itm1 in ls) - { - sum += (itm1.Qty * itm1.Price); - if (sum > 10000000) - { - var billNum = OrderNumberGenerator.GenerateOrderNumber("N"); - var bbac_sa = new HBPO_CAN_SA(); - bbac_sa.SetId(Guid.NewGuid()); - bbac_sa.BillNum = billNum; - bbac_sa.InvGroupNum = billNum; - bbac_sa.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); - bbac_sa.State = SettleBillState.未结状态; - bbac_sa.SettleBillNum = string.Empty; - bbac_sa.Site = "104T"; - bbac_sa.BusinessType = EnumBusinessType.JisBBAC; - billList.Add(bbac_sa); - foreach (var itm2 in details) - { - itm2.SetBillNum(billNum); - itm2.SetGroupNum(billNum); - billDetails.Add(itm2); - } - details = new List(); - sum = itm1.Qty * itm1.Price; - } - var _detailEntity = new HBPO_CAN_SA_DETAIL( - guid: GuidGenerator.Create(), + var _detailEntity = new HBPO_CAN_SA_DETAIL( + guid: GuidGenerator.Create(), keyCode: itm1.KeyCode, version: itm1.Version, billNum: string.Empty, @@ -682,100 +709,192 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs invGroupNum: string.Empty, invbillnum: string.Empty, partcode: itm1.PartCode - ); - _detailEntity.RealPartCode = itm1.RealPartCode; - details.Add(_detailEntity); - } - var billNum1 = OrderNumberGenerator.GenerateOrderNumber("N"); - var bbac_sa1 = new HBPO_CAN_SA(); - bbac_sa1.SetId(Guid.NewGuid()); - bbac_sa1.BillNum = billNum1; - bbac_sa1.InvGroupNum = billNum1; - bbac_sa1.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); - bbac_sa1.State = SettleBillState.未结状态; - bbac_sa1.SettleBillNum = string.Empty; - bbac_sa1.Site = "104T"; - bbac_sa1.BusinessType = EnumBusinessType.JisBBAC; - billList.Add(bbac_sa1); - foreach (var detail in details) - { - detail.SetBillNum(billNum1); - detail.SetGroupNum(billNum1); - billDetails.Add(detail); - } + ); + _detailEntity.RealPartCode = itm1.RealPartCode; + billDetails.Add(_detailEntity); } + + + //foreach (var itm in part_group_big) + //{ + // var ls = hbpo_can_list.Where(p => p.LU == itm.LU).ToList(); + // decimal sum = 0; + // List details = new List(); + // foreach (var itm1 in ls) + // { + // sum += (itm1.Qty * itm1.Price); + // if (sum > 10000000) + // { + // var billNum = OrderNumberGenerator.GenerateOrderNumber("N"); + // var bbac_sa = new HBPO_CAN_SA(); + // bbac_sa.SetId(Guid.NewGuid()); + // bbac_sa.BillNum = billNum; + // bbac_sa.InvGroupNum = billNum; + // bbac_sa.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); + // bbac_sa.State = SettleBillState.未结状态; + // bbac_sa.SettleBillNum = string.Empty; + // bbac_sa.Site = "104T"; + // bbac_sa.BusinessType = EnumBusinessType.JisBBAC; + // billList.Add(bbac_sa); + // foreach (var itm2 in details) + // { + // itm2.SetBillNum(billNum); + // itm2.SetGroupNum(billNum); + // billDetails.Add(itm2); + // } + // details = new List(); + // sum = itm1.Qty * itm1.Price; + // } + // var _detailEntity = new HBPO_CAN_SA_DETAIL( + // guid: GuidGenerator.Create(), + // keyCode: itm1.KeyCode, + // version: itm1.Version, + // billNum: string.Empty, + // settleBillNum: itm1.SettleBillNum, + // lU: itm1.LU, + // pN: itm1.PN, + // site: itm1.Site, + // qty: itm1.Qty, + // price: itm1.Price, + // businessType: itm1.BusinessType, + // settleDate: itm1.SettleDate, + // groupNum: itm1.GroupNum, + // invGroupNum: string.Empty, + // invbillnum: string.Empty, + // partcode: itm1.PartCode + // ); + // _detailEntity.RealPartCode = itm1.RealPartCode; + // details.Add(_detailEntity); + // } + // var billNum1 = OrderNumberGenerator.GenerateOrderNumber("N"); + // var bbac_sa1 = new HBPO_CAN_SA(); + // bbac_sa1.SetId(Guid.NewGuid()); + // bbac_sa1.BillNum = billNum1; + // bbac_sa1.InvGroupNum = billNum1; + // bbac_sa1.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); + // bbac_sa1.State = SettleBillState.未结状态; + // bbac_sa1.SettleBillNum = string.Empty; + // bbac_sa1.Site = "104T"; + // bbac_sa1.BusinessType = EnumBusinessType.JisBBAC; + // billList.Add(bbac_sa1); + // foreach (var detail in details) + // { + // detail.SetBillNum(billNum1); + // detail.SetGroupNum(billNum1); + // billDetails.Add(detail); + // } + //} } if (part_group_small.Count > 0) { var partlist = part_group_small.Select(p => p.LU).ToList(); - var ls = hbpo_can_list.Where(p => partlist.Contains(p.LU)).ToList(); ; - decimal sum = 0; - List details = new List(); + var ls = hbpo_can_list.Where(p => partlist.Contains(p.LU)).ToList(); + var billNum = OrderNumberGenerator.GenerateOrderNumber("N"); + var hbpo_sa = new HBPO_CAN_SA(); + hbpo_sa.SetId(Guid.NewGuid()); + hbpo_sa.BillNum = billNum; + hbpo_sa.InvGroupNum = billNum; + hbpo_sa.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); + hbpo_sa.State = SettleBillState.未结状态; + hbpo_sa.SettleBillNum = string.Empty; + hbpo_sa.Site = "104T"; + hbpo_sa.BusinessType = EnumBusinessType.JisBBAC; + billList.Add(hbpo_sa); foreach (var itm1 in ls) { - sum += (itm1.Qty * itm1.Price); - if (sum > 10000000) - { - var billNum = OrderNumberGenerator.GenerateOrderNumber("N"); - var bbac_sa = new HBPO_CAN_SA(); - bbac_sa.SetId(Guid.NewGuid()); - bbac_sa.BillNum = billNum; - bbac_sa.InvGroupNum = billNum; - bbac_sa.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); - bbac_sa.State = SettleBillState.未结状态; - bbac_sa.SettleBillNum = string.Empty; - bbac_sa.Site = "104T"; - bbac_sa.BusinessType = EnumBusinessType.JisBBAC; - billList.Add(bbac_sa); - foreach (var itm2 in details) - { - itm2.SetBillNum(billNum); - itm2.SetGroupNum(billNum); - billDetails.Add(itm2); - } - details = new List(); - sum = itm1.Qty * itm1.Price; - } var _detailEntity = new HBPO_CAN_SA_DETAIL( - guid: GuidGenerator.Create(), - keyCode: itm1.KeyCode, - version: itm1.Version, - billNum: string.Empty, - settleBillNum: itm1.SettleBillNum, - lU: itm1.LU, - pN: itm1.PN, - site: itm1.Site, - qty: itm1.Qty, - price: itm1.Price, - businessType: itm1.BusinessType, - - settleDate: itm1.SettleDate, - groupNum: itm1.GroupNum, - invGroupNum: string.Empty, - - invbillnum: string.Empty, - partcode: itm1.PartCode - ); + guid: GuidGenerator.Create(), + keyCode: itm1.KeyCode, + version: itm1.Version, + billNum: string.Empty, + settleBillNum: itm1.SettleBillNum, + lU: itm1.LU, + pN: itm1.PN, + site: itm1.Site, + qty: itm1.Qty, + price: itm1.Price, + businessType: itm1.BusinessType, + settleDate: itm1.SettleDate, + groupNum: itm1.GroupNum, + invGroupNum: string.Empty, + invbillnum: string.Empty, + partcode: itm1.PartCode + ); _detailEntity.RealPartCode = itm1.RealPartCode; - details.Add(_detailEntity); - } - var billNum1 = OrderNumberGenerator.GenerateOrderNumber("N"); - var bbac_sa1 = new HBPO_CAN_SA(); - bbac_sa1.SetId(Guid.NewGuid()); - bbac_sa1.BillNum = billNum1; - bbac_sa1.InvGroupNum = billNum1; - bbac_sa1.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); - bbac_sa1.State = SettleBillState.未结状态; - bbac_sa1.SettleBillNum = string.Empty; - bbac_sa1.Site = "104T"; - bbac_sa1.BusinessType = EnumBusinessType.JisBBAC; - billList.Add(bbac_sa1); - foreach (var detail in details) - { - detail.SetBillNum(billNum1); - detail.SetGroupNum(billNum1); - billDetails.Add(detail); + billDetails.Add(_detailEntity); } + + + + //var partlist = part_group_small.Select(p => p.LU).ToList(); + //var ls = hbpo_can_list.Where(p => partlist.Contains(p.LU)).ToList(); ; + //decimal sum = 0; + //List details = new List(); + //foreach (var itm1 in ls) + //{ + // sum += (itm1.Qty * itm1.Price); + // if (sum > 10000000) + // { + // var billNum = OrderNumberGenerator.GenerateOrderNumber("N"); + // var bbac_sa = new HBPO_CAN_SA(); + // bbac_sa.SetId(Guid.NewGuid()); + // bbac_sa.BillNum = billNum; + // bbac_sa.InvGroupNum = billNum; + // bbac_sa.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); + // bbac_sa.State = SettleBillState.未结状态; + // bbac_sa.SettleBillNum = string.Empty; + // bbac_sa.Site = "104T"; + // bbac_sa.BusinessType = EnumBusinessType.JisBBAC; + // billList.Add(bbac_sa); + // foreach (var itm2 in details) + // { + // itm2.SetBillNum(billNum); + // itm2.SetGroupNum(billNum); + // billDetails.Add(itm2); + // } + // details = new List(); + // sum = itm1.Qty * itm1.Price; + // } + // var _detailEntity = new HBPO_CAN_SA_DETAIL( + // guid: GuidGenerator.Create(), + // keyCode: itm1.KeyCode, + // version: itm1.Version, + // billNum: string.Empty, + // settleBillNum: itm1.SettleBillNum, + // lU: itm1.LU, + // pN: itm1.PN, + // site: itm1.Site, + // qty: itm1.Qty, + // price: itm1.Price, + // businessType: itm1.BusinessType, + + // settleDate: itm1.SettleDate, + // groupNum: itm1.GroupNum, + // invGroupNum: string.Empty, + + // invbillnum: string.Empty, + // partcode: itm1.PartCode + // ); + // _detailEntity.RealPartCode = itm1.RealPartCode; + // details.Add(_detailEntity); + //} + //var billNum1 = OrderNumberGenerator.GenerateOrderNumber("N"); + //var bbac_sa1 = new HBPO_CAN_SA(); + //bbac_sa1.SetId(Guid.NewGuid()); + //bbac_sa1.BillNum = billNum1; + //bbac_sa1.InvGroupNum = billNum1; + //bbac_sa1.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); + //bbac_sa1.State = SettleBillState.未结状态; + //bbac_sa1.SettleBillNum = string.Empty; + //bbac_sa1.Site = "104T"; + //bbac_sa1.BusinessType = EnumBusinessType.JisBBAC; + //billList.Add(bbac_sa1); + //foreach (var detail in details) + //{ + // detail.SetBillNum(billNum1); + // detail.SetGroupNum(billNum1); + // billDetails.Add(detail); + //} } } }