From c9cd6646fdd1296a7feeb4384ebfe06ab90a52d7 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期三, 27 十一月 2024 08:25:17 +0800
Subject: [PATCH] 修改批次长度判断 ，批次长度增加为11位和12位
---
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index e70f362..1ffa2f4 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -49,11 +49,11 @@
{
throw new Exception("鍗曟嵁绫诲瀷涓嶅彲涓虹┖!");
}
- if (string.IsNullOrEmpty(model.Customer))
- {
- throw new Exception("瀹㈡埛涓嶅彲涓虹┖!");
- }
- if (string.IsNullOrEmpty(model.OrderCode))
+ //if (string.IsNullOrEmpty(model.Customer))
+ //{
+ // throw new Exception("瀹㈡埛涓嶅彲涓虹┖!");
+ //}
+ if (string.IsNullOrEmpty(model.OrderNo))
{
throw new Exception("绯荤粺鍗曞彿涓嶅彲涓虹┖!");
}
@@ -68,10 +68,10 @@
//瀹㈡埛淇℃伅
var customer = Db.Queryable<SysCustomer>().First(m => m.IsDel == "0" && m.CustomerNo == model.Customer);
- if (customer == null)
- {
- throw new Exception("瀹㈡埛涓嶅彲涓虹┖!");
- }
+ //if (customer == null)
+ //{
+ // throw new Exception("瀹㈡埛涓嶅彲涓虹┖!");
+ //}
var logistics = Db.Queryable<SysLogisticsInfo>().First(m => m.IsDel == "0" && m.CarrierName == model.LogisticsNo);
int? logisticsId = null;
if (logistics != null)
@@ -127,8 +127,9 @@
}
if (qty > d.Qty - q1)
{
- q1 += d.Qty - q1;
dic.Add(stocks.First().Id, d.Qty - q1);
+
+ q1 += d.Qty - q1;
}
else
{
@@ -149,10 +150,11 @@
}
var q2 = demo.Qty - demo.LockQty - demo.FrozenQty;
- if (q2 > d.Qty - q1)
+ if (q2 >= d.Qty - q1)
{
- q1 += d.Qty - q1;
dic.Add(demo.Id, d.Qty - q1);
+
+ q1 += d.Qty - q1;
}
else
{
@@ -161,7 +163,7 @@
}
}
- if (d.Qty >= q1)
+ if (d.Qty > q1)
{
stocks = stockList.Where(s => s.SkuNo == d.SkuNo && string.IsNullOrWhiteSpace(s.LotNo)).ToList();
if (stocks.Count == 0)
@@ -169,10 +171,11 @@
throw new Exception($"鎬诲簱瀛樹腑鍑哄簱鐗╂枡淇℃伅:{d.SkuNo}搴撳瓨鏁伴噺涓嶈冻");
}
var q2 = stocks.First().Qty - stocks.First().LockQty - stocks.First().FrozenQty;
- if (q2 > d.Qty - q1)
+ if (q2 >= d.Qty - q1)
{
- q1 += d.Qty - q1;
dic.Add(stocks.First().Id, d.Qty - q1);
+
+ q1 += d.Qty - q1;
}
else
{
@@ -227,8 +230,8 @@
Type = model.SoType,
Status = "0",
Origin = model.Origin,
- CustomerNo = model.Customer,
- CustomerName = customer.CustomerName,
+ //CustomerNo = model.Customer,
+ //CustomerName = customer.CustomerName,
LogisticsId = logisticsId,
IsWave = "0",
WaveNo = "",
@@ -309,7 +312,7 @@
}
var soInfo = new SoInfo()
{
- OrderCode = notice.OrderCode,
+ OrderNo = notice.OrderCode,
SoDetails = list
};
#region 閫氳繃鎺ュ彛鍙戦�佽嚦erp
@@ -3357,9 +3360,9 @@
var needQty = detail.Qty - detail.AllotQty;
//鍒嗛厤鐨勫嚭搴撴暟閲�
var outQty = model.StockList.Select(s => s.Qty).ToList().Sum();
- if (outQty != needQty)
+ if (outQty < needQty)
{
- throw new Exception("鎿嶄綔澶辫触锛屽嚭搴撴暟閲忎笌璁″垝鏁伴噺涓嶄竴鑷达紒");
+ throw new Exception("鎿嶄綔澶辫触锛屽嚭搴撴暟閲忎笉鑳藉ぇ浜庤鍒掓暟閲忥紒");
}
}
--
Gitblit v1.8.0