From a824b8140c6952a361aaf91f60e8dabf92753bb3 Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期二, 27 五月 2025 17:30:58 +0800
Subject: [PATCH] 双钱-日周月年产量记录表增加规格字段，WMS库存管理表增加距离过期还剩多少天字段
---
api/ApiHelper.cs | 654 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 432 insertions(+), 222 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 41acf7d..9b86ead 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -116,13 +116,13 @@
}
/// <summary>
- /// PDA婊℃墭鎶芥鍒ゆ柇
+ /// PDA婊℃墭澶嶆鍒ゆ柇
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
internal static SimpleResult PDAFullCheckIn(PDAFullCheckInfo model)
{
- LogHelper.Info("瑙﹀彂API锛歅DA婊℃墭鎶芥鍒ゆ柇" + JsonConvert.SerializeObject(model), "API");
+ LogHelper.Info("瑙﹀彂API锛歅DA婊℃墭澶嶆鍒ゆ柇" + JsonConvert.SerializeObject(model), "API");
var db = new SqlHelper<object>().GetInstance();
var result = new SimpleResult();//杩斿洖缁撴灉
try
@@ -150,7 +150,7 @@
if (startLoc == null)
{
result.resultCode = 3;
- result.resultMsg = $"璧风偣璐т綅{locCnt.S_LOC_CODE}鏈В閿侊紝鎴栬�涓嶅睘浜庢娊妫�尯";
+ result.resultMsg = $"璧风偣璐т綅{locCnt.S_LOC_CODE}鏈В閿侊紝鎴栬�涓嶅睘浜庡妫�尯";
LogHelper.Info(result.resultMsg);
return result;
}
@@ -164,6 +164,14 @@
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).
OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣� }
+ else if (model.cgState == 4)//鎶�湳鍚堟牸鍥炲簱
+ {
+ cG_Detail.N_ITEM_STATE = 4;
+ 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).
+ OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣�+ }
else if (model.cgState == 2)//涓嶅悎鏍煎洖鐐� {
cG_Detail.N_ITEM_STATE = 2;
@@ -172,10 +180,18 @@
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).
OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣� }
+ else if (model.cgState == 5)//娣峰悎涔熷洖搴擄紝閫氳繃鐐瑰鐐瑰啀鍙戠嚎杈�+ {
+ 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).
+ OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣�+ }
else
{
result.resultCode = 6;
- result.resultMsg = $"鐗╂枡鐘舵�鍙兘涓�鎴�锛屽嵆鍙傛暟cgState = 2 鎴�= 0锛屽鏋滀负鍏朵粬鍊硷紝鍒欎笉澶勭悊锛�鍚堟牸锛�涓嶅悎鏍�;
+ result.resultMsg = $"鐗╂枡鐘舵�鍙兘涓�銆�銆�銆�锛屽鏋滀负鍏朵粬鍊硷紝鍒欎笉澶勭悊锛�鍚堟牸锛�涓嶅悎鏍硷紝4鎶�湳鍚堟牸锛�娣峰悎";
LogHelper.Info(result.resultMsg);
return result;
}
@@ -188,7 +204,9 @@
LogHelper.Info(result.resultMsg);
return result;
}
- var typeName = (model.cgState == 0) ? "浜哄伐鎶芥鍥炲簱" : "浜哄伐鎶芥鍥炵倝";
+
+ 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))//鍒涘缓鎼�浠诲姟锛岃捣鐐圭粓鐐瑰鍣� {
@@ -209,17 +227,36 @@
{
var target = new TN_RemeltDetail()
{
- CntCode = locCnt.S_CNTR_CODE,
- StartLoc = startLoc.S_CODE,
- LoginName = model.staff,
- ItemCode = cG_Detail.S_ITEM_CODE,
- Spec = cG_Detail.S_SPE,
- CarCode = cG_Detail.S_CAR_CODE,
- Weight = cG_Detail.F_QTY,
- RemeltTime = DateTime.Now,
- TaskNo = taskNo
+ CNTCODE = locCnt.S_CNTR_CODE,
+ STARTLOC = startLoc.S_CODE,
+ LOGINNAME = model.staff,
+ ITEMCODE = cG_Detail.S_ITEM_CODE,
+ SPEC = cG_Detail.S_SPE,
+ CARCODE = cG_Detail.S_CAR_CODE,
+ WEIGHT = cG_Detail.F_QTY,
+ REMELTTIME = DateTime.Now,
+ TASKNO = taskNo
};
SpecHelper.InsertRemeltDetail(target);
+ }
+ });
+
+ Task task27 = Task.Run(() =>
+ {
+ if (model.cgState != 2)
+ {
+ var target = new TN_InventoryM()
+ {
+ S_ID = cG_Detail.S_ID,
+ RFID = cG_Detail.S_CNTR_CODE,
+ SPEC = cG_Detail.S_SPE,
+ WEIGHT = cG_Detail.F_QTY,
+ ITEMSTATE = cG_Detail.S_ITEM_STATE,
+ ITEMCODE = cG_Detail.S_ITEM_CODE,
+ LOGINNAME = model.staff,
+ SHIFT = "None",
+ };
+ SpecHelper.InsertInventoryM(target);
}
});
@@ -234,7 +271,6 @@
LogHelper.Info(result.resultMsg);
return result;
}
-
}
catch (Exception ex)
{
@@ -365,18 +401,34 @@
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
+ };
+ SpecHelper.InsertRemeltDetail(target);
+ });
tran.CommitTran();
result.resultCode = 0;
result.resultMsg = "鎴愬姛";
- LogHelper.Info($"鐢熸垚婊℃墭涓嬬嚎鍏ュ簱浠诲姟鎴愬姛锛屽鍣細{model.rfId}锛岃捣鐐癸細{model.startLoc}锛岀粓鐐癸細{endLoc.S_CODE}");
+ 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}";
+ result.resultMsg = $"鐢熸垚浜哄伐娆″搧鍥炵倝浠诲姟澶辫触锛屽鍣細{model.rfId}锛岃捣鐐癸細{model.startLoc}锛岀粓鐐癸細{endLoc.S_CODE}";
LogHelper.Info(result.resultMsg);
return result;
}
@@ -386,7 +438,7 @@
catch(Exception ex)
{
result.resultCode = -1;
- result.resultMsg = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
+ result.resultMsg = $"鐢熸垚浜哄伐娆″搧鍥炵倝浠诲姟澶辫触锛屽彂鐢熶簡寮傚父锛歿ex.Message}";
LogHelper.Info(result.resultMsg);
return result;
}
@@ -588,204 +640,188 @@
var startPoint = Settings.ProductionLines.FirstOrDefault(a => a.PointOut == model.StartLoc);
if (startPoint != null)//璧风偣瀛樺湪
{
- var woInfo = db.Queryable<TN_WorkOrder>().Where(a => a.S_LINE_NO == startPoint.ProductionLine_Name && a.S_B_STATE == "寮�惎").OrderBy(b => b.T_CREATE, OrderByType.Desc).First();
-
- if (woInfo != null)//褰撳墠浜х嚎涓嶅瓨鍦ㄥ紑鍚殑鏈�柊鐨勫伐鍗�+ var startLoc = db.Queryable<TN_Location>().First(a => a.S_LOCK_STATE == "鏃� && a.N_LOCK_STATE == 0 && a.S_CODE == model.StartLoc && a.C_ENABLE == "Y");
+ if (startLoc != null)//璇ヤ骇绾跨殑璧风偣娌￠攣浣� {
- var startLoc = db.Queryable<TN_Location>().First(a => a.S_LOCK_STATE == "鏃� && a.N_LOCK_STATE == 0 && a.S_CODE == model.StartLoc && a.C_ENABLE == "Y");
- if (startLoc != null)//璇ヤ骇绾跨殑璧风偣娌￠攣浣�+ var cgInfo = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == model.RfId);
+ if (cgInfo != null)//鏈夋畫鐣欑殑瀹瑰櫒璐у搧鏄庣粏鍏崇郴琛ㄤ俊鎭� {
- var cgInfo = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == model.RfId);
- if (cgInfo != null)//鏈夋畫鐣欑殑瀹瑰櫒璐у搧鏄庣粏鍏崇郴琛ㄤ俊鎭�+ result.resultCode = 1;
+ result.resultMsg = $"璇ュ鍣▄model.RfId}宸茬粦瀹氳揣鍝亄cgInfo.S_ITEM_CODE}锛屽鏋滆浣跨敤锛屽鍣ㄥ厛瑙ｇ粦璐у搧";
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
+ else
+ {
+ var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_CNTR_CODE == model.RfId);
+ if (locCntrRel != null)//褰撳墠瀹瑰櫒鏄惁缁戝畾浜嗚揣浣� {
- result.resultCode = 1;
- result.resultMsg = $"璇ュ鍣▄model.RfId}宸茬粦瀹氳揣鍝亄cgInfo.S_ITEM_CODE}锛屽鏋滆浣跨敤锛屽鍣ㄥ厛瑙ｇ粦璐у搧";
+ result.resultCode = 2;
+ result.resultMsg = $"璇ュ鍣▄model.RfId}宸茬粦瀹氳揣浣峽locCntrRel.S_LOC_CODE}锛屽鏋滆浣跨敤锛屽鍣ㄥ厛瑙ｇ粦璐т綅";
LogHelper.Info(result.resultMsg);
return result;
}
else
{
- var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_CNTR_CODE == model.RfId);
- if (locCntrRel != null)//褰撳墠瀹瑰櫒鏄惁缁戝畾浜嗚揣浣�+ //鏂板璐т綅瀹瑰櫒鍏崇郴琛�+ locCntrRel = new TN_Loc_Container()
{
- result.resultCode = 2;
- result.resultMsg = $"璇ュ鍣▄model.RfId}宸茬粦瀹氳揣浣峽locCntrRel.S_LOC_CODE}锛屽鏋滆浣跨敤锛屽鍣ㄥ厛瑙ｇ粦璐т綅";
+ S_LOC_CODE = startPoint.PointOut,
+ S_CNTR_CODE = model.RfId,
+ };
+
+ var readBytes1 = S7Helper.ReadBytes(startPoint.ProductionLine_IP, 20, 2, 4);
+ byte[] rfid = new byte[4] { readBytes1[0], readBytes1[1], readBytes1[2], readBytes1[3] };
+ string rfids16 = BitConverter.ToString(rfid);
+ string rfids = (((readBytes1[0]) << 24) + (readBytes1[1] << 16) + (readBytes1[2] << 8) + readBytes1[3]).ToString();
+ LogHelper.Info($"浜х嚎瀹瑰櫒鍙凤細{rfids}锛屽叾16杩涘埗褰㈠紡锛歿rfids16}");
+
+ if (rfids != model.RfId)
+ {
+ result.resultCode = 9;
+ result.resultMsg = $"PDA濉叆鐨勫鍣ㄥ彿{model.RfId}涓嶴7浜х嚎閫氳鐨勫鍣ㄥ彿{rfids}涓嶅悓";
LogHelper.Info(result.resultMsg);
return result;
}
- else
+ var readBytes2 = S7Helper.ReadBytes(startPoint.ProductionLine_IP, 20, 26, 2);
+ var modelWeight = ((readBytes2[0]) << 8) + readBytes2[1];
+
+ var modelCI = db.Queryable<TN_CAR_IN>().First(i => i.S_CAR_CODE == model.CarCode && i.S_CNTR_CODE == model.RfId && i.S_B_STATE == "0");//鏌ヨ鏄惁鏈夎繖涓搴旂殑涓旂姸鎬佹甯哥殑瀹瑰櫒杞﹀彿瀛愯〃
+
+ TN_CG_Detail tN_CG_Detail = new TN_CG_Detail()//鏂板瀹瑰櫒璐у搧鏄庣粏琛� {
- //鏂板璐т綅瀹瑰櫒鍏崇郴琛�- locCntrRel = new TN_Loc_Container()
+ S_CNTR_CODE = model.RfId,
+ S_ITEM_SPEC = model.Spe,
+ S_SPE = model.Spe,
+ S_CAR_CODE = model.CarCode,
+ N_ITEM_STATE = 1,
+ S_ITEM_STATE = "寰呮",
+ F_QTY = modelWeight,//杩欓噷鐨勯噸閲忚褰撴垚鏁伴噺鏉ヤ娇鐢�+ };
+
+ 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();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣嶏紝鐩存帴鍒ゆ柇褰撳墠鏁伴噺涓�鍗冲彲
+
+ if (endLoc != null)
+ {
+ var task1 = new TN_Task()
{
- S_LOC_CODE = startPoint.PointOut,
+ 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 = "PDA婊℃墭涓嬬嚎鍏ュ簱",
+ N_B_STATE = 0,
S_CNTR_CODE = model.RfId,
+ S_SPEC = model.Spe,
};
- var readBytes1 = S7Helper.ReadBytes(startPoint.ProductionLine_IP, 20, 2, 4);
- byte[] rfid = new byte[4] { readBytes1[0], readBytes1[1], readBytes1[2], readBytes1[3] };
- string rfids16 = BitConverter.ToString(rfid);
- string rfids = (((readBytes1[0]) << 24) + (readBytes1[1] << 16) + (readBytes1[2] << 8) + readBytes1[3]).ToString();
- LogHelper.Info($"浜х嚎瀹瑰櫒鍙凤細{rfids}锛屽叾16杩涘埗褰㈠紡锛歿rfids16}");
+ startLoc.N_LOCK_STATE = 2;
+ startLoc.S_LOCK_STATE = "鍑哄簱閿�;
+ startLoc.N_CURRENT_NUM = 1;
+ startLoc.T_MODIFY = DateTime.Now;
- if (rfids != model.RfId)
+ endLoc.N_LOCK_STATE = 1;
+ endLoc.S_LOCK_STATE = "鍏ュ簱閿�;
+ startLoc.T_MODIFY = DateTime.Now;
+
+ using (var tran = db.Ado.UseTran())
{
- result.resultCode = 9;
- result.resultMsg = $"PDA濉叆鐨勫鍣ㄥ彿{model.RfId}涓嶴7浜х嚎閫氳鐨勫鍣ㄥ彿{rfids}涓嶅悓";
- LogHelper.Info(result.resultMsg);
- return result;
- }
- var readBytes2 = S7Helper.ReadBytes(startPoint.ProductionLine_IP, 20, 26, 2);
- var modelWeight = ((readBytes2[0]) << 8) + readBytes2[1];
-
- var modelCI = db.Queryable<TN_CAR_IN>().First(i => i.S_CAR_CODE == model.CarCode && i.S_CNTR_CODE == model.RfId && i.S_B_STATE == "0");//鏌ヨ鏄惁鏈夎繖涓搴旂殑涓旂姸鎬佹甯哥殑瀹瑰櫒杞﹀彿瀛愯〃
-
- TN_CG_Detail tN_CG_Detail = new TN_CG_Detail()//鏂板瀹瑰櫒璐у搧鏄庣粏琛�- {
- S_CNTR_CODE = model.RfId,
- S_ITEM_CODE = woInfo.S_ITEM_CODE,
- S_BATCH_NO = woInfo.S_BATCH_CODE,
- S_ITEM_SPEC = woInfo.S_ITEM_SPEC,
- S_SPE= woInfo.S_ITEM_SPEC,
- S_CAR_CODE = model.CarCode,
- N_ITEM_STATE = 1,
- S_ITEM_STATE = "寰呮",
- F_QTY = modelWeight,//杩欓噷鐨勯噸閲忚褰撴垚鏁伴噺鏉ヤ娇鐢�- };
-
- 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();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣嶏紝鐩存帴鍒ゆ柇褰撳墠鏁伴噺涓�鍗冲彲
-
- if (endLoc != null)
- {
- var task1 = new TN_Task()
+ if (modelCI == null)//瀹瑰櫒杞﹀彿瀛愯〃涓嶅瓨鍦� {
- 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 = "PDA婊℃墭涓嬬嚎鍏ュ簱",
- N_B_STATE = 0,
- S_CNTR_CODE = model.RfId,
- S_SPEC = model.Spe,
- };
-
- startLoc.N_LOCK_STATE = 2;
- startLoc.S_LOCK_STATE = "鍑哄簱閿�;
- startLoc.N_CURRENT_NUM = 1;
- startLoc.T_MODIFY = DateTime.Now;
-
- endLoc.N_LOCK_STATE = 1;
- endLoc.S_LOCK_STATE = "鍏ュ簱閿�;
- startLoc.T_MODIFY = DateTime.Now;
-
- using (var tran = db.Ado.UseTran())
- {
- if (modelCI == null)//瀹瑰櫒杞﹀彿瀛愯〃涓嶅瓨鍦�+ modelCI = new TN_CAR_IN()
{
- modelCI = new TN_CAR_IN()
- {
- S_CNTR_CODE = model.RfId,
- S_CAR_CODE = model.CarCode,
- S_B_STATE = "0",
- };
- if (db.Insertable<TN_CAR_IN>(modelCI).ExecuteCommand() <= 0)
- {
- tran.RollbackTran();
- result.resultCode = 8;
- result.resultMsg = $"鏂板鐨凾N_CAR_IN琛ㄦ彃鍏ュけ璐ワ紝瀹瑰櫒锛歿modelCI.S_CNTR_CODE}锛岃溅鍙凤細{modelCI.S_CAR_CODE}";
- 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 &&
- db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() > 0 &&
- db.Insertable<TN_CG_Detail>(tN_CG_Detail).ExecuteCommand() > 0)//鍒涘缓鎼�浠诲姟锛岃捣鐐圭粓鐐瑰鍣�- {
- tran.CommitTran();
- result.resultCode = 0;
- result.resultMsg = "鎴愬姛";
- LogHelper.Info($"鐢熸垚PDA婊℃墭涓嬬嚎鍏ュ簱浠诲姟鎴愬姛锛屽鍣細{modelCI.S_CNTR_CODE}锛岃捣鐐癸細{startPoint.PointOut}锛岀粓鐐癸細{endLoc.S_CODE}");
-
- Task task99 = Task.Run(() =>
- {
- WMSHelper.InsertOpInfo(model.staff, "PDA婊℃墭涓嬬嚎鍏ュ簱", modelCI.S_CNTR_CODE);
- });
-
- Task task98 = Task.Run(() =>
- {
- var target = new TN_EquipProDetail()
- {
- S_ID = tN_CG_Detail.S_ID,
- TaskType = "PDA婊℃墭涓嬬嚎鍏ュ簱",
- RFID = model.RfId,
- Spec = woInfo.S_ITEM_SPEC,
- CarCode = model.CarCode,
- Weight = modelWeight,
- ItemState = "寰呮",
- ItemCode = woInfo.S_ITEM_CODE,
- LoginName = model.staff,
- Shift = "None",
- StartLoc = startLoc.S_CODE,
- };
- SpecHelper.InsertEquipProDetail(target);
- });
-
- Task task27 = Task.Run(() =>
- {
- var target = new TN_InventoryM()
- {
- S_ID = tN_CG_Detail.S_ID,
- RFID = model.RfId,
- Spec = woInfo.S_ITEM_SPEC,
- Weight = modelWeight,
- ItemState = "寰呮",
- ItemCode = woInfo.S_ITEM_CODE,
- LoginName = model.staff,
- Shift = "None",
- };
- SpecHelper.InsertInventoryM(target);
- });
-
- return result;
- }
- else
+ S_CNTR_CODE = model.RfId,
+ S_CAR_CODE = model.CarCode,
+ S_B_STATE = "0",
+ };
+ if (db.Insertable<TN_CAR_IN>(modelCI).ExecuteCommand() <= 0)
{
tran.RollbackTran();
- result.resultCode = 7;
- result.resultMsg = $"鐢熸垚婊℃墭涓嬬嚎鍏ュ簱浠诲姟澶辫触锛屽鍣細{modelCI.S_CNTR_CODE}锛岃捣鐐癸細{startPoint.PointOut}锛岀粓鐐癸細{endLoc.S_CODE}";
+ result.resultCode = 8;
+ result.resultMsg = $"鏂板鐨凾N_CAR_IN琛ㄦ彃鍏ュけ璐ワ紝瀹瑰櫒锛歿modelCI.S_CNTR_CODE}锛岃溅鍙凤細{modelCI.S_CAR_CODE}";
LogHelper.Info(result.resultMsg);
return result;
}
}
- }
- else
- {
- result.resultCode = 4;
- result.resultMsg = $"鏈壘鍒板悎閫傜殑缁堢偣锛屽鍣細{modelCI.S_CNTR_CODE}";
- 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 &&
+ db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() > 0 &&
+ db.Insertable<TN_CG_Detail>(tN_CG_Detail).ExecuteCommand() > 0)//鍒涘缓鎼�浠诲姟锛岃捣鐐圭粓鐐瑰鍣�+ {
+ tran.CommitTran();
+ result.resultCode = 0;
+ result.resultMsg = "鎴愬姛";
+ LogHelper.Info($"鐢熸垚PDA婊℃墭涓嬬嚎鍏ュ簱浠诲姟鎴愬姛锛屽鍣細{modelCI.S_CNTR_CODE}锛岃捣鐐癸細{startPoint.PointOut}锛岀粓鐐癸細{endLoc.S_CODE}");
+
+ Task task99 = Task.Run(() =>
+ {
+ WMSHelper.InsertOpInfo(model.staff, "PDA婊℃墭涓嬬嚎鍏ュ簱", modelCI.S_CNTR_CODE);
+ });
+
+ Task task98 = Task.Run(() =>
+ {
+ var target = new TN_EquipProDetail()
+ {
+ S_ID = tN_CG_Detail.S_ID,
+ TASKTYPE = "PDA婊℃墭涓嬬嚎鍏ュ簱",
+ RFID = model.RfId,
+ SPEC = model.Spe,
+ CARCODE = model.CarCode,
+ WEIGHT = modelWeight,
+ ITEMSTATE = "寰呮",
+ LOGINNAME = model.staff,
+ SHIFT = "None",
+ STARTLOC = startLoc.S_CODE,
+ };
+ SpecHelper.InsertEquipProDetail(target);
+ });
+
+ Task task27 = Task.Run(() =>
+ {
+ var target = new TN_InventoryM()
+ {
+ S_ID = tN_CG_Detail.S_ID,
+ RFID = model.RfId,
+ SPEC = model.Spe,
+ WEIGHT = modelWeight,
+ ITEMSTATE = "寰呮",
+ LOGINNAME = model.staff,
+ SHIFT = "None",
+ };
+ SpecHelper.InsertInventoryM(target);
+ });
+
+ return result;
+ }
+ else
+ {
+ tran.RollbackTran();
+ result.resultCode = 7;
+ result.resultMsg = $"鐢熸垚婊℃墭涓嬬嚎鍏ュ簱浠诲姟澶辫触锛屽鍣細{modelCI.S_CNTR_CODE}锛岃捣鐐癸細{startPoint.PointOut}锛岀粓鐐癸細{endLoc.S_CODE}";
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
}
}
+ else
+ {
+ result.resultCode = 4;
+ result.resultMsg = $"鏈壘鍒板悎閫傜殑缁堢偣锛屽鍣細{modelCI.S_CNTR_CODE}";
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
}
- }
- else
- {
- result.resultCode = 9;
- result.resultMsg = $"姝や綅缃細{startPoint.PointOut}宸查攣浣�;
- LogHelper.Info(result.resultMsg);
- return result;
}
}
else
{
- result.resultCode = 10;
- result.resultMsg = $"褰撳墠浜х嚎{startPoint.ProductionLine_Name}浣嶇疆{startPoint.PointOut}娌℃湁寮�惎鐨勫伐鍗�;
+ result.resultCode = 9;
+ result.resultMsg = $"姝や綅缃細{startPoint.PointOut}宸查攣浣�;
LogHelper.Info(result.resultMsg);
return result;
}
@@ -923,16 +959,28 @@
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 == 0 && s.S_ITEM_STATE == "鍚堟牸" //鍚堟牸鐨�- && s.T_MODIFY.AddMinutes(waitTime) <= System.DateTime.Now).//鏍规嵁瑙勬牸鐨勪笉鍚岄潤缃笉鍚屽垎閽熸墠鑳藉嚭搴�- OrderBy((o, i, s) => s.T_CREATE, OrderByType.Asc).//鍏堣繘鍏堝嚭
+ && s.N_ITEM_STATE == 4 && s.S_ITEM_STATE == "鎶�湳鍚堟牸"). //鎶�湳鍚堟牸
First();//绛涢�鏈夊鍣ㄨ揣浣嶅叧绯昏〃淇℃伅锛岀瓫閫夋湁瀹瑰櫒璐у搧鏄庣粏琛ㄤ俊鎭�+
+ if (startLoc == null)//鍏舵鍚堟牸
+ {
+ //鏌ヨ绗﹀悎瑙勬牸鐨勭墿鏂欐墍鍦ㄧ殑鏈攣瀹氬凡鍚敤鎸囧畾璐у尯鐨勮揣浣嶏紝璧风偣
+ 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 == 0 && s.S_ITEM_STATE == "鍚堟牸" //鍚堟牸鐨�+ && s.T_MODIFY.AddMinutes(waitTime) <= System.DateTime.Now).//鏍规嵁瑙勬牸鐨勪笉鍚岄潤缃笉鍚屽垎閽熸墠鑳藉嚭搴�+ OrderBy((o, i, s) => s.T_CREATE, OrderByType.Asc).//鍏堣繘鍏堝嚭
+ First();//绛涢�鏈夊鍣ㄨ揣浣嶅叧绯昏〃淇℃伅锛岀瓫閫夋湁瀹瑰櫒璐у搧鏄庣粏琛ㄤ俊鎭�+ }
if (startLoc == null)
{
@@ -970,15 +1018,21 @@
{
var target = new TN_Component_Detail()
{
- ItemCode = cgInfo.S_ITEM_CODE,
- CntrCode = container,
- EndLoc = endLoc.S_CODE,
- Staff = model.staff,
- Weight = cgInfo.F_QTY,
- Spec = model.Spe,
- TaskNo = taskNo,
+ ITEMCODE = cgInfo.S_ITEM_CODE,
+ CNTRCODE = container,
+ CARCODE = cgInfo.S_CAR_CODE,
+ ENDLOC = endLoc.S_CODE,
+ STAFF = model.staff,
+ WEIGHT = cgInfo.F_QTY,
+ SPEC = model.Spe,
+ TASKNO = taskNo,
};
SpecHelper.InsertComponentDetail(target);
+ });
+
+ Task task27 = Task.Run(() =>
+ {
+ SpecHelper.DeleteInventoryM(cgInfo.S_ID);
});
}
else
@@ -1215,17 +1269,33 @@
{
var target = new TN_SurplusDetail()
{
- CntCode = model.cntID,
- StartLoc = startLoc_New.S_CODE,
- LoginName = model.staff,
- ItemCode = cG_Detail.S_ITEM_CODE,
- Spec = cG_Detail.S_SPE,
- CarCode = cG_Detail.S_CAR_CODE,
- Weight = cG_Detail.F_QTY,
- RemeltTime = DateTime.Now,
- TaskNo = taksNo
+ CNTCODE = model.cntID,
+ STARTLOC = startLoc_New.S_CODE,
+ LOGINNAME = model.staff,
+ ITEMCODE = cG_Detail.S_ITEM_CODE,
+ SPEC = cG_Detail.S_SPE,
+ CARCODE = cG_Detail.S_CAR_CODE,
+ WEIGHT = cG_Detail.F_QTY,
+ REMELTTIME = DateTime.Now,
+ TASKNO = taksNo
};
SpecHelper.InsertSurplusDetail(target);
+ });
+
+ Task task27 = Task.Run(() =>
+ {
+ var target = new TN_InventoryM()
+ {
+ S_ID = cG_Detail.S_ID,
+ RFID = cG_Detail.S_CNTR_CODE,
+ SPEC = cG_Detail.S_SPE,
+ WEIGHT = cG_Detail.F_QTY,
+ ITEMSTATE = cG_Detail.S_ITEM_STATE,
+ ITEMCODE = cG_Detail.S_ITEM_CODE,
+ LOGINNAME = model.staff,
+ SHIFT = "None",
+ };
+ SpecHelper.InsertInventoryM(target);
});
}
else
@@ -1432,7 +1502,7 @@
var locCntrRel_New1 = db.Queryable<TN_Loc_Container>().First(a => a.S_CNTR_CODE == model.new_CntIds);
if (locCntrRel_New1 != null)
{
- LocationHelper.ErrorLocCntReset(new ErrorLocCntResetInfo() { cntID = model.new_CntIds ,reqCode=2});
+ LocationHelper.PdaUnBind(new PdaUnBindInfo() { cntID = model.new_CntIds ,reqCode=1});
result.resultCode = 6;
result.resultMsg = $"鎷嗗垎鍚庣殑鏂版墭鐩樺瓨鍦ㄦ畫鐣欑殑璐т綅瀹瑰櫒鍏崇郴琛紝宸茶В缁戦噸缃紝瀹瑰櫒鍙穥model.new_CntIds}锛岃揣浣峽locCntrRel_New1.S_LOC_CODE}";
LogHelper.Info(result.resultMsg);
@@ -1441,7 +1511,7 @@
var locCntrRel_Old1 = db.Queryable<TN_Loc_Container>().First(a => a.S_CNTR_CODE == model.old_CntId);
if (locCntrRel_Old1 != null)
{
- LocationHelper.ErrorLocCntReset(new ErrorLocCntResetInfo() { cntID = model.old_CntId, reqCode = 2 });
+ LocationHelper.PdaUnBind(new PdaUnBindInfo() { cntID = model.old_CntId, reqCode = 1 });
result.resultCode = 6;
result.resultMsg = $"琚媶鐨勬棫鎵樼洏瀛樺湪娈嬬暀鐨勮揣浣嶅鍣ㄥ叧绯昏〃锛屽凡瑙ｇ粦閲嶇疆锛屽鍣ㄥ彿{model.old_CntId}锛岃揣浣峽locCntrRel_Old1.S_LOC_CODE}";
LogHelper.Info(result.resultMsg);
@@ -1599,15 +1669,15 @@
{
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
+ 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
};
SpecHelper.InsertRemeltDetail(target);
}
@@ -1615,17 +1685,51 @@
{
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
+ 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
};
SpecHelper.InsertRemeltDetail(target);
+ }
+ });
+
+ Task task27 = Task.Run(() =>
+ {
+ if (model.old_IsOK == 1)
+ {
+ var target = new TN_InventoryM()
+ {
+ S_ID = cG_old_Detail.S_ID,
+ RFID = cG_old_Detail.S_CNTR_CODE,
+ SPEC = cG_old_Detail.S_SPE,
+ WEIGHT = cG_old_Detail.F_QTY,
+ ITEMSTATE = cG_old_Detail.S_ITEM_STATE,
+ ITEMCODE = cG_old_Detail.S_ITEM_CODE,
+ LOGINNAME = model.staff,
+ SHIFT = "None",
+ };
+ SpecHelper.InsertInventoryM(target);
+ }
+ if (model.new_IsOK == 1)
+ {
+ var target = new TN_InventoryM()
+ {
+ S_ID = cG_new_Detail_Ins.S_ID,
+ RFID = cG_new_Detail_Ins.S_CNTR_CODE,
+ SPEC = cG_new_Detail_Ins.S_SPE,
+ WEIGHT = cG_new_Detail_Ins.F_QTY,
+ ITEMSTATE = cG_new_Detail_Ins.S_ITEM_STATE,
+ ITEMCODE = cG_new_Detail_Ins.S_ITEM_CODE,
+ LOGINNAME = model.staff,
+ SHIFT = "None",
+ };
+ SpecHelper.InsertInventoryM(target);
}
});
}
@@ -1658,5 +1762,111 @@
return result;
}
+
+
+ /// <summary>
+ /// 浜哄伐鍒涘缓鐐瑰埌鐐逛换鍔�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ internal static SimpleResult CreateP2PTask(CreateP2PTaskInfo model)
+ {
+ LogHelper.Info("瑙﹀彂API锛氫汉宸ュ垱寤虹偣鍒扮偣浠诲姟" + JsonConvert.SerializeObject(model), "API");
+
+ var result = new SimpleResult();
+ var db = new SqlHelper<object>().GetInstance();
+ try
+ {
+ 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 == "鏃�))
+ {
+ result.resultCode = 1;
+ result.resultMsg = $"璧峰浣嶇疆{model.startLoc}涓嶆弧瓒虫潯浠讹細startLoc != null && startLoc.N_CURRENT_NUM > 0 && 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 == "鏃�))
+ {
+ result.resultCode = 2;
+ result.resultMsg = $"缁堢偣浣嶇疆{model.endLoc}涓嶆弧瓒虫潯浠讹細endLoc != null && endLoc.N_CURRENT_NUM == 0 && endLoc.N_LOCK_STATE == 0 && endLoc.S_LOCK_STATE == 鏃�;
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
+
+ var startLocCnt = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == model.startLoc);
+
+ if (startLocCnt == null)
+ {
+ result.resultCode = 3;
+ result.resultMsg = $"璧峰浣嶇疆{model.startLoc}鏈粦瀹氬鍣�;
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
+
+ //鍒涘缓鐐瑰鐐逛换鍔�+ if (WCSHelper.CreateTask(startLoc.S_CODE, endLoc.S_CODE, "鐐瑰鐐�, 3, startLocCnt.S_CNTR_CODE))//鍒涘缓鎼�浠诲姟锛岃捣鐐圭粓鐐瑰鍣�+ {
+ 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(() =>
+ {
+ 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)
+ {
+ 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 = "None",
+ };
+ SpecHelper.InsertInventoryM(target);
+ }
+ });
+ Task task26 = Task.Run(() =>
+ {
+ 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;
+ }
+ 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)
+ {
+ result.resultCode = -1;
+ result.resultMsg = $"浜哄伐鍒涘缓鐐瑰埌鐐逛换鍔★紝鍙戠敓浜嗗紓甯革紝{ex.Message}";
+ LogHelper.Error(result.resultMsg, ex);
+ return result;
+ }
+ }
}
}
--
Gitblit v1.9.1