From 2ca90a404fa1ab94eb6374f50c6ddd47a2b7f0e6 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 31 七月 2025 17:23:57 +0800
Subject: [PATCH] 删除有问题的TCP旧代码, 优化事务处理和ERP数据模型
---
wms/WMSHelper.cs | 83 ++++++++++++++++++++++++++++++++---------
1 files changed, 65 insertions(+), 18 deletions(-)
diff --git a/wms/WMSHelper.cs b/wms/WMSHelper.cs
index c704164..e5eaf47 100644
--- a/wms/WMSHelper.cs
+++ b/wms/WMSHelper.cs
@@ -16,7 +16,7 @@
/// </summary>
public class WMSHelper {
/// <summary>
- /// 妫�煡瀹瑰櫒绫诲瀷
+ /// 妫�煡瀹瑰櫒绫诲瀷 ( 瀹瑰櫒琛�涓嶅瓨鍦�/ 绫诲瀷涓嶅尮閰�鏃�, 杩斿洖 false )
/// </summary>
/// <param name="cntrCode"></param>
/// <param name="cntrType"></param>
@@ -35,21 +35,6 @@
return (true, "妫�煡瀹瑰櫒绫诲瀷鎴愬姛!!");
}
/// <summary>
- ///
- /// </summary>
- /// <param name="locCode"></param>
- /// <param name="areas"></param>
- /// <param name="startLoc"></param>
- /// <returns></returns>
- public static (bool, string) FindStartLocUnbind(string locCode, List<string> areas, out TN_Location startLoc) {
- var db = new SqlHelper<object>().GetInstance();
- startLoc = db.Queryable<TN_Location>().Where(DbExpr.StartLocUnbind(locCode, areas)).First();
- if (startLoc == null) {
- return (false, LogMsg.StartLocUnbindNotFound(locCode, areas));
- }
- return (true, "");
- }
- /// <summary>
/// 鏍规嵁瀹瑰櫒鍙�, 鏌ユ壘鏃х殑璐т綅 / 璐т綅缁戝畾 / 鐗╂枡淇℃伅 ( 灏嗗緟鍒犻櫎 / 鏇存柊鏁版嵁鍐欏叆 obj )
/// </summary>
/// <remarks><code><![CDATA[obj.Old = oldLocCntrCg;]]></code></remarks>
@@ -57,13 +42,14 @@
/// <param name="cntrCode"></param>
/// <param name="skipCgDetail"></param>
/// <returns></returns>
- public static LocCntrCg FindCntrOldInfo(CreateTaskObj obj, string cntrCode, bool skipCgDetail = true) {
+ public static LocCntrCg FindOldCntrInfo(CreateTaskObj obj, string cntrCode, bool skipCgDetail = true) {
var oldLocCntrCg = WCSHelper.GetLocCntrCg(cntrCode, skipCgDetail);
obj.Old = oldLocCntrCg;
return oldLocCntrCg;
}
/// <summary>
- /// 缁戝畾璐т綅瀹瑰櫒 ( 淇敼 [ 璐т綅瀹瑰櫒琛�] [ 璐т綅绫诲瀷 ] = cntrType ; 灏�[ 寰呮彃鍏�] 璐т綅瀹瑰櫒鍏崇郴 鍔犲叆鍒�obj 涓�)
+ /// 缁戝畾璐т綅瀹瑰櫒 ( 淇敼 [ 璐т綅瀹瑰櫒琛�] [ 璐т綅绫诲瀷 ] = cntrType ; 灏�[ 寰呮彃鍏�] 璐т綅瀹瑰櫒鍏崇郴 鍔犲叆鍒�obj 涓�)<br/>
+ /// 璋冪敤 <see cref="WCSHelper.BindLocCntr"/> 璁剧疆 loc.N_CURRENT_NUM = 1
/// </summary>
/// <remarks><code><![CDATA[obj.New = new LocCntrCg { LocCntrRel = locCntrRel };]]></code></remarks>
/// <param name="obj"></param>
@@ -107,5 +93,66 @@
return task;
}
+
+ private const bool __鏌ヨ璇彞灏佽__ = false; // 浠呯敤浜庡垎娈�娌℃湁瀹炶川鎰忎箟(VS2022 v17.4.3 鏂囨。澶х翰)
+ #region 鏌ヨ璇彞(鎼佺疆,璁句负绉佹湁,鏌ヨ闇�眰鍙樻洿澶�灏佽涓嶅鐏垫椿)
+ /// <summary>
+ /// 鏌ヨ [ 缁戝畾鍓�] 鐨勮捣鐐硅揣浣�+ /// </summary>
+ /// <example><code><![CDATA[
+ /// (ok, msg) = WMSHelper.FindStartLocUnbind(model.StartLoc, taskInfo.StartAreas, out var startLoc);
+ /// if (!ok) return NewSimpleResult(2, preLog + msg);
+ /// ]]></code></example>
+ /// <param name="locCode"></param>
+ /// <param name="areas"></param>
+ /// <param name="startLoc"></param>
+ /// <returns></returns>
+ private static (bool, string) FindStartLocUnbind(string locCode, List<string> areas, out TN_Location startLoc) {
+ var db = new SqlHelper<object>().GetInstance();
+ startLoc = db.Queryable<TN_Location>().Where(DbExpr.StartLocUnbind(locCode, areas)).First();
+ if (startLoc == null) {
+ return (false, LogMsg.StartLocUnbindNotFound(locCode, areas));
+ }
+ return (true, "");
+ }
+ /// <summary>
+ /// 鏌ヨ [ 缁戝畾鍚�] 鐨勮捣鐐硅揣浣�+ /// </summary>
+ /// <example><code><![CDATA[
+ /// (ok, msg) = WMSHelper.FindStartLoc(model.StartLoc, taskInfo.StartAreas, out var startLoc);
+ /// if (!ok) return NewSimpleResult(2, preLog + msg);
+ /// ]]></code></example>
+ /// <param name="locCode"></param>
+ /// <param name="areas"></param>
+ /// <param name="startLoc"></param>
+ /// <returns></returns>
+ private static (bool, string) FindStartLoc(string locCode, List<string> areas, out TN_Location startLoc) {
+ var db = new SqlHelper<object>().GetInstance();
+ startLoc = db.Queryable<TN_Location>().Where(DbExpr.StartLoc(locCode, areas)).First();
+ if (startLoc == null) {
+ return (false, LogMsg.StartLocNotFound(locCode, areas));
+ }
+ return (true, "");
+ }
+ /// <summary>
+ /// 鏌ヨ缁堢偣璐т綅
+ /// </summary>
+ /// <example><code><![CDATA[
+ /// (ok, msg) = WMSHelper.FindEndLoc(areas: taskInfo.EndAreas, out var endLoc);
+ /// if (!ok) return NewSimpleResult(3, preLog + msg);
+ /// ]]></code></example>
+ /// <param name="locCode"></param>
+ /// <param name="areas"></param>
+ /// <param name="endLoc"></param>
+ /// <returns></returns>
+ private static (bool, string) FindEndLoc(string locCode, List<string> areas, out TN_Location endLoc) {
+ var db = new SqlHelper<object>().GetInstance();
+ endLoc = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(locCode, areas)).First();
+ if (endLoc == null) {
+ return (false, LogMsg.EndLocNotFound(locCode, areas));
+ }
+ return (true, "");
+ }
+ #endregion
}
}
--
Gitblit v1.9.1