From 7afc439ba32e234ebc455c98fa084ae6eef8a621 Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期四, 03 七月 2025 17:24:04 +0800
Subject: [PATCH] 优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs
index 1bec18f..2600909 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs
@@ -2176,8 +2176,8 @@
string[] state = new string[] { "鎵ц涓�, "寮�鍙栬揣", "鍙栬揣瀹屾垚", "寮�鍗歌揣", "鍗歌揣瀹屾垚" };
- var elevatorLoc = db.Queryable<Location>().Where(a => a.S_CODE == eleLoc.TN_Location).First();
- if (elevatorLoc==null)
+ var elevatorLoc = db.Queryable<Location>().Where(a => a.S_CODE == eleLoc.TN_Location).First();
+ if (elevatorLoc == null)
{
result.code = "1";
result.msg = $"鏍规嵁鐢垫閰嶇疆鏂囦欢璐т綅锛歿eleLoc.TN_Location}鏈壘鍒板浜庤揣浣嶆暟鎹紝璇锋鏌ヨ揣浣嶈〃";
@@ -2269,6 +2269,47 @@
}
+
+ /// <summary>
+ /// 鐢垫浠诲姟鎺ㄩ�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ internal static Result DT(DTModel model)
+ {
+ Result result = new Result() { code = "200", msg = "鐢垫浠诲姟鎺ㄩ�鎴愬姛" };
+ string Source = "WMS";
+ if (model == null)
+ {
+ result.code = "1";
+ result.msg = "鍙傛暟涓簄ull";
+ AddErrorInfo("鍙傛暟涓虹┖", result.msg, Source);
+ return result;
+ }
+ try
+ {
+ if (model.prepare=="1")
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ //淇敼瀵瑰簲鐢垫浠诲姟杩涜鎺ㄩ�
+ return result;
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"涓�ゼ鐢垫鎼繍浠诲姟鎺ㄩ�澶辫触 prepare{model.prepare}涓嶄负1";
+ LogHelper.Info(result.msg);
+ return result;
+ }
+ }
+ catch(Exception ex)
+ {
+ result.code = "1";
+ result.msg = $"鐢垫浠诲姟鎺ㄩ�澶辫触 閿欒淇℃伅锛歿ex}";
+ LogHelper.Error("鐐瑰鐐逛换鍔�Error锛� + ex.ToString(), ex);
+ return result;
+ }
+ }
/// <summary>
/// 璐т綅淇℃伅涓婁紶
/// </summary>
@@ -2834,14 +2875,14 @@
{
var rowList = locations.Where(r => r.N_ROW == rows[i]).ToList();
- // LogHelper.Info($"褰撳墠鎺�{rows[i]},鑾峰緱璐т綅{JsonConvert.SerializeObject(rowList)}");
+ // LogHelper.Info($"褰撳墠鎺�{rows[i]},鑾峰緱璐т綅{JsonConvert.SerializeObject(rowList)}");
if (rowList.Count(a => a.N_CURRENT_NUM == 0) > 0)
{
Location other = null;
//褰撳墠鎺掓病鏈夐攣骞朵笖鏈夌┖浣嶇疆
// other = rowList.OrderBy(a => a.N_COL).Where(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.C_ENABLE == "Y").FirstOrDefault();
- other = rowList.OrderBy(a => a.N_COL).Where(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 ).FirstOrDefault();
+ other = rowList.OrderBy(a => a.N_COL).Where(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0).FirstOrDefault();
//if (full == null)
//{
// //娌℃湁婊′綅锛岄偅灏辨壘鏈�皬鐨勭┖浣�@@ -3012,7 +3053,6 @@
{
lock (AGVDeviceReceiveLock)
{
-
var db = new SqlHelper<HangChaAGV>().GetInstance();
var agvDeviceInfo = db.Queryable<HangChaAGV>().Where(a => a.agvNo.Trim() == forkliftNo).First();
if (agvDeviceInfo == null)
--
Gitblit v1.9.1