From 9fa293298c53429e8ac5148de8328933c0a80ff4 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期三, 11 六月 2025 17:26:04 +0800
Subject: [PATCH] 更新容器必须检查前台是否维护的功能
---
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/d4ee5337-1afa-4e11-9fd2-caeaeefa2394.vsidx | 0
wms/LocationHelper.cs | 44 +++---
core/Monitor.cs | 10 +
/dev/null | 0
api/ApiHelper.cs | 341 +++++++++++++++++++++---------------------------
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/bd3ccb48-a785-4e86-8285-4198f2483a17.vsidx | 0
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/5c630563-0c2e-4c9a-b0ed-88f0f49d2377.vsidx | 0
api/ApiModel.cs | 9 +
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3b98bb07-94dd-4668-8e48-2d4c81bfe8f5.vsidx | 0
9 files changed, 185 insertions(+), 219 deletions(-)
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3051f4c7-a03d-4ed5-a59d-3d04bff3e616.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3051f4c7-a03d-4ed5-a59d-3d04bff3e616.vsidx
deleted file mode 100644
index 584b335..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3051f4c7-a03d-4ed5-a59d-3d04bff3e616.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3b98bb07-94dd-4668-8e48-2d4c81bfe8f5.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3b98bb07-94dd-4668-8e48-2d4c81bfe8f5.vsidx
new file mode 100644
index 0000000..5622fa1
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3b98bb07-94dd-4668-8e48-2d4c81bfe8f5.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/5c630563-0c2e-4c9a-b0ed-88f0f49d2377.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/5c630563-0c2e-4c9a-b0ed-88f0f49d2377.vsidx
new file mode 100644
index 0000000..58a5f02
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/5c630563-0c2e-4c9a-b0ed-88f0f49d2377.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/b2279396-cedf-4e13-9379-f9b937f2b7c7.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/b2279396-cedf-4e13-9379-f9b937f2b7c7.vsidx
deleted file mode 100644
index 4539821..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/b2279396-cedf-4e13-9379-f9b937f2b7c7.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/bd3ccb48-a785-4e86-8285-4198f2483a17.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/bd3ccb48-a785-4e86-8285-4198f2483a17.vsidx
new file mode 100644
index 0000000..9b2648c
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/bd3ccb48-a785-4e86-8285-4198f2483a17.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/c17e55d3-cccd-4fba-9a50-2551ca54ee71.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/d4ee5337-1afa-4e11-9fd2-caeaeefa2394.vsidx
similarity index 73%
rename from .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/c17e55d3-cccd-4fba-9a50-2551ca54ee71.vsidx
rename to .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/d4ee5337-1afa-4e11-9fd2-caeaeefa2394.vsidx
index 55abc90..7093b03 100644
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/c17e55d3-cccd-4fba-9a50-2551ca54ee71.vsidx
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/d4ee5337-1afa-4e11-9fd2-caeaeefa2394.vsidx
Binary files differ
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index c415618..753f4d6 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -50,9 +50,9 @@
if (cgDetail == null) {
info = $"PDA鎵爜鐗╂枡淇℃伅涓庤创鏍囨満浼犻�鐨勪俊鎭笉涓�嚧锛� + JsonConvert.SerializeObject(model);
LogHelper.Info(info);
- return NewSimpleResult(2, info);
+ return NewSimpleResult(1, info);
}
-
+
// 鏌ヨ璧风偣璐т綅锛屾槸鍚︾鍚堣姹傦紙鍒濇涓嬬嚎瑕佹眰璐т綅鏃犲鍣級
// 娉細璧风偣璐т綅缁戝畾鍓嶆病鏈夎揣鐗╋紝鏁伴噺涓�0
var startLoc = db.Queryable<TN_Location>()
@@ -63,57 +63,20 @@
.First();
if (startLoc == null) {
- info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣峽model.StartLoc}锛屾垨涓嶅叿澶囧彇璐ц姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
+ info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛屾垨涓嶅叿澶囧彇璐ц姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
LogHelper.Info(info);
- return NewSimpleResult(3, info);
+ return NewSimpleResult(2, info);
}
startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚庯紝淇敼璧风偣璐т綅鏁伴噺涓�1
// 缁戝畾璐т綅鍜屽鍣ㄥ彿锛堟弧绠变笅绾垮埌鎿嶄綔鍖猴紝姝ゆ椂灏氭湭缁戝畾锛� var locCntrRel = new TN_Loc_Container {
- S_LOC_CODE = model.StartLoc,
- S_CNTR_CODE = cgDetail.S_CNTR_CODE,
+ S_LOC_CODE = startLoc.S_CODE, // 宸叉牎楠�+ S_CNTR_CODE = cgDetail.S_CNTR_CODE, // 宸叉牎楠� S_CNTR_TYPE = "濂借繍绠�,
};
-
- var needInsertContainer = false;
- var needUpdateContainer = false;
-
- // 鏌ュ鍣ㄤ俊鎭〃鏄惁宸茬粡鏈夎繖涓鍣�- var cntr = db.Queryable<TN_Container>()
- .Where(c => c.S_CODE == locCntrRel.S_CNTR_CODE).First();
- // 濡傛灉鎵句笉鍒拌瀹瑰櫒锛岄渶瑕佹坊鍔狅紝骞朵笖灏嗗鍣ㄦ潵婧愯缃负浠诲姟鍚嶇О
- if (cntr == null) {
- needInsertContainer = true;
- LogHelper.Info($"璧风偣璐т綅鐨勫鍣細{locCntrRel.S_CNTR_CODE}锛屽湪瀹瑰櫒琛ㄤ腑娌℃湁鐧昏锛岀櫥璁板苟璁剧疆瀹瑰櫒鏉ユ簮涓猴細{taskName}");
-
- cntr = new TN_Container {
- S_CODE = locCntrRel.S_CNTR_CODE,
- S_SPEC = cgDetail.S_ITEM_CODE, // 鐧昏瀹瑰櫒瀵瑰簲鐨勭墿鏂欑紪鍙�
- S_TYPE = "鏂欑", // 瀹瑰櫒绫诲瀷锛氭枡绠憋紙濂借繍绠憋級
- S_SOURCE = taskName,
- };
- }
- else {
- // 濡傛灉瀹瑰櫒瀛樺湪锛屼絾娌℃湁绫诲瀷鎴栨病鏈夐�鐢ㄧ殑鐗╂枡缂栧彿锛岄渶瑕佹洿鏂帮紝骞跺皢瀹瑰櫒鏉ユ簮璁剧疆涓轰换鍔″悕绉�- if (string.IsNullOrEmpty(cntr.S_TYPE)) {
- needUpdateContainer = true;
- LogHelper.Info($"璧风偣璐т綅鐨勫鍣細{locCntrRel.S_CNTR_CODE}锛屽湪瀹瑰櫒琛ㄤ腑鐧昏浣嗘病鏈夌被鍨嬶紝" +
- $"鏇存柊绫诲瀷涓猴細鏂欑锛屽苟璁剧疆瀹瑰櫒鏉ユ簮涓猴細{taskName}");
-
- cntr.S_TYPE = "鏂欑"; // 瀹瑰櫒绫诲瀷锛氭枡绠憋紙濂借繍绠憋級
- cntr.S_SOURCE = taskName;
- }
- if (string.IsNullOrEmpty(cntr.S_SPEC)) {
- needUpdateContainer = true;
- LogHelper.Info($"璧风偣璐т綅鐨勫鍣細{locCntrRel.S_CNTR_CODE}锛屽湪瀹瑰櫒琛ㄤ腑鐧昏浣嗘病鏈夐�鐢ㄧ墿鏂欑紪鐮侊紝" +
- $"鏇存柊鐗╂枡缂栫爜涓猴細{cgDetail.S_ITEM_CODE}锛屽苟璁剧疆瀹瑰櫒鏉ユ簮涓猴細{taskName}");
-
- cntr.S_SPEC = cgDetail.S_ITEM_CODE; // 瑙勬牸锛氱墿鏂欑紪鍙�- cntr.S_SOURCE = taskName;
- }
- }
+ // NOTE 涓嶉渶瑕佹牎楠宭ocCntrRel鐨勫鍣ㄦ槸鍚﹀瓨鍦紝鍗氬疄涓嬪彂鐗╂枡宸茬粡鍋氳繃鏍￠獙
// TODO 婊＄鍏ュ簱绠楁硶寰呬紭鍖� var endLoc = db.Queryable<TN_Location>()
@@ -126,10 +89,9 @@
if (endLoc == null) {
info = $"鍦�{endAreaName}'涓病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�鏃犺揣鐗�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(3, info);
}
-
var cntId = locCntrRel.S_CNTR_CODE;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
@@ -138,23 +100,6 @@
// 鏁版嵁搴撴搷浣滀簨鍔￠儴鍒嗭細閿欒缂栫爜锛�00
using (var tran = db.Ado.UseTran()) {
- if (needInsertContainer) {
- if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
- info = $"鎻掑叆瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
- tran.RollbackTran();
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
- }
- }
- else if (needUpdateContainer) {
- if (db.Updateable<TN_Container>(cntr).ExecuteCommand() <= 0) {
- info = $"鏇存柊瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
- tran.RollbackTran();
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
- }
- }
-
if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
tran.RollbackTran();
@@ -179,7 +124,7 @@
it.N_LOCK_STATE,
it.S_LOCK_STATE,
it.S_LOCK_OP,
- it.T_MODIFY
+ it.T_MODIFY,
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
@@ -203,7 +148,7 @@
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(-1, info);
}
}
@@ -234,9 +179,27 @@
.First();
if (startLoc == null) {
- info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣峽model.StartLoc}锛屾垨涓嶅叿澶囪姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
+ info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛屾垨涓嶅叿澶囪捣鐐瑰彇璐ц姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
+ LogHelper.Info(info);
+ return NewSimpleResult(1, info);
+ }
+
+ // TEMP 鐩墠娴佺▼锛氬鍣ㄥ繀椤诲厛鍦ㄧ郴缁熶腑缁存姢锛屽惁鍒欐姤閿�+ // - 鍚庡彴绋嬪簭涓嶅彲浠ョ敓鎴怌ontainer锛屽繀椤荤敱鍓嶅彴缁存姢
+ // - 鍚﹀垯锛屽伐浜洪殢鎰忚緭鍏ヤ竴涓鍣�杈撳叆閿欏鍣ㄥ彿锛岄兘鍙互缁戝畾
+ var cntr = db.Queryable<TN_Container>()
+ .Where(c => c.S_CODE == model.CntrCode) // 瀵逛簬鍓嶅彴绋嬪簭鑰岃█锛孲_CODE灏辨槸涓婚敭锛岀淮鎶ゆ椂蹇呭畾鍞竴
+ .First();
+
+ if (cntr == null) {
+ info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
LogHelper.Info(info);
return NewSimpleResult(2, info);
+ }
+ if (cntr.S_TYPE != "鎵樼洏") { // 绌烘墭鍏ュ簱
+ info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌杈撳叆鐨勫鍣ㄧ被鍨�鎵樼洏'涓嶅悓锛�;
+ LogHelper.Info(info);
+ return NewSimpleResult(3, info);
}
// 鍋囧畾浜哄伐涓嶄細灏嗘湁鐗╂枡鐨勭瀛愭斁鍦ㄧ┖绠卞叆搴撴帴椹充綅锛屾病鏈夊繀瑕佹鏌�@@ -254,45 +217,16 @@
.Where(l => l.S_CODE == locCntrRelOld.S_LOC_CODE).First();
if (locOld != null) {
locOld.N_CURRENT_NUM = 0; // 濡傛灉鏃ц揣浣嶅瓨鍦紝灏嗘棫璐т綅鐨勬暟閲忚缃负 0
+ locOld.T_MODIFY = DateTime.Now;
}
}
// 缁戝畾璐т綅鍜屽鍣ㄥ彿锛圥DA鍦ㄦ帴椹充綅缁戝畾锛� var locCntrRel = new TN_Loc_Container {
- S_LOC_CODE = model.StartLoc,
- S_CNTR_CODE = model.CntrCode,
- S_CNTR_TYPE = "鎵樼洏",
+ S_LOC_CODE = startLoc.S_CODE,
+ S_CNTR_CODE = cntr.S_CODE,
+ S_CNTR_TYPE = "鎵樼洏", // 绌烘墭鍏ュ簱
};
-
- var needInsertContainer = false;
- var needUpdateContainer = false;
-
- // 鏌ュ鍣ㄤ俊鎭〃鏄惁宸茬粡鏈夎繖涓鍣�- var cntr = db.Queryable<TN_Container>()
- .Where(c => c.S_CODE == locCntrRel.S_CNTR_CODE).First();
- // 濡傛灉鎵句笉鍒拌瀹瑰櫒锛岄渶瑕佹坊鍔狅紝骞朵笖灏嗗鍣ㄦ潵婧愯缃负浠诲姟鍚嶇О
- if (cntr == null) {
- needInsertContainer = true;
- LogHelper.Info($"璧风偣璐т綅鐨勫鍣細{locCntrRel.S_CNTR_CODE}锛屽湪瀹瑰櫒琛ㄤ腑娌℃湁鐧昏锛岀櫥璁板苟璁剧疆瀹瑰櫒鏉ユ簮涓猴細{taskName}");
-
- cntr = new TN_Container {
- S_CODE = locCntrRel.S_CNTR_CODE,
- S_SPEC = "", // 绌烘墭锛岀墿鏂欑紪鐮佸厛璁剧疆涓虹┖
- S_TYPE = locCntrRel.S_CNTR_TYPE, // 瀹瑰櫒绫诲瀷锛氭墭鐩�- S_SOURCE = taskName,
- };
- }
- else {
- // 濡傛灉瀹瑰櫒瀛樺湪锛屼絾娌℃湁绫诲瀷鎴栨病鏈夐�鐢ㄧ殑鐗╂枡缂栧彿锛岄渶瑕佹洿鏂帮紝骞跺皢瀹瑰櫒鏉ユ簮璁剧疆涓轰换鍔″悕绉�- if (string.IsNullOrEmpty(cntr.S_TYPE)) {
- needUpdateContainer = true;
- LogHelper.Info($"璧风偣璐т綅鐨勫鍣細{locCntrRel.S_CNTR_CODE}锛屽湪瀹瑰櫒琛ㄤ腑鐧昏浣嗘病鏈夌被鍨嬶紝" +
- $"鏇存柊绫诲瀷涓猴細鎵樼洏锛屽苟璁剧疆瀹瑰櫒鏉ユ簮涓猴細{taskName}");
-
- cntr.S_TYPE = "鎵樼洏"; // 瀹瑰櫒绫诲瀷锛氭墭鐩�- }
- // 绌烘墭涓嶆洿鏂扮墿鏂欑紪鐮�- }
// TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
var endLoc = db.Queryable<TN_Location>()
@@ -315,29 +249,12 @@
LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
- if (needInsertContainer) {
- if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
- info = $"鎻掑叆瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
- tran.RollbackTran();
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
- }
- }
- else if (needUpdateContainer) {
- if (db.Updateable<TN_Container>(cntr).ExecuteCommand() <= 0) {
- info = $"鏇存柊瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
- tran.RollbackTran();
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
- }
- }
-
if (cgDetailOld != null) {
if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
info = $"鍒犻櫎鏃х墿鏂欎俊鎭け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld);
tran.RollbackTran();
LogHelper.Info(info);
- return NewSimpleResult(5, info);
+ return NewSimpleResult(500, info);
}
}
@@ -346,16 +263,16 @@
info = $"鍒犻櫎鏃ц揣浣嶅鍣ㄥ叧绯诲け璐ワ細" + JsonConvert.SerializeObject(locCntrRelOld);
tran.RollbackTran();
LogHelper.Info(info);
- return NewSimpleResult(5, info);
+ return NewSimpleResult(500, info);
}
}
if (locOld != null) {
- if (db.Updateable<TN_Location>(locOld).UpdateColumns(l => l.N_CURRENT_NUM).ExecuteCommand() <= 0) {
+ if (db.Updateable<TN_Location>(locOld).UpdateColumns(l => new { l.N_CURRENT_NUM, l.T_MODIFY }).ExecuteCommand() <= 0) {
info = $"鏇存柊鏃ц揣浣嶅鍣ㄦ暟閲忓け璐ワ細" + JsonConvert.SerializeObject(locOld);
tran.RollbackTran();
LogHelper.Info(info);
- return NewSimpleResult(5, info);
+ return NewSimpleResult(500, info);
}
}
@@ -363,7 +280,7 @@
info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
tran.RollbackTran();
LogHelper.Info(info);
- return NewSimpleResult(5, info);
+ return NewSimpleResult(500, info);
}
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -375,7 +292,7 @@
tran.RollbackTran();
info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(5, info);
+ return NewSimpleResult(500, info);
}
if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -387,14 +304,14 @@
tran.RollbackTran();
info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(5, info);
+ return NewSimpleResult(500, info);
}
if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
LogHelper.Info(info);
- return NewSimpleResult(5, info);
+ return NewSimpleResult(500, info);
}
tran.CommitTran();
@@ -440,6 +357,24 @@
return NewSimpleResult(2, info);
}
+ // TEMP 鐩墠娴佺▼锛氬鍣ㄥ繀椤诲厛鍦ㄧ郴缁熶腑缁存姢锛屽惁鍒欐姤閿�+ // - 鍚庡彴绋嬪簭涓嶅彲浠ョ敓鎴怌ontainer锛屽繀椤荤敱鍓嶅彴缁存姢
+ // - 鍚﹀垯锛屽伐浜洪殢鎰忚緭鍏ヤ竴涓鍣�杈撳叆閿欏鍣ㄥ彿锛岄兘鍙互缁戝畾
+ var cntr = db.Queryable<TN_Container>()
+ .Where(c => c.S_CODE == model.CntrCode) // 瀵逛簬鍓嶅彴绋嬪簭鑰岃█锛孲_CODE灏辨槸涓婚敭锛岀淮鎶ゆ椂蹇呭畾鍞竴
+ .First();
+
+ if (cntr == null) {
+ info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
+ LogHelper.Info(info);
+ return NewSimpleResult(2, info);
+ }
+ if (cntr.S_TYPE != "濂借繍绠�) { // 绌虹鍏ュ簱
+ info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌杈撳叆鐨勫鍣ㄧ被鍨�濂借繍绠�涓嶅悓锛�;
+ LogHelper.Info(info);
+ return NewSimpleResult(2, info);
+ }
+
// 鍋囧畾浜哄伐涓嶄細灏嗘湁鐗╂枡鐨勭瀛愭斁鍦ㄧ┖绠卞叆搴撴帴椹充綅锛屾病鏈夊繀瑕佹鏌� // 濡傛灉浜哄伐灏嗗嚭搴撳悗鐨勬墭鐩樺叆搴擄紝杩欐椂鐗╂枡淇℃伅骞舵病鏈夊垹闄わ紝闇�灏嗘墭鐩樼墿鏂欑殑鍏崇郴瑙ｉ櫎
var cgDetailOld = db.Queryable<TN_CG_Detail>()
@@ -460,40 +395,10 @@
// 缁戝畾璐т綅鍜屽鍣ㄥ彿
var locCntrRel = new TN_Loc_Container {
- S_LOC_CODE = model.StartLoc,
- S_CNTR_CODE = model.CntrCode,
+ S_LOC_CODE = startLoc.S_CODE,
+ S_CNTR_CODE = cntr.S_CODE,
S_CNTR_TYPE = "濂借繍绠�,
};
-
- var needInsertContainer = false;
- var needUpdateContainer = false;
-
- // 鏌ュ鍣ㄤ俊鎭〃鏄惁宸茬粡鏈夎繖涓鍣�- var cntr = db.Queryable<TN_Container>()
- .Where(c => c.S_CODE == locCntrRel.S_CNTR_CODE).First();
- // 濡傛灉鎵句笉鍒拌瀹瑰櫒锛岄渶瑕佹坊鍔狅紝骞朵笖灏嗗鍣ㄦ潵婧愯缃负浠诲姟鍚嶇О
- if (cntr == null) {
- needInsertContainer = true;
- LogHelper.Info($"璧风偣璐т綅鐨勫鍣細{locCntrRel.S_CNTR_CODE}锛屽湪瀹瑰櫒琛ㄤ腑娌℃湁鐧昏锛岀櫥璁板苟璁剧疆瀹瑰櫒鏉ユ簮涓猴細{taskName}");
-
- cntr = new TN_Container {
- S_CODE = locCntrRel.S_CNTR_CODE,
- S_SPEC = "", // 绌虹锛岀墿鏂欑紪鐮佸厛璁剧疆涓虹┖
- S_TYPE = locCntrRel.S_CNTR_TYPE, // 瀹瑰櫒绫诲瀷锛氭枡绠憋紙濂借繍绠憋級
- S_SOURCE = taskName,
- };
- }
- else {
- // 濡傛灉瀹瑰櫒瀛樺湪锛屼絾娌℃湁绫诲瀷鎴栨病鏈夐�鐢ㄧ殑鐗╂枡缂栧彿锛岄渶瑕佹洿鏂帮紝骞跺皢瀹瑰櫒鏉ユ簮璁剧疆涓轰换鍔″悕绉�- if (string.IsNullOrEmpty(cntr.S_TYPE)) {
- needUpdateContainer = true;
- LogHelper.Info($"璧风偣璐т綅鐨勫鍣細{locCntrRel.S_CNTR_CODE}锛屽湪瀹瑰櫒琛ㄤ腑鐧昏浣嗘病鏈夌被鍨嬶紝" +
- $"鏇存柊绫诲瀷涓猴細鏂欑锛屽苟璁剧疆瀹瑰櫒鏉ユ簮涓猴細{taskName}");
-
- cntr.S_TYPE = "鏂欑"; // 瀹瑰櫒绫诲瀷锛氭枡绠憋紙濂借繍绠憋級
- }
- // 绌虹涓嶆洿鏂扮墿鏂欑紪鐮�- }
// TODO 鏆傚畾閫夋嫨鏈�綆灞傞『搴忓叆搴擄紝鍚庨潰寰呬慨鏀� var endLoc = db.Queryable<TN_Location>()
@@ -516,23 +421,6 @@
LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
- if (needInsertContainer) {
- if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
- info = $"鎻掑叆瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
- tran.RollbackTran();
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
- }
- }
- else if (needUpdateContainer) {
- if (db.Updateable<TN_Container>(cntr).ExecuteCommand() <= 0) {
- info = $"鏇存柊瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
- tran.RollbackTran();
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
- }
- }
-
if (cgDetailOld != null) {
if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
info = $"鍒犻櫎鏃х墿鏂欎俊鎭け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld);
@@ -617,7 +505,7 @@
/// <remarks>
/// 浜哄伐鏍规嵁褰撳墠鐢熶骇鐗╂枡鎵�渶鐨勫鍣ㄧ被鍨嬶紝鍛煎彨AGV浠庣┖瀹瑰櫒璐ф灦涓彨涓�釜绗﹀悎瑕佹眰鐨勬墭鐩� /// </remarks>
- /// <param name="model">b鍖呭惈锛氬鍣ㄥ彿銆佺墿鏂欑紪鐮�/param>
+ /// <param name="model">鍖呭惈锛氬鍣ㄥ彿銆佺墿鏂欑紪鐮�/param>
/// <returns></returns>
public static SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo model) {
var db = new SqlHelper<object>().GetInstance();
@@ -630,22 +518,37 @@
try {
// 鏌ュ鍣ㄤ俊鎭〃鏄惁宸茬粡鏈夎繖涓鍣� var cntr = db.Queryable<TN_Container>()
- .Where(c => c.S_CODE == model.CntId).First();
- // 濡傛灉琛ㄤ腑瀛樺湪杩欎釜鎵樼洏淇℃伅锛屼絾瀹瑰櫒绫诲瀷銆佺墿鏂欑被鍨嬩笌涓婄嚎鎵�渶鐗╂枡涓嶇锛屾姤閿�- // 濡傛灉涓嶅瓨鍦紝涓嶄綔闄愬埗锛堣浣滅涓�涓婄嚎锛�- if (cntr != null) {
- // 濡傛灉瀛樺湪瀹瑰櫒鍙凤紝浣嗙被鍨嬩笉鏄墭鐩橈紝鎶ラ敊
- if (!string.IsNullOrEmpty(cntr.S_TYPE) && cntr.S_TYPE != "鎵樼洏") {
- info = $"瀹瑰櫒鍦ㄥ鍣ㄨ〃涓壘鍒帮紝浣嗙被鍨嬫槸锛歿cntr.S_TYPE}锛屼笉鏄瘂taskName}鎵�渶鐨勶細鎵樼洏";
- LogHelper.Info(info);
- return NewSimpleResult(1, info);
- }
- // 濡傛灉琛ㄤ腑鐗╂枡缂栫爜涓嶄负绌猴紝涓斾笌涓婄嚎鎵�渶鐗╂枡涓嶄竴鑷达紝鎶ラ敊
- if (!string.IsNullOrEmpty(cntr.S_SPEC) && cntr.S_SPEC != model.ItemCode) {
- info = $"瀹瑰櫒{model.CntId}宸茬粡涓庣墿鏂欑被鍨媨cntr.S_SPEC}缁戝畾锛屾棤娉曠敤浜庤杞界墿鏂檣model.ItemCode}";
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
- }
+ .Where(c => c.S_CODE == model.CntId)
+ .First();
+
+ // 濡傛灉瀹瑰櫒鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛屾姤閿�+ if (cntr == null) {
+ info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
+ LogHelper.Info(info);
+ return NewSimpleResult(1, info);
+ }
+ // 濡傛灉瀛樺湪瀹瑰櫒鍙凤紝浣嗙被鍨嬩笉鏄墭鐩橈紝鎶ラ敊
+ if (cntr.S_TYPE != "鎵樼洏") { // 瀹瑰櫒绫诲瀷榛樿涓嶄細涓虹┖
+ info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷鏄�{cntr.S_TYPE}锛屼笉鏄�鎵樼洏'锛�;
+ LogHelper.Info(info);
+ return NewSimpleResult(2, info);
+ }
+
+ var needUpdateContainer = false;
+ if (string.IsNullOrEmpty(cntr.S_SPEC)) {
+ // TEMP 鐩墠娴佺▼锛氬鏋滃鍣ㄨ〃涓鏍硷紙鐗╂枡缂栫爜锛変负绌猴紝鏍规嵁娴佺▼鐨勭墿鏂欎俊鎭啓鍏�+ // 寰呭畾锛氬悗闈㈠彲鑳戒細鏇存敼娴佺▼锛屾垨鑰呯敤鍏朵粬淇℃伅锛堝鐗╂枡绫诲瀷/瑙勬牸锛変綔涓哄鍣ㄧ殑瑙勬牸
+
+ needUpdateContainer = true;
+ info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓鏍硷紙鐗╂枡缂栫爜锛変负绌猴紝灏嗙墿鏂欑紪鐮�{model.ItemCode}'鍐欏叆瀹瑰櫒鐨勮鏍�;
+ LogHelper.Info(info);
+
+ cntr.S_SPEC = model.ItemCode;
+ }
+ else if (cntr.S_SPEC != model.ItemCode) {
+ info = $"瀹瑰櫒'{model.CntId}'宸茬粡涓庣墿鏂欑被鍨�{cntr.S_SPEC}'缁戝畾锛屾棤娉曠敤浜庤杞界墿鏂�{model.ItemCode}'";
+ LogHelper.Info(info);
+ return NewSimpleResult(3, info);
}
var startLoc = db.Queryable<TN_Location>()
@@ -680,7 +583,20 @@
LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿� LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
+ cntr.S_SOURCE = task.S_CODE; // 鐢ㄤ换鍔″彿浣滀负瀹瑰櫒鏇存柊鐨勪緷鎹�+ cntr.T_MODIFY = DateTime.Now;
+
using (var tran = db.Ado.UseTran()) {
+ if (needUpdateContainer) {
+ if (db.Updateable<TN_Container>(cntr)
+ .UpdateColumns(c => new { c.S_SPEC, c.S_SOURCE, c.T_MODIFY }).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = $"鏇存柊琛�{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
+ LogHelper.Info(info);
+ return NewSimpleResult(4, info);
+ }
+ }
+
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
it.N_LOCK_STATE,
it.S_LOCK_STATE,
@@ -721,7 +637,7 @@
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(-1, info);
}
}
@@ -739,6 +655,25 @@
var endAreaName = AreaName.K绌虹鎿嶄綔鍖�
try {
+ // 鏌ュ鍣ㄤ俊鎭〃鏄惁宸茬粡鏈夎繖涓鍣�+ var cntr = db.Queryable<TN_Container>()
+ .Where(c => c.S_CODE == model.CntId)
+ .First();
+
+ // 濡傛灉瀹瑰櫒鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛屾姤閿�+ if (cntr == null) {
+ info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
+ LogHelper.Info(info);
+ return NewSimpleResult(1, info);
+ }
+ // 濡傛灉瀛樺湪瀹瑰櫒鍙凤紝浣嗙被鍨嬩笉鏄墭鐩橈紝鎶ラ敊
+ if (cntr.S_TYPE != "鎵樼洏") { // 瀹瑰櫒绫诲瀷榛樿涓嶄細涓虹┖
+ info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷鏄�{cntr.S_TYPE}锛屼笉鏄�濂借繍绠�锛�;
+ LogHelper.Info(info);
+ return NewSimpleResult(2, info);
+ }
+ // NOTE 濂借繍绠卞彧闇�鍏虫敞鍦ㄤ笉鍦紝涓嶉渶瑕佸叧蹇冨叾閫傜敤鐗╂枡绫诲瀷
+
var startLoc = db.Queryable<TN_Location>()
.LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
.Where((l, c) => c.S_CNTR_CODE == model.CntId)
@@ -996,7 +931,7 @@
.First();
if (startLoc == null) {
- info = "娌℃湁鎵惧埌鍚堥�鐨勮捣鐐硅揣浣�;
+ info = "寰呮娊妫�墿鏂欏湪鎶芥鍖轰腑娌℃湁鎵惧埌锛�;
LogHelper.Info(info);
return NewSimpleResult(0, info);
}
@@ -1008,7 +943,9 @@
.First();
if (endLoc == null) {
- return NewSimpleResult(3, "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅");
+ info = "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅";
+ LogHelper.Info(info);
+ return NewSimpleResult(3, info);
}
cgDetail.N_ITEM_STATE = 2;
@@ -1442,6 +1379,22 @@
return NewMesResult(400, info);
}
+ // TEMP 鐩墠娴佺▼锛氬鍗氬疄涓嬪彂鐨勪俊鎭篃杩涜妫�煡锛屾湭鎵惧埌灏辨姤閿欙紝鍚庨潰鏈夐渶姹傚啀鏇存敼
+ var cntr = db.Queryable<TN_Container>()
+ .Where(c => c.S_CODE == model.CntrCode) // 瀵逛簬鍓嶅彴绋嬪簭鑰岃█锛孲_CODE灏辨槸涓婚敭锛岀淮鎶ゆ椂蹇呭畾鍞竴
+ .First();
+
+ if (cntr == null) {
+ info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
+ LogHelper.Info(info);
+ return NewMesResult(1, info);
+ }
+ if (cntr.S_TYPE != "濂借繍绠�) {
+ info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌褰撳墠瀹瑰櫒绫诲瀷'濂借繍绠�涓嶅悓锛�;
+ LogHelper.Info(info);
+ return NewMesResult(2, info);
+ }
+
// 灏嗕笅鍙戠殑淇℃伅鍏堝瓨鍌ㄥ埌CG琛ㄤ腑锛堟鏃舵墭鐩樻病鏈変笌浜х嚎澶勭殑璐т綅缁戝畾锛� var detail = new TN_CG_Detail {
S_ITEM_CODE = model.ItemCode, // NOT NULL
@@ -1482,7 +1435,7 @@
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.InfoEx(ex);
- return NewMesResult(1, info);
+ return NewMesResult(-1, info);
}
}
diff --git a/api/ApiModel.cs b/api/ApiModel.cs
index 065bc60..c995cd7 100644
--- a/api/ApiModel.cs
+++ b/api/ApiModel.cs
@@ -206,7 +206,7 @@
public string StartLoc { get; set; }
}
/// <summary>
- /// 绌虹涓婄嚎淇℃伅
+ /// 绌烘墭涓婄嚎淇℃伅
/// </summary>
public class EmptyOnlinePalletInfo {
/// <summary>
@@ -394,6 +394,13 @@
public string Data { get; set; }
}
+ /// <summary>
+ /// 浠呭綋 Code = 0 琛ㄧず鎴愬姛
+ /// </summary>
+ /// <param name="code"></param>
+ /// <param name="message"></param>
+ /// <param name="printLog"></param>
+ /// <returns></returns>
public static MesResult NewMesResult(int code, string message = "", bool printLog = true) {
return new MesResult {
Result = code,
diff --git a/core/Monitor.cs b/core/Monitor.cs
index fdcfbb7..8a7dbbd 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -68,6 +68,8 @@
var needInsertContainer = false;
var needUpdateContainer = false;
+
+ // TEMP 鑷姩瑙﹀彂鐨勬墭鐩樹笅绾挎殏鏃朵笉鑰冭檻鍒ゆ柇锛岄粯璁ゆ病鏈夋椂鍐欏叆
// 鏌ュ鍣ㄤ俊鎭〃鏄惁宸茬粡鏈夎繖涓鍣� var cntr = db.Queryable<TN_Container>()
.Where(c => c.S_CODE == cntrCode).First();
@@ -80,7 +82,6 @@
S_CODE = cntrCode,
S_TYPE = "鎵樼洏",
S_SPEC = itemCode,
- S_SOURCE = taskName,
};
}
else {
@@ -91,7 +92,6 @@
$"涓庢墍闇�鐨勭墿鏂欎俊鎭瘂itemCode}涓嶇锛岀洿鎺ヨ鐩栫粨鏋�);
cntr.S_SPEC = itemCode;
- cntr.S_SOURCE = taskName;
}
}
@@ -134,6 +134,9 @@
LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿� LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
+ cntr.S_SOURCE = task.S_CODE;
+ cntr.T_MODIFY = DateTime.Now;
+
using (var tran = db.Ado.UseTran()) {
if (needInsertContainer) {
if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
@@ -144,7 +147,8 @@
}
}
else if (needUpdateContainer) {
- if (db.Updateable<TN_Container>(cntr).ExecuteCommand() <= 0) {
+ if (db.Updateable<TN_Container>(cntr)
+ .UpdateColumns(c => new { c.S_SPEC, c.S_SOURCE, c.T_MODIFY }).ExecuteCommand() <= 0) {
info = $"鏇存柊瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
tran.RollbackTran();
LogHelper.Info(info);
diff --git a/wms/LocationHelper.cs b/wms/LocationHelper.cs
index 7e4e291..e4bc21a 100644
--- a/wms/LocationHelper.cs
+++ b/wms/LocationHelper.cs
@@ -257,29 +257,29 @@
location.S_LOCK_STATE = "鏃�;
location.N_LOCK_STATE = 0;
- var containerList = new List<TN_Container>();
- foreach (var item in lcrList) {
- // 閽堝瀹瑰櫒绫诲瀷娣诲姞鐨勬柊閫昏緫
- var cntr = db.Queryable<TN_Container>()
- .Where(c => c.S_CODE == item.S_CNTR_CODE).First();
- if (cntr == null) {
- LogHelper.Info($"璐т綅瑙ｇ粦鏃讹紝瀹瑰櫒{item.S_CNTR_CODE}娌℃湁鍦ㄥ鍣ㄤ俊鎭〃涓煡鍒帮紝杩欓噷鏍规嵁璐т綅瀹瑰櫒鍏崇郴娣诲姞");
- containerList.Add(new TN_Container {
- S_CODE = item.S_CNTR_CODE,
- S_TYPE = item.S_CNTR_TYPE,
- });
- }
- }
+ //var containerList = new List<TN_Container>();
+ //foreach (var item in lcrList) {
+ // // 閽堝瀹瑰櫒绫诲瀷娣诲姞鐨勬柊閫昏緫
+ // var cntr = db.Queryable<TN_Container>()
+ // .Where(c => c.S_CODE == item.S_CNTR_CODE).First();
+ // if (cntr == null) {
+ // LogHelper.Info($"璐т綅瑙ｇ粦鏃讹紝瀹瑰櫒{item.S_CNTR_CODE}娌℃湁鍦ㄥ鍣ㄤ俊鎭〃涓煡鍒帮紝杩欓噷鏍规嵁璐т綅瀹瑰櫒鍏崇郴娣诲姞");
+ // containerList.Add(new TN_Container {
+ // S_CODE = item.S_CNTR_CODE,
+ // S_TYPE = item.S_CNTR_TYPE,
+ // });
+ // }
+ //}
using (var tran = db.Ado.UseTran())
{
- if (containerList.Count > 0) {
- if (db.Insertable<TN_Container>(containerList).ExecuteCommand() <= 0) {
- LogHelper.Info($"鎻掑叆瀹瑰櫒淇℃伅琛ㄥけ璐� + JsonConvert.SerializeObject(containerList));
- tran.RollbackTran();
- return "璐т綅瑙ｇ粦瀹瑰櫒澶辫触锛� + logs;
- }
- }
+ //if (containerList.Count > 0) {
+ // if (db.Insertable<TN_Container>(containerList).ExecuteCommand() <= 0) {
+ // LogHelper.Info($"鎻掑叆瀹瑰櫒淇℃伅琛ㄥけ璐� + JsonConvert.SerializeObject(containerList));
+ // tran.RollbackTran();
+ // return "璐т綅瑙ｇ粦瀹瑰櫒澶辫触锛� + logs;
+ // }
+ //}
if (db.Deleteable<TN_Loc_Container>().Where(it => cntrs.Contains(it.S_CNTR_CODE) && it.S_LOC_CODE == loc).ExecuteCommand() > 0)
{
@@ -348,7 +348,9 @@
{
// 閽堝瀹瑰櫒绫诲瀷娣诲姞鐨勬柊閫昏緫
var cntr = db.Queryable<TN_Container>()
- .Where(c => c.S_CODE == item).First();
+ .Where(c => c.S_CODE == item)
+ .First();
+
if (cntr == null) {
LogHelper.Info($"璐т綅瑙ｇ粦鏃讹紝瀹瑰櫒{item}娌℃湁鍦ㄥ鍣ㄤ俊鎭〃涓煡鍒帮紝涓嶈褰曞鍣ㄧ被鍨�);
bindLocCntList.Add(new TN_Loc_Container() { S_LOC_CODE = loc, S_CNTR_CODE = item });
--
Gitblit v1.9.1