From 2d3ee03961d6cfbde70342e8a97bc7b05d0b0dc3 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 21 七月 2025 17:27:34 +0800
Subject: [PATCH] 优化代码, 封装货位锁和创建任务流程, 数据库事务等
---
core/WCSCore.cs | 585 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 450 insertions(+), 135 deletions(-)
diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index 95eff3f..801e745 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -1,11 +1,13 @@
锘縰sing System;
using System.Collections.Generic;
using System.Linq;
+using System.Net;
+using System.Net.Sockets;
using System.Text;
using System.Threading.Tasks;
+using HH.WCS.Mobox3.DSZSH.api;
using HH.WCS.Mobox3.DSZSH.device;
-
using HH.WCS.Mobox3.DSZSH.models;
using HH.WCS.Mobox3.DSZSH.process;
using HH.WCS.Mobox3.DSZSH.util;
@@ -13,53 +15,33 @@
using Newtonsoft.Json;
-using static HH.WCS.Mobox3.DSZSH.api.ApiModel;
+using Swashbuckle.Swagger;
+using static HH.WCS.Mobox3.DSZSH.api.ApiModel;
namespace HH.WCS.Mobox3.DSZSH.core {
public class WCSCore {
public static ReturnResult OperateAgvTaskStatus(AgvTaskState model) {
- var result = new ReturnResult();
+ const string preLog = "AGV:浠诲姟鐘舵�鍥炴姤:";
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,璇存槑娌℃湁鎵惧埌浠诲姟
+ return NewReturnResult(1, preLog + $"鏍规嵁浠诲姟鍙�{model.task_no}'鏈壘鍒板搴旂殑浠诲姟!");
+ }
}
- result.ResultCode = 0;
- result.ResultMsg = "success";
- LogHelper.Info(result.ResultMsg, "API");
- return result;
+ return NewReturnResult(0, "success"); // 涓嶈繑鍥炶缁嗘垚鍔熸棩蹇�閬垮厤NDC浠sg=success浣滀负鎴愬姛鍒ゅ畾 (鍙傝�鍥借嚜)
}
catch (Exception ex) {
- result.ResultCode = -1;
- result.ResultMsg = $"鍙戠敓浜嗗紓甯革細+{ex.Message}";
- LogHelper.Info(result.ResultMsg, "Error");
- return result;
+ return NewReturnResult(-1, $"鍙戠敓浜嗗紓甯�{ex.Message}\n\n{ex.StackTrace}\n");
}
}
/// <summary>
- /// 鎵ц AGV 浠诲姟锛屾煡璇笉鍒颁换鍔¤繑鍥�<see langword="false"/>
+ /// 鎵ц AGV 浠诲姟,鏌ヨ涓嶅埌浠诲姟杩斿洖 <see langword="false"/>
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -85,9 +67,12 @@
WCSHelper.UpdateStatus(TN_Task, "鍙栬揣瀹屾垚"); // 浠诲姟鐘舵�鏀规垚鍙栬揣瀹屾垚
TaskProcess.OperateStatus(TN_Task, 4); // 璧风偣瀹瑰櫒璐т綅瑙ｇ粦,瑙ｉ攣璧风偣
- if (TN_Task.S_TYPE == TaskName.鎴愬搧鑳跺嚭搴� {
+ if (TN_Task.S_TYPE == ETask.C鎴愬搧鑳跺嚭搴�Name()) {
var nextOutboundTask = Task.Run(() => {
UpdateOutboundTaskState(3);
+ });
+ var pickUpReturnErpTask = Task.Run(() => {
+ PickUpReturnErp(TN_Task);
});
}
@@ -102,11 +87,15 @@
case 2: // 瀹屾垚
WCSHelper.End(TN_Task); // 浠诲姟鐘舵�鏀规垚缁撴潫
- if (TN_Task.S_TYPE == TaskName.鎶芥_鍑哄簱) {
- var checkCompleteTask = Task.Run(() => {
- UpdateCheckTaskState(3);
- });
- }
+ //if (TN_Task.S_TYPE == TaskName.鎶芥_鍑哄簱) {
+ // var checkCompleteTask = Task.Run(() => {
+ // UpdateCheckTaskState(3);
+ // });
+ //}
+
+ var recordTask = Task.Run(() => {
+ RecordTaskTable(TN_Task);
+ });
break;
case 7: // 寮傚父
@@ -115,84 +104,200 @@
break;
}
- // 灏咥GV鎵ц鐘舵�锛屽姞鍏N_Task_Action琛ㄤ腑
+ // 灏咥GV鎵ц鐘舵�,鍔犲叆TN_Task_Action琛ㄤ腑
WCSHelper.AddActionRecord(model.task_no, model.state, model.forklift_no, model.ext_data);
- //璋冪敤绗笁鏂规帴鍙ｏ紙濡傛灉鏈夛級TaskProcess.ReportStatus锛屾坊鍔犱换鍔″姩浣滃叧绯昏〃
+ //璋冪敤绗笁鏂规帴鍙�(濡傛灉鏈� TaskProcess.ReportStatus,娣诲姞浠诲姟鍔ㄤ綔鍏崇郴琛�
return true;
}
- public static ReturnResult SafetyInteraction(SafetyInteractionInfo model) {
- var gzResult = new ReturnResult();
+ private static void RecordTaskTable(TN_Task task) {
var db = new SqlHelper<object>().GetInstance();
- ModbusHelper.Relink();
try {
+ var cgDetail = new TN_CG_Detail(); // 濡傛灉娌℃湁淇℃伅,榛樿灏辨槸绌哄�,鍙互鐩存帴濉叆,涓嶉渶瑕佸垽鏂�+
+ //var emptyTask = false; // 绌烘墭/绌虹浠诲姟
+ if (task.S_TYPE != ETask.K绌烘墭涓婄嚎鍑哄簱.Name() && task.S_TYPE != ETask.K绌烘墭鍏ュ簱.Name() &&
+ task.S_TYPE != ETask.K绌虹涓婄嚎鍑哄簱.Name() && task.S_TYPE != ETask.K绌虹鍏ュ簱.Name()) {
+ // 闈炵┖鎵�绌虹浠诲姟 (绌烘墭/绌虹浠诲姟鏃犳硶鍦–GDetail鏌ュ埌鐗╂枡淇℃伅)
+ //emptyTask= true;
+ cgDetail = db.Queryable<TN_CG_Detail>()
+ .Where(d => d.S_CNTR_CODE == task.S_CNTR_CODE)
+ .First();
-
- var prodLineInfo = Settings.ProductionLines[0];
- var prodLineDevice = new ProductionLineDevice(prodLineInfo.PlcIp, prodLineInfo.PlcPort);
- if (!prodLineDevice.LoadDeviceStateOk()) {
- LogHelper.Info("鍔犺浇璁惧淇℃伅澶辫触");
- }
-
- var tn_task = db.Queryable<TN_Task>().First(a => a.S_CODE == model.task_no);
- if (tn_task == null) {
- LogHelper.Info($"浠诲姟鍙�'{model.task_no}' 涓嶅瓨鍦�);
- }
-
- // 寰呬慨鏀癸細琛ュ厖涓嶅悓鍒嗘敮AGV鍒ゆ柇
- if (prodLineDevice.SystemState == 1) {
- if (prodLineDevice.FullOffline == 1 && tn_task.S_TYPE == TaskName.鎵樼洏_婊℃墭涓嬬嚎鍏ュ簱) {
- prodLineDevice.AgvPicking = 1;
- }
- if (prodLineDevice.AllowAgvPlacePallet == 1 && tn_task.S_TYPE == TaskName.鎵樼洏_绌烘墭涓婄嚎) {
- prodLineDevice.AgvPlacingPallet = 1;
+ if (cgDetail == null) {
+ LogHelper.Info($"浠诲姟{task.S_CODE}瀹屾垚,璁板綍鍑哄叆搴撳瓨鍦ㄩ棶棰�鏃犳硶鍦ㄥ鍣ㄨ揣鍝佹槑缁嗚〃涓壘鍒版墭鐩榹task.S_CNTR_CODE}瀵瑰簲鐨勭墿鏂�);
+ //return;
+ cgDetail = new TN_CG_Detail() ;
+ cgDetail.S_ITEM_CODE = "寮傚父";
}
}
- LogHelper.Info(JsonConvert.SerializeObject(prodLineDevice, Formatting.Indented));
- return gzResult;
+ var isInbound = false; // 鍏ュ簱绫诲瀷鐨勪换鍔�(鍖呮嫭绉诲簱绫讳换鍔�
+ var inboundTasks = new List<string> {
+ ETask.M婊℃墭涓嬬嚎鍏ュ簱.Name(), ETask.M婊＄涓嬬嚎鍏ュ簱.Name(), ETask.K绌烘墭鍏ュ簱.Name(), ETask.K绌虹鍏ュ簱.Name(),
+ ETask.C鎶芥鍚堟牸鍥炲簱.Name(), ETask.C鎶芥涓嶅悎鏍肩Щ搴�Name(), ETask.Y绉诲簱.Name()
+ };
+ if (inboundTasks.Contains(task.S_TYPE)) {
+ isInbound= true;
+ }
+
+ //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;
+ LogHelper.Info($"鍑哄叆搴撹褰曡〃涓凡缁忓瓨鍦ㄤ换鍔″彿{task.S_CODE}"); // 闃叉娴嬭瘯鏃跺弽澶嶈皟鐢�34562瀵艰嚧閲嶅璁板綍
+ 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,
+ S_LOC_CODE = isInbound ? task.S_END_LOC : task.S_START_LOC, // 鍏ュ簱璁板綍缁堢偣璐т綅,鍑哄簱璁板綍璧风偣璐т綅
+ S_CNTR_CODE = task.S_CNTR_CODE,
+ S_ITEM_SPEC = cgDetail.S_ITEM_SPEC,
+ S_NET_WEIGHT = cgDetail.S_NET_WEIGHT,
+ S_QUALITY_GRADE = cgDetail.S_QUALITY_GRADE,
+ S_STANDARD = cgDetail.S_STANDARD,
+ S_TASK_NO = task.S_CODE,
+ T_RECORD_TIME = DateTime.Now,
+ S_TYPE = task.S_TYPE,
+ S_BS_CODE = task.S_BS_NO, // ERP鍗曞彿,榛樿涓虹┖
+ N_QTY = cgDetail.N_ITEM_NUM,
+ S_NO = task.S_OP_CODE, // 鍑哄簱/鎶芥/绉诲簱鍗�+ };
+
+ // 鏁版嵁搴撴搷浣�+ if (db.Insertable(record).ExecuteCommand() <= 0) {
+ LogHelper.Info("鎻掑叆鍑哄叆搴撹褰曡〃澶辫触:" + JsonConvert.SerializeObject(record));
+ return;
+ }
+
+ LogHelper.Info("鎻掑叆鍑哄叆搴撹褰曡〃鎴愬姛");
}
catch (Exception ex) {
- LogHelper.Info($"鍙戠敓浜嗗紓甯革細{ex.Message}");
- return gzResult;
+ LogHelper.InfoEx(ex);
+ }
+ }
+
+ /// <summary>
+ /// AGV浜х嚎瀹夊叏浜や簰閫昏緫瀹炵幇
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public static ReturnResult SafetyInteraction(SafetyInteractionInfo model) {
+ var db = new SqlHelper<object>().GetInstance();
+ const string preLog = "AGV:浜х嚎瀹夊叏浜や簰:";
+
+ try {
+ ModbusHelper.Relink();
+
+ var BZQ = Settings.GetTaskInfo(ETask.M婊℃墭涓嬬嚎鍏ュ簱).StartAreas;
+ var loc = db.Queryable<TN_Location>()
+ .Where(l => BZQ.Contains(l.S_AREA_CODE) && l.S_AGV_SITE == model.station_name).First();
+
+ if (loc == null) {
+ return NewReturnResult(1, preLog + $"AGV 绔欑偣{model.station_name}涓嶆槸鍚堟硶鐨勪骇绾挎帴椹充綅绔欑偣");
+ }
+
+ if (!Settings.LocProdIdMap.TryGetValue(loc.S_CODE, out var prodIndex)) {
+ return NewReturnResult(1, preLog + $"AGV 绔欑偣{model.station_name}涓嶆槸鍚堟硶鐨勪骇绾挎帴椹充綅绔欑偣");
+ }
+
+ var prodLineInfo = Settings.ProductionLines[prodIndex];
+
+ var prodLineDevice = new ProductionLineDevice(prodLineInfo);
+ if (!prodLineDevice.LoadDeviceStateOk()) {
+ return NewReturnResult(2, preLog + "涓庝骇绾胯澶囬�璁け璐�);
+ }
+
+ //var tn_task = db.Queryable<TN_Task>().First(a => a.S_CODE == model.task_no);
+ //if (tn_task == null) {
+ // LogHelper.Info($"浠诲姟鍙�'{model.task_no}' 涓嶅瓨鍦�);
+ //}
+ //if (prodLineDevice.SystemState == 1) {
+ // if (prodLineDevice.FullOffline == 1 && tn_task.S_TYPE == TaskName.鎵樼洏_婊℃墭涓嬬嚎鍏ュ簱) {
+ // prodLineDevice.AgvPicking = 1;
+ // }
+ // if (prodLineDevice.AllowAgvPlacePallet == 1 && tn_task.S_TYPE == TaskName.鎵樼洏_绌烘墭涓婄嚎) {
+ // prodLineDevice.AgvPlacingPallet = 1;
+ // }
+ //}
+
+ if (prodLineDevice.SystemState != 1) {
+ return NewReturnResult(3, preLog + $"褰撳墠浜х嚎鏃犳硶涓嶢GV鑱斿姩:鐘舵�{prodLineDevice.SystemState}");
+ }
+
+ // 璇锋眰鍙栬揣
+ if (model.apply_code == "5") {
+ if (prodLineDevice.FullOffline != 1) {
+ return NewReturnResult(4, preLog + $"褰撳墠杈撻�绾挎弧鏂欎笅绾夸俊鍙蜂笉涓�,鏃犳硶鍙栬揣");
+ }
+
+ if (!prodLineDevice.SetAgvPicking(1)) {
+ return NewReturnResult(5, preLog + $"鍚戣緭閫佺嚎鍐欏叆鍏佽鍙栬揣淇″彿澶辫触");
+ }
+
+ return NewReturnResult(0, preLog + $"鍚戣緭閫佺嚎鍐欏叆鍏佽鍙栬揣淇″彿鎴愬姛");
+ }
+ // 璇锋眰鍗歌揣
+ else if (model.apply_code == "1") {
+ if (prodLineDevice.AllowAgvPlacePallet != 1) {
+ return NewReturnResult(6, preLog + $"褰撳墠杈撻�绾垮厑璁告斁鎵樼洏淇″彿涓嶄负1,鏃犳硶鏀捐揣");
+ }
+
+ if (!prodLineDevice.SetAgvPlacingPallet(1)) {
+ return NewReturnResult(7, preLog + $"鍚戣緭閫佺嚎鍐欏叆鍏佽鏀捐揣淇″彿澶辫触");
+ }
+
+ return NewReturnResult(0, preLog + $"鍚戣緭閫佺嚎鍐欏叆鍏佽鏀捐揣淇″彿鎴愬姛");
+ }
+ else {
+ return NewReturnResult(8, preLog + $"褰撳墠AGV璇锋眰鐮佷笉涓�5鍙栬揣 鎴�1鍗歌揣");
+ }
+
+ }
+ catch (Exception ex) {
+ return NewReturnResult(1, preLog + $"鍙戠敓浜嗗紓甯�{ex.Message}\n\n{ex.StackTrace}\n");
}
}
public static void UpdateOutboundTaskState(int spotStateCode) {
-
+ var taskName = ETask.C鎴愬搧鑳跺嚭搴�Name();
var db = new SqlHelper<object>().GetInstance();
var detail = db.Queryable<TN_Outbound_Detail>()
.First(d => d.N_B_STATE == 2);
if (detail == null) {
- LogHelper.Info("鍑哄簱--AGV鍙栬揣--鏌ヨDetail锛氬綋鍓嶆病鏈�鎵ц涓�鐨凞etail琛紒");
+ LogHelper.Info($"{taskName}:AGV鍙栬揣:鏌ヨ鏄庣粏鍗�褰撳墠娌℃湁鎵ц涓殑鏄庣粏鍗�);
return;
}
using (var tran = db.Ado.UseTran()) {
detail.N_B_STATE = spotStateCode;
- if (db.Updateable<TN_Outbound_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
+ if (db.Updateable(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
tran.RollbackTran();
- LogHelper.Info("鍑哄簱--AGV鍙栬揣锛氫慨鏀笵etail鐘舵� N_B_STATE 涓�3浠诲姟鎵ц瀹屾垚 澶辫触锛�);
+ LogHelper.Info($"{taskName}:AGV鍙栬揣:淇敼鏄庣粏鍗曠姸鎬佷负銆�浠诲姟鎵ц瀹屾垚銆戝け璐�");
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($"鍑哄簱--AGV鍙栬揣--缁熻浠诲姟宸插畬鎴愶細{finishedCount} / {allCount}");
+ LogHelper.Info($"{taskName}:AGV鍙栬揣:缁熻浠诲姟宸插畬鎴�{finishedCount}/{allCount}");
- if (finishedCount == allCount) { // 褰撳墠鍑哄簱鍗曚笅鐨勬墍鏈夋槑缁嗗崟锛屼换鍔￠兘宸茬粡瀹屾垚
+ if (finishedCount == allCount) { // 褰撳墠鍑哄簱鍗曚笅鐨勬墍鏈夋槑缁嗗崟,浠诲姟閮藉凡缁忓畬鎴�
if (db.Updateable<TN_Outbound_Order>().SetColumns(it => it.N_B_STATE == 3)
.Where(it => it.S_NO == detail.S_OO_NO)
.ExecuteCommand() <= 0) {
tran.RollbackTran();
- LogHelper.Info("鍑哄簱--AGV鍙栬揣--鎵�湁浠诲姟瀹屾垚鏃讹細淇敼Order鐘舵� N_B_STATE 涓�3浠诲姟鎵ц瀹屾垚 澶辫触锛�);
+ LogHelper.Info($"{taskName}:AGV鍙栬揣:鎵�湁浠诲姟瀹屾垚鏃�淇敼鍗曟嵁鐘舵�涓�浠诲姟鎵ц瀹屾垚--澶辫触!");
return;
}
}
@@ -201,84 +306,294 @@
}
}
- public static void UpdateCheckTaskState(int spotStateCode) {
+ public static void PickUpReturnErp(TN_Task task) {
var db = new SqlHelper<object>().GetInstance();
+ var httpH = new HttpHelper();
+
+ try {
+ var plan = db.Queryable<TN_Outbound_Plan>()
+ .Where(p => p.JHDH == task.S_BS_NO)
+ .First();
- var detail = db.Queryable<TN_Check_Detail>()
- .First(d => d.N_B_STATE == 2);
+ if (plan == null) {
+ LogHelper.Info($"璁″垝鍗曞彿{task.S_BS_NO}涓嶅瓨鍦�");
+ }
- if (detail == null) {
- LogHelper.Info("鎶芥--AGV浠诲姟瀹屾垚--鏌ヨDetail锛氬綋鍓嶆病鏈�鎵ц涓�鐨凞etail琛紒");
- return;
+ var cgDetail = db.Queryable<TN_CG_Detail>()
+ .Where(d => d.S_CNTR_CODE == task.S_CNTR_CODE)
+ .First();
+
+ if (cgDetail == null) {
+ LogHelper.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 + Settings.ErpRoute.PickUpReturn, jsonInfo);
+
+ LogHelper.InfoApi($"鍙栬揣瀹屾垚鍙嶉ERP鎺ュ彛,缁撴灉={result},璋冪敤鍙傛暟:", model);
+
+ plan.SFJS = model.sfjs;
+ plan.SFSL = model.sfsl;
+ plan.HWZT = model.hwzt;
+ var success = db.Updateable(plan).UpdateColumns(p => new { p.SFJS, p.SFSL, p.HWZT }).ExecuteCommand() > 0;
+ LogHelper.Info("鏇存柊鍑哄簱璁″垝鍗曡褰曡〃" + (success ? "鎴愬姛" : "澶辫触"));
}
-
- using (var tran = db.Ado.UseTran()) {
- detail.N_B_STATE = spotStateCode;
- if (db.Updateable<TN_Check_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- LogHelper.Info("鎶芥--AGV浠诲姟瀹屾垚锛氫慨鏀笵etail鐘舵� N_B_STATE 涓�3浠诲姟鎵ц瀹屾垚 澶辫触锛�);
- return;
- }
-
- var finishedCount = db.Queryable<TN_Check_Detail>().Count(d => d.S_NO == detail.S_NO && d.N_B_STATE == 3);
- var allCount = db.Queryable<TN_Check_Detail>().Count(d => d.S_NO == detail.S_NO);
-
- LogHelper.Info($"鎶芥--AGV浠诲姟瀹屾垚锛氱粺璁′换鍔″凡瀹屾垚锛歿finishedCount} / {allCount}");
-
- if (finishedCount == allCount) { // 褰撳墠order涓嬬殑detail锛屼换鍔￠兘宸茬粡瀹屾垚
-
- if (db.Updateable<TN_Check_Order>().SetColumns(it => it.N_B_STATE == 3)
- .Where(it => it.S_NO == detail.S_NO)
- .ExecuteCommand() <= 0) {
-
- tran.RollbackTran();
- LogHelper.Info("鎶芥--AGV浠诲姟瀹屾垚--鎵�湁浠诲姟瀹屾垚鏃讹細淇敼Order鐘舵� N_B_STATE 涓�3浠诲姟鎵ц瀹屾垚 澶辫触锛�);
- return;
- }
- }
-
- tran.CommitTran();
+ catch (Exception ex) {
+ LogHelper.InfoEx(ex);
}
}
- public static void UpdateShiftTaskState(int spotStateCode) {
+ /// <summary>
+ /// 浠诲姟鍒嗗彂,鏍规嵁璋冨害绫诲瀷鍙戠粰涓嶅悓鐨勮皟搴︾郴缁�+ /// </summary>
+ internal static void Dispatch() {
+ //鑾峰彇鎵�湁绛夊緟鐨勪换鍔�+ var list = WCSHelper.GetWaitingTaskList();
+ if (list.Count > 0) {
+ LogHelper.Info($"杞:浠诲姟鍒嗗彂:绛夊緟浠诲姟淇℃伅\n\n{JsonConvert.SerializeObject(list)}\n");
+ list.ForEach(task => {
+ //浣跨敤鑷畾涔変换鍔℃帹閫�+ //TaskProcess.SendTask(task);//璋冨害NDC鎴栨澀濂ユ垨鍥借嚜璁惧
+ TaskProcess.SendNDCTask(task);
+ });
+ }
+ else {
+ LogHelper.Debug("杞:浠诲姟鍒嗗彂:鏆傛棤浠诲姟");
+ }
+ }
+
+ // TCP 闈炶疆璇㈡柟寮�妯℃嫙浜х嚎涓嬬嚎鐨勫皾璇�+
+ public static void StartServer() {
+ var ListenPort = Settings.TcpServerPort;
+ TcpListener listener = new TcpListener(IPAddress.Any, ListenPort);
+ listener.Start();
+ Console.WriteLine($"鍚庡彴鏈嶅姟宸插惎鍔�鐩戝惉绔彛 {ListenPort}...");
+
+ while (true) {
+ try {
+ // 鎺ュ彈浜х嚎杩炴帴
+ System.Net.Sockets.TcpClient client = listener.AcceptTcpClient();
+ Console.WriteLine($"浜х嚎瀹㈡埛绔凡杩炴帴: {client.Client.RemoteEndPoint}");
+
+ // 澶勭悊瀹㈡埛绔姹�(浣跨敤Task閬垮厤闃诲涓荤嚎绋�
+ Task.Run(() => HandleClientRequest(client));
+ }
+ catch (Exception ex) {
+ Console.WriteLine($"鏈嶅姟绔紓甯� {ex.Message}");
+ }
+ }
+ }
+
+ public static void HandleClientRequest(System.Net.Sockets.TcpClient client) {
+ var db = new SqlHelper<object>().GetInstance();
+ using (client)
+ using (NetworkStream stream = client.GetStream()) {
+ try {
+ // 璇诲彇浜х嚎娑堟伅
+ byte[] buffer = new byte[1024];
+ int bytesRead = stream.Read(buffer, 0, buffer.Length);
+ string jsonMessage = Encoding.UTF8.GetString(buffer, 0, bytesRead);
+
+ // 瑙ｆ瀽娑堟伅
+ var message = JsonConvert.DeserializeObject<ProductCompletedMessage>(jsonMessage);
+ //Console.WriteLine($"鏀跺埌浜у搧瀹屾垚閫氱煡 - 鐗╂枡:{message.ItemCode};鎵规鍙�{message.BatchNo};瀹瑰櫒鍙�{message.CntrCode}");
+ LogHelper.Info($"鏀跺埌浜у搧涓嬬嚎閫氱煡:"+message);
+
+ string startLocCode = "";
+
+ // A. 濡傛灉鏄崟涓骇绾縋LC,閫氳繃TCP浼犳挱,闇�浼犻�浜х嚎ID,鏍规嵁ID璁＄畻璧风偣璐т綅
+ //startLocCode = Settings.ProductionLines[message.Id].OffLoc[0]; // 鐞嗚涓婂簲璇ュ彧鏈�涓狾ffLoc,鍚﹀垯搴旇娉ㄦ槑鏄摢涓�釜
+
+ // B. 濡傛灉鏄瘡鏉′骇绾垮悇涓�釜瀹㈡埛绔�鏇寸畝鍗�鐩存帴鏍规嵁IP鍦板潃纭畾缁堢偣璐т綅
+ // TODO 鍏蜂綋閫昏緫寰呭悗缁‘瀹氭椂琛ュ畬
+
+ var success = CreateInboundTask(startLocCode, message.CntrCode).Value;
+
+ // 鍙戦�鍝嶅簲
+ string response = success ? "ACK: 鏈哄櫒浜哄凡璋冨害" : "NAK: 璋冨害澶辫触";
+ byte[] responseData = Encoding.UTF8.GetBytes(response);
+ stream.Write(responseData, 0, responseData.Length);
+ }
+ catch (Exception ex) {
+ Console.WriteLine($"澶勭悊瀹㈡埛绔姹傚紓甯� {ex.Message}");
+ }
+ }
+ }
+
+ /// <summary>
+ /// 鍏ュ簱浣滀笟鍒涘缓鍙帴鏀惰捣鐐硅揣浣嶅拰瀹瑰櫒鍙�(鐗╂枡淇℃伅寰呭畾,閫氳繃浜х嚎鍙疯绠楄捣鐐圭殑閫昏緫鏀惧湪鏂规硶澶�
+ /// </summary>
+ /// <param name="startLocCode"></param>
+ /// <param name="cntrCode"></param>
+ /// <returns></returns>
+ public static Result<bool> CreateInboundTask(string startLocCode, string cntrCode) {
var db = new SqlHelper<object>().GetInstance();
- var detail = db.Queryable<TN_Shift_Detail>()
- .First(d => d.N_B_STATE == 2);
+ var taskInfo = Settings.GetTaskInfo(ETask.M婊℃墭涓嬬嚎鍏ュ簱);
+ var taskName = taskInfo.TaskName;
+ var startAreas = taskInfo.StartAreas;
+ var endAreas = taskInfo.EndAreas;
+ const string cntrType = "鎵樼洏";
- if (detail == null) {
- LogHelper.Info("绉诲簱--AGV浠诲姟瀹屾垚--鏌ヨDetail锛氬綋鍓嶆病鏈�鎵ц涓�鐨凞etail琛紒");
- return;
- }
+ try {
+ var startLoc = db.Queryable<TN_Location>()
+ .Where(l => l.S_CODE == startLocCode)
+ .Where(l => startAreas.Contains(l.S_AREA_CODE))
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+ //.Where(l => l.N_CURRENT_NUM == 0) // 缁戝畾鍓�+ .First();
- detail.N_B_STATE = spotStateCode;
-
- var finishedCount = db.Queryable<TN_Shift_Detail>().Count(d => d.S_NO == detail.S_NO && d.N_B_STATE == 3);
- var allCount = db.Queryable<TN_Shift_Detail>().Count(d => d.S_NO == detail.S_NO);
-
- LogHelper.Info($"绉诲簱--AGV浠诲姟瀹屾垚锛氱粺璁′换鍔″凡瀹屾垚锛歿finishedCount} / {allCount}");
-
- using (var tran = db.Ado.UseTran()) {
- if (db.Updateable<TN_Shift_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- LogHelper.Info("绉诲簱--AGV浠诲姟瀹屾垚锛氫慨鏀笵etail鐘舵� N_B_STATE 涓�3浠诲姟鎵ц瀹屾垚 澶辫触锛�);
- return;
+ if (startLoc == null) {
+ return NewResult(false, $"娌℃湁鎵惧埌璧风偣璐т綅'{startLocCode}',鎴栦笉婊¤冻瑕佹眰:鏈笂閿�褰撳墠瀹瑰櫒鏁伴噺=0");
}
- if (finishedCount == allCount) { // 褰撳墠order涓嬬殑detail锛屼换鍔￠兘宸茬粡瀹屾垚
- if (db.Updateable<TN_Shift_Order>().SetColumns(it => it.N_B_STATE == 3)
- .Where(it => it.S_NO == detail.S_NO)
- .ExecuteCommand() <= 0) {
+ var locCntrRelOld = db.Queryable<TN_Loc_Container>()
+ .Where(c => c.S_CNTR_CODE == cntrCode).First();
- tran.RollbackTran();
- LogHelper.Info("绉诲簱--AGV浠诲姟瀹屾垚--鎵�湁浠诲姟瀹屾垚鏃讹細淇敼Order鐘舵� N_B_STATE 涓�3浠诲姟鎵ц瀹屾垚 澶辫触锛�);
- return;
+ // 缁戝畾璐т綅鍜屽鍣ㄥ彿
+ var locCntrRel = new TN_Loc_Container {
+ S_LOC_CODE = startLocCode,
+ S_CNTR_CODE = cntrCode,
+ S_CNTR_TYPE = cntrType,
+ };
+
+ startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚�+
+ var endLoc = db.Queryable<TN_Location>()
+ .Where(a => endAreas.Contains(a.S_AREA_CODE))
+ .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�:鏈笂閿�+ .Where(a => a.N_CURRENT_NUM == 0) // 绛涢�:绌鸿揣浣�+ .OrderBy(l => l.N_LAYER)
+ .First();
+
+ if (endLoc == null) {
+ return NewResult(false, $"娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆�闇�婊¤冻瑕佹眰:鏈笂閿�褰撳墠瀹瑰櫒鏁伴噺=0");
+ }
+
+ var cntId = locCntrRel.S_CNTR_CODE;
+ var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+
+ WCSHelper.LockStartLoc(startLoc); // 璧风偣鍑哄簱閿�+ WCSHelper.LockEndLoc(endLoc); // 缁堢偣鍏ュ簱閿�+
+ using (var tran = db.Ado.UseTran()) {
+ if (locCntrRelOld != null) {
+ if (db.Deleteable(locCntrRelOld).ExecuteCommand() <= 0 &&
+ db.Updateable<TN_Location>().SetColumns(l => l.N_CURRENT_NUM == 0).Where(l => l.S_CODE == locCntrRelOld.S_LOC_CODE).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return NewResult(false, $"鍒犻櫎鏃ц揣浣嶅鍣ㄥ叧绯昏〃澶辫触:璐т綅缂栫爜{locCntrRelOld.S_LOC_CODE},瀹瑰櫒缂栫爜{locCntrRelOld.S_CNTR_CODE}");
+ }
}
- }
- tran.CommitTran();
+ if (db.Insertable(locCntrRel).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return NewResult(false, $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴琛ㄥけ璐�璐т綅缂栫爜{locCntrRel.S_LOC_CODE},瀹瑰櫒缂栫爜{locCntrRel.S_CNTR_CODE}");
+ }
+
+ if (db.Updateable(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM, }).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return NewResult(false, $"鐢熸垚浠诲姟'{taskName}'澶辫触:鏇存柊璧风偣璐т綅{startLoc.S_CODE}閿佺姸鎬佸け璐�);
+ }
+
+ if (db.Updateable(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, }).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return NewResult(false, $"鐢熸垚浠诲姟'{taskName}'澶辫触:鏇存柊缁堢偣璐т綅{endLoc.S_CODE}閿佺姸鎬佸け璐�);
+ }
+
+ if (db.Insertable(task).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return NewResult(false, $"鐢熸垚浠诲姟'{taskName}'澶辫触,浠诲姟鍙�{task.S_CODE},瀹瑰櫒鍙�{cntId},璧风偣={startLoc.S_CODE},缁堢偣={endLoc.S_CODE}");
+ }
+
+ tran.CommitTran();
+ return NewResult(true, $"鐢熸垚浠诲姟'{taskName}'鎴愬姛,浠诲姟鍙�{task.S_CODE},瀹瑰櫒鍙�{cntId},璧风偣={startLoc.S_CODE},缁堢偣={endLoc.S_CODE}");
+ }
}
+ catch (Exception ex) {
+ return NewResult(false, ex.Message);
+ }
+ }
+
+ private static Result<bool> NewResult(bool res, string msg, bool log = true) {
+ if (log) { LogHelper.Info(msg); }
+ return new Result<bool>(res, msg);
+ }
+
+ }
+
+ public class ProductCompletedMessage {
+ public int Id { get; set; }
+ //public string ItemCode { get; set; }
+ //public string BatchNo { get; set; }
+ public string CntrCode { get; set; }
+ }
+
+ public class Result<T> {
+ public T Value { get; set; }
+ public string Content { get; set; }
+
+ public Result(T value, string content) {
+ Value = value;
+ Content = content;
}
}
}
--
Gitblit v1.9.1