From 8a83e6f21af0a764950e45b2565a370fff74daa5 Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期四, 08 五月 2025 16:47:45 +0800
Subject: [PATCH] Merge branch 'csc'
---
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 103 ++++++---------------------------------------------
1 files changed, 13 insertions(+), 90 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index f5c6885..d088c20 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -2589,21 +2589,21 @@
try
{
var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
- response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍏ュ簱鍛戒护", "WCS");
+ //response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍏ュ簱鍛戒护", "WCS");
var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
var list = new List<string>() { model.TaskNo };
- //瑙ｆ瀽杩斿洖鏁版嵁
- var wcsModel = JsonConvert.DeserializeObject<WcsModel2>(response);
- if (wcsModel.code == 200)
- {
+ ////瑙ｆ瀽杩斿洖鏁版嵁
+ //var wcsModel = JsonConvert.DeserializeObject<WcsModel2>(response);
+ //if (wcsModel.code == 200)
+ //{
//鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
new TaskServer().EditTaskIssueOk(list, time1, time2);
- }else
- {
- new TaskServer().EditTaskIssueNo(list, time1, time2, wcsModel.message);
- throw new Exception("WCS鍙嶉锛�"+wcsModel.message);
- }
+ //}else
+ //{
+ // new TaskServer().EditTaskIssueNo(list, time1, time2, wcsModel.message);
+ // throw new Exception("WCS鍙嶉锛�"+wcsModel.message);
+ //}
}
catch (Exception ex)
{
@@ -2616,85 +2616,7 @@
}
}
- /// <summary>
- /// 鍏ュ簱浠诲姟瀹屾垚JC34
- /// </summary>
- /// <param name="taskNo"></param>
- /// <param name="userId"></param>
- /// <exception cref="Exception"></exception>
- public void ArrivalSuccess2(string taskNo, int userId)
- {
- try
- {
- //姝ｅ父鍏ュ簱
- var task = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == taskNo);
- if (task == null)
- {
- throw new Exception("鏈煡璇㈠埌浠诲姟淇℃伅");
- }
- if (task.Status == "2")
- {
- throw new Exception("褰撳墠浠诲姟宸插畬鎴�");
- }
-
- var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == task.PalletNo).ToList();
- var upShelf = Db.Queryable<BllPalletUpShelf>().First(m => m.TaskNo == taskNo);
- if (upShelf == null)
- {
- throw new Exception("娌℃湁鎵惧埌鎵樼洏涓婃灦淇℃伅");
- }
- //褰撳墠浠诲姟涓殑鍌ㄤ綅淇℃伅
- var locate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == task.EndLocat);
- if (locate == null)
- {
- throw new Exception($"鏈煡璇㈠埌浠诲姟涓殑鍌ㄤ綅淇℃伅");
- }
- Db.BeginTran();
-
- task.Status = "2";//浠诲姟鐘舵��
- task.IsSend = 0;
- task.IsCancel = 0;
- task.IsFinish = 0;
- task.FinishDate = DateTime.Now;//瀹屾垚鏃堕棿
- Db.Updateable(task).ExecuteCommand();
- if (userId != 0)
- {
- //娣诲姞鎿嶄綔鏃ュ織璁板綍
- var k = new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鏃ュ織", taskNo, "瀹屾垚", $"鐐瑰嚮瀹屾垚鎸夐挳銆佸畬鎴愪换鍔″彿涓猴細{taskNo}鐨勪换鍔�", userId);
- }
-
- //鍒ゆ柇鏄惁鏄洖娴佸叆搴撳畬鎴�
- if (stockDetail.Any())
- {
- throw new Exception("娌℃湁鏌ヨ鍒板簱瀛樹俊鎭�");
- }
-
- foreach (var item in stockDetail)
- {
- item.WareHouseNo = locate.WareHouseNo;
- item.RoadwayNo = locate.RoadwayNo;
- item.AreaNo = locate.AreaNo;
- item.LocatNo = locate.LocatNo;
- item.UpdateTime = DateTime.Now;
- if (userId != 0)
- {
- item.UpdateUser = userId;
- }
- }
- upShelf.Status = "2";
- Db.Updateable(upShelf).ExecuteCommand();
-
- locate.Status = "1";
- Db.Updateable(locate).ExecuteCommand();
- Db.Updateable(stockDetail).ExecuteCommand();
- Db.CommitTran();
-
- }
- catch (Exception e)
- {
- throw new Exception(e.Message);
- }
- }
+
#endregion
@@ -4330,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