From 6b43055b5aa32dbea0dacee5a0235b0d5a76c293 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 30 五月 2025 17:19:35 +0800
Subject: [PATCH] 优化后台报错信息，空箱入库容器号增加检查逻辑
---
wms/SYSHelper.cs | 30 ---
/dev/null | 0
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/687ebc79-98fe-4ac4-b909-c9e972afad42.vsidx | 0
core/Monitor.cs | 16
wms/LocationHelper.cs | 29 ++
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/c746dfc7-35d0-465f-9364-9d1f640d45c0.vsidx | 0
api/ApiModel.cs | 204 ++++----------------
core/WCSCore.cs | 2
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3908d945-9e88-4170-b92a-f2cf0dcb5e54.vsidx | 0
wms/WCSHelper.cs | 19 -
api/DebugController.cs | 82 +++++++
Models/TN_Location.cs | 2
api/ApiHelper.cs | 204 +++++++++++--------
13 files changed, 271 insertions(+), 317 deletions(-)
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/0e784c8d-2ea0-45e5-8726-82d212591fce.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/0e784c8d-2ea0-45e5-8726-82d212591fce.vsidx
deleted file mode 100644
index 6353d41..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/0e784c8d-2ea0-45e5-8726-82d212591fce.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3908d945-9e88-4170-b92a-f2cf0dcb5e54.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3908d945-9e88-4170-b92a-f2cf0dcb5e54.vsidx
new file mode 100644
index 0000000..f26c45c
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3908d945-9e88-4170-b92a-f2cf0dcb5e54.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/541e9f47-0b5c-4a4e-9982-872d7ed880d7.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/541e9f47-0b5c-4a4e-9982-872d7ed880d7.vsidx
deleted file mode 100644
index d1602e8..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/541e9f47-0b5c-4a4e-9982-872d7ed880d7.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/687ebc79-98fe-4ac4-b909-c9e972afad42.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/687ebc79-98fe-4ac4-b909-c9e972afad42.vsidx
new file mode 100644
index 0000000..38484ce
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/687ebc79-98fe-4ac4-b909-c9e972afad42.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/c746dfc7-35d0-465f-9364-9d1f640d45c0.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/c746dfc7-35d0-465f-9364-9d1f640d45c0.vsidx
new file mode 100644
index 0000000..dc62859
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/c746dfc7-35d0-465f-9364-9d1f640d45c0.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/e95c9dfb-066e-4e8f-a68a-626ca63d579a.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/e95c9dfb-066e-4e8f-a68a-626ca63d579a.vsidx
deleted file mode 100644
index 557714e..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/e95c9dfb-066e-4e8f-a68a-626ca63d579a.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/fb5893ae-54ab-4004-9fc4-c8a740b25317.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/fb5893ae-54ab-4004-9fc4-c8a740b25317.vsidx
deleted file mode 100644
index 1681a73..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/fb5893ae-54ab-4004-9fc4-c8a740b25317.vsidx
+++ /dev/null
Binary files differ
diff --git a/Models/TN_Location.cs b/Models/TN_Location.cs
index 5db9cbf..9141ff1 100644
--- a/Models/TN_Location.cs
+++ b/Models/TN_Location.cs
@@ -61,7 +61,7 @@
public int N_ROADWAY { get; set; } = 1;
public string S_PURPOSE { get; set; } = "瀛樺偍";
public string S_TYPE { get; set; } = "甯歌";
- public string S_WH_CODE { get; set; } = "鐙北瀛愮煶鍖�;
+ public string S_WH_CODE { get; set; } = "DSZSH";
// END
/// <summary>
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index fc8de9c..fa5a44d 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -1,55 +1,49 @@
锘縰sing System;
using System.Collections.Generic;
using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using HH.WCS.Mobox3.DSZSH.models;
using HH.WCS.Mobox3.DSZSH.util;
using HH.WCS.Mobox3.DSZSH.wms;
using Newtonsoft.Json;
-using Org.BouncyCastle.Asn1.Tsp;
using SqlSugar;
-using Swashbuckle.Swagger;
-
using static HH.WCS.Mobox3.DSZSH.api.ApiModel;
using static HH.WCS.Mobox3.DSZSH.api.OtherModel;
-using static HH.WCS.Mobox3.DSZSH.Config;
namespace HH.WCS.Mobox3.DSZSH.api {
public class ApiHelper {
/// <summary>
/// 濂借繍绠�婊＄涓嬬嚎鍏ュ簱(PDA)
/// </summary>
- /// <param name="model"></param>
+ /// <param name="model">鍖呭惈锛氱墿鏂欎俊鎭�璧风偣璐т綅</param>
/// <returns></returns>
public static SimpleResult GoodpackOffline(GoodpackOfflineInfo model) {
var db = new SqlHelper<object>().GetInstance();
var info = "";
var taskName = TaskName.H濂借繍绠盻婊＄涓嬬嚎鍏ュ簱; // 鐢ㄤ簬鐢熸垚浠诲姟绫诲瀷銆佹墦鍗版棩蹇椾俊鎭�- var startAreaName = AreaName.M婊＄鎿嶄綔鍖�
- var endAreaName = AreaName.M婊＄璐ф灦鍖�
+ var startAreaName = AreaName.M婊＄鎿嶄綔鍖� // 璧风偣璐у尯
+ var endAreaName = AreaName.M婊＄璐ф灦鍖� // 缁堢偣璐у尯
try {
+ // 璐存爣鏈轰細鎻愬墠灏嗙墿鏂欎俊鎭啓鍏G_Detail琛ㄤ腑
// 灏哖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 == "寰呮") // 鏂板鐗╂枡锛屾晠鐗╂枡鐘舵�搴旇涓�1寰呮
// TODO model 涓�鏁伴噺銆佽鏍兼槸鍚︿篃鍙備笌姣斿 寰呭悗缁姹� .First();
-
+ // 濡傛灉鎵句笉鍒版寚瀹氱殑鐗╂枡锛岃鏄庝俊鎭笉涓�嚧锛屾姤閿� if (cgDetail == null) {
info = $"PDA鎵爜鐗╂枡淇℃伅涓庤创鏍囨満浼犻�鐨勪俊鎭笉涓�嚧锛� + JsonConvert.SerializeObject(model);
LogHelper.Info(info);
return NewSimpleResult(2, 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,7 +57,7 @@
return NewSimpleResult(3, info);
}
- // 缁戝畾璐т綅鍜屽鍣ㄥ彿
+ // 缁戝畾璐т綅鍜屽鍣ㄥ彿锛堟弧绠变笅绾垮埌鎿嶄綔鍖猴紝姝ゆ椂灏氭湭缁戝畾锛� var locCntrRel = new TN_Loc_Container {
S_LOC_CODE = model.StartLoc,
S_CNTR_CODE = cgDetail.S_CNTR_CODE,
@@ -87,8 +81,8 @@
var cntId = locCntrRel.S_CNTR_CODE;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
@@ -121,7 +115,7 @@
LogHelper.Info(info);
return NewSimpleResult(5, info);
}
-
+
if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
@@ -165,12 +159,28 @@
.First();
if (startLoc == null) {
- info = $"璧风偣浣嶇疆{model.StartLoc}涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�;
+ info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣峽model.StartLoc}锛屾垨涓嶅叿澶囪姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
LogHelper.Info(info);
return NewSimpleResult(2, info);
}
- // 缁戝畾璐т綅鍜屽鍣ㄥ彿
+ //// 鏌ョ湅瀹瑰櫒鏄惁宸叉湁鐗╂枡缁戝畾
+ //var cgDetail = db.Queryable<TN_CG_Detail>()
+ // .Where(d => d.S_CNTR_CODE == model.CntrCode).First();
+ //// 濡傛灉鏈夌粦瀹氱墿鏂欙紝鎶ラ敊锛屽洜涓虹┖鎵樹笉搴旇鏈夌墿鏂�+ //if (cgDetail != null) {
+ // info = $"瀹瑰櫒{model.CntrCode}宸茬粡缁戝畾浜嗙墿鏂檣cgDetail.S_ITEM_CODE}锛屼笉鏄┖鎵樻棤娉曞叆搴�;
+ // LogHelper.Info(info);
+ // return NewSimpleResult(3, info);
+ //}
+
+ // 鍋囧畾浜哄伐涓嶄細灏嗘湁鐗╂枡鐨勭瀛愭斁鍦ㄧ┖绠卞叆搴撴帴椹充綅锛屾病鏈夊繀瑕佹鏌�+ // 濡傛灉浜哄伐灏嗗嚭搴撳悗鐨勬墭鐩樺叆搴擄紝杩欐椂鐗╂枡淇℃伅骞舵病鏈夊垹闄わ紝闇�灏嗘墭鐩樼墿鏂欑殑鍏崇郴瑙ｉ櫎
+ var cgDetail = db.Queryable<TN_CG_Detail>()
+ .Where(d => d.S_CNTR_CODE == model.CntrCode).First();
+ var needDeleteDetail = cgDetail != null;
+
+ // 缁戝畾璐т綅鍜屽鍣ㄥ彿锛圥DA鍦ㄦ帴椹充綅缁戝畾
var locCntrRel = new TN_Loc_Container {
S_LOC_CODE = model.StartLoc,
S_CNTR_CODE = model.CntrCode,
@@ -194,15 +204,15 @@
var cntId = locCntrRel.S_CNTR_CODE;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
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);
+ return NewSimpleResult(5, info);
}
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -214,7 +224,7 @@
tran.RollbackTran();
info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(5, info);
}
if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -226,14 +236,14 @@
tran.RollbackTran();
info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(5, 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(4, info);
+ return NewSimpleResult(5, info);
}
tran.CommitTran();
@@ -275,6 +285,16 @@
return NewSimpleResult(2, info);
}
+ // 鏌ョ湅瀹瑰櫒鏄惁宸叉湁鐗╂枡缁戝畾
+ var cgDetail = db.Queryable<TN_CG_Detail>()
+ .Where(d => d.S_CNTR_CODE == model.CntrCode).First();
+ // 濡傛灉鏈夌粦瀹氱墿鏂欙紝鎶ラ敊锛屽洜涓虹┖绠变笉搴旇鏈夌墿鏂�+ if (cgDetail != null) {
+ info = $"瀹瑰櫒{model.CntrCode}宸茬粡缁戝畾浜嗙墿鏂檣cgDetail.S_ITEM_CODE}锛屼笉鏄┖绠辨棤娉曞叆搴�;
+ LogHelper.Info(info);
+ return NewSimpleResult(3, info);
+ }
+
// 缁戝畾璐т綅鍜屽鍣ㄥ彿
var locCntrRel = new TN_Loc_Container {
S_LOC_CODE = model.StartLoc,
@@ -299,8 +319,8 @@
var cntId = locCntrRel.S_CNTR_CODE;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
@@ -365,6 +385,7 @@
var taskName = TaskName.T鎵樼洏_绌烘墭涓婄嚎;
var startAreaName = AreaName.K绌烘墭瀛樻斁鍖�
+ var endAreaName = AreaName.B鍖呰鍖�
try {
// 鏌ュ鍣�鐗╂枡绫诲瀷琛�@@ -394,7 +415,7 @@
}
var endLoc = db.Queryable<TN_Location>()
- //.Where(l => Settings.AreaMap[AreaName.B鍖呰鍖篯.Contains(l.S_AREA_CODE))
+ .Where(l => Settings.AreaMap[endAreaName].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();
@@ -408,8 +429,8 @@
var cntId = model.CntId;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -467,6 +488,7 @@
var taskName = TaskName.H濂借繍绠盻绌虹涓婄嚎;
var startAreaName = AreaName.K绌烘墭瀛樻斁鍖�
+ var endAreaName = AreaName.K绌虹鎿嶄綔鍖�
try {
var startLoc = db.Queryable<TN_Location>()
@@ -484,7 +506,7 @@
}
var endLoc = db.Queryable<TN_Location>()
- //.Where(l => Settings.AreaMap[AreaName.B鍖呰鍖篯.Contains(l.S_AREA_CODE))
+ .Where(l => Settings.AreaMap[endAreaName].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();
@@ -498,8 +520,8 @@
var cntId = model.CntId;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -616,8 +638,8 @@
var cntId = locCntrRel.S_CNTR_CODE;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it =>
@@ -672,9 +694,11 @@
}
}
public static SimpleResult UnqualifiedShift(UnqualifiedShiftInfo model) {
- var taskName = TaskName.C鎶芥_涓嶅悎鏍肩Щ搴�
var db = new SqlHelper<object>().GetInstance();
var info = "";
+
+ var taskName = TaskName.C鎶芥_涓嶅悎鏍肩Щ搴�
+
try {
if (!Settings.AreaMap[AreaName.C鎶芥寮傚父鍖篯.Contains(model.EndArea)) {
@@ -731,8 +755,8 @@
var cntId = locCntrRel.S_CNTR_CODE;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it =>
@@ -788,9 +812,11 @@
}
public static SimpleResult RestBack(RestBackInfo model) {
- var taskName = TaskName.W灏剧鍥炲簱;
var db = new SqlHelper<object>().GetInstance();
var info = "";
+
+ var taskName = TaskName.W灏剧鍥炲簱;
+
try {
var startLoc = db.Queryable<TN_Location>()
.Where(l => l.S_CODE == model.StartLoc)
@@ -835,8 +861,8 @@
var cntId = locCntrRel.S_CNTR_CODE;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -885,7 +911,7 @@
}
/// <summary>
- /// 鎴愬搧鑳跺嚭搴�WMS)
+ /// 鎴愬搧鑳跺嚭搴�PDA)
/// </summary>
/// <remarks>
/// WMS鎻愪緵鍑哄簱鐨勭墿鏂欑被鍨嬩笌鏁伴噺锛岃皟鐢ㄦ帴鍙ｇ敱WCS鐢熸垚鍏蜂綋鐨勫嚭搴撲换鍔★紝鐒跺悗WCS鍚庡彴杞澶勭悊
@@ -894,14 +920,12 @@
/// <returns></returns>
public static SimpleResult FinishedOutbound(FinishedOutboundInfo model) {
var db = new SqlHelper<object>().GetInstance();
- var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
var info = "";
+
+ var taskName = TaskName.C鎴愬搧鑳跺嚭搴�
+
try {
- if (string.IsNullOrEmpty(orderNo)) {
- info = "鍑哄簱鍗曞彿涓嶈兘涓虹┖";
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
- }
+ var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
var cgDetailList = SelectCgByTotalQty(model);
@@ -916,7 +940,6 @@
S_ITEM_CODE = model.ItemCode,
S_BATCH = model.BatchNo,
N_END_NUM = model.Qty,
- //F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
S_END_AREA = model.EndArea
};
@@ -951,7 +974,9 @@
tran.CommitTran();
}
- return NewSimpleResult(0, "鐢熸垚鍑哄簱鍗曟垚鍔�);
+ info = "鐢熸垚鍑哄簱鍗曟垚鍔�;
+ LogHelper.Info(info);
+ return NewSimpleResult(0, info);
}
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
@@ -966,54 +991,63 @@
/// <returns></returns>
public static SimpleResult FinishedOutboundForce(FinishedOutboundInfo model) {
var db = new SqlHelper<object>().GetInstance();
- var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
var info = "";
+
+ var taskName = TaskName.C鎴愬搧鑳跺嚭搴�
+
try {
- if (string.IsNullOrEmpty(orderNo)) {
- return NewSimpleResult(2, "鍑哄簱鍗曞彿涓嶈兘涓虹┖");
+ var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
+
+ var cgDetailList = SelectCgByTotalQty(model);
+
+ if (cgDetailList.Count == 0) {
+ info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
+ LogHelper.Info(info);
+ return NewSimpleResult(3, info);
+ }
+
+ var order = new TN_Outbound_Order {
+ S_NO = orderNo,
+ S_ITEM_CODE = model.ItemCode,
+ S_BATCH = model.BatchNo,
+ N_END_NUM = model.Qty,
+ S_END_AREA = model.EndArea
+ };
+
+ var detailList = new List<TN_Outbound_Detail>();
+ foreach (var cgDetail in cgDetailList) {
+ var detail = new TN_Outbound_Detail {
+ S_OO_NO = orderNo,
+ S_ITEM_CODE = cgDetail.S_ITEM_CODE,
+ S_BATCH_NO = cgDetail.S_BATCH_NO,
+ S_CNTR_CODE = cgDetail.S_CNTR_CODE,
+ N_COUNT = cgDetail.N_ITEM_NUM,
+ S_END_AREA = model.EndArea
+ };
+ detailList.Add(detail);
}
using (var tran = db.Ado.UseTran()) {
-
- var cgDetailList = SelectCgByTotalQty(model);
-
- if (cgDetailList.Count == 0) {
- return NewSimpleResult(3, "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�);
- }
-
- foreach (var cgDetail in cgDetailList) {
- var detail = new TN_Outbound_Detail {
- S_OO_NO = orderNo,
- S_ITEM_CODE = cgDetail.S_ITEM_CODE,
- S_BATCH_NO = cgDetail.S_BATCH_NO,
- S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- S_END_AREA = model.EndArea
- };
-
- if (db.Insertable<TN_Outbound_Detail>(detail).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- return NewSimpleResult(4, "鐢熸垚鍑哄簱鍗曟槑缁嗗け璐ワ細" + JsonConvert.SerializeObject(detail));
- }
- }
-
- var order = new TN_Outbound_Order {
- S_NO = orderNo,
- S_ITEM_CODE = model.ItemCode,
- S_BATCH = model.BatchNo,
- N_END_NUM = model.Qty,
- //F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
- S_END_AREA = model.EndArea
- };
-
if (db.Insertable<TN_Outbound_Order>(order).ExecuteCommand() <= 0) {
tran.RollbackTran();
- return NewSimpleResult(5, "鐢熸垚鍑哄簱鍗曞け璐ワ細" + JsonConvert.SerializeObject(order));
+ info = "鐢熸垚鍑哄簱鍗曞け璐ワ細" + JsonConvert.SerializeObject(order);
+ LogHelper.Info(info);
+ return NewSimpleResult(2, info);
+ }
+
+ if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = "鐢熸垚鍑哄簱鍗曟槑缁嗗け璐�;
+ LogHelper.Info(info);
+ return NewSimpleResult(4, info);
}
tran.CommitTran();
}
- return NewSimpleResult(0, "鐢熸垚鍑哄簱鍗曟垚鍔�);
+ info = "鐢熸垚鍑哄簱鍗曟垚鍔�;
+ LogHelper.Info(info);
+ return NewSimpleResult(0, info);
}
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
diff --git a/api/ApiModel.cs b/api/ApiModel.cs
index 4b66d75..30b6b23 100644
--- a/api/ApiModel.cs
+++ b/api/ApiModel.cs
@@ -106,8 +106,6 @@
/// 璁㈠崟褰撳墠鐨勭洰鐨勫湴
/// </summary>
public string currentDes { get; set; }
-
-
/// <summary>
/// 褰撳墠鎸囦护
/// </summary>
@@ -151,9 +149,8 @@
}
public class OtherModel {
- #region PDA 鏁版嵁
/// <summary>
- /// 濂借繍绠�婊℃墭涓嬬嚎鍏ュ簱(PDA)鏁版嵁绫�+ /// 濂借繍绠�婊＄涓嬬嚎鍏ュ簱(PDA)鏁版嵁绫� /// </summary>
public class GoodpackOfflineInfo {
/// <summary>
@@ -161,11 +158,6 @@
/// </summary>
[JsonProperty("s_item_code")]
public string ItemCode { get; set; }
- ///// <summary>
- ///// 鐗╂枡鍚嶇О
- ///// </summary>
- //[JsonProperty("item_name")]
- //public string ItemName { get; set; }
/// <summary>
/// 鎵规鍙� /// </summary>
@@ -182,71 +174,12 @@
[JsonProperty("n_num")]
public int Num { get; set; }
/// <summary>
- /// 璧风偣璐т綅淇℃伅
+ /// 璧风偣璐т綅淇℃伅锛堣捣鐐硅揣浣嶈揣鍖鸿姹傦細MXCZQ 婊＄鎿嶄綔鍖猴級
/// </summary>
[JsonProperty("s_start_loc")]
public string StartLoc { get; set; }
}
- /// <summary>
- /// 绌烘墭/绌虹鍏ュ簱缁戝畾(PDA)鏁版嵁绫�- /// </summary>
- public class EmptyBindInfo {
- /// <summary>
- /// 瀹瑰櫒缂栫爜
- /// </summary>
-
- [JsonProperty("s_cntr_code")]
- public string CntrCode { get; set; }
- /// <summary>
- /// 瀹瑰櫒绫诲瀷
- /// </summary>
-
- [JsonProperty("s_cntr_type")]
- public string CntrType { get; set; }
- ///// <summary>
- ///// 鎵樼洏鏁伴噺锛堜粎褰撳鍣ㄧ被鍨嬩负鎵樼洏鏃朵娇鐢級
- ///// </summary>
- //[JsonProperty("pallet_count", NullValueHandling = NullValueHandling.Ignore)]
- //public int PalletCount { get; set; }
- /// <summary>
- /// 璐т綅缂栫爜
- /// </summary>
- [JsonProperty("s_loc_code")]
- public string LocCode { get; set; }
- }
- /// <summary>
- /// 绌烘墭缁戝畾
- /// </summary>
- public class EmptyBindPalletInfo {
- /// <summary>
- /// 瀹瑰櫒缂栫爜
- /// </summary>
- public string CntrCode { get; set; }
-
- /// <summary>
- /// 鎵樼洏鏁伴噺
- /// </summary>
- public int PalletCount { get; set; }
-
- /// <summary>
- /// 璐т綅缂栫爜
- /// </summary>
- public string LocCode { get; set; }
- }
- /// <summary>
- /// 绌虹缁戝畾
- /// </summary>
- public class EmptyBindGoodpackInfo {
- /// <summary>
- /// 瀹瑰櫒缂栫爜
- /// </summary>
- public string CntrCode { get; set; }
-
- /// <summary>
- /// 璐т綅缂栫爜
- /// </summary>
- public string LocCode { get; set; }
- }
+
/// <summary>
/// 绌烘墭/绌虹鍏ュ簱(PDA)鏁版嵁绫� /// </summary>
@@ -257,77 +190,57 @@
[JsonProperty("cntr_code")]
public string CntrCode { get; set; }
/// <summary>
- /// 瀹瑰櫒绫诲瀷
+ /// 瀹瑰櫒绫诲瀷锛堝繀椤讳负 '绌烘墭鐩樷� 鎴�鈥樼┖濂借繍绠�锛� /// </summary>
[JsonProperty("cntr_type")]
public string CntrType { get; set; }
/// <summary>
- /// 缁堢偣搴撳尯缂栫爜
+ /// 缁堢偣搴撳尯缂栫爜锛堟墭鐩樻槸 KTCFQ 绌烘墭瀛樻斁鍖猴紱濂借繍绠辨槸 CXHJQ 绌虹璐ф灦鍖猴級
/// </summary>
[JsonProperty("end_area")]
public string EndArea { get; set; }
/// <summary>
- /// 璧风偣璐т綅
+ /// 璧风偣璐т綅锛堟墭鐩樻槸 KTJBQ 绌烘墭鍏ュ簱鎺ラ┏鍖猴紱濂借繍绠辨槸 KXJBQ 绌虹鍏ュ簱鎺ラ┏鍖猴級
/// </summary>
[JsonProperty("start_loc")]
public string StartLoc { get; set; }
}
-
- public class EmptyOnlinePalletInfo {
- [JsonProperty("item_code")]
- public string ItemCode { get; set; }
- [JsonProperty("batch_no")]
- public string BatchNo { get; set; }
- [JsonProperty("spe")]
- public string Spec { get; set; } // 鐗╂枡瑙勬牸
- [JsonProperty("cnt_id")]
- public string CntId { get; set; } // 瀹瑰櫒绫诲瀷 = 鎵樼洏
- }
-
- public class EmptyOnlineGoodpackInfo {
- [JsonProperty("cnt_id")]
- public string CntId { get; set; } // 瀹瑰櫒绫诲瀷 = 濂借繍绠�- }
-
/// <summary>
- /// 鎶芥-鍒涘缓鎶芥鍗�WMS)鏁版嵁绫�+ /// 绌虹涓婄嚎淇℃伅
/// </summary>
- public class CreateCheckOrderInfo {
+ public class EmptyOnlinePalletInfo {
/// <summary>
/// 鐗╂枡缂栫爜
/// </summary>
-
[JsonProperty("item_code")]
public string ItemCode { get; set; }
+ /// <summary>
+ /// 鎵规鍙�+ /// </summary>
+ [JsonProperty("batch_no")]
+ public string BatchNo { get; set; }
/// <summary>
/// 鐗╂枡瑙勬牸
/// </summary>
[JsonProperty("spe")]
- public string Spe { get; set; }
+ public string Spec { get; set; }
/// <summary>
- /// 鎵规鍙�+ /// 瀹瑰櫒鍙� /// </summary>
-
- [JsonProperty("batch_no")]
- public string BatchNo { get; set; }
- /// <summary>
- /// 闇�嚭搴撴暟閲�- /// </summary>
- [JsonProperty("qty")]
- public int Qty { get; set; }
- /// <summary>
- /// 瀹瑰櫒绫诲瀷
- /// </summary>
-
- [JsonProperty("cntr_type")]
- public string CntrType { get; set; }
- /// <summary>
- /// 鍑哄簱缁堢偣璐у尯
- /// </summary>
-
- [JsonProperty("end_area")]
- public string EndArea { get; set; }
+ [JsonProperty("cnt_id")]
+ public string CntId { get; set; } // 瀹瑰櫒绫诲瀷 = 鎵樼洏
}
+ /// <summary>
+ /// 绌哄ソ杩愮涓婄嚎淇℃伅
+ /// </summary>
+ public class EmptyOnlineGoodpackInfo {
+ /// <summary>
+ /// 瀹瑰櫒鍙�+ /// </summary>
+ [JsonProperty("cnt_id")]
+ public string CntId { get; set; } // 瀹瑰櫒绫诲瀷 = 濂借繍绠�+ }
+
/// <summary>
/// 鎶芥-鍚堟牸鍥炲簱(PDA) 鏁版嵁绫� /// </summary>
@@ -344,21 +257,17 @@
public string CntrCode { get; set; }
}
+ /// <summary>
+ /// 涓嶅悎鏍肩Щ搴撴暟鎹被
+ /// </summary>
public class UnqualifiedShiftInfo : QualifiedBackInfo {
/// <summary>
- /// 涓嶅悎鏍肩Щ搴撶粓鐐瑰簱鍖�+ /// 涓嶅悎鏍肩Щ搴撶粓鐐瑰簱鍖猴紙蹇呴』鏄�CJYCQ 鎶芥寮傚父鍖猴級
/// </summary>
[JsonProperty("end_area")]
public string EndArea { get; set; }
}
- public class CheckShiftInfo : UnqualifiedShiftInfo {
- public bool Qualified { get; set; }
- }
-
- #endregion
-
- #region WMS 鏁版嵁
/// <summary>
/// 鎴愬搧鑳跺嚭搴�PDA)
/// </summary>
@@ -368,11 +277,6 @@
/// </summary>
[JsonProperty("item_code")]
public string ItemCode { get; set; }
- ///// <summary>
- ///// 鐗╂枡鍚嶇О
- ///// </summary>
- //[JsonProperty("item_name")]
- //public string ItemName { get; set; }
/// <summary>
/// 鐗╂枡瑙勬牸
/// </summary>
@@ -404,35 +308,6 @@
[JsonProperty("force_out")]
public bool ForcedOut { get; set; }
}
- /// <summary>
- /// 绉诲簱-鍒涘缓绉诲簱浠诲姟鏁版嵁绫�- /// </summary>
- public class CreateShiftOrderInfo {
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
-
- [JsonProperty("item_code")]
- public string ItemCode { get; set; }
- ///// <summary>
- ///// 鐗╂枡鍚嶇О
- ///// </summary>
- //
- //[JsonProperty("item_name")]
- //public string ItemName { get; set; }
- /// <summary>
- /// 鎵规鍙�- /// </summary>
-
- [JsonProperty("batch_no")]
- public string BatchNo { get; set; }
- /// <summary>
- /// 绉诲簱缁堢偣璐у尯
- /// </summary>
-
- [JsonProperty("end_area")]
- public string EndArea { get; set; }
- }
/// <summary>
/// 浣欐枡灏剧鍥炲簱(PDA)鏁版嵁绫�@@ -444,16 +319,24 @@
[JsonProperty("start_loc")]
public string StartLoc { get; set; }
}
- #endregion
/// <summary>
/// 鐗╂枡淇℃伅涓嬪彂鍚屾 鏁版嵁绫� /// </summary>
public class CgInfoSyncInfo {
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
[JsonProperty("itemName")]
public string ItemName { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
[JsonProperty("itemCode")]
public string ItemCode { get; set; }
+ /// <summary>
+ /// 鎵规鍙�+ /// </summary>
[JsonProperty("batchNo")]
public string BatchNo { get; set; }
@@ -531,11 +414,6 @@
/// </summary>
[JsonProperty("item_code")]
public string ItemCode { get; set; }
- ///// <summary>
- ///// 鐗╂枡鍚嶇О
- ///// </summary>
- //[JsonProperty("item_name")]
- //public string ItemName { get; set; }
/// <summary>
/// 鐗╂枡瑙勬牸
/// </summary>
diff --git a/api/DebugController.cs b/api/DebugController.cs
index 76e5b30..f443eef 100644
--- a/api/DebugController.cs
+++ b/api/DebugController.cs
@@ -64,6 +64,66 @@
}
/// <summary>
+ /// AGV鐘舵�涓�敭鍥炴姤134
+ /// </summary>
+ /// <param name="model">瀹瑰櫒鍙�/param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("AGVSeriesReports14")]
+ public ReturnResults AGVSeriesReports14(UpdateTaskState model) {
+ var agvTaskState = new AgvTaskState() {
+ task_no = model.TaskID,
+ forklift_no = model.ForkliftNo,
+ state = 1
+ };
+ ReturnResults returnResult = new ReturnResults();
+ returnResult.ResultList = new List<ReturnResult>();
+
+ var temp1 = WCSCore.OperateAgvTaskStatus(agvTaskState);
+ returnResult.ResultList.Add(temp1);
+
+ agvTaskState.state = 3;
+ var temp3 = WCSCore.OperateAgvTaskStatus(agvTaskState);
+ returnResult.ResultList.Add(temp3);
+
+ agvTaskState.state = 4;
+ var temp4 = WCSCore.OperateAgvTaskStatus(agvTaskState);
+ returnResult.ResultList.Add(temp4);
+
+ return returnResult;
+ }
+
+ /// <summary>
+ /// AGV鐘舵�涓�敭鍥炴姤562
+ /// </summary>
+ /// <param name="model">瀹瑰櫒鍙�/param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("AGVSeriesReports62")]
+ public ReturnResults AGVSeriesReports62(UpdateTaskState model) {
+ var agvTaskState = new AgvTaskState() {
+ task_no = model.TaskID,
+ forklift_no = model.ForkliftNo,
+ state = 5
+ };
+ ReturnResults returnResult = new ReturnResults();
+ returnResult.ResultList = new List<ReturnResult>();
+
+ var temp5 = WCSCore.OperateAgvTaskStatus(agvTaskState);
+ returnResult.ResultList.Add(temp5);
+
+ agvTaskState.state = 6;
+ var temp6 = WCSCore.OperateAgvTaskStatus(agvTaskState);
+ returnResult.ResultList.Add(temp6);
+
+ agvTaskState.state = 2;
+ var temp2 = WCSCore.OperateAgvTaskStatus(agvTaskState);
+ returnResult.ResultList.Add(temp2);
+
+ return returnResult;
+ }
+
+ /// <summary>
/// 鍒濆鍖栨暟鎹簱
/// </summary>
/// <returns></returns>
@@ -186,7 +246,6 @@
var db = new SqlHelper<object>().GetInstance();
try {
-
using (var tran = db.UseTran()) {
LogHelper.Info("LogCntrCg锛� + JsonConvert.SerializeObject(locCntrCg));
@@ -322,6 +381,11 @@
}
}
+ /// <summary>
+ /// DEBUG锛氭ā鎷熻緭閫佺嚎浜х嚎婊℃墭鐩樹笅绾挎祦绋�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
[HttpPost]
[Route("AddInboundTask")]
public string AddInboundTask(AddInboundTaskInfo model) {
@@ -397,8 +461,8 @@
var cntId = locCntrRel.S_CNTR_CODE;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (db.Insertable<TN_CG_Detail>(cgDetail).ExecuteCommand() <= 0) {
@@ -480,9 +544,21 @@
}
public class AddInboundTaskInfo {
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
public string ItemCode { get; set; }
+ /// <summary>
+ /// 鎵规鍙�+ /// </summary>
public string BatchNo { get; set; }
+ /// <summary>
+ /// 瀹瑰櫒缂栫爜
+ /// </summary>
public string CntrCode { get; set; }
+ /// <summary>
+ /// 璧峰璐т綅
+ /// </summary>
public string StartLoc { get; set; }
}
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 50fd5a9..c1bb5de 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -124,8 +124,8 @@
var cntId = locCntrRel.S_CNTR_CODE;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (db.Insertable<TN_CG_Detail>(cgDetail).ExecuteCommand() <= 0) {
@@ -294,8 +294,8 @@
var cntId = detail.S_CNTR_CODE;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_Outbound_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
@@ -451,8 +451,8 @@
var cntId = detail.S_CNTR_CODE;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_SpotCheck_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
@@ -575,8 +575,8 @@
var cntId = detail.S_CNTR_CODE;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_RelocationList_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index aafecbe..312a7a3 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -131,6 +131,7 @@
private static void RecordTaskTable(TN_Task task) {
var db = new SqlHelper<object>().GetInstance();
var info = "";
+
try {
var cgDetail = new TN_CG_Detail();
@@ -172,6 +173,7 @@
T_RECORD_TIME = DateTime.Now,
S_TYPE = task.S_TYPE,
S_BS_CODE = task.S_BS_TYPE,
+ N_QTY = cgDetail.N_ITEM_NUM,
};
if (db.Insertable<TN_Record_Table>(record).ExecuteCommand() <= 0) {
diff --git a/wms/LocationHelper.cs b/wms/LocationHelper.cs
index db9d569..9e86b9c 100644
--- a/wms/LocationHelper.cs
+++ b/wms/LocationHelper.cs
@@ -127,21 +127,34 @@
}
/// <summary>
- /// 鍏ュ簱閿佸畾缁堢偣锛屽嚭搴撻攣瀹氳捣鐐�- /// 浣犲垱寤轰换鍔￠攣瀹氳揣浣嶇殑鏃跺�锛屾妸閿佺殑鏉ユ簮灏辨槸浠诲姟鍙蜂篃鍐欎笂鍘伙紙鍔犻攣鐨勬柟娉曞姞涓弬鏁帮紝鍙┖鐨勫弬鏁帮級锛岃В閿佺殑鏃跺�鎶婃潵婧愮疆绌恒�
+ /// 璧风偣鍑哄簱閿� /// </summary>
/// <param name="loc"></param>
- /// <param name="lockState">1:鍏ュ簱閿併�2:鍑哄簱閿併�3:鍏跺畠閿�/param>
- /// <param name="lockSource">閿佺殑鏉ユ簮=浠诲姟鍙�/param>
+ /// <param name="lockSource"></param>
/// <returns></returns>
- public static bool LockLoc(ref TN_Location loc, int lockState, string lockSource = "") {
+ public static bool LockStartLoc(ref TN_Location loc, string lockSource = "") {
if (loc == null || loc.N_LOCK_STATE != 0) {
return false;
}
if (loc != null && loc.N_LOCK_STATE == 0) {
- loc.N_LOCK_STATE = lockState;
- loc.S_LOCK_STATE = TN_Location.GetLockStateStr(lockState);
+ loc.N_LOCK_STATE = 2; // 璧风偣鍑哄簱閿�+ loc.S_LOCK_STATE = TN_Location.GetLockStateStr(2); // 璧风偣鍑哄簱閿�+ loc.S_LOCK_OP = lockSource;
+ loc.T_MODIFY = System.DateTime.Now;
+ }
+
+ return true;
+ }
+
+ public static bool LockEndLoc(ref TN_Location loc, string lockSource = "") {
+ if (loc == null || loc.N_LOCK_STATE != 0) {
+ return false;
+ }
+
+ if (loc != null && loc.N_LOCK_STATE == 0) {
+ loc.N_LOCK_STATE = 1; // 缁堢偣鍑哄簱閿�+ loc.S_LOCK_STATE = TN_Location.GetLockStateStr(1); // 缁堢偣鍑哄簱閿� loc.S_LOCK_OP = lockSource;
loc.T_MODIFY = System.DateTime.Now;
}
@@ -159,7 +172,7 @@
/// <param name="lockState">1:鍏ュ簱閿併�2:鍑哄簱閿併�3:鍏跺畠閿�/param>
/// <param name="lockSource">閿佺殑鏉ユ簮=浠诲姟鍙�/param>
/// <returns></returns>
- public static bool LockLoc(string loc, int lockState, string lockSource = "")
+ private static bool LockLoc(string loc, int lockState, string lockSource = "")
{
var res = false;
var db = new SqlHelper<object>().GetInstance();
diff --git a/wms/SYSHelper.cs b/wms/SYSHelper.cs
index 8044904..d075833 100644
--- a/wms/SYSHelper.cs
+++ b/wms/SYSHelper.cs
@@ -27,38 +27,8 @@
sId.CN_T_LAST = DateTime.Now;
if (db.Ado.ExecuteCommand($"update OI_SYS_MAXID set CN_N_MAX={sId.CN_N_MAX}, CN_T_LAST='{sId.CN_T_LAST}' where CN_S_TYPE='{snType}' and CN_S_PRE='{prefix}' ") > 0) {
- //LogHelper.Info($"set cn_n_max {sId.CN_N_MAX}");
result = sId.CN_N_MAX;
}
-
- //if (db.Updateable<OI_SYS_MAXID>(sId).UpdateColumns(it => new { it.CN_N_MAX, it.CN_T_LAST}).ExecuteCommand() > 0) {
- // result = sId.CN_N_MAX;
- //}
-
- //if (db.Updateable<OI_SYS_MAXID>()
- // .SetColumns(it => it.CN_N_MAX == sId.CN_N_MAX && it.CN_T_LAST == sId.CN_T_LAST)
- // .Where(it => it.CN_S_TYPE == sId.CN_S_TYPE && it.CN_S_PRE == sId.CN_S_TYPE)
- // .ExecuteCommand() > 0) {
- // result = sId.CN_N_MAX;
- //}
-
- //var parameters = new[] {
- // new SugarParameter("@CN_N_MAX", sId.CN_N_MAX),
- // new SugarParameter("@CN_T_LAST", sId.CN_T_LAST),
- // new SugarParameter("@CN_S_TYPE", sId.CN_S_TYPE),
- // new SugarParameter("@CN_S_PRE", sId.CN_S_TYPE)
- //};
-
- //var sql = @"UPDATE OI_SYS_MAXID
- // SET CN_N_MAX = @CN_N_MAX, CN_T_LAST = @CN_T_LAST
- // WHERE CN_S_TYPE = @CN_S_TYPE AND CN_S_PRE = @CN_S_PRE";
-
- //if (db.Ado.ExecuteCommand(sql, parameters) > 0) {
- // result = sId.CN_N_MAX;
- // LogHelper.Info($"set cn_n_max {sId.CN_N_MAX}");
- //}
-
-
}
else {
//鎻掑叆琛�diff --git a/wms/WCSHelper.cs b/wms/WCSHelper.cs
index d341fde..bef1956 100644
--- a/wms/WCSHelper.cs
+++ b/wms/WCSHelper.cs
@@ -82,25 +82,6 @@
return TN_Task;
}
- public static TN_Task BuildTask(TN_Loc_Container locCntrRel, TN_Location endLoc, string cntId, string type) {
- var fromLoc = LocationHelper.GetLocation(locCntrRel.S_LOC_CODE);
-
- TN_Task TN_Task = new TN_Task() {
- S_CODE = GenerateTaskNo(),
- S_START_AREA = fromLoc.S_AREA_CODE,
- S_END_AREA = endLoc.S_AREA_CODE,
- S_START_LOC = fromLoc.S_CODE,
- S_END_LOC = endLoc.S_CODE,
- S_TYPE = type,
- N_PRIORITY = 3, // 鍒濆浼樺厛绾ч粯璁や负锛�
- N_SCHEDULE_TYPE = 3, // 鍥借嚜
- N_B_STATE = 0,
- S_CNTR_CODE = cntId,
- };
-
- return TN_Task;
- }
-
/// <summary>
/// 鍒涘缓鎼�浠诲姟
/// </summary>
--
Gitblit v1.9.1