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


@@ -2024,16 +2024,16 @@


                           materialCode = group.Key.MaterielCode,


                           lineNo = group.Key.lineNo,


                           warehouseCode = group.Key.WarehouseCode,


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


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


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


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


                           unit = group.Key.Unit,


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


                           {


                               barcode = row.CurrentBarcode,


                               supplyCode = row.SupplyCode,


                               batchNo = row.BatchNo,


                               unit = row.Unit,


                               qty = row.PickedQty


                               unit = row.BarcodeUnit,


                               qty = row.BarcodeQty


                           }).ToList()


                       }).ToList();




@@ -2828,7 +2828,7 @@


                        var detailModel = new FeedbackOutboundDetailsModel


                        {


                            materialCode = detail.MaterielCode,


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


                            lineNo = detail.lineNo,  


                            warehouseCode = detail.WarehouseCode,


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


                            currentDeliveryQty = detail.OverOutQuantity,


@@ -2838,8 +2838,8 @@


                                barcode = lockInfo.CurrentBarcode,


                                supplyCode = lockInfo.SupplyCode,


                                batchNo = lockInfo.BatchNo,


                                unit = lockInfo.Unit,


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


                                unit = lockInfo.BarcodeUnit,


                                qty = lockInfo.BarcodeQty //  


                            }).ToList()


                        };




@@ -2968,9 +2968,9 @@


                        InboundOrderNo = dbinboundOrderDetails.First()?.OrderNo,


                        UpperOrderNo = dbinboundOrderDetails.First()?.OrderNo,


                        SupplierId = dbinboundOrderDetails.First()?.SupplyCode,


                        OrderType = InOrderTypeEnum.InternalAllocat.ObjToInt(),


                        OrderType = materielGroupDTO.orderTypes,




                        BusinessType = InOrderTypeEnum.InternalAllocat.ObjToInt().ToString(),


                        BusinessType = materielGroupDTO.orderTypes.ToString(),




                        FactoryArea = dbinboundOrderDetails.First()?.FactoryArea,


                        Remark = "",