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 | 311 +++++++--------------------------------------------
1 files changed, 46 insertions(+), 265 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 0cb6082..b12c74c 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -202,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 == "鏃�
@@ -213,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 = "浜岀骇鏂�;
@@ -227,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;
}
@@ -421,7 +421,7 @@
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() == 1 &&
+ db.Insertable<TN_Loc_Container>(locCntList).ExecuteCommand() == locCntList.Count &&
db.Insertable<TN_Task>(task).ExecuteCommand() == 1
)
{
@@ -628,178 +628,6 @@
{
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 PDAReturnReset(PDAReturnResetInfo 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 && o.N_CURRENT_NUM ==0 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE=="鏃� && o.S_AREA_CODE == Settings.Areas[4]);
- if (startLoc == null)
- {
- 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]}";
- 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();
-
- if (endLoc == 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 == 鏃�;
- LogHelper.Info(result.resultMsg);
- return result;
- }
-
- var cgInfo = db.Queryable<TN_CG_Detail>().First(a=>a.S_CNTR_CODE == model.rfId);
- if (cgInfo == null)
- {
- result.resultCode = 3;
- result.resultMsg = $"鏈壘鍒板搴旂殑鐗╂枡淇℃伅锛岃姹傦細a.S_CNTR_CODE == {model.rfId}";
- LogHelper.Info(result.resultMsg);
- return result;
- }
-
- var task1 = 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_B_STATE = 0,
- S_B_STATE = "绛夊緟",
- S_CNTR_CODE = model.rfId,
- S_SPEC = cgInfo.S_ITEM_SPEC,
- };
-
- startLoc.N_LOCK_STATE = 2;
- startLoc.S_LOCK_STATE = "鍑哄簱閿�;
- startLoc.N_CURRENT_NUM = 1;
- startLoc.T_MODIFY = System.DateTime.Now;
-
- endLoc.N_LOCK_STATE = 1;
- endLoc.S_LOCK_STATE = "鍏ュ簱閿�;
- endLoc.T_MODIFY = System.DateTime.Now;
-
- using (var tran = 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;
- }
- }
-
- 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
- {
- locCnt = new TN_Loc_Container()
- {
- S_LOC_CODE = model.startLoc,
- S_CNTR_CODE = model.rfId,
- };
- if (db.Insertable<TN_Loc_Container>(locCnt).ExecuteCommand() <= 0)
- {
- tran.RollbackTran();
- result.resultCode = 6;
- result.resultMsg = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴琛紙缁戝畾锛夊け璐ワ紝{model.startLoc}";
- LogHelper.Info(result.resultMsg);
- return result;
- }
- }
-
- if (db.Insertable<TN_Task>(task1).ExecuteCommand() > 0 &&
- db.Updateable<TN_Location>(startLoc).ExecuteCommand() > 0 &&
- db.Updateable<TN_Location>(endLoc).ExecuteCommand() > 0)
- {
-
- Task task99 = Task.Run(() =>
- {
- WMSHelper.InsertOpInfo(model.staff, "浜哄伐娆″搧鍥炵倝", locCnt.S_CNTR_CODE);
- });
-
- 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();
- result.resultCode = 0;
- result.resultMsg = "鎴愬姛";
- LogHelper.Info($"鐢熸垚浜哄伐娆″搧鍥炵倝浠诲姟鎴愬姛锛屽鍣細{model.rfId}锛岃捣鐐癸細{model.startLoc}锛岀粓鐐癸細{endLoc.S_CODE}");
- return result;
- }
- else
- {
- tran.RollbackTran();
- result.resultCode = 7;
- result.resultMsg = $"鐢熸垚浜哄伐娆″搧鍥炵倝浠诲姟澶辫触锛屽鍣細{model.rfId}锛岃捣鐐癸細{model.startLoc}锛岀粓鐐癸細{endLoc.S_CODE}";
- LogHelper.Info(result.resultMsg);
- return result;
- }
- }
-
- }
- catch(Exception ex)
- {
- result.resultCode = -1;
- result.resultMsg = $"鐢熸垚浜哄伐娆″搧鍥炵倝浠诲姟澶辫触锛屽彂鐢熶簡寮傚父锛歿ex.Message}";
LogHelper.Info(result.resultMsg);
return result;
}
@@ -1828,7 +1656,7 @@
if (model.new_IsOK == model.old_IsOK)
{
result.resultCode = 19;
- result.resultMsg = $"浜哄伐鎷嗙洏鍏ュ簱锛岀墿鏂欓渶瑕佷竴涓緟妫�竴涓笉鍚堟牸";
+ result.resultMsg = $"浜哄伐鎷嗙洏鍏ュ簱锛岀墿鏂欓渶瑕佷竴涓悎鏍�鍜�涓�釜涓嶅悎鏍硷紙鍥炵倝鑳舵垨搴熸枡锛�;
LogHelper.Info(result.resultMsg);
return result;
}
@@ -1857,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 == "鏃�);
@@ -1920,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
};
@@ -1936,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;
}
@@ -1945,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)
{
@@ -1959,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 = "鍑哄簱閿�;
@@ -2041,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(() =>
@@ -2126,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;
}
@@ -2135,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;
}
--
Gitblit v1.9.1