From 3a050b4d542dd2aefa65de27a6acecca1d9dda3d Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期日, 25 五月 2025 14:27:04 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/HttpServer.cs | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/Wms/WMS.BLL/HttpServer.cs b/Wms/WMS.BLL/HttpServer.cs
index 0f5f9a3..81d4d68 100644
--- a/Wms/WMS.BLL/HttpServer.cs
+++ b/Wms/WMS.BLL/HttpServer.cs
@@ -534,9 +534,9 @@
{
areaList.Add(item);
}
-
+ 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))
+ 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).OrderBy(m => m.RoadwayNo).Select(m => m.RoadwayNo).ToList();
#endregion
@@ -1231,7 +1231,7 @@
else
{
locate2.Status = "1";
- Db.Updateable(locate).ExecuteCommand();
+ Db.Updateable(locate2).ExecuteCommand();
}
Db.Updateable(stockDetail).ExecuteCommand();
@@ -1348,12 +1348,13 @@
/// <param name="soNo"></param>
/// <param name="detailId"></param>
/// <param name="outMode"></param>
+ /// <param name="palletNo"></param>
/// <param name="userId"></param>
/// <param name="url"></param>
/// <param name="str"></param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
- public List<OutCommandDto> IssueOutHouseLk(string soNo, string detailId,string outMode, 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
{
@@ -1463,7 +1464,22 @@
str = "鍌ㄤ綅鎹熷潖涓嶈兘鍑哄簱";
return outDto1;
}
-
+ if (locate.WareHouseNo != "W02")
+ {
+ str = "鎵樼洏涓嶅湪璐ф灦搴撲笂";
+ return outDto1;
+ }
+ var locateEnd = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == outModeLocate && m.IsDel == "0");//褰撳墠鍑哄簱鐨勭洰鏍囧偍浣嶄俊鎭�
+ if (locateEnd == null)
+ {
+ str = "鍑哄簱鐨勬墭鐩樺偍浣嶄俊鎭敊璇�(鍦ㄥ偍浣嶈〃涓湭鏌ヨ鍒�)";
+ return outDto1;
+ }
+ else if (locateEnd.Status != "0")
+ {
+ str = "鐩爣鍌ㄤ綅鐘舵�佷笉鏄┖鍌ㄤ綅";
+ return outDto1;
+ }
#endregion
if (locate.Status == "1") //鏈夌墿鍝�
@@ -1614,7 +1630,7 @@
//瑙ｆ瀽杩斿洖鏁版嵁
var wcsModel = JsonConvert.DeserializeObject<WcsModel2>(response);
- if (wcsModel.code == 0)
+ if (wcsModel.code == 200)
{
//鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
new TaskServer().EditTaskIssueOk(list2, time1, time2);
--
Gitblit v1.8.0