From 7bb0a817a938d4f44569cc14d6ea34dbb7b1105f Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 01 二月 2024 08:45:14 +0800
Subject: [PATCH] 入库单增加复核时间和复核人
---
Wms/WMS.BLL/BllAsnServer/BllLabelBoxNoServer.cs | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/BllLabelBoxNoServer.cs b/Wms/WMS.BLL/BllAsnServer/BllLabelBoxNoServer.cs
index e936662..8309e3f 100644
--- a/Wms/WMS.BLL/BllAsnServer/BllLabelBoxNoServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/BllLabelBoxNoServer.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq.Expressions;
using System.Text;
+using Model.ModelDto.BllAsnDto;
using Model.ModelVm.BllAsnVm;
using SqlSugar;
using WMS.DAL;
@@ -21,7 +22,7 @@
}
//鑾峰彇鏍囩绠辩爜淇℃伅
- public List<BllLabelBoxNo> GetLabelBoxList(LabelBoxVm model, out int count)
+ public List<LabelBoxDto> GetLabelBoxList(LabelBoxVm model, out int count)
{
try
{
@@ -36,11 +37,11 @@
var data = GetAllWhereAsync(item)
.LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id)
.LeftJoin<SysUserInfor>((a, b, c) => a.UpdateUser == c.Id)
- .Select((a, b, c) => new BllLabelBoxNo()
+ .Select((a, b, c) => new LabelBoxDto()
{
Id = a.Id,
- ASNNo = a.ASNNo,
- ASNDetailNo = a.ASNDetailNo,
+ AsnNo = a.ASNNo,
+ AsnDetailNo = a.ASNDetailNo,
BoxNo = a.BoxNo,
ParentBoxNo = a.ParentBoxNo,
Qty = a.Qty,
@@ -64,14 +65,14 @@
UDF4 = a.UDF4,
UDF5 = a.UDF5,
- //CreateUserName = b.RealName,
- //UpdateUserName = c.RealName,
+ CreateUserName = b.RealName,
+ UpdateUserName = c.RealName,
CreateTime = a.CreateTime,
UpdateTime = a.UpdateTime
}).OrderByDescending(a => a.CreateTime).OrderBy(a => a.BoxNo).ToOffsetPage(model.Page, model.Limit, ref total);
count = total;
- //return data;
+ return data;
}
catch (Exception e)
{
--
Gitblit v1.8.0