From 49efcc39ef399f8f3b170f6b06ffc2177643f1b2 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期二, 27 五月 2025 17:27:39 +0800
Subject: [PATCH] 优化空托上线通过物料类型检查容器的功能
---
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/798bf6bf-6818-456f-ab4b-aad13079f168.vsidx | 0
core/Monitor.cs | 37 +++
/dev/null | 0
util/LogHelper.cs | 8
config/config.json | 30 +-
HH.WCS.Mobox3.DSZSH.csproj | 3
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/6450fb4e-6068-4bff-9055-f0bd1f177c4d.vsidx | 0
api/DebugController.cs | 71 +++++++
config/config.comment.json | 201 ++++++++++++++++++++
Models/TN_Container_Item.cs | 7
api/ApiHelper.cs | 210 ++++++++++++++------
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/870c2cc4-322b-42e1-a32f-bc410b5f82a5.vsidx | 0
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/c9195d04-088d-47d3-be93-4565501364ba.vsidx | 0
Dispatch/NDCApi.cs | 1
Models/TN_CG_Detail.cs | 2
api/MoboxController.cs | 6
16 files changed, 487 insertions(+), 89 deletions(-)
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/06d8e01f-6afb-4384-90b8-31f0488cd604.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/06d8e01f-6afb-4384-90b8-31f0488cd604.vsidx
deleted file mode 100644
index 4d1fb68..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/06d8e01f-6afb-4384-90b8-31f0488cd604.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/21a5a3a3-5cdb-4cd3-a5e2-25be17fb4dfe.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/21a5a3a3-5cdb-4cd3-a5e2-25be17fb4dfe.vsidx
deleted file mode 100644
index a87405c..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/21a5a3a3-5cdb-4cd3-a5e2-25be17fb4dfe.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/6450fb4e-6068-4bff-9055-f0bd1f177c4d.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/6450fb4e-6068-4bff-9055-f0bd1f177c4d.vsidx
new file mode 100644
index 0000000..2fa8974
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/6450fb4e-6068-4bff-9055-f0bd1f177c4d.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/67e4ef9b-7188-43f4-a60f-46c9a1d6bd44.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/67e4ef9b-7188-43f4-a60f-46c9a1d6bd44.vsidx
deleted file mode 100644
index 4d375c1..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/67e4ef9b-7188-43f4-a60f-46c9a1d6bd44.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/798bf6bf-6818-456f-ab4b-aad13079f168.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/798bf6bf-6818-456f-ab4b-aad13079f168.vsidx
new file mode 100644
index 0000000..60539af
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/798bf6bf-6818-456f-ab4b-aad13079f168.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/870c2cc4-322b-42e1-a32f-bc410b5f82a5.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/870c2cc4-322b-42e1-a32f-bc410b5f82a5.vsidx
new file mode 100644
index 0000000..949bf0b
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/870c2cc4-322b-42e1-a32f-bc410b5f82a5.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/c9195d04-088d-47d3-be93-4565501364ba.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/c9195d04-088d-47d3-be93-4565501364ba.vsidx
new file mode 100644
index 0000000..2429cb4
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/c9195d04-088d-47d3-be93-4565501364ba.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/f1cb2527-5e7a-4ff5-bd94-7e85a024df58.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/f1cb2527-5e7a-4ff5-bd94-7e85a024df58.vsidx
deleted file mode 100644
index c8264a7..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/f1cb2527-5e7a-4ff5-bd94-7e85a024df58.vsidx
+++ /dev/null
Binary files differ
diff --git a/Dispatch/NDCApi.cs b/Dispatch/NDCApi.cs
index 917704d..75cd6ad 100644
--- a/Dispatch/NDCApi.cs
+++ b/Dispatch/NDCApi.cs
@@ -17,7 +17,6 @@
public static string NDCApiUrl { set; get; }
static NDCApi()
{
-
NDCApiUrl = Settings.NdcApiUrl;
}
diff --git a/HH.WCS.Mobox3.DSZSH.csproj b/HH.WCS.Mobox3.DSZSH.csproj
index 09c07a9..6d9ef00 100644
--- a/HH.WCS.Mobox3.DSZSH.csproj
+++ b/HH.WCS.Mobox3.DSZSH.csproj
@@ -289,6 +289,9 @@
<ItemGroup>
<None Include=".editorconfig" />
<None Include="App.config" />
+ <None Include="config\config.comment.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
<None Include="config\config.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
diff --git a/Models/TN_CG_Detail.cs b/Models/TN_CG_Detail.cs
index 9a9a2a9..84c29ea 100644
--- a/Models/TN_CG_Detail.cs
+++ b/Models/TN_CG_Detail.cs
@@ -76,7 +76,7 @@
// ----------------
- // TODO
+ // [NOTE]
///// <summary>
///// 鐗╂枡鎵�湪鐨勫尯鍩�diff --git a/Models/TN_Container_Item.cs b/Models/TN_Container_Item.cs
index 9870889..5b03144 100644
--- a/Models/TN_Container_Item.cs
+++ b/Models/TN_Container_Item.cs
@@ -8,8 +8,13 @@
namespace HH.WCS.Mobox3.DSZSH.models {
/// <summary>
- /// 瀹瑰櫒-鐗╂枡绫诲瀷 鍏崇郴琛�+ /// 瀹瑰櫒-鐗╂枡绫诲瀷 鍏崇郴琛紙鍙敤浜庢墭鐩橈級
/// </summary>
+ /// <remarks>
+ /// 鐩墠鐞嗚В涓猴細绗竴娆℃弧鎵樹笅鏂欑殑鏃跺�锛屽皢缁戝畾鍏崇郴璁板綍鍦ㄨ繖涓〃涓紝鐒跺悗涓嶅啀鍒犻櫎<br/>
+ /// 鍚庨潰绌烘墭鍙墭鐩樼殑鏃跺�锛岃仈琛ㄦ煡鐗╂枡缂栧彿<br/>
+ /// 鍚庣画鍙兘鏄彁鍓嶇淮鎶わ紝灏嗗鍣ㄥ拰鐗╂枡缂栫爜鍐欏叆杩欎釜琛紝鎴栬�鐩存帴璁╃被鍨嬪湪瀹瑰櫒缂栫爜涓綋鐜�+ /// </remarks>
[SugarTable("TN_Container_Item")]
public class TN_Container_Item : BaseModel {
public string S_CNTR_CODE { get; set; }
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 0d86eb0..f844780 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -33,7 +33,7 @@
// 灏哖DA鎻愪緵鐨勭墿鏂欑紪鐮佷笌璐存爣鏈虹殑淇℃伅姣斿
var cgDetail = db.Queryable<TN_CG_Detail>()
.Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo) // 鎸囧畾锛氱墿鏂欑紪鐮併�鎵规鍙�- .Where(d => d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮") // NOTE 鍐椾綑妫�煡锛氱墿鏂欑姸鎬佸簲璇ヤ负 1寰呮
+ .Where(d => d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮") // 鏂板鐗╂枡锛屾晠鐗╂枡鐘舵�搴旇涓�1寰呮
.First();
if (cgDetail == null) {
@@ -42,6 +42,8 @@
return NewSimpleResult(1, info);
}
+ // 璧风偣璐т綅缁戝畾鍚庯紝鍙互涓嶇珛鍗宠缃甆_CURRENT_NUM涓�
+ // 鍥犱负AGV鍙栬揣鍚庡氨浼氭仮澶�锛岃�涓旇揣浣嶄笂閿佸悗涓嶄細琚闂埌
var startLoc = db.Queryable<TN_Location>()
.Where(l => l.S_CODE == model.StartLoc) // 鎸囧畾锛氳捣鐐硅揣浣嶅彿
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
@@ -63,9 +65,9 @@
// TODO 婊＄鍏ュ簱绠楁硶寰呬紭鍖� var endLoc = db.Queryable<TN_Location>()
- .Where(a => Settings.AreaMap[AreaName.婊℃墭瀛樻斁鍖篯.Contains(a.S_AREA_CODE))
- .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(a => a.N_CURRENT_NUM == 0) // 绛涢�锛氱┖璐т綅
+ .Where(l => Settings.AreaMap[AreaName.婊℃墭瀛樻斁鍖篯.Contains(l.S_AREA_CODE))
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
+ .Where(l => l.N_CURRENT_NUM == 0) // 绛涢�锛氱┖璐т綅
.OrderBy(l => l.N_LAYER)
.First();
@@ -243,10 +245,11 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
try {
+ // 鐜板湪PDA娌℃湁鍗曠嫭鐨勭粦瀹氭祦绋嬶紝缁戝畾鍦ㄥ叆搴撴椂瀹屾垚
var startLoc = db.Queryable<TN_Location>()
- .Where(a => a.S_CODE == model.StartLoc) // 鎸囧畾锛氳捣鐐硅揣浣�- .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(a => a.N_CURRENT_NUM == 1)
+ .Where(l => l.S_CODE == model.StartLoc) // 鎸囧畾锛氳捣鐐硅揣浣�+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
+ .Where(l => l.N_CURRENT_NUM == 0) // 缁戝畾鍓嶈揣浣嶄负绌� .First();
if (startLoc == null) {
@@ -256,22 +259,29 @@
}
// 鏌ョ湅瀹瑰櫒涓庤捣鐐硅揣浣嶆槸鍚︾粦瀹�- var locCntrRel = db.Queryable<TN_Loc_Container>()
- .Where(c => c.S_LOC_CODE == model.StartLoc && c.S_CNTR_CODE == model.CntrCode)
- .First();
+ //var locCntrRel = db.Queryable<TN_Loc_Container>()
+ // .Where(c => c.S_LOC_CODE == model.StartLoc && c.S_CNTR_CODE == model.CntrCode)
+ // .First();
- if (locCntrRel == null) {
- info = $"璧风偣浣嶇疆{model.StartLoc}娌℃湁缁戝畾瀹瑰櫒{model.CntrCode}";
- LogHelper.Info(info);
- return NewSimpleResult(3, info);
- }
+ //if (locCntrRel == null) {
+ // info = $"璧风偣浣嶇疆{model.StartLoc}娌℃湁缁戝畾瀹瑰櫒{model.CntrCode}";
+ // LogHelper.Info(info);
+ // return NewSimpleResult(3, info);
+ //}
+
+ // 缁戝畾璐т綅鍜屽鍣ㄥ彿
+ var locCntrRel = new TN_Loc_Container {
+ S_LOC_CODE = model.StartLoc,
+ S_CNTR_CODE = model.CntrCode,
+ S_CNTR_TYPE = "鎵樼洏",
+ };
// TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
var endLoc = db.Queryable<TN_Location>()
.Where(l => Settings.AreaMap[AreaName.绌烘墭瀛樻斁鍖篯.Contains(l.S_AREA_CODE))
- .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(a => a.N_CURRENT_NUM == 0)
- .OrderBy(l => l.N_LAYER)
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
+ .Where(l => l.N_CURRENT_NUM == 0)
+ .OrderBy(l => new { l.N_LAYER, row=SqlFunc.Desc(l.S_AREA_CODE) })
.First();
if (endLoc == null) {
@@ -287,6 +297,13 @@
LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
+ if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
+ info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
+ tran.RollbackTran();
+ LogHelper.Info(info);
+ return NewSimpleResult(4, info);
+ }
+
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
it.N_LOCK_STATE,
it.S_LOCK_STATE,
@@ -341,9 +358,9 @@
var info = "";
try {
var startLoc = db.Queryable<TN_Location>()
- .Where(a => a.S_CODE == model.StartLoc)
- .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(a => a.N_CURRENT_NUM == 1) // 绛涢�锛氭湁璐ц揣浣�+ .Where(l => l.S_CODE == model.StartLoc)
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+ .Where(l => l.N_CURRENT_NUM == 0) // 缁戝畾鍓嶈揣浣嶄负绌� .First();
if (startLoc == null) {
@@ -353,21 +370,28 @@
}
// 鏌ョ湅瀹瑰櫒涓庤捣鐐硅揣浣嶆槸鍚︾粦瀹�- var locCntrRel = db.Queryable<TN_Loc_Container>()
- .Where(c => c.S_LOC_CODE == model.StartLoc && c.S_CNTR_CODE == model.CntrCode)
- .First();
+ //var locCntrRel = db.Queryable<TN_Loc_Container>()
+ // .Where(c => c.S_LOC_CODE == model.StartLoc && c.S_CNTR_CODE == model.CntrCode)
+ // .First();
- if (locCntrRel == null) {
- info = $"璧风偣浣嶇疆{model.StartLoc}娌℃湁缁戝畾瀹瑰櫒{model.CntrCode}";
- LogHelper.Info(info);
- return NewSimpleResult(3, info);
- }
+ //if (locCntrRel == null) {
+ // info = $"璧风偣浣嶇疆{model.StartLoc}娌℃湁缁戝畾瀹瑰櫒{model.CntrCode}";
+ // LogHelper.Info(info);
+ // return NewSimpleResult(3, info);
+ //}
- // TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
+ // 缁戝畾璐т綅鍜屽鍣ㄥ彿
+ var locCntrRel = new TN_Loc_Container {
+ S_LOC_CODE = model.StartLoc,
+ S_CNTR_CODE = model.CntrCode,
+ S_CNTR_TYPE = "濂借繍绠�,
+ };
+
+ // TODO 鏆傚畾閫夋嫨鏈�綆灞傞『搴忓叆搴擄紝鍚庨潰寰呬慨鏀� var endLoc = db.Queryable<TN_Location>()
.Where(l => Settings.AreaMap[AreaName.绌虹瀛樻斁鍖篯.Contains(l.S_AREA_CODE))
- .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(a => a.N_CURRENT_NUM == 0)
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+ .Where(l => l.N_CURRENT_NUM == 0)
.OrderBy(l => new { l.N_LAYER })
.First();
@@ -382,6 +406,13 @@
LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
+ if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
+ info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
+ tran.RollbackTran();
+ LogHelper.Info(info);
+ return NewSimpleResult(4, info);
+ }
+
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
it.N_LOCK_STATE,
it.S_LOCK_STATE,
@@ -437,23 +468,53 @@
var taskInfo = Settings.TaskMap[taskName];
var info = "";
try {
- // TODO 绗﹀悎鐗╂枡淇℃伅鐨勮揣浣�+ // 鎵剧鍚堢墿鏂欎俊鎭殑璐т綅
+ //var startLoc = db.Queryable<TN_Location>()
+ // .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE) // 鑱旇〃锛氳揣浣嶅鍣ㄥ叧绯昏〃
+ // .LeftJoin<TN_Container_Item>((l, c, i) => c.S_CNTR_CODE == i.S_CNTR_CODE) // 鑱旇〃锛氬鍣ㄤ笌鐗╂枡绫诲瀷缁戝畾琛�+ // .Where(l => taskInfo.StartAreas.Contains(l.S_AREA_CODE)) // 闄愬畾鍦ㄧ┖鎵樺瓨鏀惧尯涓壘瀹瑰櫒璐т綅
+ // .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭病鏈夐攣鐘舵�
+ // .Where(l => l.N_CURRENT_NUM == 1) // 绛涢�锛氭湁璐ц揣浣�+ // .Where((l, c) => c.S_CNTR_CODE == model.CntId) // 鎵炬寚瀹氬鍣ㄥ彿
+ // .Where((l, c, i) => i.S_ITEM_CODE == model.ItemCode) // 纭繚瀹瑰櫒缂栫爜缁戝畾鐨勭墿鏂欑紪鐮佷笌鎵�渶涓�嚧
+ // .First();
+
+ //if (startLoc == null) {
+ // info = $"鍦ㄧ┖鎵樺瓨鏀惧尯涓紝鎵句笉鍒扮鍚坽model.ItemCode}鐗╂枡锛屼笖缂栫爜涓簕model.CntId}鐨勭┖鎵樼洏";
+ // LogHelper.Info(info);
+ // return NewSimpleResult(2, info);
+ //}
+
+ //var locCntrRel = db.Queryable<TN_Loc_Container>().First(
+ // a => a.S_LOC_CODE == startLoc.S_CODE
+ // && a.S_CNTR_CODE == model.CntId);
+
+ //if (locCntrRel == null) {
+ // return NewSimpleResult(3, $"璧风偣浣嶇疆 '{startLoc.S_CODE}' 娌℃湁缁戝畾瀹瑰櫒 '{model.CntId}'");
+ //}
+
+ var cntrItemRel = db.Queryable<TN_Container_Item>()
+ .Where(i => i.S_CNTR_CODE == model.CntId && i.S_ITEM_CODE == model.ItemCode)
+ .First();
+
+ if (cntrItemRel == null) {
+ info = $"瀹瑰櫒{model.CntId}涓嶇鍚堢墿鏂檣model.ItemCode}锛氭病鏈夊湪瀹瑰櫒鐗╂枡绫诲瀷鐧昏琛ㄤ腑鎵惧埌";
+ LogHelper.Info(info);
+ return NewSimpleResult(2, info);
+ }
+
var startLoc = db.Queryable<TN_Location>()
- .Where(l => taskInfo.StartAreas.Contains(l.S_AREA_CODE))
- .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(a => a.N_CURRENT_NUM == 1) // 绛涢�锛氭湁璐ц揣浣�+ .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE) // 鑱旇〃锛氳揣浣嶅鍣ㄥ叧绯昏〃
+ .Where(l => taskInfo.StartAreas.Contains(l.S_AREA_CODE)) // 闄愬畾鍦ㄧ┖鎵樺瓨鏀惧尯涓壘瀹瑰櫒璐т綅
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭病鏈夐攣鐘舵�
+ .Where(l => l.N_CURRENT_NUM == 1) // 绛涢�锛氭湁璐ц揣浣�+ .Where((l, c) => c.S_CNTR_CODE == model.CntId) // 鎵炬寚瀹氬鍣ㄥ彿
.First();
if (startLoc == null) {
- return NewSimpleResult(2, $"娌℃湁鍚堥�鐨勮捣鐐逛綅缃�);
- }
-
- var locCntrRel = db.Queryable<TN_Loc_Container>().First(
- a => a.S_LOC_CODE == startLoc.S_CODE
- && a.S_CNTR_CODE == model.CntId);
-
- if (locCntrRel == null) {
- return NewSimpleResult(3, $"璧风偣浣嶇疆 '{startLoc.S_CODE}' 娌℃湁缁戝畾瀹瑰櫒 '{model.CntId}'");
+ info = $"鍦ㄧ┖鎵樺瓨鏀惧尯涓紝鎵句笉鍒扮鍚坽model.ItemCode}鐗╂枡锛屼笖缂栫爜涓簕model.CntId}鐨勭┖鎵樼洏";
+ LogHelper.Info(info);
+ return NewSimpleResult(3, info);
}
var endLoc = db.Queryable<TN_Location>()
@@ -464,10 +525,12 @@
.First();
if (endLoc == null) {
- return NewSimpleResult(4, $"缁堢偣浣嶇疆 涓嶅瓨鍦ㄦ垨涓嶅叿澶囨斁璐ц姹�);
+ info = $"缁堢偣浣嶇疆 涓嶅瓨鍦ㄦ垨涓嶅叿澶囨斁璐ц姹�;
+ LogHelper.Info(info);
+ return NewSimpleResult(4, info);
}
- var cntId = locCntrRel.S_CNTR_CODE;
+ var cntId = model.CntId;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�@@ -529,23 +592,27 @@
var taskInfo = Settings.TaskMap[taskName];
var info = "";
try {
- // TODO 绗﹀悎鐗╂枡淇℃伅鐨勮揣浣� var startLoc = db.Queryable<TN_Location>()
+ .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
.Where(l => taskInfo.StartAreas.Contains(l.S_AREA_CODE))
- .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(a => a.N_CURRENT_NUM == 1).First();
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+ .Where(l => l.N_CURRENT_NUM == 1)
+ .Where((l, c) => c.S_CNTR_CODE == model.CntId)
+ .First();
if (startLoc == null) {
- return NewSimpleResult(2, $"娌℃湁鍚堥�鐨勮捣鐐逛綅缃�);
+ info = $"鍦ㄧ┖绠卞瓨鏀惧尯涓紝鎵句笉鍒扮紪鐮佷负{model.CntId}鐨勭┖濂借繍绠�;
+ LogHelper.Info(info);
+ return NewSimpleResult(2, info);
}
- var locCntrRel = db.Queryable<TN_Loc_Container>().First(
- a => a.S_LOC_CODE == startLoc.S_CODE
- && a.S_CNTR_CODE == model.CntId);
+ //var locCntrRel = db.Queryable<TN_Loc_Container>().First(
+ // a => a.S_LOC_CODE == startLoc.S_CODE
+ // && a.S_CNTR_CODE == model.CntId);
- if (locCntrRel == null) {
- return NewSimpleResult(3, $"璧风偣浣嶇疆 '{startLoc.S_CODE}' 娌℃湁缁戝畾瀹瑰櫒 '{model.CntId}'");
- }
+ //if (locCntrRel == null) {
+ // return NewSimpleResult(3, $"璧风偣浣嶇疆 '{startLoc.S_CODE}' 娌℃湁缁戝畾瀹瑰櫒 '{model.CntId}'");
+ //}
var endLoc = db.Queryable<TN_Location>()
.Where(l => Settings.AreaMap[AreaName.鍖呰鍖篯.Contains(l.S_AREA_CODE))
@@ -558,7 +625,7 @@
return NewSimpleResult(4, $"缁堢偣浣嶇疆 涓嶅瓨鍦ㄦ垨涓嶅叿澶囨斁璐ц姹�);
}
- var cntId = locCntrRel.S_CNTR_CODE;
+ var cntId = model.CntId;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�@@ -935,9 +1002,30 @@
return NewSimpleResult(2, $"璧风偣璐т綅 {model.StartLoc}");
}
- var endLoc = db.Queryable<TN_Location, TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
- .Where((l, c) => c.S_CNTR_TYPE == locCntrRel.S_CNTR_TYPE)
- .First();
+ var endLoc = new TN_Location();
+ if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") {
+ endLoc = db.Queryable<TN_Location>()
+ .Where(l => Settings.AreaMap[AreaName.婊℃墭瀛樻斁鍖篯.Contains(l.S_AREA_CODE))
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
+ .Where(l => l.N_CURRENT_NUM == 0) // 璧风偣缁戝畾鍓嶆病鏈夊鍣�+ .First();
+ }
+ else if (locCntrRel.S_CNTR_TYPE =="濂借繍绠�){
+ endLoc = db.Queryable<TN_Location>()
+ .Where(l => Settings.AreaMap[AreaName.婊＄瀛樻斁鍖篯.Contains(l.S_AREA_CODE))
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
+ .Where(l => l.N_CURRENT_NUM == 0) // 璧风偣缁戝畾鍓嶆病鏈夊鍣�+ .First();
+ }
+ else {
+ endLoc = null;
+ }
+
+ //var endLoc = db.Queryable<TN_Location, TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
+ // .Where((l, c) => c.S_CNTR_TYPE == locCntrRel.S_CNTR_TYPE)
+ // .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
+ // .Where(l => l.N_CURRENT_NUM == 0) // 璧风偣缁戝畾鍓嶆病鏈夊鍣�+ // .First();
if (endLoc == null) {
return NewSimpleResult(3, $"涓嶅瓨鍦ㄥ悎閫傜殑缁堢偣璐т綅鍙互鍥炲簱");
diff --git a/api/DebugController.cs b/api/DebugController.cs
index 2ce3d54..425fc6e 100644
--- a/api/DebugController.cs
+++ b/api/DebugController.cs
@@ -82,13 +82,15 @@
//typeof(SysHelper.OI_SYS_MAXID),
//typeof(TN_Inbound_Order),
- typeof(TN_Check_Detail),
+ //typeof(TN_Check_Detail),
//typeof(TN_Check_Order),
//typeof(TN_CNTR_ITEM),
//typeof(TN_Outbound_Detail),
//typeof(TN_Outbound_Order),
//typeof(TN_Shift_Order),
//typeof(TN_Shift_Detail)
+
+ typeof(TN_Container_Item),
};
using (var tran = db.Ado.UseTran()) {
@@ -203,6 +205,68 @@
return $"Error reading CSV file: {ex.Message}";
}
}
+
+ /// <summary>
+ /// DEBUG锛氭牴鎹鍣ㄧ墿鏂欎俊鎭〃锛屾彃鍏ュ鍣ㄧ墿鏂欑櫥璁颁俊鎭〃
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("InsertContainerItemByCgDetail")]
+ public string InsertContainerItemByCgDetail(CoverInfo _) {
+ var db = new SqlHelper<object>().GetInstance();
+ try {
+ var cgDetailList = db.Queryable<TN_CG_Detail>().ToList();
+ var cntrItemList = new List<TN_Container_Item>();
+ foreach (var cgDetail in cgDetailList) {
+ if (db.Queryable<TN_Container_Item>().Where(i => i.S_CNTR_CODE == cgDetail.S_CNTR_CODE).Any()) {
+ continue;
+ }
+
+ cntrItemList.Add(new TN_Container_Item {
+ S_CNTR_CODE = cgDetail.S_CNTR_CODE,
+ S_ITEM_CODE = cgDetail.S_ITEM_CODE,
+ });
+ }
+
+ if (db.Insertable<TN_Container_Item>(cntrItemList).ExecuteCommand() <= 0) {
+ return "鎻掑叆澶辫触";
+ }
+
+ return "鎻掑叆鎴愬姛";
+ }
+ catch (Exception ex) {
+
+ LogHelper.InfoEx(ex);
+ return ex.Message;
+ }
+ }
+
+ /// <summary>
+ /// DEBUG锛氭牴鎹鍣ㄧ墿鏂欎俊鎭〃锛屾彃鍏ュ鍣ㄧ墿鏂欑櫥璁颁俊鎭〃
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("InsertContainerItem")]
+ public string InsertContainerItem(InsertCntrItemInfo cgDetail) {
+ var db = new SqlHelper<object>().GetInstance();
+ try {
+ var cntrItem = new TN_Container_Item {
+ S_CNTR_CODE = cgDetail.Cntr,
+ S_ITEM_CODE = cgDetail.Item,
+ };
+
+ if (db.Insertable<TN_Container_Item>(cntrItem).ExecuteCommand() <= 0) {
+ return "鎻掑叆澶辫触";
+ }
+
+ return "鎻掑叆鎴愬姛";
+ }
+ catch (Exception ex) {
+
+ LogHelper.InfoEx(ex);
+ return ex.Message;
+ }
+ }
}
/// <summary>
@@ -227,6 +291,11 @@
public bool IsCover { set; get; } = false;
}
+ public class InsertCntrItemInfo {
+ public string Cntr { set; get; }
+ public string Item { set; get; }
+ }
+
/// <summary>
///
/// </summary>
diff --git a/api/MoboxController.cs b/api/MoboxController.cs
index 36a11bf..ac5f2e8 100644
--- a/api/MoboxController.cs
+++ b/api/MoboxController.cs
@@ -59,14 +59,14 @@
var apiName = "绌烘墭/绌虹鍏ュ簱";
LogHelper.InfoApi(apiName, model);
- if (model.CntrType == "鎵樼洏") {
+ if (model.CntrType == "绌烘墭鐩�) {
return ApiHelper.EmptyInboundPallet(model);
}
- else if (model.CntrType == "濂借繍绠�) {
+ else if (model.CntrType == "绌哄ソ杩愮") {
return ApiHelper.EmptyInboundGoodpack(model);
}
else {
- return NewSimpleResult(-1, $"瀹瑰櫒绫诲瀷 '{model.CntrType}' 涓嶅悎娉曪細搴斾负 '鎵樼洏' 鎴�'濂借繍绠�");
+ return NewSimpleResult(-1, $"瀹瑰櫒绫诲瀷 '{model.CntrType}' 涓嶅悎娉曪細搴斾负 '绌烘墭鐩� 鎴�'绌哄ソ杩愮'");
}
}
diff --git a/config/config.comment.json b/config/config.comment.json
new file mode 100644
index 0000000..66d1192
--- /dev/null
+++ b/config/config.comment.json
@@ -0,0 +1,201 @@
+{
+ "WebApiUrl": "http://192.168.1.141:8901", //WCS鑷繁鐨勫湴鍧�+ "NdcApiUrl": "http://127.0.0.1:5201/api/order/", //
+ "SqlServer": "Data Source=192.168.1.87;Initial Catalog=AMS_OIMobox;User ID=sa;Password=123456;",
+ "TcpServerIp": "127.0.0.1",
+ "TcpServerPort": 8085,
+ "Areas": [ // 璐у尯
+ {
+ "Name": "鍖呰鍖�,
+ "Codes": [ "BZQ" ]
+ },
+ {
+ "Name": "鎿嶄綔鍖�,
+ "Codes": [ "CZQ1", "CZQ2" ]
+ },
+ {
+ "Name": "璐ф灦鍖�,
+ "Codes": [ "HJQ1", "HJQ2", "HJQ3", "HJQ4" ]
+ },
+ {
+ "Name": "绌烘墭瀛樻斁鍖�,
+ "Codes": [ "KTCFQ" ]
+ },
+ {
+ "Name": "绌虹瀛樻斁鍖�,
+ "Codes": [ "HJQ1" ]
+ },
+ {
+ "Name": "婊℃墭瀛樻斁鍖�,
+ "Codes": [ "HJQ2" ]
+ },
+ {
+ "Name": "婊＄瀛樻斁鍖�,
+ "Codes": [ "HJQ3" ]
+ },
+ {
+ "Name": "鎶芥鍖�,
+ "Codes": [ "CJQ1" ]
+ },
+ {
+ "Name": "鎶芥寮傚父鍖�,
+ "Codes": [ "CJYCQ" ]
+ },
+ {
+ "Name": "绌虹鎿嶄綔鍖�,
+ "Codes": [ "CZQ1" ]
+ },
+ {
+ "Name": "婊＄鎿嶄綔鍖�,
+ "Codes": [ "CZQ2" ]
+ },
+ {
+ "Name": "绌烘墭鍏ュ簱鎺ラ┏鍖�,
+ "Codes": [ "KTRKJBQ" ]
+ },
+ {
+ "Name": "绌虹鍏ュ簱鎺ラ┏鍖�,
+ "Codes": [ "KXRKJBQ1", "KXRKJBQ2" ]
+ },
+ {
+ "Name": "姹借溅鍑哄簱澶囪揣鍖�, // 姹借溅鍑哄簱鏈堝彴
+ "Codes": [ "CKQ-QC" ] // 鎷奸煶锛氬嚭搴撳尯-姹借溅
+ },
+ {
+ "Name": "鐏溅鍑哄簱澶囪揣鍖�, // 鐏溅鍑哄簱鏈堝彴
+ "Codes": [ "CKQ-HC" ] // 鎷奸煶锛氬嚭搴撳尯-鐏溅
+ }
+ ],
+ "Tasks": [
+ {
+ "Name": "鎵樼洏-婊℃墭涓嬬嚎鍏ュ簱",
+ "StartAreas": [ "BZQ" ],
+ "EndAreas": [ "HJQ2" ]
+ },
+ {
+ "Name": "濂借繍绠�婊＄涓嬬嚎鍏ュ簱",
+ "StartAreas": [ "CZQ2" ],
+ "EndAreas": [ "HJQ3" ]
+ },
+ {
+ "Name": "鎵樼洏-绌烘墭涓婄嚎",
+ "StartAreas": [ "KTCFQ" ],
+ "EndAreas": [ "BZQ" ]
+ },
+ {
+ "Name": "濂借繍绠�绌虹涓婄嚎",
+ "StartAreas": [ "HJQ1" ],
+ "EndAreas": [ "CZQ1" ]
+ },
+ {
+ "Name": "鎵樼洏-绌烘墭鍏ュ簱",
+ "StartAreas": [ "KTRKJBQ" ],
+ "EndAreas": [ "KTCFQ" ]
+ },
+ {
+ "Name": "濂借繍绠�绌虹鍏ュ簱",
+ "StartAreas": [ "KXRKJBQ1" ],
+ "EndAreas": [ "HJQ1" ]
+ },
+ {
+ "Name": "鎶芥-鍑哄簱"
+ },
+ {
+ "Name": "鎶芥-鍚堟牸鍥炲簱"
+ },
+ {
+ "Name": "鎶芥-涓嶅悎鏍肩Щ搴�
+ },
+ {
+ "Name": "鎴愬搧鑳跺嚭搴�
+ }
+ ],
+ "ProductionLines": [ // 浜х嚎鐨�+ {
+ "Id": "1",
+ "Name": "鎵樼洏浜х嚎1",
+ "PlcIp": "127.0.0.1",
+ "PlcPort": 502,
+ "SlaveId": 1,
+ "OnLoc": [
+ "CX11"
+ ],
+ "OffLoc": [
+ "CX12"
+ ]
+ },
+ {
+ "Id": "2",
+ "Name": "鎵樼洏浜х嚎2",
+ "PlcIp": "127.0.0.1",
+ "PlcPort": 503,
+ "SlaveId": 2,
+ "OnLoc": [
+ "CX21"
+ ],
+ "OffLoc": [
+ "CX22"
+ ]
+ },
+ {
+ "Id": "3",
+ "Name": "濂借繍绠变骇绾�",
+ "PlcIp": "127.0.0.1",
+ "PlcPort": 504,
+ "SlaveId": 3,
+ "OnLoc": [
+ "CX31"
+ ],
+ "OffLoc": [
+ "CX32"
+ ]
+ },
+ {
+ "Id": "4",
+ "Name": "濂借繍绠变骇绾�",
+ "PlcIp": "127.0.0.1",
+ "PlcPort": 505,
+ "SlaveId": 4,
+ "OnLoc": [
+ "CX41"
+ ],
+ "OffLoc": [
+ "CX42"
+ ]
+ }
+ ],
+ "ProdAgvSite": [
+ {
+ "Code": "work111",
+ "ProdId": 0
+ },
+ {
+ "Code": "work112",
+ "ProdId": 0
+ },
+ {
+ "Code": "work121",
+ "ProdId": 1
+ },
+ {
+ "Code": "work122",
+ "ProdId": 1
+ },
+ {
+ "Code": "work131",
+ "ProdId": 2
+ },
+ {
+ "Code": "work132",
+ "ProdId": 2
+ },
+ {
+ "Code": "work141",
+ "ProdId": 3
+ },
+ {
+ "Code": "work142",
+ "ProdId": 3
+ }
+ ]
+}
\ No newline at end of file
diff --git a/config/config.json b/config/config.json
index e40371a..4c45dee 100644
--- a/config/config.json
+++ b/config/config.json
@@ -11,11 +11,11 @@
},
{
"Name": "鎿嶄綔鍖�,
- "Codes": [ "CZQ1", "CZQ2" ]
+ "Codes": [ "CZQ-KX", "CZQ-MX" ]
},
{
"Name": "璐ф灦鍖�,
- "Codes": [ "HJQ1", "HJQ2", "HJQ3", "HJQ4" ]
+ "Codes": [ "HJQ-KX", "HJQ-MT", "HJQ-MT" ]
},
{
"Name": "绌烘墭瀛樻斁鍖�,
@@ -23,19 +23,19 @@
},
{
"Name": "绌虹瀛樻斁鍖�,
- "Codes": [ "HJQ1" ]
+ "Codes": [ "HJQ-KX" ]
},
{
"Name": "婊℃墭瀛樻斁鍖�,
- "Codes": [ "HJQ2" ]
+ "Codes": [ "HJQ-MT" ]
},
{
"Name": "婊＄瀛樻斁鍖�,
- "Codes": [ "HJQ3" ]
+ "Codes": [ "HJQ-MX" ]
},
{
"Name": "鎶芥鍖�,
- "Codes": [ "CJQ1" ]
+ "Codes": [ "CJQ" ]
},
{
"Name": "鎶芥寮傚父鍖�,
@@ -43,39 +43,39 @@
},
{
"Name": "绌虹鎿嶄綔鍖�,
- "Codes": [ "CZQ1" ]
+ "Codes": [ "CZQ-KX" ]
},
{
"Name": "婊＄鎿嶄綔鍖�,
- "Codes": [ "CZQ2" ]
+ "Codes": [ "CZQ-MX" ]
},
{
"Name": "绌烘墭鍏ュ簱鎺ラ┏鍖�,
- "Codes": [ "KTRKJBQ" ]
+ "Codes": [ "JBQ-KT" ]
},
{
"Name": "绌虹鍏ュ簱鎺ラ┏鍖�,
- "Codes": [ "KXRKJBQ1", "KXRKJBQ2" ]
+ "Codes": [ "JBQ-KX1", "JBQ-KX2" ]
},
{
"Name": "姹借溅鍑哄簱澶囪揣鍖�,
- "Codes": [ "QCCKBHQ" ]
+ "Codes": [ "CKQ-QC" ]
},
{
"Name": "鐏溅鍑哄簱澶囪揣鍖�,
- "Codes": [ "HCCKBHQ" ]
+ "Codes": [ "CKQ-HC" ]
}
],
"Tasks": [
{
"Name": "鎵樼洏-婊℃墭涓嬬嚎鍏ュ簱",
"StartAreas": [ "BZQ" ],
- "EndAreas": [ "HJQ2" ]
+ "EndAreas": [ "HJQ-MT" ]
},
{
"Name": "濂借繍绠�婊＄涓嬬嚎鍏ュ簱",
- "StartAreas": [ "CZQ2" ],
- "EndAreas": [ "HJQ3" ]
+ "StartAreas": [ "CZQ-MX" ],
+ "EndAreas": [ "HJQ-MX" ]
},
{
"Name": "鎵樼洏-绌烘墭涓婄嚎",
diff --git a/core/Monitor.cs b/core/Monitor.cs
index ccb2fd5..b31eb12 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -66,6 +66,21 @@
S_CNTR_CODE = cntrCode,
};
+ // TODO 姣忔杞閮芥鏌ュ搴斿鍣ㄦ槸鍚﹀凡鐧昏锛岀櫥璁板垯鏇存柊锛屾湭鐧昏鍒欐彃鍏�+ var cntrItemRel = db.Queryable<TN_Container_Item>()
+ .Where(i => i.S_CNTR_CODE == cntrCode).First();
+
+ var insertTable = cntrItemRel == null;
+
+ if (insertTable) {
+ // 鏆傚畾鍦ㄦ弧鎵樹笅绾垮叆搴撶殑鏃跺�锛岀櫥璁版墭鐩樺鍣�鐗╂枡鍙峰叧绯伙紙鍚庨潰鍙兘浼氭敼鎴愮郴缁熺淮鎶わ級
+ cntrItemRel = new TN_Container_Item {
+ S_ITEM_CODE = itemCode,
+ S_CNTR_CODE = cntrCode,
+ };
+ }
+ // END TODO
+
var startLoc = db.Queryable<TN_Location>()
.Where(l => l.S_CODE == startLocCode) // 鎸囧畾锛氳捣鐐硅揣浣嶅彿
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
@@ -93,7 +108,6 @@
// //return;
//}
- // TODO 婊＄鍏ュ簱绠楁硶寰呬紭鍖� var endLoc = db.Queryable<TN_Location>()
.Where(a => Settings.AreaMap[AreaName.绌烘墭瀛樻斁鍖篯.Contains(a.S_AREA_CODE))
.Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
@@ -120,6 +134,25 @@
LogHelper.Info(info);
continue;
}
+
+ // TODO 鎻掑叆鎴栨洿鏂板鍣ㄤ笌鐗╂枡绫诲瀷鐨勭粦瀹氳〃
+ if (insertTable) {
+ if (db.Insertable<TN_Container_Item>(cntrItemRel).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = $"鐧昏瀹瑰櫒鐗╂枡绫诲瀷缁戝畾琛ㄥけ璐ワ細鐗╂枡缂栫爜{cntrItemRel.S_ITEM_CODE}锛屽鍣ㄧ紪鐮亄cntrItemRel.S_CNTR_CODE}";
+ LogHelper.Info(info);
+ continue;
+ }
+ }
+ else {
+ if (db.Updateable<TN_Container_Item>(cntrItemRel).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = $"鐧昏瀹瑰櫒鐗╂枡绫诲瀷缁戝畾琛ㄥけ璐ワ細鐗╂枡缂栫爜{cntrItemRel.S_ITEM_CODE}锛屽鍣ㄧ紪鐮亄cntrItemRel.S_CNTR_CODE}";
+ LogHelper.Info(info);
+ continue;
+ }
+ }
+ // END TODO
if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
tran.RollbackTran();
@@ -206,7 +239,7 @@
}
var lastDetail = db.Queryable<TN_Outbound_Detail>()
- .Where(d => d.S_OO_NO == order.S_NO && d.N_B_STATE == 2) // TODO 鎴栬�鏀规垚鏌ask
+ .Where(d => d.S_OO_NO == order.S_NO && d.N_B_STATE == 2) // [NOTE] 鎴栬�鏀规垚鏌ask
.First();
if (lastDetail != null) {
diff --git a/util/LogHelper.cs b/util/LogHelper.cs
index 0afe82a..ccf4812 100644
--- a/util/LogHelper.cs
+++ b/util/LogHelper.cs
@@ -68,17 +68,17 @@
if (logger != null) {
logger.Error($"{message}{ex.StackTrace}");
}
- }
+ }
- // ------------
-
+ #region DIY
public static void InfoEx(Exception ex) {
Info($"鍙戠敓浜嗗紓甯革細{ex.Message}\n{ex.StackTrace}");
}
public static void InfoApi(string apiName, object model) {
Info($"瑙﹀彂API锛歿apiName} " + JsonConvert.SerializeObject(model), "API");
- }
+ }
+ #endregion
}
--
Gitblit v1.9.1