From c21c4880ccb8fd06c1647d3a84d330c42ebf9ee5 Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期一, 28 七月 2025 10:25:09 +0800
Subject: [PATCH] 删除人工次品回炉PDA功能
---
api/ApiHelper.cs | 556 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 325 insertions(+), 231 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index ff81f44..b12c74c 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -123,10 +123,12 @@
internal static SimpleResult PDAFullCheckIn(PDAFullCheckInfo model)
{
LogHelper.Info("瑙﹀彂API锛歅DA婊℃墭澶嶆鍒ゆ柇" + JsonConvert.SerializeObject(model), "API");
- var db = new SqlHelper<object>().GetInstance();
+
var result = new SimpleResult();//杩斿洖缁撴灉
try
{
+ var db = new SqlHelper<object>().GetInstance();
+
var locCnt = db.Queryable<TN_Loc_Container>().First(a => a.S_CNTR_CODE == model.rfId);
if (locCnt == null)
{
@@ -167,10 +169,10 @@
&& 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 == "鏃�
@@ -200,10 +202,10 @@
&& o.C_ENABLE == "Y" && o.N_CURRENT_NUM == 0).
OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣� }
- else if (model.cgState == 6)//涓�骇鏂欎簩绾ф枡鍥炲簱
+ else if (model.cgState == 6)//E绾ф枡浜岀骇鏂欏洖搴� {
cG_Detail.N_ITEM_STATE = 6;
- cG_Detail.S_ITEM_STATE = "涓�骇鏂�;
+ cG_Detail.S_ITEM_STATE = "E绾ф枡";
endLoc = db.Queryable<TN_Location>().
Where(o => o.S_AREA_CODE == Settings.Areas[2]
&& o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃�
@@ -211,7 +213,7 @@
&& o.C_ENABLE == "Y" && o.N_CURRENT_NUM == 0).
OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣� }
- else if (model.cgState == 7)//涓�骇鏂欎簩绾ф枡鍥炲簱
+ else if (model.cgState == 7)//E绾ф枡浜岀骇鏂欏洖搴� {
cG_Detail.N_ITEM_STATE = 7;
cG_Detail.S_ITEM_STATE = "浜岀骇鏂�;
@@ -225,7 +227,7 @@
else
{
result.resultCode = 6;
- result.resultMsg = $"鐗╂枡鐘舵�鍙兘涓�鍚堟牸1寰呮2涓嶅悎鏍硷紝涓嬬嚎鍗冲緟妫�紝3杩囨湡锛�鎶�湳鍚堟牸锛�娣峰悎锛�涓�骇鏂欍�7浜岀骇鏂欙紝濡傛灉涓哄叾浠栧�锛屽垯涓嶅鐞�;
+ result.resultMsg = $"鐗╂枡鐘舵�鍙兘涓�鍚堟牸1寰呮2涓嶅悎鏍硷紝涓嬬嚎鍗冲緟妫�紝3杩囨湡锛�鎶�湳鍒ゅ畾锛�娣峰悎锛�E绾ф枡銆�浜岀骇鏂欙紝濡傛灉涓哄叾浠栧�锛屽垯涓嶅鐞�;
LogHelper.Info(result.resultMsg);
return result;
}
@@ -241,7 +243,7 @@
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);//璧风偣鍑哄簱閿侊紝
@@ -296,6 +298,7 @@
ITEMCODE = cG_Detail.S_ITEM_CODE,
LOGINNAME = model.staff,
SHIFT = model.shift,
+ STARTLOC = startLoc.S_CODE,
};
SpecHelper.InsertInventoryM(target);
}
@@ -323,170 +326,308 @@
}
/// <summary>
- /// 浜哄伐娆″搧鍥炵倝
+ /// 绾胯竟绌烘墭鍒扮┖鎵樺爢鍙犲尯
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- internal static SimpleResult PDAReturnReset(PDAReturnResetInfo model)
+ internal static SimpleResult EmptyLineToEmptyMax(EmptyLineToEmptyMaxInfo model)
{
- LogHelper.Info("瑙﹀彂API锛氫汉宸ユ鍝佸洖鐐� + JsonConvert.SerializeObject(model), "API");
- var db = new SqlHelper<object>().GetInstance();
+ LogHelper.Info("瑙﹀彂API锛氱嚎杈圭┖鎵樺埌绌烘墭鍫嗗彔鍖� + JsonConvert.SerializeObject(model), "API");
var result = new SimpleResult();//杩斿洖缁撴灉
-
try
{
- var startLoc = db.Queryable<TN_Location>().First(o => o.S_CODE == model.startLoc && o.N_CURRENT_NUM ==0 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE=="鏃� && o.S_AREA_CODE == Settings.Areas[4]);
- if (startLoc == null)
+ var db = new SqlHelper<object>().GetInstance();
+
+ if (model.cntCount<=0)
{
result.resultCode = 1;
- result.resultMsg = $"鏈壘鍒板悎閫傜殑璧风偣淇℃伅锛岃姹傦細o.S_CODE == { model.startLoc} && o.N_CURRENT_NUM ==0 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == 鏃�&& o.S_AREA_CODE == {Settings.Areas[4]}";
+ result.resultMsg = $"鍙傛暟cntCount蹇呴』澶т簬0锛屽嵆鏈�皯瑕佹湁涓�釜绌烘墭";
LogHelper.Info(result.resultMsg);
return result;
}
- 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();
+ var startLoc = db.Queryable<TN_Location>().First(it => it.S_CODE == model.startLoc);
- if (endLoc == null)
+ if (startLoc == null)
{
result.resultCode = 2;
- result.resultMsg = $"鏈壘鍒板悎閫傜殑缁堢偣淇℃伅锛岃姹傦細o.S_AREA_CODE == {Settings.Areas[11]} && o.N_CURRENT_NUM == 0 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == 鏃�;
+ result.resultMsg = $"鏈壘鍒拌璧风偣{model.startLoc}";
LogHelper.Info(result.resultMsg);
return result;
}
- var cgInfo = db.Queryable<TN_CG_Detail>().First(a=>a.S_CNTR_CODE == model.rfId);
- if (cgInfo == null)
+ var settingArea = Settings.Areas[13];
+ if (startLoc.S_AREA_CODE != settingArea)
{
result.resultCode = 3;
- result.resultMsg = $"鏈壘鍒板搴旂殑鐗╂枡淇℃伅锛岃姹傦細a.S_CNTR_CODE == {model.rfId}";
+ result.resultMsg = $"璇ヨ捣鐐箋model.startLoc}蹇呴』鍦ㄦ搴撳尯鍐厈settingArea}";
LogHelper.Info(result.resultMsg);
return result;
}
- var task1 = new TN_Task()
+ if (startLoc.N_LOCK_STATE != 0 || startLoc.S_LOCK_STATE != "鏃�)
{
- 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_B_STATE = 0,
- S_B_STATE = "绛夊緟",
- S_CNTR_CODE = model.rfId,
- S_SPEC = cgInfo.S_ITEM_SPEC,
- };
+ result.resultCode = 4;
+ result.resultMsg = $"璇ヨ捣鐐箋model.startLoc}宸查攣瀹氾紝浠诲姟姝ｅ湪鎼�";
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
- startLoc.N_LOCK_STATE = 2;
- startLoc.S_LOCK_STATE = "鍑哄簱閿�;
- startLoc.N_CURRENT_NUM = 1;
- startLoc.T_MODIFY = System.DateTime.Now;
+ //鏌ヨ绗﹀悎鐨勬湭閿佸畾宸插惎鐢ㄦ寚瀹氳揣鍖虹殑褰撳墠鏁伴噺鍚堣鍚庢渶鎺ヨ繎瀹归噺鐨勮揣浣嶏紝缁堢偣
+ var endLoc = db.Queryable<TN_Location>().
+ Where(a => a.N_CURRENT_NUM + model.cntCount <= a.N_CAPACITY && a.S_AREA_CODE == Settings.Areas[3] && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y").
+ ToList().OrderByDescending(a => a.N_CURRENT_NUM + model.cntCount - a.N_CAPACITY).ThenBy(a => a.N_ROW).ThenBy(a => a.N_COL).ToList().First();
- endLoc.N_LOCK_STATE = 1;
- endLoc.S_LOCK_STATE = "鍏ュ簱閿�;
- endLoc.T_MODIFY = System.DateTime.Now;
-
- using (var tran = db.Ado.UseTran())
+ using (var trans = db.Ado.UseTran())
{
- var locCnt = db.Queryable<TN_Loc_Container>().First(o => o.S_CNTR_CODE == model.rfId && o.S_LOC_CODE != model.startLoc);
- TN_Location locOld = null;
- if (locCnt != null)
- {
- locOld = db.Queryable<TN_Location>().First(o => o.S_CODE == locCnt.S_LOC_CODE);
- if (locOld != null)
- {
- locOld.N_CURRENT_NUM = 0;
- if (db.Updateable<TN_Location>(locOld).UpdateColumns(it => new { it.N_CURRENT_NUM }).ExecuteCommand() <= 0)
- {
- tran.RollbackTran();
- result.resultCode = 4;
- result.resultMsg = $"鏇存柊鏃ц揣浣嶅け璐ワ紝{locOld.S_CODE}";
- LogHelper.Info(result.resultMsg);
- return result;
- }
- }
+ startLoc.N_CURRENT_NUM = model.cntCount;
+ startLoc.N_LOCK_STATE = 2;
+ startLoc.S_LOCK_STATE = "鍑哄簱閿�;
- locCnt.S_LOC_CODE = model.startLoc;
- if (db.Updateable<TN_Loc_Container>(locCnt).UpdateColumns(it => new { it.S_LOC_CODE }).ExecuteCommand() <= 0)
- {
- tran.RollbackTran();
- result.resultCode = 5;
- result.resultMsg = $"鏇存柊璐т綅瀹瑰櫒鍏崇郴琛紙鎹㈢粦锛夊け璐ワ紝{model.startLoc}";
- LogHelper.Info(result.resultMsg);
- return result;
- }
- }
- else
+ endLoc.N_LOCK_STATE = 1;
+ endLoc.S_LOCK_STATE = "鍏ュ簱閿�;
+
+ var locCntList = new List<TN_Loc_Container>();
+ string cntStr = "";
+ for (int i = 0; i < model.cntCount; i++)
{
- locCnt = new TN_Loc_Container()
+ var locCnt = new TN_Loc_Container()
{
- S_LOC_CODE = model.startLoc,
- S_CNTR_CODE = model.rfId,
+ S_LOC_CODE = startLoc.S_CODE,
+ S_CNTR_CODE = Guid.NewGuid().ToString("D"),
};
- if (db.Insertable<TN_Loc_Container>(locCnt).ExecuteCommand() <= 0)
- {
- tran.RollbackTran();
- result.resultCode = 6;
- result.resultMsg = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴琛紙缁戝畾锛夊け璐ワ紝{model.startLoc}";
- LogHelper.Info(result.resultMsg);
- return result;
- }
+ cntStr += locCnt.S_CNTR_CODE + ",";
+
+ locCntList.Add(locCnt);
}
+ cntStr= cntStr.Trim(',');
+
- if (db.Insertable<TN_Task>(task1).ExecuteCommand() > 0 &&
- db.Updateable<TN_Location>(startLoc).ExecuteCommand() > 0 &&
- db.Updateable<TN_Location>(endLoc).ExecuteCommand() > 0)
+ var task = new TN_Task()
{
+ 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 = 3,
+ N_SCHEDULE_TYPE = 1,
+ N_B_STATE = 0,
+ S_B_STATE = "绛夊緟",
+ S_CNTR_CODE = cntStr,
+ };
- Task task99 = Task.Run(() =>
+ if (
+ db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { it.N_CURRENT_NUM, it.N_LOCK_STATE, it.S_LOCK_STATE }).ExecuteCommand() == 1 &&
+ db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE }).ExecuteCommand() == 1 &&
+ db.Insertable<TN_Loc_Container>(locCntList).ExecuteCommand() == locCntList.Count &&
+ db.Insertable<TN_Task>(task).ExecuteCommand() == 1
+ )
+ {
+ Task task1 = Task.Run(() =>
{
- WMSHelper.InsertOpInfo(model.staff, "浜哄伐娆″搧鍥炵倝", locCnt.S_CNTR_CODE);
+ WMSHelper.InsertOpInfo(model.staff, "鐐瑰鐐�, cntStr);
});
- Task task2 = Task.Run(() =>
- {
- var target = new TN_RemeltDetail()
- {
- TASKNO = task1.S_CODE,
- CNTCODE = model.rfId,
- STARTLOC = model.startLoc,
- LOGINNAME = model.staff,
- ITEMCODE = cgInfo.S_ITEM_CODE,
- SPEC = cgInfo.S_SPE,
- CARCODE = cgInfo.S_CAR_CODE,
- WEIGHT = cgInfo.F_QTY,
- REMELTTIME = DateTime.Now,
- SHIFT = model.shift,
- };
- SpecHelper.InsertRemeltDetail(target);
- });
-
- tran.CommitTran();
+ trans.CommitTran();
result.resultCode = 0;
- result.resultMsg = "鎴愬姛";
- LogHelper.Info($"鐢熸垚浜哄伐娆″搧鍥炵倝浠诲姟鎴愬姛锛屽鍣細{model.rfId}锛岃捣鐐癸細{model.startLoc}锛岀粓鐐癸細{endLoc.S_CODE}");
+ result.resultMsg = $"鍒涘缓 绌烘墭涓嬬嚎鍫嗗彔 浠诲姟鎴愬姛锛岃捣鐐癸細{startLoc.S_CODE}锛岀粓鐐癸細{endLoc.S_CODE}";
+ LogHelper.Info(result.resultMsg);
return result;
}
else
{
- tran.RollbackTran();
- result.resultCode = 7;
- result.resultMsg = $"鐢熸垚浜哄伐娆″搧鍥炵倝浠诲姟澶辫触锛屽鍣細{model.rfId}锛岃捣鐐癸細{model.startLoc}锛岀粓鐐癸細{endLoc.S_CODE}";
+ trans.RollbackTran();
+ result.resultCode = 12;
+ result.resultMsg = $"鍒涘缓 绌烘墭涓嬬嚎鍫嗗彔 浠诲姟澶辫触锛岃捣鐐癸細{startLoc.S_CODE}锛岀粓鐐癸細{endLoc.S_CODE}";
LogHelper.Info(result.resultMsg);
return result;
}
}
+ }
+ catch (Exception ex)
+ {
+ result.resultCode = -1;
+ result.resultMsg = $"PDA婊℃墭澶嶆鍒ゆ柇锛屽彂鐢熶簡寮傚父锛歿ex.Message}";
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
+ }
+ /// <summary>
+ /// 绾胯竟绌烘墭鍒板師鏉愭枡杈撻�绾�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ internal static SimpleResult EmptyLineToLine(EmptyLineToLineInfo model)
+ {
+ LogHelper.Info("瑙﹀彂API锛氱嚎杈圭┖鎵樺埌鍘熸潗鏂欒緭閫佺嚎" + JsonConvert.SerializeObject(model), "API");
+ var result = new SimpleResult();//杩斿洖缁撴灉
+ try
+ {
+ var db = new SqlHelper<object>().GetInstance();
+
+ var startLoc = db.Queryable<TN_Location>().First(o => o.S_CODE == model.startLoc);
+ if (startLoc == null)
+ {
+ result.resultCode = 1;
+ result.resultMsg = $"鏁版嵁搴撲腑鏈壘鍒版璐т綅锛歿model.startLoc}";
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
+ if (startLoc.N_CURRENT_NUM == 1 || db.Queryable<TN_Loc_Container>().Any(a=>a.S_LOC_CODE==model.startLoc))
+ {
+ result.resultCode = 2;
+ result.resultMsg = $"姝よ揣浣嶏細{model.startLoc}锛屽凡缁戝畾鎵樼洏";
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
+ if (startLoc.N_LOCK_STATE != 0 || startLoc.S_LOCK_STATE != "鏃�)
+ {
+ result.resultCode = 3;
+ result.resultMsg = $"姝よ揣浣嶏細{model.startLoc}锛屽凡涓婇攣";
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
+ if (startLoc.C_ENABLE != "Y")
+ {
+ result.resultCode = 4;
+ result.resultMsg = $"姝よ揣浣嶏細{model.startLoc}锛屾湭鍚敤";
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
+ var startLocArea = Settings.Areas[13];
+ if (startLoc.S_AREA_CODE != startLocArea)
+ {
+ result.resultCode = 5;
+ result.resultMsg = $"姝よ揣浣嶏細{model.startLoc}锛屼笉灞炰簬绾胯竟绌烘墭鍖簕startLocArea}";
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
+
+
+ var endLocIndex = Settings.LineSorting;
+ var endLocLine = Settings.ProductionLines.FirstOrDefault(a => a.Sorting == endLocIndex);
+ if (endLocLine == null)
+ {
+ result.resultCode = 6;
+ result.resultMsg = $"閰嶇疆鏂囦欢涓湭鎵惧埌搴忓彿涓猴細{endLocIndex}鐨勫師鏉愭枡浜х嚎鐨勪俊鎭�;
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
+ var endLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == endLocLine.PointIn);
+ if (endLoc == null)
+ {
+ result.resultCode = 7;
+ result.resultMsg = $"鏁版嵁搴撲腑鏈壘鍒板師鏉愭枡浜х嚎绌烘墭涓婄嚎鍙ｏ細{endLocLine.PointIn}";
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
+ var endLocArea = Settings.Areas[14];
+ if (endLoc.S_AREA_CODE != endLocArea)
+ {
+ result.resultCode = 8;
+ result.resultMsg = $"姝よ揣浣嶏細{endLoc.S_CODE}锛屼笉灞炰簬鍘熸潗鏂欎骇绾跨┖鎵樹笂绾垮彛搴撳尯{endLocArea}";
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
+ if (endLoc.N_CURRENT_NUM == 1 || db.Queryable<TN_Loc_Container>().Any(a => a.S_LOC_CODE == endLocLine.PointIn))
+ {
+ result.resultCode = 9;
+ result.resultMsg = $"姝よ揣浣嶏細{model.startLoc}锛屽凡缁戝畾鎵樼洏";
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
+ if (endLoc.N_LOCK_STATE != 0 || endLoc.S_LOCK_STATE != "鏃�)
+ {
+ result.resultCode = 10;
+ result.resultMsg = $"姝よ揣浣嶏細{model.startLoc}锛屽凡涓婇攣";
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
+ if (endLoc.C_ENABLE != "Y")
+ {
+ result.resultCode = 11;
+ result.resultMsg = $"姝よ揣浣嶏細{model.startLoc}锛屾湭鍚敤";
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
+ var Cnt = Guid.NewGuid().ToString("D");
+
+
+ using (var trans = db.Ado.UseTran())
+ {
+ startLoc.N_CURRENT_NUM = 1;
+ startLoc.N_LOCK_STATE = 2;
+ startLoc.S_LOCK_STATE = "鍑哄簱閿�;
+
+ endLoc.N_LOCK_STATE = 1;
+ endLoc.S_LOCK_STATE = "鍏ュ簱閿�;
+
+ var locCnt = new TN_Loc_Container()
+ {
+ S_LOC_CODE = startLoc.S_CODE,
+ S_CNTR_CODE = Cnt,
+ };
+
+ var task = new TN_Task()
+ {
+ 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 = 3,
+ N_SCHEDULE_TYPE = 1,
+ N_B_STATE = 0,
+ S_B_STATE = "绛夊緟",
+ S_CNTR_CODE = Cnt,
+ };
+
+ if (
+ db.Updateable<TN_Location>(startLoc).UpdateColumns(it=>new {it.N_CURRENT_NUM,it.N_LOCK_STATE,it.S_LOCK_STATE }).ExecuteCommand() == 1 &&
+ db.Updateable<TN_Location>(endLoc).UpdateColumns(it=>new {it.N_LOCK_STATE,it.S_LOCK_STATE }).ExecuteCommand() == 1 &&
+ db.Insertable<TN_Loc_Container>(locCnt).ExecuteCommand() == 1 &&
+ db.Insertable<TN_Task>(task).ExecuteCommand() == 1
+ )
+ {
+ if (Settings.LineSorting < Settings.ProductionLines.Count - 1)
+ {
+ Settings.LineSorting++;
+ }
+ else
+ {
+ Settings.LineSorting = 0;
+ }
+
+ Task task1 = Task.Run(() =>
+ {
+ WMSHelper.InsertOpInfo(model.staff, "鐐瑰鐐�, Cnt);
+ });
+
+
+ trans.CommitTran();
+ result.resultCode = 0;
+ result.resultMsg = $"鍒涘缓 绾胯竟绌烘墭涓婄嚎 浠诲姟鎴愬姛锛岃捣鐐癸細{startLoc.S_CODE}锛岀粓鐐癸細{endLoc.S_CODE}";
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
+ else
+ {
+ trans.RollbackTran();
+ result.resultCode = 12;
+ result.resultMsg = $"鍒涘缓 绾胯竟绌烘墭涓婄嚎 浠诲姟澶辫触锛岃捣鐐癸細{startLoc.S_CODE}锛岀粓鐐癸細{endLoc.S_CODE}";
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
+ }
}
catch(Exception ex)
{
result.resultCode = -1;
- result.resultMsg = $"鐢熸垚浜哄伐娆″搧鍥炵倝浠诲姟澶辫触锛屽彂鐢熶簡寮傚父锛歿ex.Message}";
+ result.resultMsg = $"PDA婊℃墭澶嶆鍒ゆ柇锛屽彂鐢熶簡寮傚父锛歿ex.Message}";
LogHelper.Info(result.resultMsg);
return result;
}
@@ -679,11 +820,13 @@
/// </summary>
internal static SimpleResult PDAFullInArea(PDAFullInAreaInfo model)
{
- var db = new SqlHelper<object>().GetInstance();
+
var result = new SimpleResult();//杩斿洖缁撴灉
LogHelper.Info("瑙﹀彂API锛歅DA婊℃墭涓嬬嚎鍏ュ簱" + JsonConvert.SerializeObject(model), "API");
try
{
+ var db = new SqlHelper<object>().GetInstance();
+
if (model.RfId.Length < 16)
{
result.resultCode = 1;
@@ -692,7 +835,7 @@
return result;
}
- model.RfId = WMSHelper.ConvertHexToAscii(model.RfId);
+ model.RfId = WMSHelper.ConvertHexToAscii(model.RfId.Substring(0,16));
//璇ヤ骇绾跨殑婊℃墭涓嬬嚎浣嶇疆锛岃捣鐐� var startPoint = Settings.ProductionLines.FirstOrDefault(a => a.PointOut == model.StartLoc);
@@ -763,7 +906,7 @@
&& 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.T_MODIFY, OrderByType.Asc).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣嶏紝鐩存帴鍒ゆ柇褰撳墠鏁伴噺涓�鍗冲彲
+ OrderBy(o => o.N_LAYER, OrderByType.Asc).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣嶏紝1灞傚厛鍏ュ簱
if (endLoc != null)
{
@@ -854,6 +997,7 @@
ITEMSTATE = "寰呮",
LOGINNAME = model.staff,
SHIFT = model.shift,
+ STARTLOC = startLoc.S_CODE,
};
SpecHelper.InsertInventoryM(target);
});
@@ -971,10 +1115,11 @@
LogHelper.Info("瑙﹀彂API锛氭弧鎵樺嚭搴撲笂绾� + JsonConvert.SerializeObject(model), "API");
var result = new SimpleResult();
- var db = new SqlHelper<object>().GetInstance();
+
TN_Location endLoc = new TN_Location();
try
{
+ var db = new SqlHelper<object>().GetInstance();
if (model.EndLoc != string.Empty)//鎸囧畾缁堢偣璐т綅
{
endLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.EndLoc);
@@ -1021,13 +1166,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)//鍏舵鍚堟牸
@@ -1039,7 +1184,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();//绛涢�鏈夊鍣ㄨ揣浣嶅叧绯昏〃淇℃伅锛岀瓫閫夋湁瀹瑰櫒璐у搧鏄庣粏琛ㄤ俊鎭� }
@@ -1092,11 +1237,6 @@
};
SpecHelper.InsertComponentDetail(target);
});
-
- Task task27 = Task.Run(() =>
- {
- SpecHelper.DeleteInventoryM(cgInfo.S_ID);
- });
}
else
{
@@ -1125,13 +1265,14 @@
{
LogHelper.Info("瑙﹀彂API锛氱┖鎵樹笅绾垮爢鍙� + JsonConvert.SerializeObject(model), "API");
-
var result = new SimpleResult();
- var db = new SqlHelper<object>().GetInstance();
+
TN_Location startLoc = new TN_Location();
try
{
+ var db = new SqlHelper<object>().GetInstance();
+
var startLocCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == model.startLoc && a.S_CNTR_CODE == model.cntID);
if (startLocCntrRel != null)
{
@@ -1226,13 +1367,13 @@
LogHelper.Info("瑙﹀彂API锛氫綑鏂欎笅绾垮叆搴� + JsonConvert.SerializeObject(model), "API");
var result = new SimpleResult();
- var db = new SqlHelper<object>().GetInstance();
+
TN_Location startLoc_Old = new TN_Location();
TN_Location startLoc_New = new TN_Location();
try
{
-
+ var db = new SqlHelper<object>().GetInstance();
var cG_Detail = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == model.cntID);
if (cG_Detail == null)
{
@@ -1360,6 +1501,7 @@
ITEMCODE = cG_Detail.S_ITEM_CODE,
LOGINNAME = model.staff,
SHIFT = model.shift,
+ STARTLOC = startLoc_New.S_CODE,
};
SpecHelper.InsertInventoryM(target);
});
@@ -1505,14 +1647,16 @@
LogHelper.Info("瑙﹀彂API锛氫汉宸ユ媶鐩樺叆搴� + JsonConvert.SerializeObject(model), "API");
var result = new SimpleResult();
- var db = new SqlHelper<object>().GetInstance();
+
string cntLog = $"鏃х殑瀹瑰櫒鍙穥model.old_CntId}";
try
{
+ var db = new SqlHelper<object>().GetInstance();
+
if (model.new_IsOK == model.old_IsOK)
{
result.resultCode = 19;
- result.resultMsg = $"浜哄伐鎷嗙洏鍏ュ簱锛岀墿鏂欓渶瑕佷竴涓緟妫�竴涓笉鍚堟牸";
+ result.resultMsg = $"浜哄伐鎷嗙洏鍏ュ簱锛岀墿鏂欓渶瑕佷竴涓悎鏍�鍜�涓�釜涓嶅悎鏍硷紙鍥炵倝鑳舵垨搴熸枡锛�;
LogHelper.Info(result.resultMsg);
return result;
}
@@ -1541,6 +1685,8 @@
LogHelper.Info(result.resultMsg);
return result;
}
+ cG_old_Detail.S_ITEM_SPEC = model.old_Spec;
+ cG_old_Detail.S_SPE = model.old_Spec;
var startLoc_Old = db.Queryable<TN_Location>().
First(o => o.S_CODE == model.old_StartLoc && o.N_CURRENT_NUM == 0 && o.S_AREA_CODE == Settings.Areas[5] && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃�);
@@ -1604,13 +1750,12 @@
{
S_CNTR_CODE = model.new_CntIds,
S_BATCH_NO = cG_old_Detail.S_BATCH_NO,
- S_ITEM_SPEC = cG_old_Detail.S_ITEM_SPEC,
- S_SPE = cG_old_Detail.S_SPE,
+ S_ITEM_SPEC = model.new_Spec,
+ S_SPE = model.new_Spec,
S_ITEM_STATE = LocationHelper.GetStrByOk(model.new_IsOK),
N_ITEM_STATE = model.new_IsOK,
S_CAR_CODE = cG_old_Detail.S_CAR_CODE,
T_MODIFY = System.DateTime.Now,
- //C_ITEM_MERGE = model.new_CntIds,
S_ITEM_CODE = cG_old_Detail.S_ITEM_CODE,
S_Separate_ID = cG_old_Detail.S_Separate_ID
};
@@ -1620,7 +1765,7 @@
if (db.Queryable<TN_Task>().Count(a => a.N_B_STATE < 3 && a.S_END_LOC == weightPoint) > 2)
{
result.resultCode = 11;
- result.resultMsg = $"缁堢偣绉伴噸璐т綅{weightPoint}鐨勬鍦ㄦ墽琛岀殑浠诲姟鏁伴噺澶т簬2";
+ result.resultMsg = $"缁堢偣绉伴噸璐т綅{weightPoint}鐨勬鍦ㄦ墽琛岀殑浠诲姟鏁伴噺澶т簬2锛岀箒蹇欙紝璇风瓑寰�;
LogHelper.Info(result.resultMsg);
return result;
}
@@ -1629,11 +1774,6 @@
First(o => o.S_AREA_CODE == Settings.Areas[9]
&& o.S_CODE == weightPoint);//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣嶏紝鍘荤О閲�
- var endLoc_NG = db.Queryable<TN_Location>().
- 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)
{
@@ -1643,53 +1783,48 @@
return result;
}
- if (endLoc_NG == null)
- {
- result.resultCode = 16;
- result.resultMsg = $"涓嶅悎鏍肩殑鐗╂枡鏈壘鍒板悎閫傜殑鎷嗙洏涓嶅悎鏍煎尯缁堢偣璐т綅{Settings.Areas[8]}";
- LogHelper.Info(result.resultMsg);
- return result;
- }
-
var taskLog1_Old = $"鏃у鍣ㄥ彿{model.old_CntId}锛屾棫瀹瑰櫒鍙风殑璧风偣{startLoc_Old.S_CODE}锛岀粓鐐箋endLoc_Ok.S_CODE}";
- var taskLog_New = $"鏂板鍣ㄥ彿{model.new_CntIds}锛屾柊瀹瑰櫒鍙风殑璧风偣{model.new_StartLoc}锛岀粓鐐箋endLoc_NG.S_CODE}";
+ var taskLog_New = $"鏂板鍣ㄥ彿{model.new_CntIds}锛屾柊瀹瑰櫒鍙风殑璧风偣{model.new_StartLoc}";
List<CreateTasks> modesCreateTask = new List<CreateTasks>();
- var newTaskCreate = new CreateTasks()
+ if (model.new_IsOK == 0)
{
- taskNo = WCSHelper.GenerateTaskNo(),
- from = model.new_StartLoc,
- 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) ? "浜哄伐鎷嗙洏鍥炰笉鍚堟牸鍖� : "浜哄伐鎷嗙洏鍥炲簱",
- pri = 3,
- cntrInfo = model.new_CntIds,
- spec = cG_new_Detail_Ins.S_SPE,
- };
-
- modesCreateTask.Add(newTaskCreate);
-
- var oldTaskCreate = new CreateTasks()
+ var newTaskCreate = new CreateTasks()
+ {
+ taskNo = WCSHelper.GenerateTaskNo(),
+ from = model.new_StartLoc,
+ fromArea = startLoc_New.S_AREA_CODE,
+ to = endLoc_Ok.S_CODE,
+ toArea = endLoc_Ok.S_AREA_CODE,
+ taskType = "浜哄伐鎷嗙洏鍚堟牸鍥炲簱",
+ pri = 3,
+ cntrInfo = model.new_CntIds,
+ spec = cG_new_Detail_Ins.S_SPE,
+ };
+ modesCreateTask.Add(newTaskCreate);
+ }
+ else if (model.old_IsOK == 1)
{
- taskNo = WCSHelper.GenerateTaskNo(),
- from = startLoc_Old.S_CODE,
- 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) ? "浜哄伐鎷嗙洏鍥炰笉鍚堟牸鍖� : "浜哄伐鎷嗙洏鍥炲簱",
- pri = 3,
- cntrInfo = model.old_CntId,
- spec = cG_old_Detail.S_SPE,
- };
- modesCreateTask.Add(oldTaskCreate);
+ var newTaskCreate = new CreateTasks()
+ {
+ taskNo = WCSHelper.GenerateTaskNo(),
+ from = model.old_StartLoc,
+ fromArea = startLoc_Old.S_AREA_CODE,
+ to = endLoc_Ok.S_CODE,
+ toArea = endLoc_Ok.S_AREA_CODE,
+ taskType = "浜哄伐鎷嗙洏鍚堟牸鍥炲簱",
+ pri = 3,
+ cntrInfo = model.old_CntId,
+ spec = cG_old_Detail.S_SPE,
+ };
+ modesCreateTask.Add(newTaskCreate);
+ }
startLoc_Old.N_LOCK_STATE = 2;
startLoc_Old.S_LOCK_STATE = "鍑哄簱閿�;
startLoc_Old.N_CURRENT_NUM = 1;
-
startLoc_New.N_LOCK_STATE = 2;
startLoc_New.S_LOCK_STATE = "鍑哄簱閿�;
@@ -1725,49 +1860,11 @@
if (WCSHelper.CreateTask(modesCreateTask))//鍒涘缓鎼�浠诲姟锛岃捣鐐圭粓鐐瑰鍣� {
tran.CommitTran();
- LogHelper.Info($"鐢熸垚浜哄伐鎷嗙洏鍏ュ簱浠诲姟鎴愬姛锛� + taskLog_New + taskLog1_Old);
+ LogHelper.Info($"鐢熸垚浜哄伐鎷嗙洏鍚堟牸鍥炲簱浠诲姟鎴愬姛锛� + taskLog_New + taskLog1_Old);
Task task1 = Task.Run(() =>
{
- WMSHelper.InsertOpInfo(model.staff, "浜哄伐鎷嗙洏鍏ュ簱", model.new_CntIds + "," + model.old_CntId);
- });
-
- Task task2 = Task.Run(() =>
- {
- if (model.old_IsOK == 1)
- {
- var target = new TN_RemeltDetail()
- {
- TASKNO = oldTaskCreate.taskNo,
- CNTCODE = cG_old_Detail.S_CNTR_CODE,
- STARTLOC = startLoc_Old.S_CODE,
- LOGINNAME = model.staff,
- ITEMCODE = cG_old_Detail.S_ITEM_CODE,
- SPEC = cG_old_Detail.S_SPE,
- CARCODE = cG_old_Detail.S_CAR_CODE,
- WEIGHT = cG_old_Detail.F_QTY,
- REMELTTIME = DateTime.Now,
- SHIFT = model.shift,
- };
- SpecHelper.InsertRemeltDetail(target);
- }
- if (model.new_IsOK == 1)
- {
- var target = new TN_RemeltDetail()
- {
- TASKNO = newTaskCreate.taskNo,
- CNTCODE = cG_new_Detail_Ins.S_CNTR_CODE,
- STARTLOC = startLoc_New.S_CODE,
- LOGINNAME = model.staff,
- ITEMCODE = cG_new_Detail_Ins.S_ITEM_CODE,
- SPEC = cG_new_Detail_Ins.S_SPE,
- CARCODE = cG_new_Detail_Ins.S_CAR_CODE,
- WEIGHT = cG_new_Detail_Ins.F_QTY,
- REMELTTIME = DateTime.Now,
- SHIFT = model.shift,
- };
- SpecHelper.InsertRemeltDetail(target);
- }
+ WMSHelper.InsertOpInfo(model.staff, "浜哄伐鎷嗙洏鍚堟牸鍥炲簱", model.new_CntIds + "," + model.old_CntId);
});
Task task27 = Task.Run(() =>
@@ -1784,6 +1881,7 @@
ITEMCODE = cG_old_Detail.S_ITEM_CODE,
LOGINNAME = model.staff,
SHIFT = model.shift,
+ STARTLOC = startLoc_Old.S_CODE,
};
SpecHelper.InsertInventoryM(target);
}
@@ -1799,6 +1897,7 @@
ITEMCODE = cG_new_Detail_Ins.S_ITEM_CODE,
LOGINNAME = model.staff,
SHIFT = model.shift,
+ STARTLOC = startLoc_New.S_CODE,
};
SpecHelper.InsertInventoryM(target);
}
@@ -1808,7 +1907,7 @@
{
tran.RollbackTran();
result.resultCode = 17;
- result.resultMsg = $"鐢熸垚浜哄伐鎷嗙洏鍏ュ簱浠诲姟澶辫触锛� + taskLog_New + taskLog1_Old;
+ result.resultMsg = $"鐢熸垚浜哄伐鎷嗙洏鍚堟牸鍥炲簱浠诲姟澶辫触锛� + taskLog_New + taskLog1_Old;
LogHelper.Info(result.resultMsg);
return result;
}
@@ -1817,7 +1916,7 @@
{
tran.RollbackTran();
result.resultCode = 18;
- result.resultMsg = $"鐢熸垚浜哄伐鎷嗙洏鍏ュ簱浠诲姟澶辫触锛� + taskLog_New + taskLog1_Old;
+ result.resultMsg = $"鐢熸垚浜哄伐鎷嗙洏鍚堟牸鍥炲簱浠诲姟澶辫触锛� + taskLog_New + taskLog1_Old;
LogHelper.Info(result.resultMsg);
return result;
}
@@ -1845,9 +1944,10 @@
LogHelper.Info("瑙﹀彂API锛氫汉宸ュ垱寤虹偣鍒扮偣浠诲姟" + JsonConvert.SerializeObject(model), "API");
var result = new SimpleResult();
- var db = new SqlHelper<object>().GetInstance();
try
{
+ var db = new SqlHelper<object>().GetInstance();
+
var startLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.startLoc);
if(!(startLoc != null && startLoc.N_LOCK_STATE == 0 && startLoc.S_LOCK_STATE == "鏃�))
@@ -1924,7 +2024,7 @@
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) //鎻掑叆WMS搴撳瓨鏄庣粏
+ if (endLoc.S_AREA_CODE == Settings.Areas[1] && cginfo != null) //鎻掑叆WMS搴撳瓨鏄庣粏
{
var target = new TN_InventoryM()
{
@@ -1936,15 +2036,9 @@
ITEMCODE = cginfo.S_ITEM_CODE,
LOGINNAME = model.staff,
SHIFT = model.shift,
+ STARTLOC = model.startLoc,
};
SpecHelper.InsertInventoryM(target);
- }
- });
- Task task26 = Task.Run(() =>
- {
- if (startLoc.S_AREA_CODE == Settings.Areas[2] && cginfo != null)
- {
- SpecHelper.DeleteInventoryM(cginfo.S_ID);
}
});
--
Gitblit v1.9.1