From 64ec1a7fb55389d8db371d112e49f741de866796 Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期三, 18 六月 2025 16:41:26 +0800
Subject: [PATCH] 业务开发与优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/ApiHelper.cs | 65 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/ApiHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/ApiHelper.cs
index 5640485..92791ce 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/ApiHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/ApiHelper.cs
@@ -200,7 +200,8 @@
#endregion
#region 璁＄畻绔嬪簱缁堢偣
- endloc = LocationHelper.InStorage(startloc);
+
+ endloc = LocationHelper.InStorage("");
if (endloc == null)
{
result.Code = -1;
@@ -337,6 +338,7 @@
Location endloc = new Location();
Location startloc = new Location();
string cntrcode = model.CntrNo;
+ // string itemCode = "";
var db = new SqlHelper<object>().GetInstance();
if (model.DeviceNo == "1")//鍙犵洏鏈�@@ -368,7 +370,8 @@
#endregion
#region 璁＄畻绔嬪簱缁堢偣
- endloc = LocationHelper.InStorage(startloc);
+
+ endloc = LocationHelper.InStorage("");
if (endloc == null)
{
result.Code = -1;
@@ -433,7 +436,16 @@
#endregion
#region 璁＄畻绔嬪簱缁堢偣
- endloc = LocationHelper.InStorage(startloc);
+ //鑾峰彇鎵樼洏鐗╂枡缁戝畾鍏崇郴
+ var cntrItem = db.Queryable<CntrItemDetail>().Where(a => a.S_CNTR_CODE == model.CntrNo).First();
+ if (cntrItem == null)
+ {
+ result.Code = -1;
+ result.Msg = $"鏍规嵁鎵樼洏:{model.CntrNo}鏈壘鍒扮墿鏂欎俊鎭�;
+ LogHelper.Info($"EquipmentInfo:{result.Msg}");
+ return result;
+ }
+ endloc = LocationHelper.InStorage(cntrItem.S_ITEM_CODE);
if (endloc == null)
{
result.Code = -1;
@@ -553,6 +565,53 @@
return result;
}
+ internal static Result<ReseltApplyDestModel> ApplyDest(ApplyDestModel model)
+ {
+ Result<ReseltApplyDestModel> result = new Result<ReseltApplyDestModel> { Code = 0, Msg = "鍒涘缓鎴愬姛" };
+ if (model == null)
+ {
+ result.Code = -1;
+ result.Msg = "鍏ュ弬涓虹┖";
+ return result;
+ }
+ var db = new SqlHelper<object>().GetInstance();
+ string ItemCode = "";
+ var task = WCSHelper.GetTask(model.TaskNo);
+ if (task != null)
+ {
+
+ //鏍规嵁浠诲姟鎵樼洏鑾峰彇鐗╂枡淇℃伅
+
+ var cntrItem = db.Queryable<CntrItemDetail>().Where(a => a.S_CNTR_CODE == task.S_CNTR_CODE).First();
+ if (cntrItem != null)
+ {
+ ItemCode = cntrItem.S_ITEM_CODE;
+ }
+
+ var endloc = LocationHelper.InStorage(ItemCode);
+ if (endloc != null) {
+ result.Data = new ReseltApplyDestModel() { Loc = endloc.S_CODE };
+ }
+ else
+ {
+ result.Code = -1;
+ result.Msg = "褰撳墠娌℃湁鍙敤缁堢偣鍙互鍒嗛厤";
+ return result;
+ }
+
+ }
+ else
+ {
+ result.Code = 1;
+ result.Msg = "浠诲姟涓嶅瓨鍦�;
+ return result;
+ }
+
+
+
+ return result;
+ }
+
/// <summary>
/// 鑾峰彇鎵樼洏鐗╂枡淇℃伅
/// </summary>
--
Gitblit v1.9.1