From 3909fbf77ad4ebc0dde600ff82710d959f74b5f4 Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期四, 10 七月 2025 17:49:20 +0800
Subject: [PATCH] AGV会换车，删除库存操作改成收到4执行，去线边的货位自动解绑
---
api/ApiHelper.cs | 268 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 176 insertions(+), 92 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 4040d48..39fb574 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -161,15 +161,21 @@
cG_Detail.N_ITEM_STATE = 0;
cG_Detail.S_ITEM_STATE = "鍚堟牸";
endLoc = db.Queryable<TN_Location>().
- Where(o => o.S_AREA_CODE == Settings.Areas[1] && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃� && o.C_ENABLE == "Y" && o.N_CURRENT_NUM == 0).
+ Where(o => o.S_AREA_CODE == Settings.Areas[1]
+ && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃�
+ && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()
+ && o.C_ENABLE == "Y" && o.N_CURRENT_NUM == 0).
OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣� }
- else if (model.cgState == 4)//鎶�湳鍚堟牸鍥炲簱
+ else if (model.cgState == 4)//鎶�湳鍒ゅ畾鍥炲簱
{
cG_Detail.N_ITEM_STATE = 4;
- cG_Detail.S_ITEM_STATE = "鎶�湳鍚堟牸";
+ cG_Detail.S_ITEM_STATE = "鎶�湳鍒ゅ畾";
endLoc = db.Queryable<TN_Location>().
- Where(o => o.S_AREA_CODE == Settings.Areas[8] && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃� && o.C_ENABLE == "Y" && o.N_CURRENT_NUM == 0).
+ Where(o => o.S_AREA_CODE == Settings.Areas[8]
+ && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃�
+ && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()
+ && o.C_ENABLE == "Y" && o.N_CURRENT_NUM == 0).
OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣� }
else if (model.cgState == 2)//涓嶅悎鏍煎洖鐐�@@ -177,7 +183,10 @@
cG_Detail.N_ITEM_STATE = 2;
cG_Detail.S_ITEM_STATE = "涓嶅悎鏍�;
endLoc = db.Queryable<TN_Location>().
- Where(o => o.S_AREA_CODE == Settings.Areas[8] && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃� && o.C_ENABLE == "Y" && o.N_CURRENT_NUM == 0).
+ Where(o => o.S_AREA_CODE == Settings.Areas[8]
+ && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃�
+ && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()
+ && o.C_ENABLE == "Y" && o.N_CURRENT_NUM == 0).
OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣� }
else if (model.cgState == 5)//娣峰悎涔熷洖搴擄紝閫氳繃鐐瑰鐐瑰啀鍙戠嚎杈�@@ -185,13 +194,38 @@
cG_Detail.N_ITEM_STATE = 5;
cG_Detail.S_ITEM_STATE = "娣峰悎";
endLoc = db.Queryable<TN_Location>().
- Where(o => o.S_AREA_CODE == Settings.Areas[2] && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃� && o.C_ENABLE == "Y" && o.N_CURRENT_NUM == 0).
+ Where(o => o.S_AREA_CODE == Settings.Areas[2]
+ && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃�
+ && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()
+ && o.C_ENABLE == "Y" && o.N_CURRENT_NUM == 0).
+ OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣�+ }
+ else if (model.cgState == 6)//涓�骇鏂欎簩绾ф枡鍥炲簱
+ {
+ cG_Detail.N_ITEM_STATE = 6;
+ cG_Detail.S_ITEM_STATE = "涓�骇鏂�;
+ endLoc = db.Queryable<TN_Location>().
+ Where(o => o.S_AREA_CODE == Settings.Areas[2]
+ && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃�
+ && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()
+ && o.C_ENABLE == "Y" && o.N_CURRENT_NUM == 0).
+ OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣�+ }
+ else if (model.cgState == 7)//涓�骇鏂欎簩绾ф枡鍥炲簱
+ {
+ cG_Detail.N_ITEM_STATE = 7;
+ cG_Detail.S_ITEM_STATE = "浜岀骇鏂�;
+ endLoc = db.Queryable<TN_Location>().
+ Where(o => o.S_AREA_CODE == Settings.Areas[2]
+ && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃�
+ && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()
+ && o.C_ENABLE == "Y" && o.N_CURRENT_NUM == 0).
OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣� }
else
{
result.resultCode = 6;
- result.resultMsg = $"鐗╂枡鐘舵�鍙兘涓�銆�銆�銆�锛屽鏋滀负鍏朵粬鍊硷紝鍒欎笉澶勭悊锛�鍚堟牸锛�涓嶅悎鏍硷紝4鎶�湳鍚堟牸锛�娣峰悎";
+ result.resultMsg = $"鐗╂枡鐘舵�鍙兘涓�鍚堟牸1寰呮2涓嶅悎鏍硷紝涓嬬嚎鍗冲緟妫�紝3杩囨湡锛�鎶�湳鍒ゅ畾锛�娣峰悎锛�涓�骇鏂欍�7浜岀骇鏂欙紝濡傛灉涓哄叾浠栧�锛屽垯涓嶅鐞�;
LogHelper.Info(result.resultMsg);
return result;
}
@@ -207,14 +241,20 @@
var typeName = (model.cgState == 0) ? "浜哄伐澶嶆鍥炲簱" : "浜哄伐澶嶆鍥炵倝";
- //鍒涘缓浜哄伐鎷嗙洏鍑哄簱浠诲姟
+ //鍒涘缓浜哄伐澶嶆浠诲姟
if (WCSHelper.CreateTask(startLoc.S_CODE, endLoc.S_CODE, typeName, 3, locCnt.S_CNTR_CODE,out string taskNo,cG_Detail.S_SPE))//鍒涘缓鎼�浠诲姟锛岃捣鐐圭粓鐐瑰鍣� {
LocationHelper.LockLoc(startLoc.S_CODE, 2);//璧风偣鍑哄簱閿侊紝
LocationHelper.LockLoc(endLoc.S_CODE, 1);//缁堢偣鍏ュ簱閿� LogHelper.Info($"鐢熸垚{typeName}浠诲姟鎴愬姛锛屽鍣ㄥ彿{locCnt.S_CNTR_CODE}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐箋endLoc.S_CODE}");
- db.Updateable<TN_CG_Detail>().UpdateColumns(it => new { it.S_ITEM_STATE, it.N_ITEM_STATE }).ExecuteCommand();
+ if( db.Updateable<TN_CG_Detail>(cG_Detail).UpdateColumns(it => new { it.S_ITEM_STATE, it.N_ITEM_STATE }).ExecuteCommand() <= 0)
+ {
+ result.resultCode = 5;
+ result.resultMsg = $"鏇存柊瀹瑰櫒{locCnt.S_CNTR_CODE}鐨勮揣鍝佹槑缁嗗け璐�;
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
Task task99 = Task.Run(() =>
{
@@ -304,7 +344,13 @@
return result;
}
- var endLoc = db.Queryable<TN_Location>().First(o =>o.S_AREA_CODE == Settings.Areas[11] && o.N_CURRENT_NUM == 0 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃�);
+ var endLoc = db.Queryable<TN_Location>().
+ Where(o =>o.S_AREA_CODE == Settings.Areas[11]
+ && o.N_CURRENT_NUM == 0
+ && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃�
+ && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()
+ ).First();
+
if (endLoc == null)
{
result.resultCode = 2;
@@ -343,7 +389,7 @@
endLoc.N_LOCK_STATE = 1;
endLoc.S_LOCK_STATE = "鍏ュ簱閿�;
- startLoc.T_MODIFY = System.DateTime.Now;
+ endLoc.T_MODIFY = System.DateTime.Now;
using (var tran = db.Ado.UseTran())
{
@@ -466,7 +512,7 @@
var allCount = allCg.Count;
var waittime = SpecHelper.GetExportTime(model.Spe);
- var okCount = allCg.Count(o => o.N_ITEM_STATE == 0 && o.S_ITEM_STATE == "鍚堟牸" && o.T_MODIFY.AddMinutes(waittime) <= System.DateTime.Now);
+ var okCount = allCg.Count(o => o.N_ITEM_STATE == 0 && o.S_ITEM_STATE == "鍚堟牸" && o.T_MODIFY.AddHours(waittime) <= System.DateTime.Now);
return $"婊¤冻{model.Spe}瑙勬牸鐨勬�鎵樼洏鏁伴噺锛歿allCount}锛屽叾涓悎鏍间笖闈欑疆鏃堕棿宸茶繃鐨勬墭鐩樻暟閲忥細{okCount}";
}
catch (Exception ex)
@@ -638,6 +684,16 @@
LogHelper.Info("瑙﹀彂API锛歅DA婊℃墭涓嬬嚎鍏ュ簱" + JsonConvert.SerializeObject(model), "API");
try
{
+ if (model.RfId.Length < 16)
+ {
+ result.resultCode = 1;
+ result.resultMsg = $"杈撳叆鐨凴FID锛岄暱搴︿笉澶燂紝瑕佸ぇ浜�6浣�;
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
+
+ model.RfId = WMSHelper.ConvertHexToAscii(model.RfId.Substring(0,16));
+
//璇ヤ骇绾跨殑婊℃墭涓嬬嚎浣嶇疆锛岃捣鐐� var startPoint = Settings.ProductionLines.FirstOrDefault(a => a.PointOut == model.StartLoc);
if (startPoint != null)//璧风偣瀛樺湪
@@ -702,8 +758,12 @@
};
var endLoc = db.Queryable<TN_Location>().
- Where(c => c.S_AREA_CODE == Settings.Areas[1] && c.S_LOCK_STATE == "鏃� && c.N_LOCK_STATE == 0 && c.N_CURRENT_NUM == 0 && c.C_ENABLE == "Y").
- OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣嶏紝鐩存帴鍒ゆ柇褰撳墠鏁伴噺涓�鍗冲彲
+ Where(c => c.S_AREA_CODE == Settings.Areas[1]
+ && c.S_LOCK_STATE == "鏃� && c.N_LOCK_STATE == 0
+ && c.N_CURRENT_NUM == 0 && c.C_ENABLE == "Y"
+ && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == c.S_CODE).NotAny()//涓嶈兘鏈夎揣
+ ).
+ OrderBy(o => o.N_LAYER, OrderByType.Asc).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣嶏紝1灞傚厛鍏ュ簱
if (endLoc != null)
{
@@ -822,7 +882,7 @@
}
else
{
- result.resultCode = 9;
+ result.resultCode = 12;
result.resultMsg = $"姝や綅缃細{startPoint.PointOut}宸查攣浣�;
LogHelper.Info(result.resultMsg);
return result;
@@ -943,7 +1003,7 @@
return result;
}
- if (endLoc.N_CURRENT_NUM != 0)
+ if (endLoc.N_CURRENT_NUM != 0 || db.Queryable<TN_Loc_Container>().Any(b => b.S_LOC_CODE == model.EndLoc))//涓嶈兘鏈夎揣
{
result.resultCode = 5;
result.resultMsg = $"璇ョ粓鐐硅揣浣峽model.EndLoc}宸叉弧";
@@ -961,13 +1021,13 @@
var waitTime = SpecHelper.GetWaitTime(model.Spe);
- //浼樺厛鎶�湳鍚堟牸
+ //浼樺厛鎶�湳鍒ゅ畾
var startLoc = db.Queryable<TN_Location>().
LeftJoin<TN_Loc_Container>((o, i) => o.S_CODE == i.S_LOC_CODE).
LeftJoin<TN_CG_Detail>((o, i, s) => i.S_CNTR_CODE == s.S_CNTR_CODE).
Where((o, i, s) => o.N_CURRENT_NUM > 0 && o.S_AREA_CODE == Settings.Areas[1] && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃� && o.C_ENABLE == "Y"
&& (s.S_ITEM_SPEC == model.Spe || s.S_SPE == model.Spe)//鎸囧畾瑙勬牸
- && s.N_ITEM_STATE == 4 && s.S_ITEM_STATE == "鎶�湳鍚堟牸"). //鎶�湳鍚堟牸
+ && s.N_ITEM_STATE == 4 && s.S_ITEM_STATE == "鎶�湳鍒ゅ畾"). //鎶�湳鍒ゅ畾
First();//绛涢�鏈夊鍣ㄨ揣浣嶅叧绯昏〃淇℃伅锛岀瓫閫夋湁瀹瑰櫒璐у搧鏄庣粏琛ㄤ俊鎭�
if (startLoc == null)//鍏舵鍚堟牸
@@ -979,7 +1039,7 @@
Where((o, i, s) => o.N_CURRENT_NUM > 0 && o.S_AREA_CODE == Settings.Areas[1] && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃� && o.C_ENABLE == "Y"
&& (s.S_ITEM_SPEC == model.Spe || s.S_SPE == model.Spe)//鎸囧畾瑙勬牸
&& s.N_ITEM_STATE == 0 && s.S_ITEM_STATE == "鍚堟牸" //鍚堟牸鐨�- && s.T_MODIFY.AddMinutes(waitTime) <= System.DateTime.Now).//鏍规嵁瑙勬牸鐨勪笉鍚岄潤缃笉鍚屽垎閽熸墠鑳藉嚭搴�+ && i.T_CREATE.AddMinutes(waitTime) <= System.DateTime.Now).//鏍规嵁瑙勬牸鐨勪笉鍚岄潤缃笉鍚屽垎閽熸墠鑳藉嚭搴� OrderBy((o, i, s) => s.T_CREATE, OrderByType.Asc).//鍏堣繘鍏堝嚭
First();//绛涢�鏈夊鍣ㄨ揣浣嶅叧绯昏〃淇℃伅锛岀瓫閫夋湁瀹瑰櫒璐у搧鏄庣粏琛ㄤ俊鎭� }
@@ -1031,11 +1091,6 @@
SHIFT = model.shift,
};
SpecHelper.InsertComponentDetail(target);
- });
-
- Task task27 = Task.Run(() =>
- {
- SpecHelper.DeleteInventoryM(cgInfo.S_ID);
});
}
else
@@ -1238,7 +1293,9 @@
//鏌ヨ绗﹀悎鐨勬湭閿佸畾宸插惎鐢ㄦ寚瀹氳揣鍖虹殑璐т綅锛岀粓鐐� var endLoc = db.Queryable<TN_Location>().
- First(o => o.S_AREA_CODE == Settings.Areas[9] && o.S_CODE == weightPoint && o.C_ENABLE == "Y");//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣�+ First(o => o.S_AREA_CODE == Settings.Areas[9]
+ && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()
+ && o.S_CODE == weightPoint && o.C_ENABLE == "Y");//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣�
if (endLoc == null)
{
@@ -1450,7 +1507,7 @@
if (model.new_IsOK == model.old_IsOK)
{
result.resultCode = 19;
- result.resultMsg = $"浜哄伐鎷嗙洏鍏ュ簱锛岀墿鏂欓渶瑕佷竴涓悎鏍间竴涓笉鍚堟牸";
+ result.resultMsg = $"浜哄伐鎷嗙洏鍏ュ簱锛岀墿鏂欓渶瑕佷竴涓緟妫�竴涓笉鍚堟牸";
LogHelper.Info(result.resultMsg);
return result;
}
@@ -1493,7 +1550,6 @@
var startLoc_New = db.Queryable<TN_Location>().
First(b => b.S_CODE == model.new_StartLoc && b.N_CURRENT_NUM == 0 && b.S_AREA_CODE == Settings.Areas[5] && b.N_LOCK_STATE == 0 && b.S_LOCK_STATE == "鏃�);
-
if (startLoc_New == null)
{
@@ -1565,15 +1621,19 @@
}
var endLoc_Ok = db.Queryable<TN_Location>().
- First(o => o.S_AREA_CODE == Settings.Areas[9] && o.S_CODE == weightPoint);//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣嶏紝鍘荤О閲�+ First(o => o.S_AREA_CODE == Settings.Areas[9]
+ && o.S_CODE == weightPoint);//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣嶏紝鍘荤О閲�
var endLoc_NG = db.Queryable<TN_Location>().
- First(o => o.S_AREA_CODE == Settings.Areas[8] && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃� && o.N_CURRENT_NUM == 0);//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣�+ Where(o => o.S_AREA_CODE == Settings.Areas[8]
+ && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃�
+ && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()//涓嶈兘鏈夎揣
+ && o.N_CURRENT_NUM == 0).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣�
if (endLoc_Ok == null)
{
result.resultCode = 10;
- result.resultMsg = $"鍚堟牸鐨勭墿鏂欐湭鎵惧埌鍚堥�鐨勭О閲嶇粓鐐硅揣浣峽weightPoint}";
+ result.resultMsg = $"寰呮鐨勭墿鏂欐湭鎵惧埌鍚堥�鐨勭О閲嶇粓鐐硅揣浣峽weightPoint}";
LogHelper.Info(result.resultMsg);
return result;
}
@@ -1581,7 +1641,7 @@
if (endLoc_NG == null)
{
result.resultCode = 16;
- result.resultMsg = $"涓嶅悎鏍肩殑鐗╂枡鏈壘鍒板悎閫傜殑鍥炵倝鍖虹粓鐐硅揣浣峽Settings.Areas[8]}";
+ result.resultMsg = $"涓嶅悎鏍肩殑鐗╂枡鏈壘鍒板悎閫傜殑鎷嗙洏涓嶅悎鏍煎尯缁堢偣璐т綅{Settings.Areas[8]}";
LogHelper.Info(result.resultMsg);
return result;
}
@@ -1599,7 +1659,7 @@
fromArea = startLoc_New.S_AREA_CODE,
to = (model.new_IsOK == 2) ? endLoc_NG.S_CODE : endLoc_Ok.S_CODE,
toArea = (model.new_IsOK == 2) ? endLoc_NG.S_AREA_CODE : endLoc_Ok.S_AREA_CODE,
- taskType = (model.new_IsOK == 2) ? "浜哄伐鎷嗙洏鍥炵倝" : "浜哄伐鎷嗙洏鍥炲簱",
+ taskType = (model.new_IsOK == 2) ? "浜哄伐鎷嗙洏鍥炰笉鍚堟牸鍖� : "浜哄伐鎷嗙洏鍥炲簱",
pri = 3,
cntrInfo = model.new_CntIds,
spec = cG_new_Detail_Ins.S_SPE,
@@ -1614,7 +1674,7 @@
fromArea = startLoc_Old.S_AREA_CODE,
to = (model.old_IsOK == 2) ? endLoc_NG.S_CODE : endLoc_Ok.S_CODE,
toArea = (model.old_IsOK == 2) ? endLoc_NG.S_AREA_CODE : endLoc_Ok.S_AREA_CODE,
- taskType = (model.old_IsOK == 2) ? "浜哄伐鎷嗙洏鍥炵倝" : "浜哄伐鎷嗙洏鍥炲簱",
+ taskType = (model.old_IsOK == 2) ? "浜哄伐鎷嗙洏鍥炰笉鍚堟牸鍖� : "浜哄伐鎷嗙洏鍥炲簱",
pri = 3,
cntrInfo = model.old_CntId,
spec = cG_old_Detail.S_SPE,
@@ -1785,88 +1845,112 @@
{
var startLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.startLoc);
- if(!(startLoc != null && startLoc.N_CURRENT_NUM > 0 && startLoc.N_LOCK_STATE == 0 && startLoc.S_LOCK_STATE == "鏃�))
+ if(!(startLoc != null && startLoc.N_LOCK_STATE == 0 && startLoc.S_LOCK_STATE == "鏃�))
{
result.resultCode = 1;
- result.resultMsg = $"璧峰浣嶇疆{model.startLoc}涓嶆弧瓒虫潯浠讹細startLoc != null && startLoc.N_CURRENT_NUM > 0 && startLoc.N_LOCK_STATE == 0 && startLoc.S_LOCK_STATE == 鏃�;
+ result.resultMsg = $"璧峰浣嶇疆{model.startLoc}涓嶆弧瓒虫潯浠讹細startLoc != null && startLoc.N_LOCK_STATE == 0 && startLoc.S_LOCK_STATE == 鏃�;
LogHelper.Info(result.resultMsg);
return result;
}
var endLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.endLoc);
- if (!(endLoc != null && endLoc.N_CURRENT_NUM == 0 && endLoc.N_LOCK_STATE == 0 && endLoc.S_LOCK_STATE == "鏃�))
+ if (!(endLoc != null && endLoc.N_CURRENT_NUM == 0 && endLoc.N_LOCK_STATE == 0 && endLoc.S_LOCK_STATE == "鏃�) || db.Queryable<TN_Loc_Container>().Any(a=>a.S_LOC_CODE == endLoc.S_CODE))
{
result.resultCode = 2;
- result.resultMsg = $"缁堢偣浣嶇疆{model.endLoc}涓嶆弧瓒虫潯浠讹細endLoc != null && endLoc.N_CURRENT_NUM == 0 && endLoc.N_LOCK_STATE == 0 && endLoc.S_LOCK_STATE == 鏃�;
+ result.resultMsg = $"缁堢偣浣嶇疆{model.endLoc}宸查攣浣忔垨宸叉弧";
LogHelper.Info(result.resultMsg);
return result;
}
-
var startLocCnt = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == model.startLoc);
- if (startLocCnt == null)
+ var tn_Task = new TN_Task()
{
- startLocCnt = new TN_Loc_Container()
- {
- S_LOC_CODE = model.startLoc,
- S_CNTR_CODE = Guid.NewGuid().ToString("D"),
- };
- db.Insertable<TN_Loc_Container>(startLocCnt).ExecuteCommand();
- }
+ S_CODE = WCSHelper.GenerateTaskNo(),
+ S_START_AREA = startLoc.S_AREA_CODE,
+ S_END_AREA = endLoc.S_AREA_CODE,
+ S_START_LOC = startLoc.S_CODE,
+ S_END_LOC = endLoc.S_CODE,
+ S_TYPE = "鐐瑰鐐�,
+ N_PRIORITY = model.priority,
+ N_SCHEDULE_TYPE = 1,
+ N_B_STATE = 0
+ };
+ startLoc.N_LOCK_STATE = 2;
+ startLoc.S_LOCK_STATE = "鍑哄簱閿�;
+ startLoc.N_CURRENT_NUM = 1;
- //鍒涘缓鐐瑰鐐逛换鍔�- if (WCSHelper.CreateTask(startLoc.S_CODE, endLoc.S_CODE, "鐐瑰鐐�, 3, startLocCnt.S_CNTR_CODE))//鍒涘缓鎼�浠诲姟锛岃捣鐐圭粓鐐瑰鍣�+ endLoc.N_LOCK_STATE = 1;
+ endLoc.S_LOCK_STATE = "鍏ュ簱閿�;
+
+
+ using (var tran = db.Ado.UseTran())
{
- LocationHelper.LockLoc(startLoc.S_CODE, 2);//璧风偣鍑哄簱閿侊紝
- LocationHelper.LockLoc(endLoc.S_CODE, 1);//缁堢偣鍏ュ簱閿�- LogHelper.Info($"鐢熸垚鐐瑰鐐逛换鍔℃垚鍔燂紝瀹瑰櫒鍙穥startLocCnt.S_CNTR_CODE}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐箋endLoc.S_CODE}");
-
- Task task1 = Task.Run(() =>
+ if (startLocCnt == null)
{
- WMSHelper.InsertOpInfo(model.staff, "鐐瑰鐐�, startLocCnt.S_CNTR_CODE);
- });
-
- var cginfo = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == startLocCnt.S_CNTR_CODE);
- Task task27 = Task.Run(() =>
- {
- if (endLoc.S_AREA_CODE == Settings.Areas[2] && cginfo != null)
+ startLocCnt = new TN_Loc_Container()
{
- var target = new TN_InventoryM()
+ S_LOC_CODE = model.startLoc,
+ S_CNTR_CODE = Guid.NewGuid().ToString("D"),
+ };
+ if (db.Insertable<TN_Loc_Container>(startLocCnt).ExecuteCommand() <= 0)
+ {
+ tran.RollbackTran();
+ result.resultCode = 3;
+ result.resultMsg = $"鎻掑叆TN_Loc_Container琛ㄥけ璐ワ紝璐т綅锛歿model.startLoc}";
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
+ }
+
+ tn_Task.S_CNTR_CODE = startLocCnt.S_CNTR_CODE;
+
+ if (db.Insertable<TN_Task>(tn_Task).ExecuteCommand() > 0 &&
+ db.Updateable<TN_Location>(startLoc).ExecuteCommand() > 0 &&
+ db.Updateable<TN_Location>(endLoc).ExecuteCommand() > 0
+ ){
+ LogHelper.Info($"鐢熸垚鐐瑰鐐逛换鍔℃垚鍔燂紝瀹瑰櫒鍙穥startLocCnt.S_CNTR_CODE}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐箋endLoc.S_CODE}");
+
+ Task task1 = Task.Run(() =>
+ {
+ WMSHelper.InsertOpInfo(model.staff, "鐐瑰鐐�, startLocCnt.S_CNTR_CODE);
+ });
+
+ var cginfo = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == startLocCnt.S_CNTR_CODE);
+ Task task27 = Task.Run(() =>
+ {
+ if (endLoc.S_AREA_CODE == Settings.Areas[1] && cginfo != null) //鎻掑叆WMS搴撳瓨鏄庣粏
{
- S_ID = cginfo.S_ID,
- RFID = cginfo.S_CNTR_CODE,
- SPEC = cginfo.S_SPE,
- WEIGHT = cginfo.F_QTY,
- ITEMSTATE = cginfo.S_ITEM_STATE,
- ITEMCODE = cginfo.S_ITEM_CODE,
- LOGINNAME = model.staff,
- SHIFT = model.shift,
- };
- SpecHelper.InsertInventoryM(target);
- }
- });
- Task task26 = Task.Run(() =>
+ var target = new TN_InventoryM()
+ {
+ S_ID = cginfo.S_ID,
+ RFID = cginfo.S_CNTR_CODE,
+ SPEC = cginfo.S_SPE,
+ WEIGHT = cginfo.F_QTY,
+ ITEMSTATE = cginfo.S_ITEM_STATE,
+ ITEMCODE = cginfo.S_ITEM_CODE,
+ LOGINNAME = model.staff,
+ SHIFT = model.shift,
+ };
+ SpecHelper.InsertInventoryM(target);
+ }
+ });
+
+ tran.CommitTran();
+ result.resultCode = 0;
+ result.resultMsg = "鎴愬姛";
+ LogHelper.Info($"鐢熸垚鐐瑰鐐瑰け璐ワ紝瀹瑰櫒鍙穥 startLocCnt.S_CNTR_CODE}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐箋endLoc.S_CODE}");
+ return result;
+ }
+ else
{
- if (startLoc.S_AREA_CODE == Settings.Areas[2] && cginfo != null)
- {
- SpecHelper.DeleteInventoryM(cginfo.S_ID);
- }
- });
-
- result.resultCode = 0;
- result.resultMsg = "鎴愬姛";
- LogHelper.Info($"鐢熸垚鐐瑰鐐瑰け璐ワ紝瀹瑰櫒鍙穥 startLocCnt.S_CNTR_CODE}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐箋endLoc.S_CODE}");
- return result;
+ tran.RollbackTran();
+ result.resultCode = 9;
+ result.resultMsg = $"鐢熸垚鐐瑰鐐瑰け璐ワ紝瀹瑰櫒鍙穥 startLocCnt.S_CNTR_CODE}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐箋endLoc.S_CODE}";
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
}
- else
- {
- result.resultCode = 9;
- result.resultMsg = $"鐢熸垚鐐瑰鐐瑰け璐ワ紝瀹瑰櫒鍙穥 startLocCnt.S_CNTR_CODE}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐箋endLoc.S_CODE}";
- LogHelper.Info(result.resultMsg);
- return result;
- }
-
}
catch (Exception ex)
{
--
Gitblit v1.9.1