From 094889f27d4bda5116747a2dcc57724a9d5e90d7 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期二, 09 十二月 2025 13:51:12 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu

---
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Allocate/AllocateOrderController.cs |    8 +++++++-
 1 files changed, 7 insertions(+), 1 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_WMSServer/Controllers/Allocate/AllocateOrderController.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_WMSServer/Controllers/Allocate/AllocateOrderController.cs"
index b0b0c6b..5ac31db 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_WMSServer/Controllers/Allocate/AllocateOrderController.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_WMSServer/Controllers/Allocate/AllocateOrderController.cs"
@@ -57,6 +57,10 @@
             {
                 allocateOrder.OrderType = 115;
             }
+            else if (businessType == BusinessTypeEnum.鏅轰粨璋冩櫤浠�)
+            {
+                allocateOrder.OrderType = 117;
+            }
 
             foreach (var detailDto in model.Details)
             {
@@ -94,7 +98,9 @@
                         MaterielCode = detailDto.MaterialCode,
                         LineNo = detailDto.LineNo,
                         OrderQuantity = detailDto.Qty,
-                        Unit = detailDto.Unit
+                        Unit = detailDto.Unit,
+                        BarcodeUnit =detailDto.Unit,
+                        BarcodeQty=detailDto.Qty,
                         
                     };
                     allocateOrder.Details.Add(orderDetail);

--
Gitblit v1.9.3