From ec991a5bf47647cc496e047258e253d0690365a9 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期一, 20 五月 2024 11:18:57 +0800
Subject: [PATCH] 修改增加或修改时计算折件数量，增加JC23、JC24数据库，降库存信息代码增加到JC23。
---
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 80 +++++++++++++++++++++++++---------------
1 files changed, 50 insertions(+), 30 deletions(-)
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 8ee24c5..6b45a6d 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -139,8 +139,8 @@
}
else
{
- stocks = stockList.Where(m=> m.SkuNo == d.SkuNo && !string.IsNullOrWhiteSpace(m.LotNo)).OrderBy(s => s.LotNo).ToList();
-
+ stocks = stockList.Where(m => m.SkuNo == d.SkuNo && !string.IsNullOrWhiteSpace(m.LotNo)).OrderBy(s => s.LotNo).ToList();
+
foreach (var demo in stocks)
{
if (q1 >= d.Qty)
@@ -148,7 +148,7 @@
continue;
}
var q2 = demo.Qty - demo.LockQty - demo.FrozenQty;
-
+
if (q2 > d.Qty - q1)
{
q1 += d.Qty - q1;
@@ -157,9 +157,9 @@
else
{
q1 += q2;
- dic.Add(demo.Id,q2);
+ dic.Add(demo.Id, q2);
}
-
+
}
if (d.Qty >= q1)
{
@@ -185,7 +185,7 @@
throw new Exception($"鎬诲簱瀛樹腑鍑哄簱鐗╂枡淇℃伅:{d.SkuNo} 搴撳瓨鏁伴噺涓嶈冻");
}
}
-
+
foreach (var s in dic)
{
var st = stockList.First(a => a.Id == s.Key);
@@ -214,12 +214,12 @@
CreateUser = 0,
};
list.Add(item);
-
+
st.LockQty += s.Value;//閿佸畾鏁伴噺
var i = Db.Updateable(st).UpdateColumns(it => new { it.LockQty })
.ExecuteCommand();
}
-
+
}
var notice = new BllExportNotice()
{
@@ -462,7 +462,7 @@
throw new Exception("鏈煡鍒板搴斿嚭搴撶被鍨嬬殑鐗╂枡");
}
- if (type!="8")
+ if (type != "8")
{
skuList = skuList.Where(m => m != "100088").ToList();
}
@@ -645,7 +645,7 @@
//}
//if (d.Qty >= q1)
//{
- stocks = stockList.Where(s => s.SkuNo == d.SkuNo && string.IsNullOrWhiteSpace(s.LotNo)).ToList();
+ stocks = stockList.Where(s => s.SkuNo == d.SkuNo && string.IsNullOrWhiteSpace(s.LotNo)).ToList();
// if (stocks.Count == 0)
// {
// throw new Exception($"鎬诲簱瀛樹腑鍑哄簱鐗╂枡淇℃伅:{d.SkuNo}搴撳瓨鏁伴噺涓嶈冻");
@@ -667,7 +667,7 @@
// throw new Exception($"鎬诲簱瀛樹腑鍑哄簱鐗╂枡淇℃伅:{d.SkuNo} 搴撳瓨鏁伴噺涓嶈冻");
//}
}
-
+
var item = new BllExportNoticeDetail()
{
SONo = billNo,
@@ -694,7 +694,7 @@
};
list.Add(item);
-
+
stocks.First().LockQty += d.Qty;//閿佸畾鏁伴噺
var i = Db.Updateable(stocks.First()).UpdateColumns(it => new { it.LockQty })
.ExecuteCommand();
@@ -2177,7 +2177,7 @@
//var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
//////瑙ｆ瀽杩斿洖鏁版嵁
- //var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
+ var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
//if (wcsModel.StatusCode == 0)
//{
// //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
@@ -2455,7 +2455,7 @@
//閲嶆柊涓嬪彂鍑哄簱浠诲姟
- public OutCommandDto AgainSendSoTask(string taskNo, int userId, string url)
+ public OutCommandDto AgainSendSoTask(string taskNo, string Receiver, int userId, string url)
{
try
{
@@ -2506,22 +2506,42 @@
{
//绋嬪簭姝ｅ紡鍙戝竷鍚庢斁寮�
var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
- var response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍑哄簱鍛戒护", "WCS");
+ var response = HttpHelper.DoPost(url, jsonData, Receiver == "WCS" ? "涓嬪彂缁橶CS鍑哄簱鍛戒护" : "涓嬪彂缁橝GV鍑哄簱鍛戒护", "WCS");
var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
- ////瑙ｆ瀽杩斿洖鏁版嵁
- var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
- if (wcsModel.StatusCode == 0)
+ if (Receiver == "WCS")
{
- //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
- new TaskServer().EditTaskIssueOk(list, time1, time2);
+ ////瑙ｆ瀽杩斿洖鏁版嵁
+ var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
+ if (wcsModel.StatusCode == 0)
+ {
+ //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
+ new TaskServer().EditTaskIssueOk(list, time1, time2);
+ }
+ if (wcsModel.StatusCode == -1)
+ {
+ new TaskServer().EditTaskIssueNo(list, time1, time2, wcsModel.Msg);
+ throw new Exception($"wcs杩斿洖鐘舵�佸紓甯革細{wcsModel.Msg}");
+ }
}
- if (wcsModel.StatusCode == -1)
+ else if (Receiver == "AGV")
{
- new TaskServer().EditTaskIssueNo(list, time1, time2, wcsModel.Msg);
- throw new Exception($"wcs杩斿洖鐘舵�佸紓甯革細{wcsModel.Msg}");
+ ////瑙ｆ瀽杩斿洖鏁版嵁
+ var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
+ if (agvModel.Code == "0")
+ {
+ //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
+ new TaskServer().EditTaskIssueOk(list, time1, time2);
+
+ }
+ if (agvModel.Code == "1")
+ {
+ new TaskServer().EditTaskIssueNo(list, time1, time2, agvModel.Message);
+ throw new Exception($"agv杩斿洖鐘舵�佸紓甯革細{agvModel.Message}");
+ }
}
+
}
catch (Exception ex)
{
@@ -2854,11 +2874,11 @@
throw new Exception("搴撳瓨涓嶈冻,鏃犲彲鍑哄簱搴撳瓨");
}
//0:鎴愬搧鍑哄簱銆�1:棰嗘枡鍑哄簱銆�2:鎶芥鍑哄簱銆�3锛氱墿鏂欏彇鏍峰嚭搴撱��4:涓嶅悎鏍煎搧鍑哄簱銆�5:涓棿鍝佸嚭搴撱��6:浠ｅ偍鍑哄簱銆�7:鍏朵粬鍑哄簱銆�8:瀵勫瓨鍑哄簱
- if (notice.Type == "0" || notice.Type == "1" )//鎴愬搧銆佸師杈呮枡鍑哄簱
+ if (notice.Type == "0" || notice.Type == "1")//鎴愬搧銆佸師杈呮枡鍑哄簱
{
stockDetail = stockDetail.Where(m => m.InspectStatus == "1").ToList();
}
- else if (notice.Type == "3" )//鍙栨牱鍑哄簱
+ else if (notice.Type == "3")//鍙栨牱鍑哄簱
{
stockDetail = stockDetail.Where(m => m.InspectStatus == "0").ToList();
}
@@ -2869,7 +2889,7 @@
else if (notice.Type == "4")//涓嶅悎鏍煎嚭搴�
{
stockDetail = stockDetail.Where(m => m.InspectStatus == "2").ToList();
- }
+ }
#region 鍖呰淇℃伅
@@ -2905,8 +2925,8 @@
bNum = Convert.ToInt32(pack.L1Num);
}
}
-
-
+
+
//if (pNum == 0)
//{
// throw new Exception("鏈煡璇㈠埌鐗╂枡鍖呰鎵樼鍏崇郴淇℃伅");
@@ -3125,7 +3145,7 @@
// {
// d.LotNo = "";
// }
-
+
//}
}
notice.Status = "0";
@@ -3345,7 +3365,7 @@
bl.Qty += st.Qty;
Db.Updateable(bl).ExecuteCommand();
}
-
+
//搴撳瓨鏄庣粏
stock.LockQty += st.Qty;
stock.Status = stock.LockQty == stock.Qty ? "2" : "1";
--
Gitblit v1.8.0