From cb4ee362c99bc7902663c3134e6b0f103434946a Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 30 六月 2025 14:10:40 +0800
Subject: [PATCH] PDA增加仓库收货页面
---
Wms/Wms/Controllers/PdaAsnController.cs | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaAsnController.cs b/Wms/Wms/Controllers/PdaAsnController.cs
index d8829bc..e2b9bc7 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,49 @@
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)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+ #endregion
+
+ #region 浠撳簱鏀惰揣
+ /// <summary>
+ /// 浠撳簱纭鏀惰揣
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult ConfirmTakeOf(PalletBindVm model)
+ {
+ try
+ {
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+ string UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(UserId))
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+
+ _PdaAsnSvc.ConfirmTakeOf(model.PalletNo, int.Parse(UserId));
+
+ return Ok(new { code = 0, msg = "鏀惰揣鎴愬姛!" });
}
catch (Exception e)
{
--
Gitblit v1.8.0