From b511ce686d438b202b73fc4f3b2d1abd5cf72dc4 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期六, 29 十一月 2025 09:51:40 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu

---
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs"
index 2dc95ec..cbd9442 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs"
@@ -1773,7 +1773,7 @@
             if (outboundOrder.OrderType == OutOrderTypeEnum.Allocate.ObjToInt())
             {
                 var allocate = _allocateService.Repository.QueryData(x => x.UpperOrderNo == outboundOrder.UpperOrderNo).First();
-                var feedmodel = new AllocateDto
+                var allocatefeedmodel = new AllocateDto
                 {
                     ReqCode = Guid.NewGuid().ToString(),
                     ReqTime = DateTime.Now.ToString(),
@@ -1815,9 +1815,9 @@
 
                   
                    }).ToList();
-                feedmodel.Details = groupedData;
+                allocatefeedmodel.Details = groupedData;
 
-                var result = await _invokeMESService.FeedbackAllocate(feedmodel);
+                var result = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);
                 if (result != null && result.code == 200)
                 {                    
                     await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()

--
Gitblit v1.9.3