From 557f02072fa311eefe3123aa44afebac22adc465 Mon Sep 17 00:00:00 2001
From: xiaojiao <xiaojiao@kaokeziliao.com>
Date: 星期五, 24 四月 2026 17:24:43 +0800
Subject: [PATCH] 4-24
---
项目代码/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/InboundArea/InboundRequestStationAction.cs | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/InboundArea/InboundRequestStationAction.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/InboundArea/InboundRequestStationAction.cs"
index 89b0e06..5be3f36 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/InboundArea/InboundRequestStationAction.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/InboundArea/InboundRequestStationAction.cs"
@@ -1,10 +1,12 @@
锘縰sing HslCommunication;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using WIDESEA_Common;
+using WIDESEA_Common.LogEnum;
using WIDESEA_Common.Tools;
using WIDESEA_Core.Utilities;
using WIDESEA_Entity.DomainModels;
@@ -18,6 +20,9 @@
{
public partial class InboundAreaDispatch
{
+ /// <summary>
+ /// 20101
+ /// </summary>
private static string InboundRequestStationNo = "20101";
public static void InboundRequestStationAction(IDt_TaskWCSinfoRepository taskWCSinfoRepository, PLCClient client, string lineCode)
@@ -81,7 +86,7 @@
return;
logicValue = int.Parse(client.ReadValue(CLineInfoDBName.R_Line_Logic.ToString(), lineCode).ToString());
//璇存槑绔欏彴宸茬粡鏀跺埌浠诲姟鏁版嵁锛岀瓑寰匴CS鐨勫惎鍔ㄦ寚浠�
- if (logicValue == 3)
+ if (logicValue == 3) //璇诲彇杈撻�佺嚎3锛岃〃绀�
{
//鍚姩浠诲姟
client.WriteValue(CLineInfoDBName.W_Line_Logic.ToString(), lineCode, 1);
@@ -124,13 +129,17 @@
//姝ゅ鏍￠獙绌烘墭鍑哄簱鐨勪换鍔″湪搴撳瓨涓殑鎵樼洏鐮佸拰宸ヤ綅RFID璇诲彇鍒扮殑鎵樼洏鐮佹槸鍚︿竴鑷�
int taskNumber = int.Parse(client.ReadValue(CLineInfoDBName.R_Line_TaskNumber.ToString(), InboundRequestStationNo).ToString());
Dt_TaskWCSinfo emptyOutWcsInfo = null;
+ string barcode = client.ReadValue(CLineInfoDBName.R_Line_RFID_OK.ToString(), InboundRequestStationNo).ToString();
+
if (taskNumber > 0)
emptyOutWcsInfo = taskWCSinfoRepository.FindFirst(x => x.wcstask_taskNumber == taskNumber && taskTypes.Contains(x.wcstask_state));
else
{
- string barcode = client.ReadValue(CLineInfoDBName.R_Line_RFID_OK.ToString(), InboundRequestStationNo).ToString();
emptyOutWcsInfo = taskWCSinfoRepository.FindFirst(x => x.wcstask_barcode == barcode && taskTypes.Contains(x.wcstask_state));
}
+
+ string outstr = $"璇诲彇鍒拌澶囧弽棣堢殑浠诲姟id:{taskNumber}锛屾墭鐩樻潯鐮侊細{barcode}锛岋紝鏍规嵁鍏朵腑鐨勬暟鎹繘琛屼换鍔℃煡璇紝鏌ヨ缁撴灉锛歿emptyOutWcsInfo.ToJsonString()}";
+ LogRecord.WriteLog(LogEnum.OutTask, outstr.ToString());
if (null != emptyOutWcsInfo)
{
@@ -141,7 +150,7 @@
WebResponseContent content = taskWCSinfoRepository.DbContextBeginTransaction(() =>
{
//涓婃姤WMS浠诲姟瀹屾垚
- content = WMSApi.TellWmsTaskFinished(emptyOutWcsInfo.wcstask_barcode);
+ content = WMSApi.TellWmsTaskFinished(emptyOutWcsInfo.wcstask_barcode,emptyOutWcsInfo.wcstask_backUp_2);
if (content.Status)
{
//绉诲姩浠诲姟鍒板巻鍙茶〃
@@ -154,6 +163,10 @@
return content;
});
+
+ string wmstaskStatus = $"鎵樼洏鍙�:{emptyOutWcsInfo.wcstask_barcode},浠诲姟鍙凤細{emptyOutWcsInfo.wcstask_taskNumber},鍑哄簱浠诲姟鍙嶉WMS缁撴灉锛歿content.ToJsonString()}";
+ LogRecord.WriteLog(LogEnum.OutTask, wmstaskStatus.ToString());
+
string str = string.Empty;
if (content.Status)
str = $" { DateTime.Now }涓婃姤WMS鍑哄簱瀹屾垚鎴愬姛銆怲askState_ConveyorLineExecuting銆戯紝鎵樼洏鍙�:{emptyOutWcsInfo.wcstask_barcode},浠诲姟鍙凤細{ emptyOutWcsInfo.wcstask_taskNumber}";
@@ -167,7 +180,9 @@
}
catch (Exception ex)
{
- WriteLog.Info(InboundRequestStationNo).Write($"{ DateTime.Now }涓婃姤WMS鍑哄簱瀹屾垚浠诲姟澶辫触:{ex.Message}", InboundRequestStationNo);
+ string outEorr = $"鍏ュ簱鍖猴紝鍑哄簱鏄惁鎶ラ敊锛屾姤閿欏師鍥狅細{ex.Message}";
+ LogRecord.WriteLog(LogEnum.OutTask, outEorr.ToString());
+ //WriteLog.Info(InboundRequestStationNo).Write($"{ DateTime.Now }涓婃姤WMS鍑哄簱瀹屾垚浠诲姟澶辫触:{ex.Message}", InboundRequestStationNo);
}
}
}
--
Gitblit v1.9.3