Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxia...

heshaofeng

2025-12-03 afbd572a8c6631ed9b5d85ebcafa4a99bab7d330

Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu

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

@@ -129,7 +129,7 @@
            _client.DefaultRequestHeaders.Clear();
            _client.DefaultRequestHeaders.Add("Accept", "application/json");

            _logger.LogInformation("InvokeMESService  FeedbackOutbound :  " + json);
            _logger.LogInformation("InvokeMESService  FeedbackOutbound :  "+ model.orderNo +"  , " + json);

            var response = await _client.PostAsync("AldMaterialOutbound/MaterialOutbound", content);
            string body = await response.Content.ReadAsStringAsync();
@@ -248,58 +248,7 @@
            }
        }

        /// <summary>
        /// å‡†å¤‡å›žä¼ æ•°æ®
        /// </summary>
        private TransferDataDto PrepareTransferData(List<Dt_PickingRecord> pickingRecords)
        {
            var transferData = new TransferDataDto
            {
                TransferTime = DateTime.Now,
                Items = new List<TransferItemDto>()
            };

            // æŒ‰ç‰©æ–™åˆ†ç»„
            var materialGroups = pickingRecords
                .GroupBy(x => x.MaterielCode)
                .ToList();

            foreach (var group in materialGroups)
            {
                var item = new TransferItemDto
                {
                    MaterialCode = group.Key,
                    TotalQuantity = group.Sum(x => x.PickQuantity),
                    Locations = new List<LocationInfoDto>()
                };

                // æŒ‰è´§ä½åˆ†ç»„
                var locationGroups = group
                    .GroupBy(x => x.LocationCode)
                    .ToList();

                foreach (var locationGroup in locationGroups)
                {
                    var location = new LocationInfoDto
                    {
                        LocationCode = locationGroup.Key,
                        Quantity = locationGroup.Sum(x => x.PickQuantity),
                        Barcodes = locationGroup.Select(x => new BarcodeInfoDto
                        {
                            Barcode = x.Barcode,
                            Quantity = x.PickQuantity
                        }).ToList()
                    };

                    item.Locations.Add(location);
                }

                transferData.Items.Add(item);
            }

            return transferData;
        }

   
        /// <summary>
        /// 
        /// </summary>
@@ -828,6 +777,11 @@
                            .Where(x => x.OrderNo == orderNo)
                            .ExecuteCommandAsync();

                        await _pickingRecoreRepository.Db.Updateable<Dt_PickingRecord>()
                                 .SetColumns(x => x.ReturnToMESStatus == 1)
                            .Where(x => x.OrderNo == orderNo)
                            .ExecuteCommandAsync();

                        return WebResponseContent.Instance.OK("回传MES成功");
                    }
                    else

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

