From 8639f19c82f6e263654db44286256bb8d028d2c2 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期日, 30 十一月 2025 10:10:40 +0800
Subject: [PATCH] 1

---
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Allocate/AllocateOrderController.cs |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 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 31f6001..d1616ce 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"
@@ -1,5 +1,6 @@
 锘縰sing Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
 using System.Data.Common;
 using System.Diagnostics.Eventing.Reader;
 using System.Threading.Tasks;
@@ -33,6 +34,7 @@
         [HttpPost, Route("ReceiveAllocateOrder"), MethodParamsValidate, AllowAnonymous]
         public async Task<WebResponseContent> ReceiveAllocateOrder([FromBody] AllocateDto model)
         {
+            _logger.LogInformation("AllocateOrderController ReceiveAllocateOrder:  " + JsonConvert.SerializeObject(model));
             Dt_AllocateOrder allocateOrder = new Dt_AllocateOrder
             {
                 OrderNo = model.OrderNo,
@@ -41,12 +43,20 @@
                 FactoryArea = model.FactoryArea,
                 IsBatch = model.IsBatch,
                 CreateType = model.OperationType,
-                FromWarehouse=model.fromWarehouse,
-                ToWarehouse=model.toWarehouse,                
+                FromWarehouse = model.fromWarehouse,
+                ToWarehouse = model.toWarehouse,
                 Details = new List<Dt_AllocateOrderDetail>()
             };
             Enum.TryParse<BusinessTypeEnum>(allocateOrder.BusinessType, out var businessType);
-
+            //allocateOrder.OrderType = businessType == BusinessTypeEnum.鏅轰粨璋冨閮ㄤ粨搴� ? 215 : 115;
+            if (businessType == BusinessTypeEnum.鏅轰粨璋冨閮ㄤ粨搴�)
+            {
+                allocateOrder.OrderType = 215;
+            }
+            else if (businessType == BusinessTypeEnum.澶栭儴浠撳簱璋冩櫤浠�)
+            {
+                allocateOrder.OrderType = 115;
+            }
 
             foreach (var detailDto in model.Details)
             {
@@ -69,7 +79,9 @@
                             Barcode = barcodeDto.Barcode,
                             BatchNo = barcodeDto.BatchNo,
                             BarcodeQty = barcodeDto.Qty,
-                            BarcodeUnit = barcodeDto.Unit
+                            BarcodeUnit = barcodeDto.Unit,
+                            ValidDate = barcodeDto.validDate,
+
                         };
                         allocateOrder.Details.Add(orderDetail);
                     }

--
Gitblit v1.9.3