From 06199ebfdf5d58c90c44848cf2fd490256e01c51 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期五, 23 二月 2024 08:18:09 +0800
Subject: [PATCH] Merge branch 'yyk'
---
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 29 ++++++++-
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 115 +++++++++++++++++++++-----------------
2 files changed, 87 insertions(+), 57 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 9922eb2..2c1739a 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -752,16 +752,35 @@
}
var info = boxInfo.First(m => m.BindNo == item.Id);
- if (!msgS.Contains(info.SkuNo))
+ //鑾峰彇鎵樼洏缁戝畾瀵瑰簲鍗曟嵁
+ var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().First(a => a.IsDel == "0" && a.Id == item.ASNDetailNo);
+ if (info != null)
{
- msgS += info.SkuNo + ";";
- }
+ if (!msgS.Contains(info.SkuNo))
+ {
+ msgS += info.SkuNo + ";";
+ }
- if (!msgL.Contains(info.LotNo))
+ if (!msgL.Contains(info.LotNo))
+ {
+ msgL += info.LotNo + ";";
+
+ }
+ }
+ else
{
- msgL += info.LotNo + ";";
+ if (!msgS.Contains(noticeDetail.SkuNo))
+ {
+ msgS += noticeDetail.SkuNo + ";";
+ }
+ if (!msgL.Contains(noticeDetail.LotNo))
+ {
+ msgL += noticeDetail.LotNo + ";";
+
+ }
}
+
}
var time = DateTime.Now;
var log = new BllAuditLog()
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index 9867faa..52a047c 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -49,7 +49,7 @@
.AndIF(!string.IsNullOrWhiteSpace(model.LocatNo), it => it.LocatNo.Contains(model.LocatNo.Trim()))
.AndIF(!string.IsNullOrEmpty(model.RoadwayNo), a => a.RoadwayNo == model.RoadwayNo)
.AndIF(!string.IsNullOrEmpty(model.WareHouseNo), a => a.WareHouseNo == model.WareHouseNo)
- .AndIF(strList.Count>0, it => strList.Contains((int)it.ASNDetailNo))
+ .AndIF(strList.Count > 0, it => strList.Contains((int)it.ASNDetailNo))
.AndIF(!string.IsNullOrWhiteSpace(model.LotNo), it => it.LotNo.Contains(model.LotNo.Trim()))
.AndIF(!string.IsNullOrWhiteSpace(model.LotText), it => it.LotText.Contains(model.LotText.Trim()))
.AndIF(!string.IsNullOrWhiteSpace(model.StartTime), it => it.CreateTime >= Convert.ToDateTime(model.StartTime))
@@ -99,7 +99,7 @@
})
.OrderBy(a => a.Status).OrderByDescending(a => a.CreateTime)
.ToOffsetPage(model.Page, model.Limit, ref total);
-
+
count = data.Count;
return data;
@@ -115,7 +115,7 @@
try
{
var total = 0;
- var data = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel =="0" && m.BindNo == model.BindNo)
+ var data = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BindNo == model.BindNo)
.LeftJoin<BllPalletBind>((a, b) => a.BindNo == b.Id)
.GroupBy((a, b) => new
{
@@ -218,7 +218,7 @@
{
try
{
-
+ //鑾峰彇鎵樼洏缁戝畾淇℃伅
var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.Id == id);
if (bind == null)
{
@@ -228,6 +228,8 @@
{
throw new Exception("璇ユ墭鐩樼粦瀹氫俊鎭殑鐘舵�佷笉鏄瓑寰呭叆搴擄紝涓嶈兘鍒犻櫎");
}
+ //鑾峰彇闄ゅ垹闄ょ粦瀹氫俊鎭鏄惁瀛樺湪璇ユ墭鐩樹笖鍚屽崟鎹叾瀹冪粦瀹氫俊鎭�
+ var bindid = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.PalletNo == bind.PalletNo && m.Id != id && m.ASNNo == bind.ASNNo).ToList();
//鑾峰彇鎵樼洏淇℃伅
var pallet = Db.Queryable<SysPallets>().First(a => a.IsDel == "0" && a.PalletNo == bind.PalletNo && a.Status == "1");
if (pallet == null)
@@ -256,7 +258,7 @@
b.UpdateTime = time;
b.UpdateUser = userId;
var i = Db.Updateable(b).ExecuteCommand();
- if (i!=1)
+ if (i != 1)
{
throw new Exception($"{b.BoxNo}绠辩爜銆亄b.BoxNo3}鏀爜鍒犻櫎澶辫触");
}
@@ -292,8 +294,8 @@
{
noticeDetail.Status = "0";
//鑾峰彇鐘舵�佷笉鏄瓑寰呮墽琛岀殑鏄庣粏淇℃伅
- var count = Db.Queryable<BllArrivalNoticeDetail>().Count(m => m.IsDel == "0" && m.Id != noticeDetail.Id && m.ASNNo == bind.ASNNo && m.Status !="0");
- if (count==0)
+ var count = Db.Queryable<BllArrivalNoticeDetail>().Count(m => m.IsDel == "0" && m.Id != noticeDetail.Id && m.ASNNo == bind.ASNNo && m.Status != "0");
+ if (count == 0)
{
//淇敼鍏ュ簱鍗曚俊鎭�
var notice = Db.Queryable<BllArrivalNotice>().First(m => m.IsDel == "0" && m.ASNNo == bind.ASNNo);
@@ -307,10 +309,13 @@
Db.Updateable(noticeDetail).ExecuteCommand();
}
- pallet.Status = "0";
- pallet.UpdateUser = userId;
- pallet.UpdateTime = DateTime.Now;
- Db.Updateable(pallet).ExecuteCommand();
+ if (bindid.Count == 0)
+ {
+ pallet.Status = "0";
+ pallet.UpdateUser = userId;
+ pallet.UpdateTime = DateTime.Now;
+ Db.Updateable(pallet).ExecuteCommand();
+ }
new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鎵樼洏缁戝畾", bind.PalletNo, "鍒犻櫎", $"鍒犻櫎浜嗗叆搴撳崟锛歿bind.ASNNo}銆佹墭鐩樼爜锛歿bind.PalletNo}鐨勪俊鎭�", userId);
Db.CommitTran();
@@ -363,7 +368,7 @@
{
item.ASNNo = "";
item.ASNDetailNo = null;
- }
+ }
item.BindNo = null;
item.PalletNo = "";
item.Status = "0";
@@ -377,7 +382,7 @@
//淇敼鎵樼洏缁戝畾淇℃伅
bind.Qty -= qty;
- if (bind.Qty ==0)
+ if (bind.Qty == 0)
{
//鍒ゆ柇鏄惁鏈夋寚瀹氬偍浣�
if (!string.IsNullOrWhiteSpace(bind.LocatNo))
@@ -509,11 +514,17 @@
}
var info = boxInfo.First(m => m.BindNo == bind.Id);
+ //鍏ュ簱鍗曟槑缁�
+ var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == bind.ASNDetailNo);
+ if (noticeDetail == null && info.SkuNo != "100099")
+ {
+ throw new Exception("鏈煡璇㈠埌鎵樼洏缁戝畾鐨勫叆搴撳崟鏄庣粏淇℃伅");
+ }
var log = new BllAuditLog()
{
OrderNo = notice.ASNNo,
PalletNo = bind.PalletNo,
- Msg = $"鐗╂枡锛歿info.SkuNo}銆佹壒娆★細{info.LotNo};",
+ Msg = info == null ? $"鐗╂枡锛歿noticeDetail.SkuNo}銆佹壒娆★細{noticeDetail.LotNo};": $"鐗╂枡锛歿info.SkuNo}銆佹壒娆★細{info.LotNo};",
Reason = reason,
Status = "0",
Opinion = "",
@@ -550,7 +561,7 @@
.AndIF(!string.IsNullOrWhiteSpace(column), m => m.Column == int.Parse(column))
.AndIF(!string.IsNullOrWhiteSpace(layer), m => m.Layer == int.Parse(layer))
.AndIF(!string.IsNullOrWhiteSpace(locateNo), m => m.LocatNo.Contains(locateNo))
- .And(m => m.IsDel == "0" && m.Status=="0" && m.Flag == "0" && m.WareHouseNo == houseNo)
+ .And(m => m.IsDel == "0" && m.Status == "0" && m.Flag == "0" && m.WareHouseNo == houseNo)
.ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
var total = 0;
var list = Db.Queryable<SysStorageLocat>().Where(item)
@@ -624,7 +635,7 @@
//鑾峰彇鍚屾墭鐩樼殑鎵樼洏缁戝畾淇℃伅
var bindList = Db.Queryable<BllPalletBind>()
.Where(m => m.IsDel == "0" && m.PalletNo == bind.PalletNo && m.Status == "0").ToList();
- if (bindList.Count>0)
+ if (bindList.Count > 0)
{
foreach (var b in bindList)
{
@@ -695,7 +706,7 @@
{
throw new Exception("鎵樼洏鏉＄爜涓嶅彈WMS绠＄悊锛屼笉鍙叆搴擄紒");
}
-
+
#region
//鏌ヨ鎵樼洏缁戝畾淇℃伅(鐘舵�佷负绛夊緟鍏ュ簱鐨�)
@@ -777,7 +788,7 @@
throw new Exception($"{palletNo}鎵樼洏鏉＄爜涓嶅叿鏈夌鐮佷俊鎭紝涓嶅彲鍏ュ簱锛�");
}
skuNo = stockDetail.First().SkuNo;
-
+
//鑾峰彇瀵瑰簲鍥炲簱瑙勫垯
var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetName == "鎵樼洏鍥炲簱楠岃瘉" && a.IsEnable == "NO");
#region 鎵樼洏鍥炲簱瑙勫垯
@@ -808,7 +819,7 @@
var allotLocate = new AllotLocation();
SysStorageLocat locate;
-
+
var sku = skuList.FirstOrDefault(m => m.SkuNo == skuNo);
if (sku == null)
{
@@ -878,7 +889,7 @@
var locateCount = Db.Queryable<SysStorageLocat>()
.Where(m => m.Status == "0" && m.Flag == "0" && areaList.Contains(m.AreaNo)).Count();
- if (locateCount- bindNum>0)
+ if (locateCount - bindNum > 0)
{
roadNo = l;
}
@@ -889,14 +900,14 @@
}
}
//濡傛灉璺冲贩閬撳苟涓旀湭鎵惧埌鍚堥�傜┖鍌ㄤ綅,鍒欒烦鍒版渶鍚庝竴娆′娇鐢ㄧ殑宸烽亾鏌ヨ
-
+
if (roadNo == null)
{
if (useLog != null)
{
roadNo = useLog.RoadwayNo;
}
- }
+ }
}
else//鎸夌収宸烽亾浼樺厛绾у垎閰�
{
@@ -914,7 +925,7 @@
{
throw new Exception("鏈煡璇㈠埌绌哄偍浣嶅贩閬�");
}
-
+
Db.BeginTran();
try
{
@@ -923,7 +934,7 @@
//娣诲姞宸烽亾浣跨敤璁板綍
var log = new SysRoadwayUseLog
{
- RoadwayNo = roadNo ,
+ RoadwayNo = roadNo,
WareHouseNo = houseNo,
Row = 0,
Column = 0,
@@ -1007,11 +1018,11 @@
//鏌ヨ鎵樼洏缁戝畾淇℃伅(鐘舵�佷负绛夊緟鍏ュ簱鐨�)
var palletBindList = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo && m.Status != "2").ToList();
var haveLocate = palletBindList.FirstOrDefault(m => !string.IsNullOrWhiteSpace(m.LocatNo));
-
+
var skuList = Db.Queryable<SysMaterials>().Where(m => m.IsDel == "0").ToList();
//鐗╂枡绫诲埆淇℃伅
var skuCategoryList = Db.Queryable<SysMaterialCategory>().Where(m => m.IsDel == "0").ToList();
-
+
var skuNo = ""; //鍏ュ簱鐗╂枡
if (palletBindList.Count >= 1) //姝ｅ父鍏ュ簱
@@ -1079,17 +1090,17 @@
}
skuNo = noticeDetail.SkuNo;
-
+
}
- else if(palletBindList.First().Type == "1")//绌烘墭鐩�
+ else if (palletBindList.First().Type == "1")//绌烘墭鐩�
{
- skuNo = "100099";
+ skuNo = "100099";
}
}
else //鍥炴祦鍏ュ簱
{
var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();
- if (stockDetail.Count==0)
+ if (stockDetail.Count == 0)
{
throw new Exception($"{palletNo}鎵樼洏鏉＄爜涓嶅叿鏈夌鐮佷俊鎭紝涓嶅彲鍏ュ簱锛�");
}
@@ -1108,7 +1119,7 @@
//鑾峰彇瀵瑰簲鍥炲簱瑙勫垯
- var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetName == "鎵樼洏鍥炲簱楠岃瘉" && a.IsEnable == "NO");
+ var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetName == "鎵樼洏鍥炲簱楠岃瘉" && a.IsEnable == "NO");
#region 鎵樼洏鍥炲簱瑙勫垯
if (function != null)
@@ -1129,7 +1140,7 @@
}
}
}
-
+
#endregion
}
@@ -1168,7 +1179,7 @@
}
locate = allotLocate.GetSuiTableLocate(houseNo, areaList, roadwayNo);
- }
+ }
Db.BeginTran();
try
{
@@ -1197,7 +1208,7 @@
IsSuccess = 1, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
SendDate = DateTime.Now, //鍙戦�佹椂闂�
BackDate = DateTime.Now, //杩斿洖鏃堕棿
- StartRoadway="", // 璧峰宸烽亾
+ StartRoadway = "", // 璧峰宸烽亾
StartLocat = "",//璧峰浣嶇疆
EndLocat = locate.LocatNo,//鐩爣浣嶇疆
EndRoadway = locate.RoadwayNo, // 鐩爣宸烽亾
@@ -1276,7 +1287,7 @@
var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == task.PalletNo).ToList();
//褰撳墠浠诲姟涓殑鍌ㄤ綅淇℃伅
var locate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == task.EndLocat);
- if (locate==null)
+ if (locate == null)
{
throw new Exception($"鏈煡璇㈠埌浠诲姟涓殑鍌ㄤ綅淇℃伅");
}
@@ -1319,7 +1330,7 @@
return;
}
//姝ｅ父鍏ュ簱
- var bindList = Db.Queryable<BllPalletBind>().Where(m => m.IsDel =="0" && m.TaskNo == taskNo && m.Status =="1").ToList();
+ var bindList = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.TaskNo == taskNo && m.Status == "1").ToList();
if (bindList.Count == 0)
{
throw new Exception($"{taskNo}璇ヤ换鍔℃病鏈夊搴旂殑娴佹按淇℃伅");
@@ -1868,7 +1879,7 @@
skuNo = stockDetail.First().SkuNo;
}
- var sku = Db.Queryable<SysMaterials>().First(m =>m.IsDel =="0" && m.SkuNo == skuNo);
+ var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == skuNo);
if (sku == null)
{
throw new Exception("鐗╂枡淇℃伅涓湭鏌ヨ鍒板叆搴撳崟鏄庣粏鍖呭惈鐨勭墿鏂欎俊鎭紝涓嶅彲鍏ュ簱");
@@ -1879,7 +1890,7 @@
throw new Exception($"鐗╂枡锛歿sku.SkuNo}鏈煡璇㈠埌绫诲埆淇℃伅");
}
- var skuCategory = Db.Queryable<SysMaterialCategory>().First(m =>m.IsDel=="0" && m.CategoryNo == sku.CategoryNo);
+ var skuCategory = Db.Queryable<SysMaterialCategory>().First(m => m.IsDel == "0" && m.CategoryNo == sku.CategoryNo);
if (skuCategory == null)
{
throw new Exception($"鏈湪绫诲埆淇℃伅涓煡璇㈠埌鐗╂枡锛歿sku.SkuNo}鍖呭惈鐨勭被鍒�");
@@ -1902,21 +1913,21 @@
//}
//catch (Exception ex)
//{
- // 鏁翠釜浠撳簱閮芥病鏈夋壘鍒版墭鐩�
- if (asnNo != "鍥炴祦鎵樼洏")
- {
- palletBindModel.Status = "0"; // 绛夊緟鎵ц
- palletBindModel.LocatNo = ""; // 鍌ㄤ綅鍦板潃
- Db.Updateable(palletBindModel).ExecuteCommand();
- Db.CommitTran();
- }
+ // 鏁翠釜浠撳簱閮芥病鏈夋壘鍒版墭鐩�
+ if (asnNo != "鍥炴祦鎵樼洏")
+ {
+ palletBindModel.Status = "0"; // 绛夊緟鎵ц
+ palletBindModel.LocatNo = ""; // 鍌ㄤ綅鍦板潃
+ Db.Updateable(palletBindModel).ExecuteCommand();
+ Db.CommitTran();
+ }
- return null;
- //throw ex;
- //}
+ return null;
+ //throw ex;
+ //}
}
-
+
// 鐢熸垚鍏ュ簱浠诲姟
var taskNo = new Common().GetMaxNo("TK"); // 鑾峰彇浠诲姟缂栧彿
@@ -1939,7 +1950,7 @@
Type = "0", //浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
Status = "1", //浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
OrderType = "0", //0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
- Msg = taskModel.EndLocat+">>>>" + locate.LocatNo + "鐨勫叆搴撲换鍔�", //鍏抽敭淇℃伅
+ Msg = taskModel.EndLocat + ">>>>" + locate.LocatNo + "鐨勫叆搴撲换鍔�", //鍏抽敭淇℃伅
};
Db.Insertable(exTask).ExecuteCommand();
locate.Status = "2";
@@ -1999,7 +2010,7 @@
//鎵樼洏缁戝畾淇℃伅
var bind = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.TaskNo == taskNo).ToList();
- if (bind.Count >0)
+ if (bind.Count > 0)
{
foreach (var item in bind)
{
--
Gitblit v1.8.0