From d75d3b7cf6ba68c9e9e69bced4552a554ca76e93 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 21 六月 2025 15:12:29 +0800
Subject: [PATCH] 出库口问题修改；标签打印优化
---
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 93 ++++++++++++++++++++++++----------------------
1 files changed, 48 insertions(+), 45 deletions(-)
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 247ff88..361b515 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -1014,10 +1014,11 @@
skuList = skuList.Where(m => m.SkuNo == "100088").ToList();
}
skuStrList = skuList.Select(m => m.SkuNo).ToList();
+ var areaStr = new List<string>() { "B06", "B07", "B09" };
var stockRst = new StockServer();
var stockDetailRst = new StockDetailServer();
Expression<Func<DataStockDetail, bool>> item = Expressionable.Create<DataStockDetail>()
- .And(it => it.WareHouseNo == house || string.IsNullOrWhiteSpace(it.LocatNo))
+ .And(it => it.WareHouseNo == house || string.IsNullOrWhiteSpace(it.LocatNo) || (it.WareHouseNo == "W04" && !areaStr.Contains(it.AreaNo)))
.AndIF(!string.IsNullOrWhiteSpace(inspectStatus), it => inspectStatus.Contains(it.InspectStatus))
.And(m => skuStrList.Contains(m.SkuNo))
.AndIF(type == "6", m => m.OwnerNo == ownerNo)//浠ｅ偍鍑哄簱闇�瑕佸叧鑱旇揣涓�
@@ -3033,7 +3034,7 @@
foreach (var item in list)
{
var outModeLocate = "";
- if (outMode == "1")
+ if (outMode == "17")
{
if (i < outLocatelist1.Count)
{
@@ -3042,11 +3043,11 @@
else
{
var j = i % outLocatelist1.Count;
-
+
outModeLocate = outLocatelist1[j].LocatNo;
}
}
- else if(outMode == "2")
+ else if (outMode == "18")
{
if (i < outLocatelist1.Count)
{
@@ -3058,6 +3059,10 @@
outModeLocate = outLocatelist2[j].LocatNo;
}
+ }
+ else
+ {
+ throw new Exception("鍑哄簱鍙ｅ伐浣嶅紓甯�");
}
var taskNoStr = "";
@@ -3150,18 +3155,17 @@
outDto1.Add(new OutCommandDto()
{
+ TaskNo = exTask.TaskNo, // 浠诲姟鍙�
+ TaskType = "1",// 浠诲姟绫诲瀷 (鍑哄簱)0鍏� 1鍑� 2绉�
+
PalletNo = item.PalletNo,//鎵樼洏鍙�
StartLocate = locate.LocatNo, // 璧峰浣嶇疆
StartRoadway = locate.RoadwayNo,//鍏跺疄宸烽亾
EndLocate = outModeLocate, // 鐩爣浣嶇疆
- TaskNo = exTask.TaskNo, // 浠诲姟鍙�
- TaskType = "1",// 浠诲姟绫诲瀷 (鍑哄簱)0鍏� 1鍑� 2绉�
- OutMode = outModeLocate, //鍑哄簱鍙�
- Order = 1,
-
- //UnstackingMode = "unstackingMode2",//鎷ｈ揣鏂瑰紡 0鏈哄櫒鎷嗘墭鍑� 1 浜哄伐鎷ｈ揣鍑�
- //CompleteQty = outCount2, //鎷嗙殑浠舵暟
- //BoxexQty = outCount, //鎬讳欢鏁�
+
+ Order = 999,
+ Type = PLCTypeEnum.AGV
+
});
taskNoStr = exTask.TaskNo;
@@ -3376,11 +3380,12 @@
try
{
List<LogTask> logTaskList = new List<LogTask>();//姝ゆ鍑哄簱浠诲姟闆嗗悎锛屼负搴斿鍚屾墭鐩樹笉鍚岀墿鏂欏嚭搴�
+
+
//寰幆鍒嗛厤鐨勪俊鎭敓鎴愬嚭搴撲换鍔�
foreach (var item in list)
{
var taskNoStr = "";
- string toLocation = string.Empty;//鐩爣浣嶇疆
// 鍌ㄤ綅鍙�
var locateNo = outStockDetail.First(m => m.PalletNo == item.PalletNo).LocatNo;
@@ -3390,11 +3395,11 @@
//鍒ゆ柇鎵樼洏鏄惁鍦ㄥ簱鍐�
if (string.IsNullOrWhiteSpace(locateNo)) //搴撳
{
- if (notice.Type == "0")
- {
- flagList.Add(5);
- continue;
- }
+ //if (notice.Type == "0")
+ //{
+ // flagList.Add(5);
+ // continue;
+ //}
//鍒ゆ柇鎵樼洏鏄惁鍦ㄥ叆搴撲腑
var imBl = com.GetImTask(item.PalletNo);
if (imBl != null)
@@ -3446,8 +3451,6 @@
}
#endregion
-
-
if (locate.Status == "1") //鏈夌墿鍝�
{
@@ -3515,7 +3518,7 @@
Type = "2",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
OrderType = "1",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
- Msg = "浠�" + locate.LocatNo + "鍒�" + toLocation + "鐨勫嚭搴撲换鍔�", //鍏抽敭淇℃伅
+ Msg = "浠�" + locate.LocatNo + "鍒�" + moveAddress + "鐨勭Щ搴撲换鍔�", //鍏抽敭淇℃伅
};
Db.Insertable(ykTask).ExecuteCommand();
logTaskList.Add(ykTask);
@@ -3563,7 +3566,7 @@
IsSuccess = 0, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
StartLocat = locate.LocatNo,//璧峰浣嶇疆
- EndLocat = toLocation,//outMode,//鐩爣浣嶇疆
+ EndLocat = outMode,//outMode,//鐩爣浣嶇疆
PalletNo = item.PalletNo,//鎵樼洏鐮�
IsSend = 1,//鏄惁鍙啀娆′笅鍙�
IsCancel = 1,//鏄惁鍙彇娑�
@@ -3571,11 +3574,11 @@
Type = "1",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
OrderType = "1",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
- Msg = "浠�" + locate.LocatNo + "鍒�" + toLocation + "鐨勫嚭搴撲换鍔�", //鍏抽敭淇℃伅
+ Msg = "浠�" + locate.LocatNo + "鍒�" + outMode + "鐨勫嚭搴撲换鍔�", //鍏抽敭淇℃伅
};
Db.Insertable(exTask).ExecuteCommand();
logTaskList.Add(exTask);
- var endroad = allot.RoadwayToStationNum(locate.RoadwayNo, toLocation);
+ var endroad = allot.RoadwayToStationNum(locate.RoadwayNo, outMode);
outDto1.Add(new OutCommandDto()
{
PalletNo = item.PalletNo,//鎵樼洏鍙�
@@ -3715,23 +3718,23 @@
try
{
- //var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
- //response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍑哄簱鍛戒护", "WCS");
- //var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
+ var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
+ response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍑哄簱鍛戒护", "WCS");
+ var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
- //////瑙ｆ瀽杩斿洖鏁版嵁
- //var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
- //if (wcsModel.StatusCode == 0)
- //{
- // //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
- // new TaskServer().EditTaskIssueOk(list2, time1, time2);
- // str += "涓嬪彂鎴愬姛";
- //}
- //if (wcsModel.StatusCode == -1)
- //{
- // new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.Msg);
- // throw new Exception(wcsModel.Msg);
- //}
+ ////瑙ｆ瀽杩斿洖鏁版嵁
+ var wcsModel = JsonConvert.DeserializeObject<WcsModel2>(response);
+ if (wcsModel.code == 200)
+ {
+ //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
+ new TaskServer().EditTaskIssueOk(list2, time1, time2);
+ str += "涓嬪彂鎴愬姛";
+ }
+ else
+ {
+ new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.message);
+ throw new Exception(wcsModel.message);
+ }
}
catch (Exception ex)
{
@@ -4331,12 +4334,12 @@
try
{
- task.Status = "5";//浠诲姟鐘舵��
- //鍒ゆ柇璧峰鐩爣浣嶇疆閮芥槸骞冲簱
- if (pingKuList.Contains(task.StartLocat) && pingKuList.Contains(task.EndLocat))
- {
+ //task.Status = "5";//浠诲姟鐘舵��
+ ////鍒ゆ柇璧峰鐩爣浣嶇疆閮芥槸骞冲簱
+ //if (pingKuList.Contains(task.StartLocat) && pingKuList.Contains(task.EndLocat))
+ //{
task.Status = "2";
- }
+ //}
task.IsSend = 0;
task.IsCancel = 0;
--
Gitblit v1.8.0