From 22428c74e4b57c87a979a8f2f199e0e8e34dbb86 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 28 六月 2025 16:48:09 +0800
Subject: [PATCH] 编写接收SAP下发入库单接口

---
 Wms/Wms/Controllers/PdaAsnController.cs |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Wms/Wms/Controllers/PdaAsnController.cs b/Wms/Wms/Controllers/PdaAsnController.cs
index d8829bc..efc36c8 100644
--- a/Wms/Wms/Controllers/PdaAsnController.cs
+++ b/Wms/Wms/Controllers/PdaAsnController.cs
@@ -3,6 +3,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Model.InterFaceModel;
+using Model.ModelDto;
 using Model.ModelDto.BllAsnDto;
 using Model.ModelDto.DataDto;
 using Model.ModelVm;
@@ -11,6 +12,8 @@
 using Model.ModelVm.SysVm;
 using Newtonsoft.Json;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Security.Claims;
 using Utility;
 using Utility.Tools;
@@ -37,7 +40,6 @@
             _PdaAsnSvc = pdaAsnSvc; 
             _userManager = userManager;
         }
-        
 
         #region JC34
 
@@ -265,7 +267,7 @@
 
 
         /// <summary>
-        /// 缁戝畾鎵樼洏
+        /// 杞﹂棿鍏ュ簱
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
@@ -919,7 +921,16 @@
                 model.userId = int.Parse(UserId);
                 var models = _PdaAsnSvc.AddLabels(model);
 
-                return Ok(new { code = 0, msg = "绠辩爜鐢熸垚鎴愬姛!", data = models });
+                var data = new BoxListInfoDto();
+                data.SkuNo = model.SkuNo;
+                data.SkuName = model.SkuName;
+                data.LotNo = model.LotNo;
+                data.Date1 = model.TimeFrom == null ? "" : Convert.ToDateTime(model.TimeFrom).ToString("yyyy-MM-dd");
+                data.Date2 = model.TimeEnd == null ? "" : Convert.ToDateTime(model.TimeEnd).ToString("yyyy-MM-dd");
+                data.BoxNoList = models.Select(m => m.BoxNo).ToList();
+
+
+                return Ok(new { code = 0, msg = "绠辩爜鐢熸垚鎴愬姛!", data = data });
             }
             catch (Exception e)
             {

--
Gitblit v1.8.0