From 5cc2603759e01ca9c3d95d4c0edfa6377373f455 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 05 十一月 2025 16:57:56 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS
---
Wms/WMS.BLL/HttpServer.cs | 120 +++++++++++++++++++++++++++++-------------------------------
1 files changed, 58 insertions(+), 62 deletions(-)
diff --git a/Wms/WMS.BLL/HttpServer.cs b/Wms/WMS.BLL/HttpServer.cs
index 8994443..1b7e2a7 100644
--- a/Wms/WMS.BLL/HttpServer.cs
+++ b/Wms/WMS.BLL/HttpServer.cs
@@ -22,7 +22,7 @@
namespace WMS.BLL
{
- public class HttpServer:IHttpServer
+ public class HttpServer : IHttpServer
{
private static readonly SqlSugarScope Db = DataContext.Db;
public HttpServer() { }
@@ -321,7 +321,7 @@
#endregion
-
+
Db.CommitTran();
#endregion
@@ -343,7 +343,7 @@
/// <param name="ceng"></param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
- public OutCommandDto RequestLocation(string palletNo, string houseNo,string ceng)
+ public OutCommandDto RequestLocation(string palletNo, string houseNo, string ceng)
{
try
{
@@ -374,8 +374,8 @@
throw new Exception("鎵樼洏鏉＄爜涓嶅彈WMS绠＄悊锛屼笉鍙叆搴擄紒");
#region
-
-
+
+
var skuList = Db.Queryable<SysMaterials>().Where(m => m.IsDel == "0").ToList();
//鐗╂枡绫诲埆淇℃伅
var skuCategoryList = Db.Queryable<SysMaterialCategory>().Where(m => m.IsDel == "0").ToList();
@@ -413,7 +413,7 @@
StartLocate = beingTask.StartLocat, // 璧峰浣嶇疆
EndLocate = beingTask.EndLocat, // 鐩爣浣嶇疆
EndRoadway = beingTask.EndRoadway, // 鐩爣宸烽亾
-
+
Order = 999,
Type = PLCTypeEnum.AGV
};
@@ -432,7 +432,7 @@
Db.Updateable(upShelfOld).ExecuteCommand();
}
}
-
+
return comDto;
}
else
@@ -486,7 +486,7 @@
if (beingTask.IsSuccess == 0)
{
beingTask.IsSuccess = 1;
-
+
}
beingTask.Status = "1";
Db.Updateable(beingTask).ExecuteCommand();
@@ -528,7 +528,7 @@
#region 鐢宠鍌ㄤ綅
SysStorageLocat locate;
- var sku = skuList.FirstOrDefault(m => m.SkuNo == skuNo);
+ var sku = skuList.FirstOrDefault(m => m.SkuNo == skuNo);
if (sku == null)
{
throw new Exception("鐗╂枡淇℃伅涓湭鏌ヨ鍒板叆搴撳崟鏄庣粏鍖呭惈鐨勭墿鏂欎俊鎭紝涓嶅彲鍏ュ簱");
@@ -552,16 +552,14 @@
areaList.Add(item);
}
- locate = allotLocate.GetSuiTableLocate(houseNo, areaList, "",ceng);
-
+ locate = allotLocate.GetSuiTableLocate(houseNo, areaList, "", ceng);
+
#endregion
Db.BeginTran();
try
{
-
-
//娣诲姞宸烽亾浣跨敤璁板綍
var log = new SysRoadwayUseLog
{
@@ -593,7 +591,6 @@
Status = "1",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
OrderType = "0",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
Msg = "鍏ュ簱鍙ｅ埌=>>" + locate.LocatNo + "鐨勫叆搴撲换鍔�", //鍏抽敭淇℃伅
-
};
Db.Insertable(inTask).ExecuteCommand();
var asnNo = "";
@@ -601,7 +598,7 @@
foreach (DataStockDetail stockModel in stockDetail)
{
var bindModel = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.Status == "2"
- && m.PalletNo == stockModel.PalletNo && m.ASNNo == stockModel.ASNNo && m.ASNDetailNo == stockModel.ASNDetailNo).OrderByDescending(m=>m.CreateTime).First();
+ && m.PalletNo == stockModel.PalletNo && m.ASNNo == stockModel.ASNNo && m.ASNDetailNo == stockModel.ASNDetailNo).OrderByDescending(m => m.CreateTime).First();
if (bindModel != null && string.IsNullOrWhiteSpace(bindModel.TaskNo))
{
bindModel.TaskNo = taskNo;
@@ -634,11 +631,11 @@
};
Db.Insertable(upShelf).ExecuteCommand();
}
-
-
+
+
locate.Status = "2";
Db.Updateable(locate).ExecuteCommand();
-
+
Db.CommitTran();
comDto = new OutCommandDto()
{
@@ -650,7 +647,7 @@
StartLocate = inTask.StartLocat, // 璧峰浣嶇疆
EndLocate = inTask.EndLocat, // 鐩爣浣嶇疆
EndRoadway = inTask.EndRoadway, // 鐩爣宸烽亾
-
+
Order = 999,
Type = PLCTypeEnum.AGV
};
@@ -662,7 +659,6 @@
throw new Exception(ex.Message);
}
#endregion
-
return comDto;
}
@@ -711,14 +707,14 @@
#endregion
OutCommandDto comDto;//杩斿洖wcs鐨勫叆搴撳懡浠�
-
+
#region 浠ｇ爜鍧�
//鏌ヨ鎵樼洏缁戝畾淇℃伅(鐘舵�佷负绛夊緟鍏ュ簱/姝ｅ湪鎵ц鐨�)
-
+
var skuNo = ""; //鍏ュ簱鐗╂枡
var lotNo = ""; //鍏ュ簱鎵规
-
+
//鐗╂枡淇℃伅
var skuList = Db.Queryable<SysMaterials>().Where(m => m.IsDel == "0").ToList();
//鐗╂枡绫诲埆淇℃伅
@@ -796,11 +792,11 @@
#region 鍒ゆ柇璇ユ墭鐩橈紝鏄惁绗﹀悎鍥炲簱鍔熻兘璁惧畾鐨勫洖搴撹鍒�
//鑾峰彇瀵瑰簲鍥炲簱瑙勫垯
- var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0"&& a.FunSetNo == "Fun041" && a.IsEnable == "NO");
+ var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetNo == "Fun041" && a.IsEnable == "NO");
if (function != null)
{
//鎷ｈ揣瀹屾垚鍚庡厑璁告墭鐩樺洖搴�
- var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0"&& a.LotNo == stockDetail[0].LotNo && a.PalletNo == palletNo && a.SkuNo == stockDetail[0].SkuNo);
+ var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.LotNo == stockDetail[0].LotNo && a.PalletNo == palletNo && a.SkuNo == stockDetail[0].SkuNo);
//楠岃瘉鎷ｈ揣鏄庣粏鏄惁瀛樺湪
if (allot != null)
@@ -816,7 +812,7 @@
}
var allotLocate = new AllotLocation();
-
+
#region 鏍规嵁sku纭鍖哄煙鍒掑垎
//鐗╂枡淇℃伅
@@ -843,7 +839,7 @@
{
areaList.Add(item);
}
- var roadStr = Db.Queryable<SysStorageRoadway>().Where(m => m.IsDel == "0" && m.Status == "0").Select(m=>m.RoadwayNo).ToList();
+ var roadStr = Db.Queryable<SysStorageRoadway>().Where(m => m.IsDel == "0" && m.Status == "0").Select(m => m.RoadwayNo).ToList();
//宸烽亾缁勪俊鎭�
var roadList = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.WareHouseNo == houseNo && areaList.Contains(m.AreaNo) && !string.IsNullOrWhiteSpace(m.RoadwayNo) && roadStr.Contains(m.RoadwayNo))
.GroupBy(m => m.RoadwayNo)
@@ -908,11 +904,11 @@
var asnNo = "";
// 娣诲姞鎵樼洏缁戝畾琛ㄦ墭鐩樺叆搴撲换鍔″彿 liudl
-
+
foreach (DataStockDetail stockModel in stockDetail)
{
var bindModel = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.Status == "2"
- && m.PalletNo == stockModel.PalletNo && m.ASNNo == stockModel.ASNNo && m.ASNDetailNo == stockModel.ASNDetailNo).OrderByDescending(m=>m.CreateTime).First();
+ && m.PalletNo == stockModel.PalletNo && m.ASNNo == stockModel.ASNNo && m.ASNDetailNo == stockModel.ASNDetailNo).OrderByDescending(m => m.CreateTime).First();
if (bindModel != null && string.IsNullOrWhiteSpace(bindModel.TaskNo))
{
bindModel.TaskNo = taskNo;
@@ -923,7 +919,7 @@
}
}
-
+
foreach (DataStockDetail stockModel in stockDetail)
{
//娣诲姞鎵樼洏涓婃灦璁板綍
@@ -959,7 +955,7 @@
StartLocate = inTask.StartLocat, // 璧峰浣嶇疆
EndLocate = inTask.EndLocat, // 鐩爣浣嶇疆
EndRoadway = inTask.EndRoadway, // 鐩爣宸烽亾
-
+
Order = 999,
Type = PLCTypeEnum.ConveyorLine
};
@@ -1030,12 +1026,12 @@
#region
//鏌ヨ鎵樼洏缁戝畾淇℃伅(鐘舵�佷负绛夊緟鍏ュ簱鐨�)
-
+
var skuList = Db.Queryable<SysMaterials>().Where(m => m.IsDel == "0").ToList();
//鐗╂枡绫诲埆淇℃伅
var skuCategoryList = Db.Queryable<SysMaterialCategory>().Where(m => m.IsDel == "0").ToList();
-
+
var skuNo = "";//鍏ュ簱鐗╂枡
var isAddTask = true; //鏄惁娣诲姞鏂颁换鍔�
var oldTaskNo = ""; //鏃т换鍔″彿
@@ -1053,12 +1049,12 @@
// throw new Exception("鎵樼洏涓婃湁涓嶆槸鎴愬搧鐨勭墿鏂�");
// }
//}
-
+
var upShelfOld = Db.Queryable<BllPalletUpShelf>().First(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1"));
if (upShelfOld != null) //鏈変笂鏋跺叆搴撲俊鎭�
{
-
+
var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == upShelfOld.TaskNo);
if (beingTask == null)
{
@@ -1076,7 +1072,7 @@
StartLocate = beingTask.StartRoadway, // 璧峰浣嶇疆
EndLocate = beingTask.EndLocat, // 鐩爣浣嶇疆
EndRoadway = beingTask.EndRoadway, // 鐩爣宸烽亾
-
+
Order = 999,
Type = PLCTypeEnum.ShuttleCar,
};
@@ -1098,7 +1094,7 @@
oldTaskNo = beingTask.TaskNo;
skuNo = upShelfOld.SkuNo;//鍏ュ簱鐗╂枡
}
-
+
}
else //鐢宠鍏ュ簱
{
@@ -1142,7 +1138,7 @@
#region 鐢宠鍌ㄤ綅
SysStorageLocat locate;
-
+
var sku = skuList.FirstOrDefault(m => m.SkuNo == skuNo);
if (sku == null)
{
@@ -1289,7 +1285,7 @@
locate.Status = "2";
Db.Updateable(locate).ExecuteCommand();
-
+
Db.CommitTran();
comDto = new OutCommandDto()
{
@@ -1347,7 +1343,7 @@
//娣诲姞鎿嶄綔鏃ュ織璁板綍
var k = new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鏃ュ織", taskNo, "瀹屾垚", $"鐐瑰嚮瀹屾垚鎸夐挳銆佸畬鎴愪换鍔″彿涓猴細{taskNo}鐨勪换鍔�", userId);
}
-
+
var locate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == task.StartLocat);
if (locate == null)
{
@@ -1482,7 +1478,7 @@
var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == task.PalletNo).ToList();
//鍒ゆ柇鏄惁鏄洖娴佸叆搴撳畬鎴�
- if (!stockDetail.Any() && task.EndLocat!= "B100101")//B100101鏄┖鎵樼洏鏀堕泦鍣紝涓嶇敤鏍￠獙搴撳瓨
+ if (!stockDetail.Any() && task.EndLocat != "B100101")//B100101鏄┖鎵樼洏鏀堕泦鍣紝涓嶇敤鏍￠獙搴撳瓨
{
throw new Exception("娌℃湁鏌ヨ鍒板簱瀛樹俊鎭�");
}
@@ -1498,7 +1494,7 @@
{
throw new Exception($"鏈煡璇㈠埌浠诲姟涓殑鐩爣鍌ㄤ綅淇℃伅");
}
-
+
task.Status = "2";//浠诲姟鐘舵��
task.IsSend = 0;
task.IsCancel = 0;
@@ -1539,7 +1535,7 @@
locate.Status = "0";
Db.Updateable(locate).ExecuteCommand();
}
-
+
if (locate2.LocatNo == "B040101")
{
locate2.Status = "0";
@@ -1550,7 +1546,7 @@
locate2.Status = "1";
Db.Updateable(locate2).ExecuteCommand();
}
-
+
Db.Updateable(stockDetail).ExecuteCommand();
Db.CommitTran();
@@ -1629,7 +1625,7 @@
//鐩爣鍌ㄤ綅鏀逛负鏈夎揣鐗� 1
locate2.Status = "1";
Db.Updateable(locate2).ExecuteCommand();
-
+
foreach (var item in stockDetail)
{
item.WareHouseNo = locate2.WareHouseNo;
@@ -1638,7 +1634,7 @@
item.LocatNo = locate2.LocatNo;
}
Db.Updateable(stockDetail).ExecuteCommand();
-
+
#endregion
@@ -1671,13 +1667,13 @@
/// <param name="str"></param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
- public List<OutCommandDto> IssueOutHouseLk(string soNo, string detailId,string outMode, string palletNo, int userId, string url, out string str)
+ public List<OutCommandDto> IssueOutHouseLk(string soNo, string detailId, string outMode, string palletNo, int userId, string url, out string str)
{
try
{
var outDto1 = new List<OutCommandDto>(); //鍑哄簱鏁版嵁鐨勯泦鍚堬紙娣卞害涓�1鐨勫偍浣嶏級
- //璁板綍閿欒淇℃伅鐨勯泦鍚� //1:褰撳墠瑕佸嚭搴撶殑鍌ㄤ綅姝ｅ湪绉诲嚭銆�2 鍑哄簱鐨勬墭鐩樺偍浣嶄俊鎭敊璇�(鍦ㄥ偍浣嶈〃涓湭鏌ヨ鍒�)銆�3鍌ㄤ綅鎹熷潖涓嶈兘鍑哄簱銆�4 瑕佸嚭搴撶殑鎵樼洏姝ｅ湪鍏ュ簱
-
+ //璁板綍閿欒淇℃伅鐨勯泦鍚� //1:褰撳墠瑕佸嚭搴撶殑鍌ㄤ綅姝ｅ湪绉诲嚭銆�2 鍑哄簱鐨勬墭鐩樺偍浣嶄俊鎭敊璇�(鍦ㄥ偍浣嶈〃涓湭鏌ヨ鍒�)銆�3鍌ㄤ綅鎹熷潖涓嶈兘鍑哄簱銆�4 瑕佸嚭搴撶殑鎵樼洏姝ｅ湪鍏ュ簱
+
var com = new Common();
var notice = Db.Queryable<BllExportNotice>().First(m => m.SONo == soNo && m.IsDel == "0");
@@ -1690,12 +1686,12 @@
throw new Exception("浠撳簱鍙烽敊璇�");
}
var intDetailId = int.Parse(detailId);
- if (intDetailId <=0)
+ if (intDetailId <= 0)
{
throw new Exception("閫夋嫨鐨勫嚭搴撳崟鏄庣粏鍙傛暟閿欒");
}
//鎵�鏈夎鍑哄簱鐨勫嚭搴撳垎閰嶄俊鎭�(鏈笅鍙戠殑淇℃伅鍜屽緟鎷ｈ揣鐨勪俊鎭�)
- var item = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.SONo == soNo && a.SODetailNo == intDetailId && a.PalletNo == palletNo && a.Status == "0" );
+ var item = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.SONo == soNo && a.SODetailNo == intDetailId && a.PalletNo == palletNo && a.Status == "0");
if (item == null) //鍒ゆ柇鏄惁鏈夐渶瑕佷笅鍙戠殑鍑哄簱娴佹按
{
throw new Exception("褰撳墠鍑哄簱鍗曟嵁鏃犻渶瑕佷笅鍙戠殑鎵樼洏");
@@ -1718,9 +1714,9 @@
var outLocatelist1 = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.AreaNo == "B02" && m.Flag == "0").ToList();
var outLocatelist2 = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.AreaNo == "B05" && m.Flag == "0").ToList();
//寰幆鍒嗛厤鐨勪俊鎭敓鎴愬嚭搴撲换鍔�
-
+
var outModeLocate = outMode;
-
+
var taskNoStr = "";
// 鍌ㄤ綅鍙�
@@ -1930,19 +1926,19 @@
item.OutMode = item.OutMode;//鍑哄簱鍙�
//item.UnstackingMode = unstackingMode2;//鎷嗗灈妯″紡
Db.Updateable(item).ExecuteCommand();
- }
+ }
#endregion
}
else if (locate.Status == "5") //绉诲嚭涓�
{
throw new Exception("褰撳墠瑕佸嚭搴撶殑鍌ㄤ綅姝ｅ湪绉诲嚭");
}
-
+
//娣诲姞鎿嶄綔鏃ュ織璁板綍
var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "涓嬪彂鍑哄簱", soNo, "鍑哄簱", $"鐐瑰嚮鍑哄簱鎸夐挳鍑哄簱鍗曞彿涓猴細{soNo}鐨勫嚭搴撳崟", userId);
Db.CommitTran();
-
+
if (outDto1.Count > 0)
{
// 姝ｅ紡杩愯绋嬪簭鏀惧紑
@@ -2010,7 +2006,7 @@
{
throw new Exception($"鏈壘鍒皗soNo}鍑哄簱鍗曚俊鎭�");
}
- var detail=Db.Queryable<DataStockDetail>().First(m => m.PalletNo == palletNo && m.IsDel == "0");
+ var detail = Db.Queryable<DataStockDetail>().First(m => m.PalletNo == palletNo && m.IsDel == "0");
if (detail.WareHouseNo != "W04")
{
throw new Exception("浠撳簱鍙烽敊璇�");
@@ -2102,11 +2098,11 @@
var sendModel = new SendSapQcDetailVm()
{
QcNo = data.QcNo,
- skuNo=data.SkuNo,
- skuName = data.SkuNo,
+ skuNo = data.SkuNo,
+ skuName = data.SkuNo,
lotNo = data.LotNo,
Qty = Convert.ToDecimal(data.Qty),
- SupplierLot = data.SupplierLot
+ SupplierLot = data.SupplierLot
};
var jsonData = JsonConvert.SerializeObject(sendModel);
string response = "";
@@ -2121,7 +2117,7 @@
//var limesModel = JsonConvert.DeserializeObject<LimesModel>(response);
//if (limesModel.Success == 0)
//{
-
+
// 鏇存柊璇烽獙鍗曚俊鎭�
data.Status = "1";
@@ -2135,7 +2131,7 @@
//}
//if (limesModel.Success == -1)
//{
-
+
// throw new Exception(limesModel.Message);
//}
}
--
Gitblit v1.8.0