From 7b8df9666698422eaa24c780b9e91bb7905282bb Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 31 一月 2024 13:22:57 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Wms/WMS.IBLL/IBllAsnServer/IBllLabelBoxNoServer.cs | 3 +
Wms/Model/ModelDto/BllAsnDto/LabelBoxDto.cs | 45 ++++++++++++++++++++++
Wms/WMS.BLL/BllAsnServer/BllLabelBoxNoServer.cs | 15 ++++---
3 files changed, 55 insertions(+), 8 deletions(-)
diff --git a/Wms/Model/ModelDto/BllAsnDto/LabelBoxDto.cs b/Wms/Model/ModelDto/BllAsnDto/LabelBoxDto.cs
new file mode 100644
index 0000000..716c14e
--- /dev/null
+++ b/Wms/Model/ModelDto/BllAsnDto/LabelBoxDto.cs
@@ -0,0 +1,45 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Security.AccessControl;
+using System.Text;
+
+namespace Model.ModelDto.BllAsnDto
+{
+ /// <summary>
+ /// 鏍囩绠辩爜Dto
+ /// </summary>
+ public class LabelBoxDto
+ {
+ public int Id { get; set; }
+ public string AsnNo { get; set; }
+ public int? AsnDetailNo { get; set; }
+ public string BoxNo { get; set; }
+ public string ParentBoxNo { get; set; }
+ public decimal Qty { get; set; }
+ public string SkuNo { get; set; }
+ public string SkuName { get; set; }
+ public string LotNo { get; set; }
+ public string LotText { get; set; }
+ public string SupplierName { get; set; }
+ public string SupplierLot { get; set; }
+ public DateTime? ProductionTime { get; set; }
+ public DateTime? ExpirationTime { get; set; }
+ public DateTime? InspectTime { get; set; }
+ public DateTime? CompleteTime { get; set; }
+ public string IsUse { get; set; }
+ public string Level { get; set; }
+ public int? QtyCount { get; set; }
+ public int? QtyOrd { get; set; }
+ public string UDF1 { get; set; }
+ public string UDF2 { get; set; }
+ public string UDF3 { get; set; }
+ public string UDF4 { get; set; }
+ public string UDF5 { get; set; }
+
+ public string CreateUserName { get; set; }
+ public string UpdateUserName { get; set; }
+ public DateTime CreateTime { get; set; }
+ public DateTime? UpdateTime { get; set; }
+
+ }
+}
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)
{
diff --git a/Wms/WMS.IBLL/IBllAsnServer/IBllLabelBoxNoServer.cs b/Wms/WMS.IBLL/IBllAsnServer/IBllLabelBoxNoServer.cs
index 1934115..be6e45b 100644
--- a/Wms/WMS.IBLL/IBllAsnServer/IBllLabelBoxNoServer.cs
+++ b/Wms/WMS.IBLL/IBllAsnServer/IBllLabelBoxNoServer.cs
@@ -1,6 +1,7 @@
锘縰sing System;
using System.Collections.Generic;
using System.Text;
+using Model.ModelDto.BllAsnDto;
using Model.ModelVm.BllAsnVm;
using WMS.Entity.BllAsnEntity;
@@ -14,6 +15,6 @@
/// <param name="model">鏌ヨ鏉′欢</param>
/// <param name="count">鏁伴噺</param>
/// <returns>鏍囩绠辩爜淇℃伅</returns>
- List<BllLabelBoxNo> GetLabelBoxList(LabelBoxVm model, out int count);
+ List<LabelBoxDto> GetLabelBoxList(LabelBoxVm model, out int count);
}
}
--
Gitblit v1.8.0