From a949debc0abbe90adfda1af653b7b5c2ab27d997 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 06 六月 2025 17:14:55 +0800
Subject: [PATCH] 使用Container表优化容器与物料类型绑定的逻辑
---
wms/LocationHelper.cs | 33 ++
/dev/null | 23 --
core/Monitor.cs | 80 ++++---
models/TN_Container.cs | 18 +
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/797cacde-8caf-4c9b-8a9b-43a33fa8be1a.vsidx | 0
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/93b0aa90-1489-440e-8c8a-64eb24e3558a.vsidx | 0
api/ApiModel.cs | 5
HH.WCS.Mobox3.DSZSH.csproj | 1
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/139907d5-bf69-4957-bd54-53b4b25a0984.vsidx | 0
wms/WCSHelper.cs | 2
util/SqlHelper.cs | 6
api/DebugController.cs | 124 +++--------
api/ApiHelper.cs | 272 ++++++++++++++++++++-------
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/8ed17d81-cd33-4ea4-bf1d-fa3bebc1cbd6.vsidx | 0
14 files changed, 330 insertions(+), 234 deletions(-)
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/00234e98-2307-4b05-8393-c563c56d7614.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/00234e98-2307-4b05-8393-c563c56d7614.vsidx
deleted file mode 100644
index d65f539..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/00234e98-2307-4b05-8393-c563c56d7614.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/139907d5-bf69-4957-bd54-53b4b25a0984.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/139907d5-bf69-4957-bd54-53b4b25a0984.vsidx
new file mode 100644
index 0000000..2df1e21
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/139907d5-bf69-4957-bd54-53b4b25a0984.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/4ae243f4-d9f0-4a8c-8620-a0c519179a88.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/4ae243f4-d9f0-4a8c-8620-a0c519179a88.vsidx
deleted file mode 100644
index 9ced449..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/4ae243f4-d9f0-4a8c-8620-a0c519179a88.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/797cacde-8caf-4c9b-8a9b-43a33fa8be1a.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/797cacde-8caf-4c9b-8a9b-43a33fa8be1a.vsidx
new file mode 100644
index 0000000..04080bd
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/797cacde-8caf-4c9b-8a9b-43a33fa8be1a.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/8ed17d81-cd33-4ea4-bf1d-fa3bebc1cbd6.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/8ed17d81-cd33-4ea4-bf1d-fa3bebc1cbd6.vsidx
new file mode 100644
index 0000000..fc20aca
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/8ed17d81-cd33-4ea4-bf1d-fa3bebc1cbd6.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/93b0aa90-1489-440e-8c8a-64eb24e3558a.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/93b0aa90-1489-440e-8c8a-64eb24e3558a.vsidx
new file mode 100644
index 0000000..57978e1
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/93b0aa90-1489-440e-8c8a-64eb24e3558a.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/9442875d-8d82-4dfd-bd01-827281423d02.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/9442875d-8d82-4dfd-bd01-827281423d02.vsidx
deleted file mode 100644
index a28bb5a..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/9442875d-8d82-4dfd-bd01-827281423d02.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/9c0aa391-6594-401b-9354-62501bb2601d.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/9c0aa391-6594-401b-9354-62501bb2601d.vsidx
deleted file mode 100644
index 7440612..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/9c0aa391-6594-401b-9354-62501bb2601d.vsidx
+++ /dev/null
Binary files differ
diff --git a/HH.WCS.Mobox3.DSZSH.csproj b/HH.WCS.Mobox3.DSZSH.csproj
index 12ce7fb..02e1bfd 100644
--- a/HH.WCS.Mobox3.DSZSH.csproj
+++ b/HH.WCS.Mobox3.DSZSH.csproj
@@ -244,7 +244,6 @@
<Compile Include="models\TN_Spot_Check.cs" />
<Compile Include="process\TaskProcess.cs" />
<Compile Include="util\SqlHelper.cs" />
- <Compile Include="models\TN_Container_ItemType.cs" />
<Compile Include="models\TN_Outbound_Order.cs" />
<Compile Include="models\TN_Outbound_Detail.cs" />
<Compile Include="device\ProductionLineDevice.cs" />
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index a24a1cb..f8188fb 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -32,6 +32,13 @@
var endAreaName = AreaName.M婊＄璐ф灦鍖� // 缁堢偣璐у尯
try {
+ // 鍙傛暟鍚堟硶鎬х‘璁ら儴鍒嗭細閿欒缂栫爜锛�00
+ if (model.Num <= 0 ) {
+ info = $"鐗╂枡鏁伴噺{model.Num}涓嶅悎娉曪細鐗╂枡鏁伴噺搴旇澶т簬 0";
+ LogHelper.Info(info);
+ return NewSimpleResult(400, info);
+ }
+
// 璐存爣鏈轰細鎻愬墠灏嗙墿鏂欎俊鎭啓鍏G_Detail琛ㄤ腑
// 灏哖DA鎻愪緵鐨勭墿鏂欑紪鐮佷笌璐存爣鏈虹殑淇℃伅姣斿
var cgDetail = db.Queryable<TN_CG_Detail>()
@@ -70,21 +77,44 @@
S_CNTR_TYPE = "濂借繍绠�,
};
- // 姣忎釜鏂版彃鍏ュ鍣ㄧ殑閫昏緫锛岄兘闇�鏌ヨ杩欎釜琛ㄦ槸鍚﹀瓨鍦紝濡傛灉涓嶅瓨鍦ㄤ篃鍔犲叆锛屽鏋滃瓨鍦細鏆備笉鏇存柊缁撴灉锛堝緟瀹氾級
- // 鏇磋缁嗙殑锛屾槸绌虹鍏ュ簱锛屽拰婊℃枡涓嬬嚎杩欎袱涓祦绋嬬殑瀹瑰櫒鍙兘鏄柊鐨勶紝鍏朵綑瀹瑰櫒涓�畾鏄棫鐨勶紝鏃犻渶鍐嶅垽鏂�- // 涓ユ牸鏉ヨ锛屽鍣ㄧ被鍨嬪簲璇ユ斁鍦–ontainer閲岄潰鐨勶紝Loc_Container琛ㄥ彧鏀惧叧绯伙紝涓嶈繃鏆傛椂鍏堣繖鏍锋敼鍚�- var cntrItemRel = db.Queryable<TN_Container_ItemType>()
- .Where(c => c.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).First();
- var insertContainerItemType = false;
- if (cntrItemRel == null) {
- insertContainerItemType = true;
- cntrItemRel = new TN_Container_ItemType {
- S_ITEM_CODE = cgDetail.S_ITEM_CODE, // 鐗╂枡绫诲瀷瀵逛簬濂借繍绠辫�瑷�叾瀹炰笉鐢紝涓昏鏄被鍨�- S_CNTR_TYPE = locCntrRel.S_CNTR_TYPE,
- S_CNTR_CODE = locCntrRel.S_CNTR_CODE,
+ 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;
+ }
+ }
+
// TODO 婊＄鍏ュ簱绠楁硶寰呬紭鍖� var endLoc = db.Queryable<TN_Location>()
.Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) // 缁堢偣璐у尯绗﹀悎浠诲姟瑕佹眰
@@ -99,20 +129,29 @@
return NewSimpleResult(4, info);
}
- // 鏁版嵁搴撴搷浣滈儴鍒�+
var cntId = locCntrRel.S_CNTR_CODE;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿� LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
+ // 鏁版嵁搴撴搷浣滀簨鍔￠儴鍒嗭細閿欒缂栫爜锛�00
using (var tran = db.Ado.UseTran()) {
- if (insertContainerItemType) {
- if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
- info = $"鎻掑叆瀹瑰櫒淇℃伅澶辫触锛� + JsonConvert.SerializeObject(cntrItemRel);
+ if (needInsertContainer) {
+ if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
+ info = $"鎻掑叆瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
tran.RollbackTran();
LogHelper.Info(info);
- return NewSimpleResult(5, 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);
}
}
@@ -120,7 +159,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 {
@@ -133,7 +172,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 {
@@ -145,14 +184,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();
@@ -175,7 +214,7 @@
/// 浜哄伐灏嗙┖鎵樼洏閫氳繃鎺ラ┏浣嶅叆搴擄紝闇�鏂扮粦瀹氬鍣ㄨ揣浣�br/>
/// 鐢变簬绌烘墭鐩樹竴鑸槸鍑哄簱鍗歌揣鍚庤幏寰楋紝鑰屽嚭搴撴椂娌℃湁鎵嬪姩鍗歌揣鐨勯�杈戯紝鎵�互闇�鍦ㄥ叆搴撶殑鏃跺�鍐嶅垹闄ゆ棫缁戝畾淇℃伅
/// </remarks>
- /// <param name="model"></param>
+ /// <param name="model">鍖呭惈锛氳捣鐐硅揣浣嶃�瀹瑰櫒鍙枫�瀹瑰櫒绫诲瀷銆佺粓鐐硅揣鍖�/param>
/// <returns></returns>
public static SimpleResult EmptyInboundPallet(EmptyInboundInfo model) {
var db = new SqlHelper<object>().GetInstance();
@@ -225,19 +264,34 @@
S_CNTR_TYPE = "鎵樼洏",
};
- // 姣忎釜鏂版彃鍏ュ鍣ㄧ殑閫昏緫锛岄兘闇�鏌ヨ杩欎釜琛ㄦ槸鍚﹀瓨鍦紝濡傛灉涓嶅瓨鍦ㄤ篃鍔犲叆锛屽鏋滃瓨鍦細鏆備笉鏇存柊缁撴灉锛堝緟瀹氾級
- // 鏇磋缁嗙殑锛屾槸绌虹鍏ュ簱锛屽拰婊℃枡涓嬬嚎杩欎袱涓祦绋嬬殑瀹瑰櫒鍙兘鏄柊鐨勶紝鍏朵綑瀹瑰櫒涓�畾鏄棫鐨勶紝鏃犻渶鍐嶅垽鏂�- // 涓ユ牸鏉ヨ锛屽鍣ㄧ被鍨嬪簲璇ユ斁鍦–ontainer閲岄潰鐨勶紝Loc_Container琛ㄥ彧鏀惧叧绯伙紝涓嶈繃鏆傛椂鍏堣繖鏍锋敼鍚�- var cntrItemRel = db.Queryable<TN_Container_ItemType>()
- .Where(c => c.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).First();
- var insertContainerItemType = false;
- if (cntrItemRel == null) {
- insertContainerItemType = true;
- cntrItemRel = new TN_Container_ItemType {
- S_ITEM_CODE = "", // 绌烘墭鐩樺垰鍏ュ簱锛屾病鏈夌墿鏂欑被鍨嬶紝灏遍粯璁ゅ厛涓虹┖
- S_CNTR_TYPE = locCntrRel.S_CNTR_TYPE,
- S_CNTR_CODE = locCntrRel.S_CNTR_CODE,
+ 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 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
@@ -261,12 +315,20 @@
LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
- if (insertContainerItemType) {
- if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
- info = $"鎻掑叆瀹瑰櫒淇℃伅澶辫触锛� + JsonConvert.SerializeObject(cntrItemRel);
+ if (needInsertContainer) {
+ if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
+ info = $"鎻掑叆瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
tran.RollbackTran();
LogHelper.Info(info);
- return NewSimpleResult(5, 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);
}
}
@@ -403,19 +465,34 @@
S_CNTR_TYPE = "濂借繍绠�,
};
- // 姣忎釜鏂版彃鍏ュ鍣ㄧ殑閫昏緫锛岄兘闇�鏌ヨ杩欎釜琛ㄦ槸鍚﹀瓨鍦紝濡傛灉涓嶅瓨鍦ㄤ篃鍔犲叆锛屽鏋滃瓨鍦細鏆備笉鏇存柊缁撴灉锛堝緟瀹氾級
- // 鏇磋缁嗙殑锛屾槸绌虹鍏ュ簱锛屽拰婊℃枡涓嬬嚎杩欎袱涓祦绋嬬殑瀹瑰櫒鍙兘鏄柊鐨勶紝鍏朵綑瀹瑰櫒涓�畾鏄棫鐨勶紝鏃犻渶鍐嶅垽鏂�- // 涓ユ牸鏉ヨ锛屽鍣ㄧ被鍨嬪簲璇ユ斁鍦–ontainer閲岄潰鐨勶紝Loc_Container琛ㄥ彧鏀惧叧绯伙紝涓嶈繃鏆傛椂鍏堣繖鏍锋敼鍚�- var cntrItemRel = db.Queryable<TN_Container_ItemType>()
- .Where(c => c.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).First();
- var insertContainerItemType = false;
- if (cntrItemRel == null) {
- insertContainerItemType = true;
- cntrItemRel = new TN_Container_ItemType {
- S_ITEM_CODE = "", // 绌烘墭鐩樺垰鍏ュ簱锛屾病鏈夌墿鏂欑被鍨嬶紝灏遍粯璁ゅ厛涓虹┖
- S_CNTR_TYPE = locCntrRel.S_CNTR_TYPE,
- S_CNTR_CODE = locCntrRel.S_CNTR_CODE,
+ 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 鏆傚畾閫夋嫨鏈�綆灞傞『搴忓叆搴擄紝鍚庨潰寰呬慨鏀�@@ -439,12 +516,20 @@
LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
- if (insertContainerItemType) {
- if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
- info = $"鎻掑叆瀹瑰櫒淇℃伅澶辫触锛� + JsonConvert.SerializeObject(cntrItemRel);
+ if (needInsertContainer) {
+ if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
+ info = $"鎻掑叆瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
tran.RollbackTran();
LogHelper.Info(info);
- return NewSimpleResult(5, 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);
}
}
@@ -532,7 +617,7 @@
/// <remarks>
/// 浜哄伐鏍规嵁褰撳墠鐢熶骇鐗╂枡鎵�渶鐨勫鍣ㄧ被鍨嬶紝鍛煎彨AGV浠庣┖瀹瑰櫒璐ф灦涓彨涓�釜绗﹀悎瑕佹眰鐨勬墭鐩� /// </remarks>
- /// <param name="model"></param>
+ /// <param name="model">b鍖呭惈锛氬鍣ㄥ彿銆佺墿鏂欑紪鐮�/param>
/// <returns></returns>
public static SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo model) {
var db = new SqlHelper<object>().GetInstance();
@@ -543,16 +628,24 @@
var endAreaName = AreaName.B鍖呰鍖�
try {
- // 鏌ュ鍣�鐗╂枡绫诲瀷琛�- var cntrItemRel = db.Queryable<TN_Container_ItemType>()
- .Where(i => i.S_CNTR_CODE == model.CntId && i.S_CNTR_TYPE == "鎵樼洏")
- .First();
- // 濡傛灉琛ㄤ腑瀛樺湪杩欎釜鎵樼洏淇℃伅锛屼笖鐗╂枡绫诲瀷涓庝笂绾挎墍闇�墿鏂欎笉绗︼紝鎶ラ敊
+ // 鏌ュ鍣ㄤ俊鎭〃鏄惁宸茬粡鏈夎繖涓鍣�+ var cntr = db.Queryable<TN_Container>()
+ .Where(c => c.S_CODE == model.CntId).First();
+ // 濡傛灉琛ㄤ腑瀛樺湪杩欎釜鎵樼洏淇℃伅锛屼絾瀹瑰櫒绫诲瀷銆佺墿鏂欑被鍨嬩笌涓婄嚎鎵�渶鐗╂枡涓嶇锛屾姤閿� // 濡傛灉涓嶅瓨鍦紝涓嶄綔闄愬埗锛堣浣滅涓�涓婄嚎锛�- if (cntrItemRel != null && cntrItemRel.S_ITEM_CODE != model.ItemCode) {
- info = $"瀹瑰櫒{model.CntId}宸茬粡涓庣墿鏂欑被鍨媨cntrItemRel.S_ITEM_CODE}缁戝畾锛屾棤娉曠敤浜庤杞界墿鏂檣model.ItemCode}";
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
+ 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);
+ }
}
var startLoc = db.Queryable<TN_Location>()
@@ -742,12 +835,20 @@
.First();
if (cgDetail == null) {
- return NewSimpleResult(2, "娌℃湁鎵惧埌寰呭洖搴撶殑鎶芥鐗╂枡锛� + JsonConvert.SerializeObject(model));
+ info = "娌℃湁鎵惧埌寰呭洖搴撶殑鎶芥鐗╂枡锛� + JsonConvert.SerializeObject(model);
+ LogHelper.Info(info);
+ return NewSimpleResult(2, info);
}
var locCntrRel = db.Queryable<TN_Loc_Container>()
.Where(c => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE)
.First();
+
+ if (locCntrRel == null) {
+ info = $"瀹瑰櫒{model.CntrCode}鍦ㄨ揣浣嶅鍣ㄥ叧绯昏〃涓笉瀛樺湪";
+ LogHelper.Info(info);
+ return NewSimpleResult(3, info);
+ }
var startLoc = db.Queryable<TN_Location>()
.Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
@@ -759,7 +860,7 @@
if (startLoc == null) {
info = $"鍦�{startAreaName}'涓病鏈夋壘鍒板鍣▄model.CntrCode}鐨勮捣鐐硅揣浣嶏紝鎴栦笉鍏峰鍙栬揣瑕佹眰锛氭湭涓婇攣銆佹湁璐х墿";
LogHelper.Info(info);
- return NewSimpleResult(0, info);
+ return NewSimpleResult(4, info);
}
var endLoc = new TN_Location();
@@ -778,7 +879,7 @@
.First();
}
else {
- return NewSimpleResult(2, $"鎵樼洏绫诲瀷{locCntrRel.S_CNTR_TYPE}涓嶅悎娉曪細鎵樼洏鍙穥locCntrRel.S_CNTR_CODE}");
+ return NewSimpleResult(-1, $"鎵樼洏绫诲瀷{locCntrRel.S_CNTR_TYPE}涓嶅悎娉曪細鎵樼洏鍙穥locCntrRel.S_CNTR_CODE}");
}
if (endLoc == null) {
@@ -880,6 +981,12 @@
var locCntrRel = db.Queryable<TN_Loc_Container>()
.Where(c => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE)
.First();
+
+ if (locCntrRel == null) {
+ info = $"瀹瑰櫒{model.CntrCode}鍦ㄨ揣浣嶅鍣ㄥ叧绯昏〃涓笉瀛樺湪";
+ LogHelper.Info(info);
+ return NewSimpleResult(3, info);
+ }
var startLoc = db.Queryable<TN_Location>()
.Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
@@ -1307,12 +1414,33 @@
var info = "";
try {
+ if (string.IsNullOrEmpty(model.ItemCode)) {
+ info = $"鍗氬疄涓嬪彂鐗╂枡淇℃伅锛氬弬鏁颁笉鍚堟硶锛氱墿鏂欑紪鐮侊紙itemCode锛変笉鑳戒负绌�;
+ LogHelper.Info(info);
+ return NewMesResult(400, info);
+ }
+ if (string.IsNullOrEmpty(model.CntrCode)) {
+ info = $"鍗氬疄涓嬪彂鐗╂枡淇℃伅锛氬弬鏁颁笉鍚堟硶锛氬鍣ㄧ紪鐮侊紙CntrCode锛変笉鑳戒负绌�;
+ LogHelper.Info(info);
+ return NewMesResult(400, info);
+ }
+ if (string.IsNullOrEmpty(model.BatchNo)) {
+ info = $"鍗氬疄涓嬪彂鐗╂枡淇℃伅锛氬弬鏁颁笉鍚堟硶锛氭壒娆″彿锛圔atchNo锛変笉鑳戒负绌�;
+ LogHelper.Info(info);
+ return NewMesResult(400, info);
+ }
+ if (model.ItemNum <= 0) {
+ info = $"鍗氬疄涓嬪彂鐗╂枡淇℃伅锛氬弬鏁颁笉鍚堟硶锛氳揣鍝佹暟閲忥紙ItemNum锛夊簲璇ュぇ浜�0";
+ LogHelper.Info(info);
+ return NewMesResult(400, info);
+ }
+
// 灏嗕笅鍙戠殑淇℃伅鍏堝瓨鍌ㄥ埌CG琛ㄤ腑锛堟鏃舵墭鐩樻病鏈変笌浜х嚎澶勭殑璐т綅缁戝畾锛� var detail = new TN_CG_Detail {
- S_ITEM_CODE = model.ItemCode,
- S_ITEM_NAME = model.ItemName,
- S_CNTR_CODE = model.CntrCode, // 鏂欑缂栧彿锛堝緟瀹氾紝鐜板湪鏆傛椂璁惧畾涓哄崥瀹炰笅鍙戯級
- S_BATCH_NO = model.BatchNo,
+ S_ITEM_CODE = model.ItemCode, // NOT NULL
+ S_ITEM_NAME = model.ItemName,
+ S_CNTR_CODE = model.CntrCode, // NOT NULL 鏂欑缂栧彿锛堝緟瀹氾紝鐜板湪鏆傛椂璁惧畾涓哄崥瀹炰笅鍙戯級
+ S_BATCH_NO = model.BatchNo, // NOT NULL
S_STANDARD = model.Standard,
S_NET_WEIGHT = model.NetWeight,
S_QUALITY_GRADE = model.QualityGrade,
@@ -1335,7 +1463,7 @@
if (db.Insertable<TN_CG_Detail>(detail).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = "鎻掑叆鐗╂枡淇℃伅澶辫触锛� + JsonConvert.SerializeObject(detail);
- return NewMesResult(2, info);
+ return NewMesResult(500, info);
}
tran.CommitTran();
diff --git a/api/ApiModel.cs b/api/ApiModel.cs
index f20f1c9..f21a1e4 100644
--- a/api/ApiModel.cs
+++ b/api/ApiModel.cs
@@ -359,6 +359,11 @@
/// </summary>
[JsonProperty("cntrCode")]
public string CntrCode { get; set; }
+ /// <summary>
+ /// 鐗╂枡鏁伴噺锛堝緟瀹氾級
+ /// </summary>
+ [JsonProperty("itemNum")]
+ public int ItemNum { get; set; }
///// <summary>
///// 浜х嚎鍙凤紙寰呭畾锛屽ソ杩愮鏈�鏉′骇绾匡紝瀵瑰簲2涓笅绾胯揣浣嶏紝杩欓噷鏆傚畾涓猴細3鍜�锛� ///// </summary>
diff --git a/api/DebugController.cs b/api/DebugController.cs
index 105b0e6..d377395 100644
--- a/api/DebugController.cs
+++ b/api/DebugController.cs
@@ -328,68 +328,6 @@
}
/// <summary>
- /// DEBUG锛氭牴鎹鍣ㄧ墿鏂欎俊鎭〃锛屾彃鍏ュ鍣ㄧ墿鏂欑櫥璁颁俊鎭〃
- /// </summary>
- /// <returns></returns>
- [HttpPost]
- [Route("InsertContainerItemByCgDetail")]
- public string InsertContainerItemByCgDetail(FalseOk _) {
- var db = new SqlHelper<object>().GetInstance();
- try {
- var cgDetailList = db.Queryable<TN_CG_Detail>().ToList();
- var cntrItemList = new List<TN_Container_ItemType>();
- foreach (var cgDetail in cgDetailList) {
- if (db.Queryable<TN_Container_ItemType>().Where(i => i.S_CNTR_CODE == cgDetail.S_CNTR_CODE).Any()) {
- continue;
- }
-
- cntrItemList.Add(new TN_Container_ItemType {
- S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- S_ITEM_CODE = cgDetail.S_ITEM_CODE,
- });
- }
-
- if (db.Insertable<TN_Container_ItemType>(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_ItemType {
- S_CNTR_CODE = cgDetail.Cntr,
- S_ITEM_CODE = cgDetail.Item,
- };
-
- if (db.Insertable<TN_Container_ItemType>(cntrItem).ExecuteCommand() <= 0) {
- return "鎻掑叆澶辫触";
- }
-
- return "鎻掑叆鎴愬姛";
- }
- catch (Exception ex) {
-
- LogHelper.InfoEx(ex);
- return ex.Message;
- }
- }
-
- /// <summary>
/// DEBUG锛氭ā鎷熻緭閫佺嚎浜х嚎婊℃墭鐩樹笅绾挎祦绋� /// </summary>
/// <param name="model"></param>
@@ -416,22 +354,34 @@
S_CNTR_CODE = cntrCode,
};
- // BEG 姣忔杞閮芥鏌ュ搴斿鍣ㄦ槸鍚﹀凡鐧昏锛岀櫥璁颁繚鎸佷笉鍙橈紝鏈櫥璁板垯鎻掑叆
- // TODO 鍙兘浼氶噰鐢ㄦ瘡娆′笂绾块兘鏇存柊鐨勯�杈戯紝鍚庨潰鍐嶇湅
- var cntrItemRel = db.Queryable<TN_Container_ItemType>()
- .Where(i => i.S_CNTR_CODE == cntrCode).First();
+ var needInsertContainer = false;
+ var needUpdateContainer = false;
+ // 鏌ュ鍣ㄤ俊鎭〃鏄惁宸茬粡鏈夎繖涓鍣�+ var cntr = db.Queryable<TN_Container>()
+ .Where(c => c.S_CODE == cntrCode).First();
+ // 濡傛灉鎵句笉鍒拌瀹瑰櫒锛岄渶瑕佹坊鍔狅紝骞朵笖灏嗗鍣ㄦ潵婧愯缃负浠诲姟鍚嶇О
+ if (cntr == null) {
+ needInsertContainer = true;
+ LogHelper.Info($"杞锛歿taskName}锛氬鍣細{cntrCode}锛屽湪瀹瑰櫒琛ㄤ腑娌℃湁鐧昏锛岀櫥璁板苟璁剧疆瀹瑰櫒鏉ユ簮涓猴細{taskName}");
- var insertTable = cntrItemRel == null;
-
- if (insertTable) {
- // 鏆傚畾鍦ㄦ弧鎵樹笅绾垮叆搴撶殑鏃跺�锛岀櫥璁版墭鐩樺鍣�鐗╂枡鍙峰叧绯伙紙鍚庨潰鍙兘浼氭敼鎴愮郴缁熺淮鎶わ級
- cntrItemRel = new TN_Container_ItemType {
- S_ITEM_CODE = itemCode,
- S_CNTR_CODE = cntrCode,
- S_CNTR_TYPE = "鎵樼洏",
+ cntr = new TN_Container {
+ S_CODE = cntrCode,
+ S_TYPE = "鎵樼洏",
+ S_SPEC = itemCode,
+ S_SOURCE = taskName,
};
}
- // END
+ else {
+ // 濡傛灉鎵惧埌璇ュ鍣紝浣嗗鍣ㄧ墿鏂欑被鍨嬩笌涓嬬嚎鐗╂枡涓嶇锛岃褰曞苟鐩存帴瑕嗙洊锛堝緟瀹氾級
+ if (!string.IsNullOrEmpty(cntr.S_SPEC) && cntr.S_SPEC != itemCode) {
+ needUpdateContainer = true;
+ LogHelper.Info($"杞锛歿taskName}锛氬鍣ㄨ〃涓鍣▄cntrCode}瀵瑰簲鐨勭墿鏂欎俊鎭細{cntr.S_SPEC}锛� +
+ $"涓庢墍闇�鐨勭墿鏂欎俊鎭瘂itemCode}涓嶇锛岀洿鎺ヨ鐩栫粨鏋�);
+
+ cntr.S_SPEC = itemCode;
+ cntr.S_SOURCE = taskName;
+ }
+ }
var startLoc = db.Queryable<TN_Location>()
.Where(l => l.S_CODE == startLocCode) // 鎸囧畾锛氳捣鐐硅揣浣嶅彿
@@ -480,24 +430,22 @@
return info;
}
- // BEG 鎻掑叆鎴栨洿鏂板鍣ㄤ笌鐗╂枡绫诲瀷鐨勭粦瀹氳〃
- if (insertTable) {
- if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
+ if (needInsertContainer) {
+ if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
+ info = $"鎻掑叆瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
tran.RollbackTran();
- info = $"鐧昏瀹瑰櫒鐗╂枡绫诲瀷缁戝畾琛ㄥけ璐ワ細鐗╂枡缂栫爜{cntrItemRel.S_ITEM_CODE}锛屽鍣ㄧ紪鐮亄cntrItemRel.S_CNTR_CODE}";
LogHelper.Info(info);
return info;
}
}
- //else {
- // if (db.Updateable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
- // tran.RollbackTran();
- // info = $"鐧昏瀹瑰櫒鐗╂枡绫诲瀷缁戝畾琛ㄥけ璐ワ細鐗╂枡缂栫爜{cntrItemRel.S_ITEM_CODE}锛屽鍣ㄧ紪鐮亄cntrItemRel.S_CNTR_CODE}";
- // LogHelper.Info(info);
- // return info;
- // }
- //}
- // END
+ else if (needUpdateContainer) {
+ if (db.Updateable<TN_Container>(cntr).ExecuteCommand() <= 0) {
+ info = $"鏇存柊瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
+ tran.RollbackTran();
+ LogHelper.Info(info);
+ return info;
+ }
+ }
if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
tran.RollbackTran();
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 0f935e1..9d959bb 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -66,21 +66,34 @@
S_CNTR_CODE = cntrCode,
};
- // BEG 姣忔杞閮芥鏌ュ搴斿鍣ㄦ槸鍚﹀凡鐧昏锛岀櫥璁板垯鏇存柊锛屾湭鐧昏鍒欐彃鍏�- var cntrItemRel = db.Queryable<TN_Container_ItemType>()
- .Where(i => i.S_CNTR_CODE == cntrCode).First();
+ var needInsertContainer = false;
+ var needUpdateContainer = false;
+ // 鏌ュ鍣ㄤ俊鎭〃鏄惁宸茬粡鏈夎繖涓鍣�+ var cntr = db.Queryable<TN_Container>()
+ .Where(c => c.S_CODE == cntrCode).First();
+ // 濡傛灉鎵句笉鍒拌瀹瑰櫒锛岄渶瑕佹坊鍔狅紝骞朵笖灏嗗鍣ㄦ潵婧愯缃负浠诲姟鍚嶇О
+ if (cntr == null) {
+ needInsertContainer = true;
+ LogHelper.Info($"杞锛歿taskName}锛氬鍣細{cntrCode}锛屽湪瀹瑰櫒琛ㄤ腑娌℃湁鐧昏锛岀櫥璁板苟璁剧疆瀹瑰櫒鏉ユ簮涓猴細{taskName}");
- var insertTable = cntrItemRel == null;
-
- if (insertTable) {
- // 鏆傚畾鍦ㄦ弧鎵樹笅绾垮叆搴撶殑鏃跺�锛岀櫥璁版墭鐩樺鍣�鐗╂枡鍙峰叧绯伙紙鍚庨潰鍙兘浼氭敼鎴愮郴缁熺淮鎶わ級
- cntrItemRel = new TN_Container_ItemType {
- S_ITEM_CODE = itemCode,
- S_CNTR_CODE = cntrCode,
- S_CNTR_TYPE = "鎵樼洏",
+ cntr = new TN_Container {
+ S_CODE = cntrCode,
+ S_TYPE = "鎵樼洏",
+ S_SPEC = itemCode,
+ S_SOURCE = taskName,
};
}
- // END
+ else {
+ // 濡傛灉鎵惧埌璇ュ鍣紝浣嗗鍣ㄧ墿鏂欑被鍨嬩笌涓嬬嚎鐗╂枡涓嶇锛岃褰曞苟鐩存帴瑕嗙洊锛堝緟瀹氾級
+ if (!string.IsNullOrEmpty(cntr.S_SPEC) && cntr.S_SPEC != itemCode) {
+ needUpdateContainer = true;
+ LogHelper.Info($"杞锛歿taskName}锛氬鍣ㄨ〃涓鍣▄cntrCode}瀵瑰簲鐨勭墿鏂欎俊鎭細{cntr.S_SPEC}锛� +
+ $"涓庢墍闇�鐨勭墿鏂欎俊鎭瘂itemCode}涓嶇锛岀洿鎺ヨ鐩栫粨鏋�);
+
+ cntr.S_SPEC = itemCode;
+ cntr.S_SOURCE = taskName;
+ }
+ }
var startLoc = db.Queryable<TN_Location>()
.Where(l => l.S_CODE == startLocCode) // 鎸囧畾锛氳捣鐐硅揣浣嶅彿
@@ -102,13 +115,6 @@
S_CNTR_TYPE = "鎵樼洏",
};
- //if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
- // info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
- // LogHelper.Info(info);
- // continue;
- // //return;
- //}
-
var endLoc = db.Queryable<TN_Location>()
.Where(a => Settings.AreaMap[AreaName.K绌烘墭瀛樻斁鍖篯.Contains(a.S_AREA_CODE))
.Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
@@ -129,31 +135,29 @@
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);
+ continue;
+ }
+ }
+ else if (needUpdateContainer) {
+ if (db.Updateable<TN_Container>(cntr).ExecuteCommand() <= 0) {
+ info = $"鏇存柊瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
+ tran.RollbackTran();
+ LogHelper.Info(info);
+ continue;
+ }
+ }
+
if (db.Insertable<TN_CG_Detail>(cgDetail).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = $"鎻掑叆瀹瑰櫒璐у搧淇℃伅琛ㄥけ璐ワ細鐗╂枡缂栫爜{cgDetail.S_ITEM_CODE}锛屽鍣ㄧ紪鐮亄cgDetail.S_CNTR_CODE}";
LogHelper.Info(info);
continue;
}
-
- // BEG 鎻掑叆鎴栨洿鏂板鍣ㄤ笌鐗╂枡绫诲瀷鐨勭粦瀹氳〃
- if (insertTable) {
- if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鐧昏瀹瑰櫒鐗╂枡绫诲瀷缁戝畾琛ㄥけ璐ワ細鐗╂枡缂栫爜{cntrItemRel.S_ITEM_CODE}锛屽鍣ㄧ紪鐮亄cntrItemRel.S_CNTR_CODE}";
- LogHelper.Info(info);
- continue;
- }
- }
- else {
- if (db.Updateable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鐧昏瀹瑰櫒鐗╂枡绫诲瀷缁戝畾琛ㄥけ璐ワ細鐗╂枡缂栫爜{cntrItemRel.S_ITEM_CODE}锛屽鍣ㄧ紪鐮亄cntrItemRel.S_CNTR_CODE}";
- LogHelper.Info(info);
- continue;
- }
- }
- // END
if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
tran.RollbackTran();
diff --git a/models/TN_Container.cs b/models/TN_Container.cs
index c583a63..0f11666 100644
--- a/models/TN_Container.cs
+++ b/models/TN_Container.cs
@@ -8,11 +8,19 @@
/// </summary>
[SugarTable("TN_Container")]
public class TN_Container : BaseModel {
- public string S_CODE { get; set; }
-
- public string S_TYPE { get; set; }
-
- public string S_SPEC { get; set; }
+ public string S_CODE { get; set; } = string.Empty;
+ /// <summary>
+ /// 瀹瑰櫒绫诲瀷
+ /// </summary>
+ public string S_TYPE { get; set; } = string.Empty;
+ /// <summary>
+ /// 瑙勬牸锛堢敤浜庤褰曞鍣ㄩ�鐢ㄧ殑鐗╂枡缂栧彿锛�+ /// </summary>
+ public string S_SPEC { get; set; } = string.Empty;
+ /// <summary>
+ /// 鏉ユ簮锛堣繖閲岃褰曚负鍒涘缓璇ュ鍣ㄧ殑涓讳綋锛歁obox鎴栧叿浣撶殑浠诲姟锛�+ /// </summary>
+ public string S_SOURCE { get; set; } = string.Empty;
public int N_DETAIL_COUNT { get; set; }
diff --git a/models/TN_Container_ItemType.cs b/models/TN_Container_ItemType.cs
deleted file mode 100644
index 966e19a..0000000
--- a/models/TN_Container_ItemType.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using SqlSugar;
-
-namespace HH.WCS.Mobox3.DSZSH.models {
- /// <summary>
- /// 瀹瑰櫒-鐗╂枡绫诲瀷 鍏崇郴琛紙濂借繍绠变篃璁板綍锛岄槻姝㈠悗缁渶姹傚彉鏇达級
- /// </summary>
- /// <remarks>
- /// 1. 绌烘墭涓婄嚎鏃讹紝濡傛灉鍏崇郴琛ㄤ腑娌℃湁鎵樼洏淇℃伅锛屼笉妫�煡锛涘惁鍒欙紝鍒ゆ柇鎵樼洏鏄惁鍚堥�<br/>
- /// 2. 婊℃墭涓嬬嚎鏃讹紝濡傛灉鍏崇郴琛ㄤ腑娌℃湁鎵樼洏淇℃伅锛岃褰曡繘鍘伙紱鍚﹀垯锛屼笉鏀瑰彉鍘熸湁璁板綍锛堜笉鏇存柊锛�- /// </remarks>
- [SugarTable("TN_Container_ItemType")]
- public class TN_Container_ItemType : BaseModel {
- public string S_CNTR_CODE { get; set; } = string.Empty;
- public string S_CNTR_TYPE { get; set; } = string.Empty;
- public string S_ITEM_CODE { get; set; } = string.Empty;
- }
-}
diff --git a/util/SqlHelper.cs b/util/SqlHelper.cs
index f0f6028..94c166d 100644
--- a/util/SqlHelper.cs
+++ b/util/SqlHelper.cs
@@ -39,6 +39,12 @@
//鐩稿綋浜嶦F鐨�PrintToMiniProfiler
};
+ // 閰嶇疆AOP鏃ュ織
+ //db.Aop.OnLogExecuting = (sql, pars) =>
+ //{
+ // Console.WriteLine(sql); // 杈撳嚭绾疭QL璇彞
+ //};
+
//姣忔璁剧疆鏁板�鏃堕兘鍘婚櫎鍓嶅鍚庡绌烘牸
db.Aop.DataExecuted = (value, entity) => {
entity.EntityColumnInfos.ToList().ForEach(a => {
diff --git a/wms/LocationHelper.cs b/wms/LocationHelper.cs
index 7be3946..7e4e291 100644
--- a/wms/LocationHelper.cs
+++ b/wms/LocationHelper.cs
@@ -249,7 +249,6 @@
}
cntrs = lcrList.Select(a => a.S_CNTR_CODE).ToList();
-
var log = JsonConvert.SerializeObject(cntrs);
var location = db.Queryable<TN_Location>().First(a => a.S_CODE == loc);
if (location != null)
@@ -258,8 +257,30 @@
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,
+ });
+ }
+ }
+
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 (db.Deleteable<TN_Loc_Container>().Where(it => cntrs.Contains(it.S_CNTR_CODE) && it.S_LOC_CODE == loc).ExecuteCommand() > 0)
{
LogHelper.Info($"鍒犻櫎璐т綅瀹瑰櫒鍏崇郴琛ㄦ垚鍔燂紝{log}");
@@ -326,14 +347,14 @@
foreach (var item in cntrs)
{
// 閽堝瀹瑰櫒绫诲瀷娣诲姞鐨勬柊閫昏緫
- var cntrItemRel = db.Queryable<TN_Container_ItemType>()
- .Where(c => c.S_CNTR_CODE == item).First();
- if (cntrItemRel == null) {
- LogHelper.Info($"璐т綅瑙ｇ粦鏃讹紝瀹瑰櫒{item}娌℃湁鍦ㄥ鍣ㄧ墿鏂欎俊鎭叧绯昏〃涓煡鍒�);
+ var cntr = db.Queryable<TN_Container>()
+ .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 });
}
else {
- bindLocCntList.Add(new TN_Loc_Container() { S_LOC_CODE = loc, S_CNTR_CODE = item, S_CNTR_TYPE = cntrItemRel.S_CNTR_TYPE });
+ bindLocCntList.Add(new TN_Loc_Container() { S_LOC_CODE = loc, S_CNTR_CODE = item, S_CNTR_TYPE = cntr.S_TYPE });
}
}
diff --git a/wms/WCSHelper.cs b/wms/WCSHelper.cs
index bef1956..10eafbf 100644
--- a/wms/WCSHelper.cs
+++ b/wms/WCSHelper.cs
@@ -167,7 +167,7 @@
internal static void Begin(TN_Task task, string forklift_no) {
var db = new SqlHelper<TN_Task>().GetInstance();
if (task != null) {
- if (task.N_B_STATE == 1) {
+ if (task.N_B_STATE == 1 || task.N_B_STATE == 0) { // 娣诲姞褰搕ask鐘舵�涓�鏃朵篃鍙互瑙﹀彂
task.N_B_STATE = 2;
task.S_B_STATE = TN_Task.GetStateStr(task.N_B_STATE);
task.T_START_TIME = System.DateTime.Now;
--
Gitblit v1.9.1