ALD自动小车搬运项目
上一版本: 13c22c3a | 补丁 | 提交 | 忽略空白
pan
2025-12-01 868dc3eb03f3d8b05809394f3d1e2f6a663f7833 
提交
已修改2个文件
18 ■■■■■ 文件已修改
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs


@@ -2021,7 +2021,7 @@


                        .Where(x => x.OrderNo == orderNo && x.Status == (int)OutLockStockStatusEnum.拣选完成)


                        .ToListAsync();




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


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


                       .Select(group => new FeedbackOutboundDetailsModel


                       {


                           materialCode = group.Key.MaterielCode,


@@ -2029,7 +2029,7 @@


                           warehouseCode = group.Key.WarehouseCode,


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


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


                           unit = group.Key.Unit,


                           unit = group.Key.BarcodeUnit,


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


                           {


                               barcode = row.CurrentBarcode,


@@ -2833,9 +2833,9 @@


                            materialCode = detail.MaterielCode,


                            lineNo = detail.lineNo,


                            warehouseCode = detail.WarehouseCode,


                            qty = detail.OverOutQuantity, // ä½¿ç”¨è®¢å•æ˜Žç»†çš„已出库数量


                            currentDeliveryQty = detail.OverOutQuantity,


                            unit = detail.Unit,


                            qty = detail.BarcodeQty, // ä½¿ç”¨è®¢å•æ˜Žç»†çš„已出库数量


                            currentDeliveryQty = detail.BarcodeQty,


                            unit = detail.BarcodeUnit,


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


                            {


                                barcode = lockInfo.CurrentBarcode,




 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs


@@ -663,8 +663,8 @@


                                    Barcode = lockInfo.CurrentBarcode,


                                    SupplyCode = lockInfo.SupplyCode,


                                    BatchNo = lockInfo.BatchNo,


                                    Unit = lockInfo.Unit,


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


                                    Unit = lockInfo.BarcodeUnit,


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


                                }).ToList()


                            };




@@ -720,8 +720,8 @@


                                materialCode = detail.MaterielCode,


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


                                warehouseCode = detail.WarehouseCode,


                                qty = detail.OverOutQuantity, // ä½¿ç”¨è®¢å•æ˜Žç»†çš„已出库数量


                                currentDeliveryQty = detail.OverOutQuantity,


                                qty = detail.BarcodeQty,  


                                currentDeliveryQty = detail.BarcodeQty,


                                unit = detail.Unit,


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


                                {