From 24eaa29a52b8c050fc391eafd0b0cc370733cf91 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期三, 26 十一月 2025 15:22:16 +0800
Subject: [PATCH] 修改拣货拼托判断有误
---
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index c9bc7b9..335f5ae 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -613,11 +613,11 @@
CreateUser = 0,
};
- if (houseNo == "1000" || houseNo == "1001" || houseNo == "2000" || houseNo == "2002" || houseNo == "2003" || houseNo == "2004")
+ if (houseNo == "1000" || houseNo == "1001" || houseNo == "1002" || houseNo == "1003" || houseNo == "1098" || houseNo == "2000" || houseNo == "2001" || houseNo == "2002" || houseNo == "2003" || houseNo == "2004" || houseNo == "3101" || houseNo == "3102" || houseNo == "3103" || houseNo == "3104")
{
notice.WareHouseNo = "W02";
}
- else if (houseNo == "4000")
+ else if (houseNo == "4000" | houseNo == "4001")
{
notice.WareHouseNo = "W01";
}
@@ -753,12 +753,12 @@
//绯荤粺瀵规帴鍚庢斁寮�
var jsonData = JsonConvert.SerializeObject(soInfo);
- var response = HttpHelper.DoPost(url, jsonData, "鍑哄簱鍗曞畬鎴愪笂浼�", "ERP");
+ var response = HttpHelper.DoPost(url, jsonData, "鍑哄簱鍗曞畬鎴愪笂浼�", "SAP");
- var obj = JsonConvert.DeserializeObject<ErpModel>(response);//瑙ｆ瀽杩斿洖鏁版嵁
- if (obj.Success != 0)
+ var obj = JsonConvert.DeserializeObject<SapResultModel>(response);//瑙ｆ瀽杩斿洖鏁版嵁
+ if (obj.RESULT != true)
{
- throw new Exception("涓婁紶澶辫触" + obj.Message);
+ throw new Exception("涓婁紶澶辫触" + obj.MESSAGE);
}
#endregion
}
@@ -1231,7 +1231,7 @@
//娣诲姞鍑哄簱鍗�
foreach (var d in model.Detail)
{
- if (d.Qty < 1)
+ if (d.Qty <= 0)
{
throw new Exception("鍑哄簱鏁伴噺蹇呴』澶т簬0");
}
@@ -1452,7 +1452,8 @@
{
throw new Exception("鏈煡璇㈠埌鍑哄簱鍗曟嵁淇℃伅");
}
- if (notice.Origin != "WMS" || notice.Status != "0")
+ //if (notice.Origin != "WMS" || notice.Status != "0")
+ if (notice.Status != "0")
{
throw new Exception("鍙傛暟寮傚父,璇锋鏌ョ姸鎬佹槸鍚︽湭绛夊緟鎵ц鎴栨潵婧愭槸鍚︽槸WMS");
}
@@ -1509,7 +1510,7 @@
//鏇存柊鍑哄簱鍗�
foreach (var d in model.Detail)
{
- if (d.Qty < 1)
+ if (d.Qty <= 0)
{
throw new Exception("鍑哄簱鏁版嵁蹇呴』澶т簬0");
}
@@ -2455,7 +2456,7 @@
var allot = new AllotLocation();
#region 闆嗗悎
-
+
Db.BeginTran();
try
{
@@ -2792,7 +2793,7 @@
decimal needQty = detail.Qty - (detail.AllotQty == null ? 0 : decimal.Parse(detail.AllotQty.ToString()));
//搴撳瓨鏄庣粏 Status 0锛氬緟鍒嗛厤 1锛氶儴鍒嗗垎閰� 2锛氬凡鍒嗛厤
var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.SkuNo == detail.SkuNo && (m.Qty - m.FrozenQty - m.LockQty + m.InspectQty) > 0 && (m.Status == "0" || m.Status == "1") && m.IsDel == "0"
- && m.AreaNo != "B06" && m.AreaNo != "B07" && m.AreaNo != "B09" && m.AreaNo != "B24")//鎺掗櫎杞﹂棿搴撳瓨
+ && m.AreaNo != "B06" && m.AreaNo != "B07" && m.AreaNo != "B09" && m.AreaNo != "B24" && m.AreaNo != "B26" && m.AreaNo != "B27" && m.AreaNo != "B28")//鎺掗櫎杞﹂棿搴撳瓨
.ToList();
@@ -2896,7 +2897,7 @@
{
s.Status = "1";
}
-
+
var sd = Db.Updateable(s).UpdateColumns(it => new { it.LockQty, it.Status }).ExecuteCommand();
}
@@ -2973,7 +2974,7 @@
notice.Status = "3";//姝ｅ湪鎵ц
}
}
-
+
notice.UpdateUser = userId;
notice.UpdateTime = DateTime.Now;
var zd = Db.Updateable(notice).ExecuteCommand();
@@ -4430,7 +4431,7 @@
}
}
}
- if(string.IsNullOrEmpty(newAddress))
+ if (string.IsNullOrEmpty(newAddress))
{
//宸叉湁鐗╁搧鐨勫贩閬�
var roadwayHave = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.WareHouseNo == "W01").GroupBy(g => g.RoadwayNo).Select(s => s.RoadwayNo).ToList();
@@ -4461,7 +4462,7 @@
}
}
}
-
+
}
}
@@ -4642,7 +4643,7 @@
else
{
// 鍙栨渶涓婇潰涓�鎺�
- location = slotModel[0].LocatNo;
+ location = slotModel[0].LocatNo;
}
bl = true;
@@ -4763,7 +4764,9 @@
}
- var endLocateList = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && (m.AreaNo == "B02" || m.AreaNo == "B05")).Select(m => m.LocatNo).ToList();
+ //鎵�灞炲尯鍩熼泦鍚�
+ List<string> areNolist = new List<string>() { "B01", "B02", "B05" };
+ var endLocateList = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && areNolist.Contains(m.AreaNo)).Select(m => m.LocatNo).ToList();
//鍒ゆ柇鏄惁鏄師杈呮枡鍑哄簱浠诲姟 璐ф灦鍌ㄤ綅=銆嬪钩搴撳偍浣�
if (endLocateList.Contains(task.EndLocat) && PalletType == "0")
{
--
Gitblit v1.8.0