From 54d812d9a307f3db88a51a17573b80f54c85c6cd Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 20 六月 2025 17:25:21 +0800
Subject: [PATCH] 针对NDCAGV的Request请求授权，添加报文检验功能备用
---
core/WCSCore.cs | 178 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 135 insertions(+), 43 deletions(-)
diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index aafecbe..e7b3f66 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -20,27 +20,15 @@
public static ReturnResult OperateAgvTaskStatus(AgvTaskState model) {
var result = new ReturnResult();
try {
- switch (model.state) {
- case 1023:
- break;
- case 1025:
- break;
- case 1012:
- break;
- case 1004:
- break;
- case 1103:
- break;
- default:
- // AGV 鎵ц浠诲姟鐨勯�杈戝鐞�- if (!AgvTaskProcessOk(model)) {
- // 鎵ц涓峅K锛岃鏄庢病鏈夋壘鍒颁换鍔�- result.ResultCode = 1;
- result.ResultMsg = $"鏍规嵁Model.No鏈壘鍒板搴旂殑浠诲姟锛寋model.task_no}";
- LogHelper.Info(result.ResultMsg, "API");
- return result;
- }
- break;
+ if (model.state > 0) {
+ // AGV 鎵ц浠诲姟鐨勯�杈戝鐞�+ if (!AgvTaskProcessOk(model)) {
+ // 鎵ц涓峅K锛岃鏄庢病鏈夋壘鍒颁换鍔�+ result.ResultCode = 1;
+ result.ResultMsg = $"鏍规嵁Model.No鏈壘鍒板搴旂殑浠诲姟锛寋model.task_no}";
+ LogHelper.Info(result.ResultMsg, "API");
+ return result;
+ }
}
result.ResultCode = 0;
@@ -50,7 +38,7 @@
}
catch (Exception ex) {
result.ResultCode = -1;
- result.ResultMsg = $"鍙戠敓浜嗗紓甯革細+{ex.Message}";
+ result.ResultMsg = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.Info(result.ResultMsg, "Error");
return result;
}
@@ -88,9 +76,9 @@
var nextOutboundTask = Task.Run(() => {
UpdateOutboundTaskState(3);
});
- //var pickUpReturnErpTask = Task.Run(() => {
- // PickUpReturnErp(TN_Task);
- //});
+ var pickUpReturnErpTask = Task.Run(() => {
+ PickUpReturnErp(TN_Task);
+ });
}
break;
@@ -131,25 +119,29 @@
private static void RecordTaskTable(TN_Task task) {
var db = new SqlHelper<object>().GetInstance();
var info = "";
+
try {
- var cgDetail = new TN_CG_Detail();
+ var cgDetail = new TN_CG_Detail(); // 濡傛灉娌℃湁淇℃伅锛岄粯璁ゅ氨鏄┖鍊硷紝鍙互鐩存帴濉叆锛屼笉闇�鍒ゆ柇
- var emptyTask = false;
+ //var emptyTask = false; // 绌烘墭/绌虹浠诲姟
if (task.S_TYPE != TaskName.H濂借繍绠盻绌虹涓婄嚎 && task.S_TYPE != TaskName.H濂借繍绠盻绌虹鍏ュ簱 &&
task.S_TYPE != TaskName.T鎵樼洏_绌烘墭涓婄嚎 && task.S_TYPE != TaskName.T鎵樼洏_绌烘墭鍏ュ簱) {
- // 闈炵┖鎵樹换鍔★紙绌烘墭浠诲姟鏃犳硶鍦–GDetail鏌ュ埌鐗╂枡淇℃伅锛�- emptyTask= true;
+ // 闈炵┖鎵�绌虹浠诲姟锛堢┖鎵�绌虹浠诲姟鏃犳硶鍦–GDetail鏌ュ埌鐗╂枡淇℃伅锛�+ //emptyTask= true;
cgDetail = db.Queryable<TN_CG_Detail>()
.Where(d => d.S_CNTR_CODE == task.S_CNTR_CODE)
.First();
if (cgDetail == null) {
- info = $"浠诲姟{task.S_CODE}瀹屾垚锛岃褰曞嚭鍏ュ簱澶辫触锛氭棤娉曞湪瀹瑰櫒璐у搧鏄庣粏琛ㄤ腑鎵惧埌鎵樼洏{task.S_CNTR_CODE}瀵瑰簲鐨勭墿鏂�;
+ info = $"浠诲姟{task.S_CODE}瀹屾垚锛岃褰曞嚭鍏ュ簱瀛樺湪闂锛氭棤娉曞湪瀹瑰櫒璐у搧鏄庣粏琛ㄤ腑鎵惧埌鎵樼洏{task.S_CNTR_CODE}瀵瑰簲鐨勭墿鏂�;
LogHelper.Info(info);
+ //return;
+ cgDetail = new TN_CG_Detail() ;
+ cgDetail.S_ITEM_CODE = "寮傚父";
}
}
- var isInbound = false;
+ var isInbound = false; // 鍏ュ簱绫诲瀷鐨勪换鍔★紙鍖呮嫭绉诲簱绫讳换鍔★級
var inboundTasks = new List<string> {
TaskName.H濂借繍绠盻婊＄涓嬬嚎鍏ュ簱, TaskName.H濂借繍绠盻绌虹鍏ュ簱, TaskName.T鎵樼洏_婊℃墭涓嬬嚎鍏ュ簱, TaskName.T鎵樼洏_绌烘墭鍏ュ簱,
TaskName.C鎶芥_鍚堟牸鍥炲簱, TaskName.C鎶芥_涓嶅悎鏍肩Щ搴� TaskName.Y绉诲簱
@@ -158,7 +150,17 @@
isInbound= true;
}
- var record = new TN_Record_Table {
+ //var needUpdateRecordTable = false;
+ var record = db.Queryable<TN_Record_Table>()
+ .Where(r => r.S_TASK_NO == task.S_CODE).First();
+ if (record != null) {
+ //needUpdateRecordTable = true;
+ info = $"鍑哄叆搴撹褰曡〃涓凡缁忓瓨鍦ㄤ换鍔″彿{task.S_CODE}"; // 闃叉娴嬭瘯鏃跺弽澶嶈皟鐢�34562瀵艰嚧閲嶅璁板綍
+ LogHelper.Info(info);
+ return;
+ }
+
+ record = new TN_Record_Table {
S_ITEM_CODE = cgDetail.S_ITEM_CODE,
S_BATCH_NO = cgDetail.S_BATCH_NO,
S_ITEM_NAME = cgDetail.S_ITEM_NAME,
@@ -171,9 +173,12 @@
S_TASK_NO = task.S_CODE,
T_RECORD_TIME = DateTime.Now,
S_TYPE = task.S_TYPE,
- S_BS_CODE = task.S_BS_TYPE,
+ S_BS_CODE = task.S_BS_NO, // ERP鍗曞彿锛岄粯璁や负绌�+ N_QTY = cgDetail.N_ITEM_NUM,
+ S_NO = task.S_OP_CODE, // 鍑哄簱/鎶芥/绉诲簱鍗� };
+ // 鏁版嵁搴撴搷浣� if (db.Insertable<TN_Record_Table>(record).ExecuteCommand() <= 0) {
info = "鎻掑叆鍑哄叆搴撹褰曡〃澶辫触锛� + JsonConvert.SerializeObject(record);
LogHelper.Info(info);
@@ -188,6 +193,11 @@
}
}
+ /// <summary>
+ /// AGV浜х嚎瀹夊叏浜や簰閫昏緫瀹炵幇
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
public static ReturnResult SafetyInteraction(SafetyInteractionInfo model) {
var db = new SqlHelper<object>().GetInstance();
var info = "";
@@ -249,7 +259,6 @@
info = $"鍚戣緭閫佺嚎鍐欏叆鍏佽鍙栬揣淇″彿鎴愬姛";
LogHelper.Info(info);
return NewReturnResult(0, info);
-
}
else if (model.apply_code == "1") { // 璇锋眰鍗歌揣
if (prodLineDevice.AllowAgvPlacePallet != 1) {
@@ -290,7 +299,7 @@
.First(d => d.N_B_STATE == 2);
if (detail == null) {
- LogHelper.Info($"{taskName}--AGV鍙栬揣--鏌ヨ鏄庣粏鍗曪細褰撳墠娌℃湁鎵ц涓殑鏄庣粏鍗�);
+ LogHelper.Info($"{taskName}锛欰GV鍙栬揣锛氭煡璇㈡槑缁嗗崟锛氬綋鍓嶆病鏈夋墽琛屼腑鐨勬槑缁嗗崟");
return;
}
@@ -298,14 +307,14 @@
detail.N_B_STATE = spotStateCode;
if (db.Updateable<TN_Outbound_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
tran.RollbackTran();
- LogHelper.Info($"{taskName}--AGV鍙栬揣锛氫慨鏀规槑缁嗗崟鐘舵�涓�浠诲姟鎵ц瀹屾垚--澶辫触锛�);
+ LogHelper.Info($"{taskName}锛欰GV鍙栬揣锛氫慨鏀规槑缁嗗崟鐘舵�涓恒�3浠诲姟鎵ц瀹屾垚銆戝け璐ワ紒");
return;
}
var finishedCount = db.Queryable<TN_Outbound_Detail>().Count(d => d.S_OO_NO == detail.S_OO_NO && d.N_B_STATE == 3);
var allCount = db.Queryable<TN_Outbound_Detail>().Count(d => d.S_OO_NO == detail.S_OO_NO);
- LogHelper.Info($"{taskName}--AGV鍙栬揣--缁熻浠诲姟宸插畬鎴愶細{finishedCount}/{allCount}");
+ LogHelper.Info($"{taskName}锛欰GV鍙栬揣锛氱粺璁′换鍔″凡瀹屾垚锛歿finishedCount}/{allCount}");
if (finishedCount == allCount) { // 褰撳墠鍑哄簱鍗曚笅鐨勬墍鏈夋槑缁嗗崟锛屼换鍔￠兘宸茬粡瀹屾垚
@@ -314,7 +323,7 @@
.ExecuteCommand() <= 0) {
tran.RollbackTran();
- LogHelper.Info($"{taskName}--AGV鍙栬揣--鎵�湁浠诲姟瀹屾垚鏃讹細淇敼鍗曟嵁鐘舵�涓�浠诲姟鎵ц瀹屾垚--澶辫触锛�);
+ LogHelper.Info($"{taskName}锛欰GV鍙栬揣锛氭墍鏈変换鍔″畬鎴愭椂锛氫慨鏀瑰崟鎹姸鎬佷负3浠诲姟鎵ц瀹屾垚--澶辫触锛�);
return;
}
}
@@ -324,13 +333,98 @@
}
public static void PickUpReturnErp(TN_Task task) {
+ var db = new SqlHelper<object>().GetInstance();
+ var info = "";
var httpH = new HttpHelper();
- var model = new OtherModel.PickUpReturnErpInfo();
- model.LocCode = task.S_START_LOC;
+
try {
+ var plan = db.Queryable<TN_Outbound_Plan>()
+ .Where(p => p.JHDH == task.S_BS_NO)
+ .First();
+
+ if (plan == null) {
+ info = $"璁″垝鍗曞彿{task.S_BS_NO}涓嶅瓨鍦紒";
+ LogHelper.Info(info);
+ }
+
+ var cgDetail = db.Queryable<TN_CG_Detail>()
+ .Where(d => d.S_CNTR_CODE == task.S_CNTR_CODE)
+ .First();
+
+ if (cgDetail == null) {
+ info = $"鐗╂枡缂栫爜涓嶅瓨鍦紒";
+ LogHelper.Info(info);
+ }
+
+ var model = new OtherModel.PickUpReturnErpInfo {
+ jhdh = plan.JHDH, // 璁″垝鍗曞彿锛堝敮涓�爣璇嗭級
+ ckzt = plan.CKZT, // 鍑哄簱鐘舵�锛堥渶瑕佽繑鍥烇級
+ jhlb = plan.JHLB, // 璁″垝绫诲埆
+ ckdh = plan.CKDH, // 鍙傝�鍗曞彿
+ cph = plan.CPH, // 杞︾墝鍙�+ ysfs = plan.YSFS, // 杩愯緭鏂瑰紡
+ cpzt = plan.CPZT, // 浜у搧鐘舵�
+ mddw = plan.MDDW, // 涔版柇鍗曚綅
+ cpdm = plan.CPDM, // 浜у搧浠ｇ爜
+ cplb = plan.CPLB, // 浜у搧绫诲埆
+ cplbmx = plan.CPLBMX, // 浜у搧绫诲埆鏄庣粏
+ pp = plan.PP, // 鍝佺墝
+ dj = plan.DJ, // 绛夌骇锛堥渶瑕佽繑鍥烇級
+ gh = plan.GH, // 缃愬彿
+ ph = plan.PH, // 鎵瑰彿锛堥渶瑕佽繑鍥烇級
+ bzlx = plan.BZLX, // 鍖呰绫诲瀷
+ pzdh = plan.PZDH, // 娲捐鍗曞彿
+ pzd_dw = plan.PZD_DW, // 娲捐鍗曞崟浣�+ pzd_dybh = plan.PZD_DYBH, // 娲捐鍗曡皟杩愮紪鍙�+ pzjs = plan.PZJS, // 娲捐浠舵暟
+ pzsl = plan.PZSL, // 娲捐鏁伴噺
+ pz_rq = plan.PZ_RQ, // 娲捐鏃ユ湡(yyyy-mm-dd)
+ pz_czrq = plan.PZ_CZRQ, // 娲捐鎿嶄綔鏃ユ湡
+ pz_zfbj = plan.PZ_ZFBJ, // 娲捐浣滃簾鏍囪
+ pz_zfrq = plan.PZ_ZFRQ, // 娲捐浣滃簾鏃ユ湡
+ pz_bz = plan.PZ_BZ, // 娲捐澶囨敞
+ ckdbh = plan.CKDBH, // 鍑哄簱鍗曠紪鍙�+ sfjs = plan.SFJS, // 瀹炲彂浠舵暟锛堥渶瑕佽繑鍥烇級--鏇存柊
+ sfsl = plan.SFSL, // 瀹炲彂鏁伴噺锛堥渶瑕佽繑鍥烇級--鏇存柊
+ //sfcs = plan.SFCS , // 瀹炲彂杞︽暟锛堥渶瑕佽繑鍥烇級
+ //zcsj = plan.ZCSJ , // 瑁呰溅鏃堕棿锛堥渶瑕佽繑鍥烇級
+ //jldw = plan.JLDW , // 璁￠噺鍗曚綅锛堥渶瑕佽繑鍥烇級
+ //fhrq = plan.FHRQ , // 鍙戣揣鏃ユ湡锛堥渶瑕佽繑鍥烇級
+ //ckdm = plan.CKDM , // 浠撳簱浠ｇ爜锛堥渶瑕佽繑鍥烇級
+ //fhr = plan.FHR , // 鍙戣揣浜猴紙闇�杩斿洖锛�+ //czydm = plan.CZYDM , // 鎿嶄綔鍛橈紙闇�杩斿洖锛�+ shr_username = plan.SHR_USERNAME, // 瀹℃牳浜�+ shrq = plan.SHRQ, // 瀹℃牳鏃ユ湡
+ zfbj = plan.ZFBJ, // 浣滃簾鏍囪
+ zfrq = plan.ZFRQ, // 浣滃簾鏃ユ湡
+ jsdw = plan.JSDW, // 缁撶畻鍗曚綅
+ shdw = plan.SHDW, // 鏀惰揣鍗曚綅
+ ysdw = plan.YSDW, // 杩愯緭鍗曚綅
+ lxr = plan.LXR, // 鑱旂郴浜�+ //ry_zxg = plan.RY_ZXG , // 瑁呭嵏宸ワ紙闇�杩斿洖锛�+ //ry_ccsj = plan.RY_CCSJ , // 鍙夎溅鍙告満锛堥渶瑕佽繑鍥烇級
+ erphx_jhdh = plan.ERPHX_JHDH, // erp浜よ揣鍗曞彿
+ erphx_wlbm = plan.ERPHX_WLBM, // erp鐗╂枡缂栫爜
+ erphx_wlmc = plan.ERPHX_WLMC, // erp鐗╂枡鍚嶇О
+ erphx_cjrq = plan.ERPHX_CJRQ, // erp鍒涘缓鏃ユ湡
+ hw = plan.HW, // 璐т綅锛堥渶瑕佽繑鍥烇級
+ hwzt = plan.HWZT // 璐т綅鐘舵�锛堥渶瑕佽繑鍥烇級
+ };
+ model.sfjs = cgDetail.N_ITEM_NUM;
+ model.sfsl = (decimal) cgDetail.F_QTY; // TEMP
+ model.hwzt = "宸插嚭搴�;
+
var jsonInfo = JsonConvert.SerializeObject(model);
var result = httpH.WebPost(Settings.ErpApiUrl + "PickUpReturn", jsonInfo);
- // TODO
+
+ LogHelper.InfoApi($"鍙栬揣瀹屾垚鍙嶉ERP鎺ュ彛锛岀粨鏋�{result}锛岃皟鐢ㄥ弬鏁帮細", model);
+
+ plan.SFJS = model.sfjs;
+ plan.SFSL = model.sfsl;
+ plan.HWZT = model.hwzt;
+ var success = db.Updateable<TN_Outbound_Plan>(plan).UpdateColumns(p => new { p.SFJS, p.SFSL, p.HWZT }).ExecuteCommand() > 0;
+ info = "鏇存柊鍑哄簱璁″垝鍗曡褰曡〃" + (success ? "鎴愬姛" : "澶辫触");
+ LogHelper.Info(info);
}
catch (Exception ex) {
LogHelper.InfoEx(ex);
@@ -355,8 +449,6 @@
else {
LogHelper.Info("鏆傛棤浠诲姟");
}
-
-
}
}
}
--
Gitblit v1.9.1