From 1b108e8d7335d5a5a59dfcf2f4eeef034a53b9b8 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 06 九月 2024 12:33:06 +0800
Subject: [PATCH] 用户管理页角色问题和密码增加验证问题
---
Wms/WMS.BLL/SysServer/PalletsServer.cs | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/PalletsServer.cs b/Wms/WMS.BLL/SysServer/PalletsServer.cs
index adbdd82..7905c29 100644
--- a/Wms/WMS.BLL/SysServer/PalletsServer.cs
+++ b/Wms/WMS.BLL/SysServer/PalletsServer.cs
@@ -46,7 +46,7 @@
.ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
- var data = PalletsRst.GetAllByOrderPageAsync(item, limit, page, out int counts)
+ var data = PalletsRst.GetAllByOrderPage(item, limit, page, out int counts)
.Includes(x => x.CreateUserInfo)
.ToList();
count = counts;
@@ -77,12 +77,12 @@
if (!string.IsNullOrWhiteSpace(palletNo))
{
- var code = PalletsRst.GetAllWhereAsync(m => m.PalletNo == palletNo).First();
+ var code = PalletsRst.GetAllWhere(m => m.PalletNo == palletNo).First();
return code.PalletNo;
}
else
{
- var code = PalletsRst.GetAllAsync().OrderByDescending(m => m.PalletNo).First();
+ var code = PalletsRst.GetAll().OrderByDescending(m => m.PalletNo).First();
if (code != null)
{
@@ -125,8 +125,17 @@
var str = pallNo.Substring(3, 5);
string remove = pallNo.Substring(0, 3);
- int sibelius = Convert.ToInt16(str);
+ int sibelius = 0;
var num = 0;
+ if (remove != "T" + DateTime.Now.ToString("yy"))
+ {
+ remove = "T" + DateTime.Now.ToString("yy");
+ sibelius = 0;
+ }
+ else
+ {
+ sibelius = Convert.ToInt16(str);
+ }
for (int i = 0; i < groupCount; i++)
{
sibelius += 1;
--
Gitblit v1.8.0