From b2e1c1b263d0cbf6018585b2113cc90abfcf3ed6 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 06 三月 2024 15:25:50 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 83 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 73 insertions(+), 10 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index 3593c83..adb86a9 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -524,7 +524,7 @@
{
OrderNo = notice.ASNNo,
PalletNo = bind.PalletNo,
- Msg = info == null ? $"鐗╂枡锛歿noticeDetail.SkuNo}銆佹壒娆★細{noticeDetail.LotNo};": $"鐗╂枡锛歿info.SkuNo}銆佹壒娆★細{info.LotNo};",
+ Msg = info == null ? $"鐗╂枡锛歿noticeDetail.SkuNo}銆佹壒娆★細{noticeDetail.LotNo};" : $"鐗╂枡锛歿info.SkuNo}銆佹壒娆★細{info.LotNo};",
Reason = reason,
Status = "0",
Opinion = "",
@@ -551,10 +551,19 @@
#region 鎸囧畾鍌ㄤ綅
//鎸囧畾鍌ㄤ綅鏁版嵁婧愶紙姝ｅ父鐨勭┖鍌ㄤ綅锛�
- public List<LocatDto> GetLocateList(string houseNo, string roadwayNo, string row, string column, string layer, string locateNo, int page, int limit, out int count)
+ public List<LocatDto> GetLocateList(string houseNo, string roadwayNo, string row, string column, string layer, string locateNo, string BindId, int page, int limit, out int count)
{
try
{
+ //鑾峰彇鎵樼洏缁戝畾
+ var bindASNDetailNo = Db.Queryable<BllPalletBind>().Where(a => a.IsDel == "0" && a.Status == "0" && a.Id == int.Parse(BindId)).Select(a => a.ASNDetailNo).First();
+ //鑾峰彇鍗曟嵁鏄庣粏
+ var noticeDetailSkuNo = Db.Queryable<BllArrivalNoticeDetail>().Where(a => a.Id == bindASNDetailNo && a.IsDel == "0").Select(a => a.SkuNo).First();
+ //鑾峰彇鐗╂枡
+ var skuCategoryNo = Db.Queryable<SysMaterials>().Where(a => a.IsDel == "0" && a.SkuNo == noticeDetailSkuNo).Select(a => a.CategoryNo).First();
+ //鑾峰彇鐗╂枡瀵瑰簲鍖哄煙
+ var categoryAreaNo = Db.Queryable<SysMaterialCategory>().Where(a => a.IsDel == "0" && a.CategoryNo == skuCategoryNo).Select(a => a.AreaNo).First();
+
Expression<Func<SysStorageLocat, bool>> item = Expressionable.Create<SysStorageLocat>()
.AndIF(!string.IsNullOrWhiteSpace(roadwayNo), m => m.RoadwayNo == roadwayNo)
.AndIF(!string.IsNullOrWhiteSpace(row), m => m.Row == int.Parse(row))
@@ -562,6 +571,7 @@
.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.AreaNo.Contains(categoryAreaNo))
.ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
var total = 0;
var list = Db.Queryable<SysStorageLocat>().Where(item)
@@ -611,6 +621,59 @@
{
throw new Exception("璇ュ偍浣嶇姸鎬佷笉鏄┖鍌ㄤ綅鎴栨爣蹇椾笉鏄甯哥殑");
}
+
+
+
+ //鍒ゆ柇褰撳墠鎵樼洏鏄惁瀛樺湪缁戝畾淇℃伅
+ if (bind.LocatNo != null)
+ {
+ //鍒嗗壊宸茬粦鍌ㄤ綅涓庢柊鍌ㄤ綅
+ //宸茬粦鍌ㄤ綅
+ var bindRow = bind.LocatNo.Substring(0, 2);
+ var bindColumn = bind.LocatNo.Substring(2, 2);
+ var bindLayer = bind.LocatNo.Substring(4, 2);
+ var bindDepth = bind.LocatNo.Substring(6, 2);
+ //鏂板偍浣�
+ var Row = locate.LocatNo.Substring(0, 2);
+ var Column = locate.LocatNo.Substring(2, 2);
+ var Layer = locate.LocatNo.Substring(4, 2);
+ var Depth = locate.LocatNo.Substring(6, 2);
+
+ if (bindDepth == "02")
+ {
+ //鍒ゆ柇鎺掑垪灞傛槸鍚︾浉鍚�
+ if (bindRow == Row && bindColumn == Column && bindLayer == Layer)
+ {
+ throw new Exception("鍚屽偍浣嶆繁搴�2涓嶅彲鍚戞繁搴�1鍒囨崲锛�");
+ }
+ }
+ }
+ else
+ {
+ //鑻ユ槸娣卞害1鐨� 鍒欏垽鏂繁搴�2鏄惁涓虹┖鍌ㄤ綅
+ if (locate.Depth == "01")
+ {
+ var locateDepth = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.Row == locate.Row && a.Column == locate.Column && a.Layer == locate.Layer && a.Depth == "02");
+ if (locateDepth != null)
+ {
+ if (locateDepth.Status != "1")
+ {
+ throw new Exception("璇ュ偍浣嶆繁搴�2涓嶆槸鏈夌墿鍝侊紝涓嶅彲缁戝畾");
+ }
+ }
+ }
+ //鍒ゆ柇鏄惁涓烘繁搴�2鐨� 鑻ヤ负娣卞害2 鍒欒幏鍙栨繁搴�1鍌ㄤ綅 鍒ゆ柇鏄惁涓虹┖鍌ㄤ綅
+ if (locate.Depth == "02")
+ {
+ var locateDepth = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.Row == locate.Row && a.Column == locate.Column && a.Layer == locate.Layer && a.Depth == "01");
+ if (locateDepth.Status != "0" || locateDepth.Flag == "2")
+ {
+ throw new Exception("璇ュ偍浣嶆繁搴�1涓嶆槸绌哄偍浣嶆垨鏍囧織涓嶆槸姝ｅ父鐨�");
+ }
+ }
+ }
+
+
var bindIdList = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.PalletNo == bind.PalletNo && m.Status != "2").Select(m => m.Id).ToList();
//鍒ゆ柇鏄惁鏈夐浂绠�
foreach (var item in bindIdList)
@@ -864,7 +927,7 @@
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();
- SysRoadwayUseLog useLog = Db.Queryable<SysRoadwayUseLog>().Where(m=>m.IsDel =="0" && roadList.Contains(m.RoadwayNo)).OrderByDescending(l => l.Id).First(); //宸烽亾鏈�鍚庝竴娆′娇鐢ㄨ褰�
+ SysRoadwayUseLog useLog = Db.Queryable<SysRoadwayUseLog>().Where(m => m.IsDel == "0" && roadList.Contains(m.RoadwayNo)).OrderByDescending(l => l.Id).First(); //宸烽亾鏈�鍚庝竴娆′娇鐢ㄨ褰�
#region 纭畾宸烽亾鎺掑簭
@@ -917,7 +980,7 @@
.Where(m => m.Status == "0" && m.Flag == "0" && areaList.Contains(m.AreaNo) && m.RoadwayNo == l).Count();
var bindNum = Db.Queryable<BllPalletBind>()
- .Where(m => m.IsDel == "0" && m.Status == "0" && m.RoadwayNo== l)
+ .Where(m => m.IsDel == "0" && m.Status == "0" && m.RoadwayNo == l)
.GroupBy(m => m.PalletNo).Select(m => m.PalletNo).Count();
if (locateCount - bindNum > 0)
{
@@ -944,14 +1007,14 @@
if (locateCount - bindNum > 0)
{
roadNo = useLog.RoadwayNo;
- }
+ }
}
}
}
else//鎸夌収宸烽亾浼樺厛绾у垎閰�
{
foreach (var item in roadList)
- {
+ {
var locateCount = Db.Queryable<SysStorageLocat>()
.Where(m => m.Status == "0" && m.Flag == "0" && areaList.Contains(m.AreaNo) && m.RoadwayNo == item).Count();
@@ -967,7 +1030,7 @@
if (roadNo != null)
{
break;
- }
+ }
}
}
@@ -1499,7 +1562,7 @@
#endregion
break;
- case "0":
+ case "0":
var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == item.ASNDetailNo);
if (noticeDetail == null)
{
@@ -1528,7 +1591,7 @@
{
LotNo = item.LotNo,
LotText = noticeDetail.LotText,
- SupplierLot = noticeDetail.SupplierLot,
+ SupplierLot = noticeDetail.SupplierLot,
SkuNo = noticeDetail.SkuNo,
SkuName = noticeDetail.SkuName,
Standard = noticeDetail.Standard,
@@ -1673,7 +1736,7 @@
var asnDetailNum = Db.Queryable<BllArrivalNoticeDetail>()
.Count(m => m.IsDel == "0" && m.ASNNo == noticeDetail.ASNNo && m.Status != "2");
if (asnDetailNum == 0)
- {
+ {
notice.Status = "2";
notice.CompleteTime = comTime;
Db.Updateable(notice).ExecuteCommand();
--
Gitblit v1.8.0