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/BllAsnServer/PalletBindServer.cs | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index aa0096e..54de8b1 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -1435,6 +1435,7 @@
var skuNo = ""; //鍏ュ簱鐗╂枡
var isAddTask = true; //鏄惁娣诲姞鏂颁换鍔�
var oldTaskNo = ""; //鏃т换鍔″彿
+ var starLocate = ""; // 璧峰鍌ㄤ綅
var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();
//楠岃瘉鐗╂枡鏄惁鏈夋垚鍝�
foreach (var item in stockDetail)
@@ -1461,7 +1462,7 @@
{
PalletNo = palletNo,//鎵樼洏鍙�
StartRoadway = beingTask.StartRoadway, // 璧峰宸烽亾
- StartLocate = "", // 璧峰浣嶇疆
+ StartLocate = starLocate, // 璧峰浣嶇疆
EndLocate = beingTask.EndLocat, // 鐩爣浣嶇疆
EndRoadway = beingTask.EndRoadway, // 鐩爣宸烽亾
TaskNo = beingTask.TaskNo, // 浠诲姟鍙�
@@ -1529,9 +1530,21 @@
{
throw new Exception($"{palletNo}鎵樼洏鏉＄爜涓嶅叿鏈夌鐮佷俊鎭紝涓嶅彲鍏ュ簱锛�");
}
- if (stockDetail.Count(m => !string.IsNullOrWhiteSpace(m.LocatNo)) > 0)
+ if (stockDetail.Count(m => !string.IsNullOrWhiteSpace(m.LocatNo)) == 0)
{
- throw new Exception("褰撳墠鎵樼洏宸插湪搴撳唴锛岃鏍稿疄");
+ throw new Exception("褰撳墠鎵樼洏娌℃湁鍦ㄥ钩搴撳偍浣嶄笂锛岃鏍稿疄");
+ }
+ starLocate = stockDetail.First().LocatNo;
+
+ var pingAreaStr = Db.Queryable<SysStorageArea>().Where(m => m.IsDel == "0" && m.WareHouseNo == "W04" && m.AreaNo != "B06" && m.AreaNo != "B07").Select(m=>m.AreaNo).ToList();
+ var pingLocateInfo = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == starLocate && pingAreaStr.Contains(m.AreaNo) && m.IsDel == "0");
+ if (pingLocateInfo == null )
+ {
+ throw new Exception("褰撳墠鎵樼洏鎵�鍦ㄧ殑鍌ㄤ綅娌℃湁鍦ㄧ郴缁熶腑鎵惧埌淇℃伅");
+ }
+ if (pingLocateInfo.Status != "1")
+ {
+ throw new Exception("褰撳墠鎵樼洏鎵�鍦ㄧ殑鍌ㄤ綅鐘舵�侀敊璇紝涓嶆槸绌哄偍浣�");
}
skuNo = stockDetail.First().SkuNo;
@@ -1545,13 +1558,14 @@
{
PalletNo = palletNo,//鎵樼洏鍙�
StartRoadway = beingTask.StartRoadway, // 璧峰宸烽亾
- StartLocate = "", // 璧峰浣嶇疆
+ StartLocate = beingTask.StartLocat, // 璧峰浣嶇疆
EndLocate = beingTask.EndLocat, // 鐩爣浣嶇疆
EndRoadway = beingTask.EndRoadway, // 鐩爣宸烽亾
TaskNo = beingTask.TaskNo, // 浠诲姟鍙�
TaskType = "0",// 浠诲姟绫诲瀷 (鍑哄簱)
OutMode = "", //鐩爣鍦板潃
- Order = 1
+ Order = 1,
+ Type = PLCTypeEnum.AGV
};
if (beingTask.IsSuccess == 0)
{
@@ -1663,7 +1677,7 @@
SendDate = DateTime.Now, //鍙戦�佹椂闂�
BackDate = DateTime.Now, //杩斿洖鏃堕棿
StartRoadway = "", // 璧峰宸烽亾
- StartLocat = "",//璧峰浣嶇疆
+ StartLocat = starLocate,//璧峰浣嶇疆
EndLocat = locate.LocatNo,//鐩爣浣嶇疆
EndRoadway = locate.RoadwayNo, // 鐩爣宸烽亾
PalletNo = palletNo,//鎵樼洏鐮�
@@ -1779,13 +1793,14 @@
{
PalletNo = palletNo,//鎵樼洏鍙�
StartRoadway = "",
- StartLocate = "", // 璧峰浣嶇疆
+ StartLocate = starLocate, // 璧峰浣嶇疆
EndLocate = locate.LocatNo, // 鐩爣浣嶇疆
EndRoadway = locate.RoadwayNo, // 鐩爣宸烽亾
TaskNo = oldTaskNo, // 浠诲姟鍙�
TaskType = "0",// 浠诲姟绫诲瀷 (鍑哄簱)
OutMode = "", //鐩爣鍦板潃
- Order = 1
+ Order = 1,
+ Type = PLCTypeEnum.AGV
};
}
@@ -2578,17 +2593,16 @@
var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
var list = new List<string>() { model.TaskNo };
//瑙ｆ瀽杩斿洖鏁版嵁
- var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
- if (wcsModel.StatusCode == 0)
+ var wcsModel = JsonConvert.DeserializeObject<WcsModel2>(response);
+ if (wcsModel.code == 200)
{
//鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
new TaskServer().EditTaskIssueOk(list, time1, time2);
-
}
- if (wcsModel.StatusCode == -1)
+ else
{
- new TaskServer().EditTaskIssueNo(list, time1, time2, wcsModel.Msg);
- throw new Exception(wcsModel.Msg);
+ new TaskServer().EditTaskIssueNo(list, time1, time2, wcsModel.message);
+ throw new Exception("WCS鍙嶉锛�" + wcsModel.message);
}
}
catch (Exception ex)
@@ -2601,6 +2615,8 @@
throw;
}
}
+
+
#endregion
@@ -4236,7 +4252,8 @@
var upShelfList = Db.Queryable<BllPalletUpShelf>().Where(m => m.IsDel == "0" && m.TaskNo == taskNo && m.PalletNo == task.PalletNo).ToList();
foreach (var upShelf in upShelfList)
{
- upShelf.IsDel = "1";
+ //upShelf.IsDel = "1";
+ upShelf.Status = "4";
Db.Updateable(upShelf).ExecuteCommand();
}
--
Gitblit v1.8.0