From 7e52a3232a913e5c7660af6730c9d8b398ea0284 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期三, 19 十一月 2025 13:20:02 +0800
Subject: [PATCH] Login增加密码错误次数锁定
---
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 140 ++++++++++++++++++++++++----------------------
1 files changed, 74 insertions(+), 66 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index ecce9ae..d049c59 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -42,7 +42,7 @@
/// <param name="boxNo"></param>
/// <param name="palletNoNew"></param>
/// <param name="userId"></param>
- public async Task SoSetPinPick34(string soNo, string soDetailId, string palletNo, string boxNo , string palletNoNew, int userId)
+ public async Task SoSetPinPick34(string soNo, string soDetailId, string palletNo, string boxNo, string palletNoNew, int userId)
{
Db.BeginTran();
try
@@ -122,18 +122,18 @@
bool isNew = false;
var pinStockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.SkuNo == stockDetail.SkuNo && m.LotNo == stockDetail.LotNo);
-
- if (pinStockDetail != null)
+
+ if (pinStockDetail != null)
{
if (palletNo != palletNoNew)//闈炴暣鎵樻嫞璐�
{
- var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Id!= pinStockDetail.Id).ToList();
- if (pinStockDetails.Count(m=>m.SONo != notice.SONo) > 0)
+ var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Id != pinStockDetail.Id).ToList();
+ if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
{
throw Oops.Bah("鎷兼墭鎵樼洏涓婂彧鑳芥斁鍚屼竴涓嚭搴撳崟涓嬬殑鐗╂枡锛�");
}
}
-
+
sdId = pinStockDetail.Id;
}
else
@@ -143,10 +143,14 @@
var newPalletInfo = await Db.Queryable<SysPallets>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Status == "0");
if (newPalletInfo == null)
{
- var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew &&(m.SkuNo != stockDetail.SkuNo || m.LotNo != stockDetail.LotNo)).ToList();
+ throw Oops.Bah("鏂版墭鐩樹俊鎭笉瀛樺湪锛�");
+ }
+ if (newPalletInfo.Status == "0")
+ {
+ var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && (m.SkuNo != stockDetail.SkuNo || m.LotNo != stockDetail.LotNo)).ToList();
if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
{
- throw Oops.Bah("鏂版墭鐩樹俊鎭笉瀛樺湪鎴栧凡琚娇鐢紒");
+ throw Oops.Bah("涓�涓墭鐩樺彧鑳芥帴鍙椾竴涓嚭搴撳崟鎷兼墭锛�");
}
}
else
@@ -155,9 +159,9 @@
newPalletInfo.Status = "1";
await Db.Updateable(newPalletInfo).ExecuteCommandAsync();
}
-
+
}
-
+
var sd = new DataStockDetail();
if (isNew)
{
@@ -343,9 +347,9 @@
}
boxInfos = boxInfo.ToList();
var comDetailList = await Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToListAsync();
-
+
//鏁寸鎷ｈ揣
-
+
if (boxInfo.Any(m => m.PalletNo != palletNo))
{
throw Oops.Bah("璇ユ墭鐩樹笌绠辩爜娌℃湁缁戝畾鍏崇郴");
@@ -355,7 +359,7 @@
//{
// throw Oops.Bah("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鍓╀綑寰呮嫞鏁伴噺");
//}
-
+
foreach (var item in boxInfos)
{
if (comDetailList.Any(m => m.BoxNo == item.BoxNo))
@@ -363,7 +367,7 @@
throw Oops.Bah($"褰撳墠{item.BoxNo}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
}
}
-
+
var comList = new List<BllCompleteDetail>();
foreach (var item in boxInfos)
@@ -399,20 +403,20 @@
item.BindNo = null;//鎵樼洏缁戝畾鍙�
item.PalletNo = palletNoNew;
}
-
+
item.Status = "5";//绠辨敮鐘舵�侊紝0锛氭湭缁勬墭 1锛氬凡缁勬墭 2锛氬凡鍏ュ簱 3锛氬凡鍑哄簱 4:宸插垎閰� 5锛氬凡鎷ｈ揣
await Db.Updateable(item).ExecuteCommandAsync();
pickQty += item.Qty;
-
+
}
-
+
await Db.Insertable(comList).ExecuteCommandAsync();
//淇敼鍑哄簱鍒嗛厤淇℃伅
allot.CompleteQty += pickQty;
allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
allot.UpdateTime = DateTime.Now;
-
+
await Db.Updateable(allot).ExecuteCommandAsync();
//鍒犻櫎鎴栦慨鏀瑰簱瀛樻槑缁�
@@ -442,28 +446,32 @@
var locateStr = stockDetail.LocatNo;
await Db.Deleteable(stockDetail).ExecuteCommandAsync();
- //鏀瑰彉鎵樼洏鐘舵��
- var pallet = await Db.Queryable<SysPallets>().FirstAsync(m => m.PalletNo == palletNo && m.IsDel == "0");
- if (pallet == null)
+ var detailOther = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.PalletNo == stockDetail.PalletNo && w.Id != stockDetail.Id).ToList();
+ if (detailOther.Count <= 0)
{
- throw Oops.Bah("鏈湪鎵樼洏琛ㄤ腑鏌ヨ鍒版墭鐩樹俊鎭�");
- }
- pallet.Status = "0";
- await Db.Updateable(pallet).ExecuteCommandAsync();
+ //鏀瑰彉鎵樼洏鐘舵��
+ var pallet = await Db.Queryable<SysPallets>().FirstAsync(m => m.PalletNo == palletNo && m.IsDel == "0");
+ if (pallet == null)
+ {
+ throw Oops.Bah("鏈湪鎵樼洏琛ㄤ腑鏌ヨ鍒版墭鐩樹俊鎭�");
+ }
+ pallet.Status = "0";
+ await Db.Updateable(pallet).ExecuteCommandAsync();
- //鏇存敼鍌ㄤ綅鐘舵�佷负绌哄偍浣�
- var locate = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.LocatNo == locateStr);
- if (locate != null)
- {
- locate.Status = "0";
- Db.Updateable(locate).ExecuteCommand();
+ //鏇存敼鍌ㄤ綅鐘舵�佷负绌哄偍浣�
+ var locate = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.LocatNo == locateStr);
+ if (locate != null)
+ {
+ locate.Status = "0";
+ Db.Updateable(locate).ExecuteCommand();
+ }
}
}
else
{
await Db.Updateable(stockDetail).ExecuteCommandAsync();
}
-
+
//淇敼鍑哄簱鍗曟槑缁嗘嫞璐ф暟閲�
noticeDetail.CompleteQty += pickQty;
await Db.Updateable(noticeDetail).ExecuteCommandAsync();
@@ -494,7 +502,7 @@
pinStockDetail.LockQty += pickQty;
await Db.Updateable(pinStockDetail).ExecuteCommandAsync();
}
- }
+ }
//娣诲姞鎿嶄綔鏃ュ織璁板綍
var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "鎷ｈ揣鎷兼墭", soNo, "鎷ｈ揣", $"鍦≒DA涓婂鍑哄簱鍗曞彿涓猴細{soNo}鐨勫師鎵樼洏鐮佷负锛歿palletNo}锛屾柊鎵樼洏鐮佷负锛歿palletNoNew}鐨勬嫞璐ф嫾鎵樻搷浣�", userId);
@@ -592,7 +600,7 @@
#region 鎷兼墭淇℃伅
bool isNew = false;
- var pinStockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.SkuNo== stockDetail.SkuNo && m.LotNo == stockDetail.LotNo);
+ var pinStockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.SkuNo == stockDetail.SkuNo && m.LotNo == stockDetail.LotNo);
if (pinStockDetail != null)
{
if (palletNo != palletNoNew)//闈炴暣鎵樻嫞璐�
@@ -801,8 +809,8 @@
await Db.Updateable(pallet).ExecuteCommandAsync();
//鏇存敼鍌ㄤ綅鐘舵�佷负绌哄偍浣�
- var locate = Db.Queryable<SysStorageLocat>().First(m=>m.IsDel == "0" && m.LocatNo == locateStr);
- if (locate!=null)
+ var locate = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.LocatNo == locateStr);
+ if (locate != null)
{
locate.Status = "0";
Db.Updateable(locate).ExecuteCommand();
@@ -1521,7 +1529,7 @@
//搴撳瓨鏄庣粏
var stockDetail = await Db.Queryable<DataStockDetail>()
- .FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNo
+ .FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNo
&& m.SkuNo == boxInfos.First().SkuNo && m.LotNo == boxInfos.First().LotNo);
if (stockDetail == null)
{
@@ -1576,7 +1584,7 @@
else
{
await Db.Updateable(stockDetail).ExecuteCommandAsync();
- }
+ }
stock.Qty -= pickQty;
stock.LockQty -= pickQty;
if (stock.Qty <= 0)
@@ -1619,7 +1627,7 @@
//娣诲姞鎿嶄綔鏃ュ織璁板綍
- var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "杞﹂棿鍑哄簱",
+ var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "杞﹂棿鍑哄簱",
boxNo, "鍑哄簱", $"鍦≒DA涓婂绠卞彿涓猴細{boxNo}鐨勬墭鐩樼爜涓猴細{palletNo}鐨勬嫞璐ф搷浣�", userId);
Db.CommitTran();
}
@@ -1635,7 +1643,7 @@
}
// 杞﹂棿Pda鎷ｈ揣-鏁伴噺
- public async Task ChejianPickNum(PdaSoVm model, int userId)
+ public async Task ChejianPickNum(PdaSoVm model, int userId)
{
Db.BeginTran();
try
@@ -1656,10 +1664,10 @@
{
throw Oops.Bah("鐗╂枡鏁伴噺涓嶅彲涓簄ull");
}
- else
+ else
{
skuNum = decimal.Parse(model.PickQty);
- if (skuNum <= 0)
+ if (skuNum <= 0)
{
throw Oops.Bah("鐗╂枡鏁伴噺搴斿ぇ浜�0锛�");
}
@@ -1671,9 +1679,9 @@
{
throw Oops.Bah("鐗╂枡涓嶅瓨鍦紝璇锋鏌ョ墿鏂欑紪鐮佹槸鍚︽嫰鍗达紒");
}
- else
+ else
{
- if (skuModel.IsPasteCode != "0")
+ if (skuModel.IsPasteCode != "0")
{
throw Oops.Bah("璇ョ墿鏂欎负璐存爣鐗╂枡锛岃鍒版爣绛鹃〉闈㈡嫞璐э紒");
}
@@ -1683,7 +1691,7 @@
//搴撳瓨鏄庣粏
var stockDetail = await Db.Queryable<DataStockDetail>()
.FirstAsync(m => m.IsDel == "0" && m.PalletNo == model.PalletNo
- && m.SkuNo == model.SkuNo && m.LotNo == model.LotNo);
+ && m.SkuNo == model.SkuNo && m.LotNo == model.LotNo);
if (stockDetail == null)
{
throw Oops.Bah("鏈煡璇㈠埌璇ユ墭鐩樹笂璐х墿鐨勫簱瀛樻槑缁嗕俊鎭紒");
@@ -1862,12 +1870,12 @@
//}
if (type == "1")//骞冲簱鍑哄簱鑾峰彇鍗曟嵁
{
- var allotList = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.Status == "1" && m.PalletNo == palletNo).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
+ var allotList = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.Status == "1" && m.PalletNo == palletNo).OrderByDescending(m => m.SONo).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
return allotList;
}
var noticeList = Db.Queryable<BllExportNotice>().Where(w => w.IsDel == "0" && (w.Status == "3" || w.Status == "4")).Select(s => s.SONo).ToList();
//鑾峰彇鐘舵�佷负寰呮嫞璐ф垨鑰呴儴鍒嗘嫞璐х殑鍑哄簱鍗�
- var allotList2 = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && (m.Status == "2" || m.Status == "3" || m.Status == "5") && m.PalletNo == palletNo && noticeList.Contains(m.SONo)).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
+ var allotList2 = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && (m.Status == "2" || m.Status == "3" || m.Status == "5") && m.PalletNo == palletNo && noticeList.Contains(m.SONo)).OrderByDescending(m => m.SONo).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
//var allotList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToList();
//鑾峰彇鍑哄簱鍗曟嵁涓嶄负寰呮嫞璐� 鎵ц瀹屾瘯 璁㈠崟鍏抽棴 绛夊緟鎵ц鐨勫崟鎹�
@@ -1883,18 +1891,18 @@
if (string.IsNullOrWhiteSpace(soNo))//鍒ゆ柇鎵樼洏鏄惁涓虹┖
{
throw Oops.Bah("鍑哄簱鍗曚负绌猴紝璇烽�夋嫨鍑哄簱鍗�");
- }
+ }
if (string.IsNullOrWhiteSpace(soDetailId))
{
throw Oops.Bah("鍑哄簱鏄庣粏涓虹┖锛岃閫夋嫨鐗╂枡-鎵规");
}
-
+
var allotList = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.Status == "0" && m.SONo == soNo && m.SODetailNo == int.Parse(soDetailId)).Select(m => m.PalletNo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
return allotList;
-
+
}
-
+
//鑾峰彇鎵樼洏涓惈鏈夌殑鎵ц涓殑鍗曟嵁
@@ -1902,7 +1910,7 @@
{
if (type == "1")//骞冲簱鍑哄簱鑾峰彇鍗曟嵁
{
- var allotList = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && (m.Status == "1" || m.Status =="0")).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
+ var allotList = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && (m.Status == "1" || m.Status == "0")).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
return allotList;
}
//鑾峰彇鐘舵�佷负寰呮嫞璐ф垨鑰呴儴鍒嗘嫞璐х殑鍑哄簱鍗�
@@ -1924,7 +1932,7 @@
}
//鑾峰彇鐘舵�佷负寰呮嫞璐ф垨鑰呴儴鍒嗘嫞璐х殑鍑哄簱鍗�
var allotList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.SONo == soNo && (m.Status == "0" || m.Status == "1"));
-
+
var list = await allotList.GroupBy(m => new { m.SODetailNo, m.SkuNo, m.SkuName, m.LotNo }).Select(m => new DetailIdSkuLotNo()
{
SoDetailId = m.SODetailNo,
@@ -2121,7 +2129,7 @@
/// <param name="boxNo"></param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
- public decimal CheckBoxForPick(string palletNo ,string boxNo)
+ public decimal CheckBoxForPick(string palletNo, string boxNo)
{
try
{
@@ -2382,7 +2390,7 @@
pallet.Status = "0";
await Db.Updateable(pallet).ExecuteCommandAsync();
}
-
+
//淇敼鍑哄簱鍗曟槑缁嗘嫞璐ф暟閲�
noticeDetail.CompleteQty += pickQty;
await Db.Updateable(noticeDetail).ExecuteCommandAsync();
@@ -3049,7 +3057,7 @@
await Db.Updateable(item).ExecuteCommandAsync();
}
pickQty += decimal.Parse(pickQty1);
- }
+ }
}
//鏀瑰彉搴撳唴绠辩爜鏄惁闆剁淇℃伅
if (biaoShi == "1" || biaoShi == "2")
@@ -3190,7 +3198,7 @@
/// <returns></returns>
/// <exception cref="Exception"></exception>
public async Task SoSetPickCode34(string soNo, string soDetailId, string palletNo, List<string> boxNoList, int userId)
- {
+ {
try
{
#region 鍒ゆ柇
@@ -3793,7 +3801,7 @@
else
{
stockDetail.Status = "0";
- }
+ }
if (stockDetail.Qty <= 0)
{
await Db.Deleteable(stockDetail).ExecuteCommandAsync();
@@ -4021,7 +4029,7 @@
{
endroad = new AllotLocation().RoadwayToStationNum(locat.RoadwayNo, model.OutMode);
}
-
+
outDtoList.Add(new OutCommandDto()
{
TaskNo = exTask.TaskNo, // 浠诲姟鍙�
@@ -4106,8 +4114,8 @@
var info = Db.Queryable<BllExportAllot>()
.LeftJoin<DataStockDetail>((a, b) => a.PalletNo == b.PalletNo)
- .Where(a=>a.IsDel == "0" && (a.Status == "0"||a.Status =="1") && a.SONo == soNo)
- .GroupBy((a,b) => new { a.SkuNo, a.SkuName, a.LotNo}).Select((a,b) => new BoxInfo()
+ .Where(a => a.IsDel == "0" && (a.Status == "0" || a.Status == "1") && a.SONo == soNo)
+ .GroupBy((a, b) => new { a.SkuNo, a.SkuName, a.LotNo }).Select((a, b) => new BoxInfo()
{
SkuNo = a.SkuNo,
SkuName = a.SkuName,
@@ -4132,15 +4140,15 @@
}
//鑾峰彇骞冲簱鍗曟嵁涓墭鐩樹綅缃俊鎭�
- public async Task<List<BoxInfo>> GetPingKuLocationInfo(string soNo,string skuno,string lotno)
+ public async Task<List<BoxInfo>> GetPingKuLocationInfo(string soNo, string skuno, string lotno)
{
var info = Db.Queryable<BllExportAllot>()
.LeftJoin<DataStockDetail>((a, b) => a.PalletNo == b.PalletNo)
- .LeftJoin<SysWareHouse>((a,b,c)=>b.WareHouseNo == c.WareHouseNo)
- .LeftJoin<SysStorageArea>((a,b,c,d)=>b.AreaNo == d.AreaNo)
+ .LeftJoin<SysWareHouse>((a, b, c) => b.WareHouseNo == c.WareHouseNo)
+ .LeftJoin<SysStorageArea>((a, b, c, d) => b.AreaNo == d.AreaNo)
.Where(a => a.IsDel == "0" && (a.Status == "0" || a.Status == "1") && a.SONo == soNo && a.SkuNo == skuno && a.LotNo == lotno)
- .GroupBy((a, b,c,d) => new { a.PalletNo, b.LocatNo,c.WareHouseName,d.AreaName }).Select((a, b,c,d) => new BoxInfo()
+ .GroupBy((a, b, c, d) => new { a.PalletNo, b.LocatNo, c.WareHouseName, d.AreaName }).Select((a, b, c, d) => new BoxInfo()
{
PalletNo = a.PalletNo,
LocatNo = b.LocatNo,
@@ -4360,7 +4368,7 @@
}
//鍙栨牱鍑哄簱鎷ｈ揣(鏍囩)
- public async Task SampleSoSetPick(string soType, string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3,
+ public async Task SampleSoSetPick(string soType, string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3,
string pickQty1, string asnNo, int userId)
{
Db.BeginTran();
--
Gitblit v1.8.0