From e045fc036df96d5549624685af9c63704738f5f2 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期五, 26 七月 2024 10:02:14 +0800
Subject: [PATCH] 盘点优化
---
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 37 +++++++++++++++++++++++--------------
Wms/WMS.BLL/BllCheckServer/WarehouseOutsidePalletsServer.cs | 16 +++++++++++++---
2 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/Wms/WMS.BLL/BllCheckServer/WarehouseOutsidePalletsServer.cs b/Wms/WMS.BLL/BllCheckServer/WarehouseOutsidePalletsServer.cs
index 9e2a432..b2cbc5a 100644
--- a/Wms/WMS.BLL/BllCheckServer/WarehouseOutsidePalletsServer.cs
+++ b/Wms/WMS.BLL/BllCheckServer/WarehouseOutsidePalletsServer.cs
@@ -1,5 +1,6 @@
锘縰sing Model.ModelDto.DataDto;
using Model.ModelDto.SysDto;
+using Model.ModelVm.LogVm;
using SqlSugar;
using System;
using System.Collections.Generic;
@@ -14,6 +15,7 @@
using WMS.Entity.LogEntity;
using WMS.Entity.SysEntity;
using WMS.IBLL.IBllCheckServer;
+using WMS.IBLL.ILogServer;
namespace WMS.BLL.BllCheckServer
{
@@ -21,9 +23,11 @@
{
private static readonly SqlSugarScope Db = DataContext.Db;
private readonly UserManager _userManager;
- public WarehouseOutsidePalletsServer(UserManager userManager) : base(Db)
+ private readonly IOperationCRServer _operation;
+ public WarehouseOutsidePalletsServer(UserManager userManager, IOperationCRServer operation) : base(Db)
{
_userManager = userManager;
+ _operation = operation;
}
/// <summary>
@@ -178,8 +182,14 @@
await Db.Updateable(bindModel).ExecuteCommandAsync();
}
// 鎻掑叆鎿嶄綔鏃ュ織
- new OperationASNServer().AddLogOperationAsn("搴撳唴浣滀笟", "搴撳鎵樼洏", stockDetail.PalletNo, "缂栬緫",
- $"鎸囧畾浜嗗偍浣嶏細{locate.LocatNo}銆佸崟鎹彿锛歿stockDetail.ASNNo}銆佹墭鐩樼爜锛歿stockDetail.PalletNo}鐨勪俊鎭�", _userManager.UserId);
+ await _operation.AddLogOperationCr(new OperationInputVm()
+ {
+ ParentName = "搴撳唴浣滀笟",
+ MenuName = "搴撳鎵樼洏",
+ FkNo = stockDetail.PalletNo,
+ TypeName = "缂栬緫",
+ Msg = $"鎸囧畾浜嗗偍浣嶏細{locate.LocatNo}銆佸崟鎹彿锛歿stockDetail.ASNNo}銆佹墭鐩樼爜锛歿stockDetail.PalletNo}鐨勪俊鎭�"
+ });
//鎻愪氦浜嬪姟
Db.CommitTran();
}
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index f039dd7..e2e7613 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -199,6 +199,15 @@
{
throw Oops.Bah("鏈煡璇㈠埌鏈洏鐐圭殑鐩樼偣鏄庣粏淇℃伅");
}
+ var modSku = Db.Queryable<SysMaterials>().Where(s => s.SkuNo == sku).First();
+ if (modSku.IsPasteCode == "1" && isContinue == "1")
+ {
+ throw Oops.Bah("璐存爣鐗╂枡涓嶅厑璁告暟閲忕洏鐐�");
+ }
+ else if (modSku.IsPasteCode == "0" && isContinue == "0")
+ {
+ throw Oops.Bah("涓嶈创鏍囩墿鏂欒浣跨敤鏁伴噺鐩樼偣");
+ }
//鐩樼偣璁板綍
var checkLog = Db.Queryable<BllStockCheckLog>().Where(m =>
m.IsDel == "0" && m.CRNo == crNo && m.PalletNo == palletNo && m.SkuNo == sku && m.LotNo == lotNo && m.CheckResult == null);
@@ -777,7 +786,7 @@
var storageArea = new List<SysStorageArea>();
if (string.IsNullOrEmpty(palletNo))
{
- storageArea = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.WareHouseNo == "W02").OrderBy(o=>o.AreaNo).ToList();
+ storageArea = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.WareHouseNo == "W02").OrderBy(o => o.AreaNo).ToList();
}
else
{
@@ -799,7 +808,7 @@
{
throw new Exception("鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
}
-
+
if (storageLocat.AreaNo.Contains("B0"))
{
storageArea = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.AreaNo.Contains("B0") && w.WareHouseNo == "W02").OrderBy(o => o.AreaNo).ToList();
@@ -808,7 +817,7 @@
{
storageArea = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.AreaNo.Contains("B1") && w.WareHouseNo == "W02").OrderBy(o => o.AreaNo).ToList();
}
- }
+ }
return storageArea;
}
catch (Exception ex)
@@ -894,7 +903,7 @@
if (!string.IsNullOrEmpty(areaNo) && !string.IsNullOrEmpty(ruku))
{
throw new Exception("鐩爣鍖哄煙鍜屽叆搴撳彛涓嶈兘鍚屾椂閫夋嫨锛�");
- }
+ }
try
{
string EndLocat = string.Empty;//鐩爣浣嶇疆
@@ -903,7 +912,7 @@
if (log != null)
{
throw new Exception("璇ユ墭鐩樺凡鏈夊皬杞︾瓑寰呮墽琛屾垨姝ｅ湪鎵ц鐨勪换鍔�!");
- }
+ }
var stockDetail = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo);
if (stockDetail == null)
{
@@ -916,7 +925,7 @@
{
throw new Exception("鎵�閫夊尯鍩熶俊鎭笉瀛樺湪,璇锋鏌�!");
}
- EndLocat = GetLocat(areaNo, stockDetail.SkuNo, stockDetail.LotNo,palletNo);
+ EndLocat = GetLocat(areaNo, stockDetail.SkuNo, stockDetail.LotNo, palletNo);
}
else
{
@@ -951,7 +960,7 @@
throw new Exception("鐩爣鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
}
}
-
+
//寮�鍚簨鍔�
Db.BeginTran();
@@ -996,7 +1005,7 @@
{
storageLocatEnd.Status = "4";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑
Db.Updateable(storageLocatEnd).ExecuteCommand();
- }
+ }
//娣诲姞鎿嶄綔鏃ュ織璁板綍
var k = new OperationCrServer().AddLogOperationCr("PDA妯″潡", "AGV杞繍", palletNo, "绉诲簱", $"PDA鍛煎彨灏忚溅瀵规墭鐩樺彿锛歿palletNo}鍙戣捣杞繍", userId);
//鎻愪氦浜嬪姟
@@ -1019,7 +1028,7 @@
/// <param name="palletNo"></param>
/// <param name="areaNo"></param>
/// <param name="userId"></param>
- public void AgvTransport2(string soNo,string palletNo, string areaNo, int userId)
+ public void AgvTransport2(string soNo, string palletNo, string areaNo, int userId)
{
if (string.IsNullOrEmpty(soNo))
{
@@ -1055,7 +1064,7 @@
string sqlStr = $"select * from DataStockDetail where PalletNo in (select PalletNo from BllExportAllot where IsDel='0' and SONo='{soNo}')";
stockDetailList = Db.Ado.SqlQuery<DataStockDetail>(sqlStr).ToList();
}
- if (stockDetailList.Count<=0)
+ if (stockDetailList.Count <= 0)
{
throw new Exception("鎵樼洏鏄庣粏涓嶅瓨鍦�,璇锋鏌�!");
}
@@ -1068,7 +1077,7 @@
foreach (var item in stockDetailList)
{
//浠诲姟淇℃伅
- var logInfo = log.First(w =>w.PalletNo == item.PalletNo);
+ var logInfo = log.First(w => w.PalletNo == item.PalletNo);
if (logInfo != null)
{
throw new Exception($"鎵樼洏鍙凤細{item.PalletNo}宸叉湁灏忚溅绛夊緟鎵ц鎴栨鍦ㄦ墽琛岀殑浠诲姟!");
@@ -1178,7 +1187,7 @@
/// <param name="skuNo"></param>
/// <param name="lotNo"></param>
/// <returns></returns>
- private string GetLocat(string areaNo,string skuNo,string lotNo,string palletNo,string hasLocatNoList="")
+ private string GetLocat(string areaNo, string skuNo, string lotNo, string palletNo, string hasLocatNoList = "")
{
try
{
@@ -1187,7 +1196,7 @@
var storageLocatList = Db.Queryable<SysStorageLocat>().Where(w => w.WareHouseNo == "W02" && w.AreaNo == areaNo).ToList();
//鍚屽尯鍩熷悓鎵规鐗╂枡鐨勫偍浣嶄俊鎭�
List<string> locatList = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.SkuNo == skuNo && w.LotNo == lotNo && w.WareHouseNo == "W02" && w.AreaNo == areaNo && w.PalletNo != palletNo)
- .OrderByDescending(o=>o.LocatNo).Select(s=>s.LocatNo).Distinct().ToList();
+ .OrderByDescending(o => o.LocatNo).Select(s => s.LocatNo).Distinct().ToList();
foreach (var item in locatList)
{
var locatInfo = storageLocatList.Where(w => w.LocatNo == item).First();
@@ -1202,7 +1211,7 @@
if (string.IsNullOrEmpty(endLocat))
{
var locatInfo3 = storageLocatList.Where(w => w.IsDel == "0" && w.Flag == "0" && w.Status == "0" && !hasLocatNoList.Contains(w.LocatNo))
- .OrderByDescending(m => m.Layer).OrderByDescending(m=>m.Column).OrderByDescending(m=> m.Row).First();
+ .OrderByDescending(m => m.Layer).OrderByDescending(m => m.Column).OrderByDescending(m => m.Row).First();
if (locatInfo3 != null)
{
--
Gitblit v1.8.0