@@ -1105,85 +1105,91 @@
                        //不用回传
                    }
                    else
                    {
                        var feedmodel = new FeedbackOutboundRequestModel
                    {                    
                        if (outboundOrder != null && outboundOrder.IsBatch == 0)
                        {
                            reqCode = Guid.NewGuid().ToString(),
                            reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
                            business_type = outboundOrder.BusinessType,
                            factoryArea = outboundOrder.FactoryArea,
                            operationType = 1,
                            Operator = outboundOrder.Operator,
                            orderNo = outboundOrder.UpperOrderNo,
                            documentsNO = outboundOrder.OrderNo,
                            status = outboundOrder.OrderStatus,
                            details = new List<FeedbackOutboundDetailsModel>()
                        };


                        foreach (var detail in orderDetails)
                        {
                            // èŽ·å–该明细对应的条码信息（从锁定记录）
                            var detailLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
                                .Where(x => x.OrderNo == orderNo &&
                                           x.OrderDetailId == detail.Id &&
                                           (x.Status == (int)OutLockStockStatusEnum.拣选完成 || x.Status == (int)OutLockStockStatusEnum.已回库))
                                .ToListAsync();

                            var detailModel = new FeedbackOutboundDetailsModel
                            var feedmodel = new FeedbackOutboundRequestModel
                            {
                                materialCode = detail.MaterielCode,
                                lineNo = detail.lineNo, // æ³¨æ„ï¼šè¿™é‡Œå¯èƒ½éœ€è¦è°ƒæ•´å­—段名
                                warehouseCode = detail.WarehouseCode,
                                qty = 0,
                                currentDeliveryQty = 0,
                                unit = detail.Unit,
                                barcodes = new List<WIDESEA_DTO.Outbound.BarcodesModel>()
                                reqCode = Guid.NewGuid().ToString(),
                                reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
                                business_type = outboundOrder.BusinessType,
                                factoryArea = outboundOrder.FactoryArea,
                                operationType = 1,
                                Operator = outboundOrder.Operator,
                                orderNo = outboundOrder.UpperOrderNo,
                                documentsNO = outboundOrder.OrderNo,
                                status = outboundOrder.OrderStatus,
                                details = new List<FeedbackOutboundDetailsModel>()
                            };
                            foreach (var item in detailLocks)
                            foreach (var detail in orderDetails)
                            {
                                if (item.PickedQty > 0)
                                // èŽ·å–该明细对应的条码信息（从锁定记录）
                                var detailLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
                                    .Where(x => x.OrderNo == orderNo &&
                                               x.OrderDetailId == detail.Id &&
                                               (x.Status == (int)OutLockStockStatusEnum.拣选完成 || x.Status == (int)OutLockStockStatusEnum.已回库))
                                    .ToListAsync();

                                var detailModel = new FeedbackOutboundDetailsModel
                                {
                                    var barModel = new WIDESEA_DTO.Outbound.BarcodesModel
                                    materialCode = detail.MaterielCode,
                                    lineNo = detail.lineNo, // æ³¨æ„ï¼šè¿™é‡Œå¯èƒ½éœ€è¦è°ƒæ•´å­—段名
                                    warehouseCode = detail.WarehouseCode,
                                    qty = 0,
                                    currentDeliveryQty = 0,
                                    unit = detail.Unit,
                                    barcodes = new List<WIDESEA_DTO.Outbound.BarcodesModel>()
                                };
                                foreach (var item in detailLocks)
                                {
                                    if (item.PickedQty > 0)
                                    {
                                        barcode = item.CurrentBarcode,
                                        supplyCode = item.SupplyCode,
                                        batchNo = item.BatchNo,
                                        unit = item.BarcodeUnit,
                                        qty = item.PickedQty
                                    };
                                    // å•ä½ä¸ä¸€è‡´æ—¶è½¬æ¢
                                    if (detail.BarcodeUnit != detail.Unit)
                                    {
                                        var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, detail.Unit, detail.BarcodeUnit);
                                        barModel.unit = convertResult.Unit;
                                        barModel.qty = convertResult.Quantity;
                                        var barModel = new WIDESEA_DTO.Outbound.BarcodesModel
                                        {
                                            barcode = item.CurrentBarcode,
                                            supplyCode = item.SupplyCode,
                                            batchNo = item.BatchNo,
                                            unit = item.BarcodeUnit,
                                            qty = item.PickedQty
                                        };
                                        // å•ä½ä¸ä¸€è‡´æ—¶è½¬æ¢
                                        if (detail.BarcodeUnit != detail.Unit)
                                        {
                                            var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, detail.Unit, detail.BarcodeUnit);
                                            barModel.unit = convertResult.Unit;
                                            barModel.qty = convertResult.Quantity;
                                        }
                                        else
                                        {
                                            barModel.qty = item.PickedQty;
                                        }
                                        detailModel.qty += barModel.qty;
                                        detailModel.currentDeliveryQty += barModel.qty;
                                        detailModel.barcodes.Add(barModel);
                                    }
                                    else
                                    {
                                        barModel.qty = item.PickedQty;
                                    }
                                    detailModel.qty += barModel.qty;
                                    detailModel.currentDeliveryQty += barModel.qty;
                                    detailModel.barcodes.Add(barModel);
                                }
                                feedmodel.details.Add(detailModel);
                            }
                            feedmodel.details.Add(detailModel);
                        }

                        var result = await _invokeMESService.FeedbackOutbound(feedmodel);
                        if (result != null && result.code == 200)
                            var result = await _invokeMESService.FeedbackOutbound(feedmodel);
                            if (result != null && result.code == 200)
                            {
                                await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
                                    .SetColumns(x => x.ReturnToMESStatus == 1)
                                    .Where(x => x.OrderId == outboundOrder.Id)
                                    .ExecuteCommandAsync();

                                await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
                                    .SetColumns(x => x.ReturnToMESStatus == 1)
                                    .Where(x => x.OrderNo == orderNo)
                                    .ExecuteCommandAsync();
                            }
                        }
                        else if (outboundOrder != null && outboundOrder.IsBatch == 1)
                        {
                            await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
                                .SetColumns(x => x.ReturnToMESStatus == 1)
                                .Where(x => x.OrderId == outboundOrder.Id)
                                .ExecuteCommandAsync();

                            await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
                                .SetColumns(x => x.ReturnToMESStatus == 1)
                                .Where(x => x.OrderNo == orderNo)
                                .ExecuteCommandAsync();
                           await  _invokeMESService.BatchOrderFeedbackToMes(new List<string>(){outboundOrder.OrderNo },2);
                        }

                    }
                }
            }