From 5408616fd72786b63cfe69a7426c3fb499b6962b Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期四, 17 十月 2024 18:49:04 +0800
Subject: [PATCH] Merge branch 'Liudl'
---
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 77 +++++++++++++++++++++-----------------
1 files changed, 42 insertions(+), 35 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index a17bec6..c8f8338 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -77,12 +77,13 @@
{
throw new Exception("鍗曟嵁鍙蜂笉鍙负绌�!");
}
- if (model.AsnDetailNo == 0)
- {
- throw new Exception("鍗曟嵁鏄庣粏涓嶅彲涓虹┖!");
- }
+ //if (model.AsnDetailNo == 0)
+ //{
+ // throw new Exception("鍗曟嵁鏄庣粏涓嶅彲涓虹┖!");
+ //}
//鏍规嵁鍗曟嵁鍙疯幏鍙栧叆搴撳崟鎬诲崟
- notice = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.AsnNo && a.OrderCode == model.OrderCode);
+ notice = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.AsnNo);
+ //notice = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.AsnNo && a.OrderCode == model.OrderCode);
if (notice.Status != "0" && notice.Status != "1" && notice.Status != "2")
{
throw new Exception("璇ュ崟鎹凡鍏冲崟!");
@@ -96,7 +97,8 @@
throw new Exception("鎵规涓嶈兘涓虹┖!");
}
// 楠岃瘉鍏ュ簱鍗曟槑缁嗘槸鍚﹀瓨鍦�
- detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailNo && m.ASNNo == model.AsnNo && m.LotNo == model.LotNo && m.SkuNo == model.SkuNo);
+ detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.ASNNo == notice.ASNNo && m.LotNo == model.LotNo && m.SkuNo == model.SkuNo);
+ //detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailNo && m.ASNNo == model.AsnNo && m.LotNo == model.LotNo && m.SkuNo == model.SkuNo);
if (detail == null)
{
throw new Exception("褰撳墠鐗╂枡鍙婃壒娆′笌鍗曟嵁鏃犲叧鑱旓紝璇锋牳瀹�!");
@@ -176,14 +178,14 @@
#endregion
//鍒ゆ柇鎵樼洏缁戝畾淇℃伅涓槸鍚︽湁
- var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNDetailNo == model.AsnDetailNo && m.PalletNo == model.PalletNo && m.Status != "2");
+ var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNDetailNo == detail.Id && m.PalletNo == model.PalletNo && m.Status != "2");
var bindId = 0;
if (bind == null)
{
bind = new BllPalletBind
{
- ASNNo = model.AsnNo,
- ASNDetailNo = model.AsnDetailNo,
+ ASNNo = notice.ASNNo,
+ ASNDetailNo = detail.Id,
PalletNo = model.PalletNo,
PalletNo2 = "",
PalletNo3 = "",
@@ -230,8 +232,8 @@
{
var boxInfo = new BllBoxInfo()
{
- ASNNo = model.AsnNo,
- ASNDetailNo = model.AsnDetailNo,
+ ASNNo = notice.ASNNo,
+ ASNDetailNo = detail.Id,
OrderCode = box.OrderCode,
BindNo = bindId,
BoxNo = box.BoxNo,
@@ -270,10 +272,10 @@
}
else if (model.Type == "0")//鐗╂枡鎵�
{
- if (model.Detail.Count(m => m.OrderCode != detail.OrderDetailCode) > 0)
- {
- throw new Exception($"鎵樼洏缁戝畾鏄庣粏涓紝鍚湁绠辩爜鐢熶骇宸ュ崟涓嶄竴鑷�");
- }
+ //if (model.Detail.Count(m => m.OrderCode != detail.OrderDetailCode) > 0)
+ //{
+ // throw new Exception($"鎵樼洏缁戝畾鏄庣粏涓紝鍚湁绠辩爜鐢熶骇宸ュ崟涓嶄竴鑷�");
+ //}
if (model.Detail.Count(m => m.SkuNo != model.SkuNo || m.LotNo != model.LotNo) > 0)
{
throw new Exception($"鎵樼洏缁戝畾鏄庣粏涓紝鍚湁绠辩爜鐗╂枡鎴栨壒娆′笉涓�鑷�");
@@ -288,8 +290,8 @@
boxFullQty += box.Qty;
var boxInfo = new BllBoxInfo()
{
- ASNNo = model.AsnNo,
- ASNDetailNo = model.AsnDetailNo,
+ ASNNo = detail.ASNNo,
+ ASNDetailNo = detail.Id,
OrderCode = box.OrderCode,
BindNo = bindId,
BoxNo = box.BoxNo,
@@ -376,9 +378,9 @@
// 鏇存敼鎵樼洏浣跨敤鐘舵��
var sqlStr = $"update SysPallets set Status = '1' where PalletNo = '{model.PalletNo}';";
//娣诲姞鎵樼洏璁板綍琛ㄦ暟鎹�
- sqlStr += $"insert into LogPalletTrack values('{model.PalletNo}','{model.AsnNo}','缁勭洏','0',getDate(),{userId},NULL,NULL);";
+ sqlStr += $"insert into LogPalletTrack values('{model.PalletNo}','{notice.ASNNo}','缁勭洏','0',getDate(),{userId},NULL,NULL);";
Db.Ado.ExecuteCommand(sqlStr);
- new OperationASNServer().AddLogOperationAsn("PDA妯″潡", "鎵樼洏缁戝畾", model.AsnNo, "娣诲姞", $"娣诲姞浜嗘墭鐩樼爜涓猴細{model.PalletNo}鐨勭粍鐩樹俊鎭�", userId);
+ new OperationASNServer().AddLogOperationAsn("PDA妯″潡", "鎵樼洏缁戝畾", notice.ASNNo, "娣诲姞", $"娣诲姞浜嗘墭鐩樼爜涓猴細{model.PalletNo}鐨勭粍鐩樹俊鎭�", userId);
Db.CommitTran();
}
@@ -1333,8 +1335,10 @@
break;
}
}
- var roadList = Db.Queryable<SysStorageLocat>().Where(m => m.WareHouseNo == houseNo && areaList.Contains(m.AreaNo))
- .GroupBy(m => m.RoadwayNo).OrderBy(m => m.RoadwayNo).Select(m => m.RoadwayNo).ToList();
+
+ var road = Db.Queryable<SysStorageRoadway>().Where(m => m.IsDel == "0" && m.Status == "0").Select(m => m.RoadwayNo).ToList();
+
+ var roadList = Db.Queryable<SysStorageLocat>().Where(m => m.WareHouseNo == houseNo && areaList.Contains(m.AreaNo) && road.Contains(m.RoadwayNo)).GroupBy(m => m.RoadwayNo).OrderBy(m => m.RoadwayNo).Select(m => m.RoadwayNo).ToList();
SysRoadwayUseLog useLog = Db.Queryable<SysRoadwayUseLog>().Where(m => m.IsDel == "0" && roadList.Contains(m.RoadwayNo)).OrderByDescending(l => l.Id).First(); //宸烽亾鏈�鍚庝竴娆′娇鐢ㄨ褰�
#endregion
@@ -1368,12 +1372,13 @@
}
roadList2.AddRange(roadLarge);
roadList2.AddRange(roadSmall);
+ roadList = roadList2;
}
- else
+
+ if (roadList.Count == 0)
{
- roadList2 = roadList;
+ throw new Exception("鏈煡璇㈠埌鍙兘浣跨敤鐨勫贩閬�");
}
- roadList = roadList2;
#endregion
@@ -1400,14 +1405,14 @@
roadNo = l;
}
//褰撳墠宸锋湁浣嶇疆鍒欓��鍑�
- if (roadNo != null)
+ if (!string.IsNullOrWhiteSpace(roadNo))
{
break;
}
}
//濡傛灉璺冲贩閬撳苟涓旀湭鎵惧埌鍚堥�傜┖鍌ㄤ綅,鍒欒烦鍒版渶鍚庝竴娆′娇鐢ㄧ殑宸烽亾鏌ヨ
- if (roadNo == null)
+ if (string.IsNullOrWhiteSpace(roadNo))
{
if (useLog != null)
{
@@ -1440,7 +1445,7 @@
roadNo = item;
}
//褰撳墠宸锋湁浣嶇疆鍒欓��鍑�
- if (roadNo != null)
+ if (!string.IsNullOrWhiteSpace(roadNo))
{
break;
}
@@ -1613,7 +1618,7 @@
- var areaNoStr = "A07";
+ var areaNoStr = "A03";
var allotLocate = new AllotLocation();
#region 鏍规嵁sku纭鍖哄煙鍒掑垎
@@ -1672,16 +1677,16 @@
}
roadList2.AddRange(roadLarge);
roadList2.AddRange(roadSmall);
- }
- else
- {
- roadList2 = roadList;
+ roadList = roadList2;
}
- roadList = roadList2;
+ if (roadList.Count == 0)
+ {
+ throw new Exception("鏈煡璇㈠埌鍙兘浣跨敤鐨勫贩閬�");
+ }
#endregion
-
+
var roadNo = "";
if (laneAllot == 0)//璺冲贩閬撳钩鍧囧垎閰�
{
@@ -2286,7 +2291,7 @@
SysStorageLocat locate;
var areaList = new List<string>();
- areaList.Add("A07");
+ areaList.Add("A03");
locate = allotLocate.GetSuiTableLocate(houseNo, areaList, roadwayNo);
Db.BeginTran();
@@ -2517,6 +2522,7 @@
SkuName = boxInfo.SkuName,
Standard = sku.Standard,
ProductionTime = boxInfo.ProductionTime,
+ ExpirationTime = boxInfo.ExpirationTime,
SupplierLot = boxInfo.SupplierLot,
InspectStatus = boxInfo.InspectStatus,
InspectMark = boxInfo.InspectMark,
@@ -2690,6 +2696,7 @@
SkuName = demo.SkuName,
Standard = noticeDetail.Standard,
ProductionTime = demo.ProductionTime,
+ ExpirationTime = demo.ExpirationTime,
SupplierLot = demo.SupplierLot,
InspectStatus = demo.InspectStatus,
InspectMark = demo.InspectMark,
--
Gitblit v1.8.0