ALD自动小车搬运项目
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
pan
2025-12-02 62b5e514154820ed41f0093c29e35b07224a2ba9 
 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs


@@ -269,7 +269,7 @@




                                        };




                                        var groupedData = lists.GroupBy(item => new { item.MaterielCode, item.SupplyCode, item.BatchNo, item.InboundOrderRowNo, item.BarcodeUnit, item.WarehouseCode })


                                        var groupedData = lists.GroupBy(item => new { item.MaterielCode, item.InboundOrderRowNo, item.BarcodeUnit, item.WarehouseCode })


                                           .Select(group => new AllocateDtoDetail


                                           {


                                               MaterialCode = group.Key.MaterielCode,


@@ -596,25 +596,27 @@


                                       x.Status == (int)OutLockStockStatusEnum.拣选完成)


                            .ToListAsync();




                        var detailModel = new FeedbackOutboundDetailsModel


                        {


                            materialCode = detail.MaterielCode,


                            lineNo = detail.lineNo, // æ³¨æ„ï¼šè¿™é‡Œå¯èƒ½éœ€è¦è°ƒæ•´å­—段名


                            warehouseCode = detail.WarehouseCode,


                            qty = detail.BarcodeQty,


                            currentDeliveryQty = detail.BarcodeQty,


                            unit = detail.BarcodeUnit,


                            barcodes = detailLocks.Select(lockInfo => new WIDESEA_DTO.Outbound.BarcodesModel


                            {


                                barcode = lockInfo.CurrentBarcode,


                                supplyCode = lockInfo.SupplyCode,


                                batchNo = lockInfo.BatchNo,


                                unit = lockInfo.BarcodeUnit,


                                qty = lockInfo.BarcodeQty // æ¡ç çº§åˆ«çš„数量仍用锁定记录


                            }).ToList()


                        };




                        feedmodel.details.Add(detailModel);


                        var groupdata = detailLocks.GroupBy(item => new { item.MaterielCode,item.lineNo, item.BarcodeUnit, item.WarehouseCode })


                                 .Select(group =>new FeedbackOutboundDetailsModel


                                  {


                                     


                                      materialCode = group.Key.MaterielCode,


                                      lineNo = group.Key.lineNo, // æ³¨æ„ï¼šè¿™é‡Œå¯èƒ½éœ€è¦è°ƒæ•´å­—段名


                                      warehouseCode = group.Key.WarehouseCode,


                                      qty = group.Sum(x => x.BarcodeQty),


                                      currentDeliveryQty = group.Sum(x => x.BarcodeQty),


                                      unit = group.Key.BarcodeUnit,


                                      barcodes = group.Select(lockInfo => new WIDESEA_DTO.Outbound.BarcodesModel


                                      {


                                          barcode = lockInfo.CurrentBarcode,


                                          supplyCode = lockInfo.SupplyCode,


                                          batchNo = lockInfo.BatchNo,


                                          unit = lockInfo.BarcodeUnit,


                                          qty = lockInfo.BarcodeQty // æ¡ç çº§åˆ«çš„数量仍用锁定记录


                                      }).ToList()


                                  }).ToList();


                        feedmodel.details.AddRange(groupdata);


                    }




                    var result = await FeedbackOutbound(feedmodel);