From 8f9b9411ca279670bd85fcfa7763987295ed9abf Mon Sep 17 00:00:00 2001
From: zhanghonglin <zhanghonglin@hnkhzn.com>
Date: 星期五, 10 四月 2026 10:55:38 +0800
Subject: [PATCH] 空桶入出扩展开发
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/ConveyorLineJob.cs | 113 +++++++-------------------------------------------------
1 files changed, 15 insertions(+), 98 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/ConveyorLineJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/ConveyorLineJob.cs"
index 90503dc..98cf7f5 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/ConveyorLineJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/ConveyorLineJob.cs"
@@ -135,24 +135,6 @@
//鍙戦�佹敹鍒扮紪鍙蜂俊鍙�
device.SetValue(ConveyorLineName.W_ReceivedD, 1, item.StationCode);
k = true;
-
- //鍚慚ES鍙戦�佹姤宸ュ崟
- //if (Stock.MaterialCode1 != null && !Stock.MaterialCode1.Equals(""))
- //{
- // MESReport(Stock.MaterialCode1);
- //}
- //if (Stock.MaterialCode2 != null && !Stock.MaterialCode2.Equals(""))
- //{
- // MESReport(Stock.MaterialCode2);
- //}
- //if (Stock.MaterialCode3 != null && !Stock.MaterialCode3.Equals(""))
- //{
- // MESReport(Stock.MaterialCode3);
- //}
- //if (Stock.MaterialCode4 != null && !Stock.MaterialCode4.Equals(""))
- //{
- // MESReport(Stock.MaterialCode4);
- //}
}
}
@@ -163,63 +145,29 @@
{
comm.R_StatusB((short)conveyorLineInfoRead.R_State);
comm.R_PickB((short)conveyorLineInfoRead.R_Pick);
- if (conveyorLineInfoRead.R_Pick == 1 && conveyorLineInfoRead.R_State == 1 && sc == 2)
- {
+ //if (conveyorLineInfoRead.R_Pick == 1 && conveyorLineInfoRead.R_State == 1 && sc == 2)
+ //{
- //鍒ゆ柇浠诲姟鏄惁閲嶅
- Dt_Task task = _TaskRepository.QueryFirst(x => x.TaskType == (int)TaskTypeEnum.OutEmpty);
- if (task == null)
- {
- LogLock.OutLogAOP("杈撻�佺嚎浠诲姟鏃ュ織", new string[] { device.DeviceCode, $"{"绌烘《鍑哄簱浠诲姟鐢熸垚" + "鐢宠鍙�(鏀�)鏂欙細" + conveyorLineInfoRead.R_Pick + "璁惧鐘舵�侊細" + conveyorLineInfoRead.R_State}" });
- //WMS鐢熸垚浠诲姟
- string address = AppSettings.Get("WMSApiAddress");
- if (!string.IsNullOrEmpty(address))
- {
- HttpHelper.Post($"{address}/api/Task/addOutEmptyTask/?location={item.location}", "");
- }
- }
+ // //鍒ゆ柇浠诲姟鏄惁閲嶅
+ // Dt_Task task = _TaskRepository.QueryFirst(x => x.TaskType == (int)TaskTypeEnum.OutEmpty);
+ // if (task == null)
+ // {
+ // LogLock.OutLogAOP("杈撻�佺嚎浠诲姟鏃ュ織", new string[] { device.DeviceCode, $"{"绌烘《鍑哄簱浠诲姟鐢熸垚" + "鐢宠鍙�(鏀�)鏂欙細" + conveyorLineInfoRead.R_Pick + "璁惧鐘舵�侊細" + conveyorLineInfoRead.R_State}" });
+ // //WMS鐢熸垚浠诲姟
+ // string address = AppSettings.Get("WMSApiAddress");
+ // if (!string.IsNullOrEmpty(address))
+ // {
+ // HttpHelper.Post($"{address}/api/Task/addOutEmptyTask/?location={item.location}", "");
+ // }
+ // }
- }
+ //}
}
//婊℃《鍑�
if (item.StationName == "婊℃《鍑�")
{
comm.R_StatusD((short)conveyorLineInfoRead.R_State);
comm.R_PickD((short)conveyorLineInfoRead.R_Pick);
- //鍛婅瘔WMS鍙互鍑哄簱
- if (conveyorLineInfoRead.R_Pick == 1 && conveyorLineInfoRead.R_State == 1)
- {
- if (m)
- {
- //WMS鐢熸垚浠诲姟
- string address = AppSettings.Get("WMSApiAddress");
- if (!string.IsNullOrEmpty(address))
- {
- HttpHelper.Post($"{address}/api/Task/WCSSignal/?k=1", "");
- }
- m = false;
- n = true;
- //鍐欏叆鏃ュ織
- LogLock.OutLogAOP("杈撻�佺嚎浠诲姟鏃ュ織", new string[] { device.DeviceCode, $"{"婊℃《鍑哄簱浠诲姟鐢熸垚" + "鐢宠鍙�(鏀�)鏂欙細" + conveyorLineInfoRead.R_Pick + "璁惧鐘舵�侊細" + conveyorLineInfoRead.R_State}" });
- }
- }
- //鍛婅瘔WMS涓嶅彲浠ュ嚭搴�
- else
- {
- if (n)
- {
- //WMS鐢熸垚浠诲姟
- string address = AppSettings.Get("WMSApiAddress");
- if (!string.IsNullOrEmpty(address))
- {
- HttpHelper.Post($"{address}/api/Task/WCSSignal/?k=0", "");
- }
- n = false;
- m = true;
- //鍐欏叆鏃ュ織
- LogLock.OutLogAOP("杈撻�佺嚎浠诲姟鏃ュ織", new string[] { device.DeviceCode, $"{"婊℃《鍑哄簱浠诲姟鐢熸垚" + "鐢宠鍙�(鏀�)鏂欙細" + conveyorLineInfoRead.R_Pick + "璁惧鐘舵�侊細" + conveyorLineInfoRead.R_State}" });
- }
- }
}
}
}
@@ -233,36 +181,5 @@
}
return Task.CompletedTask;
}
-
- //MES鎶ュ伐
- //public void MESReport(string MaterialCode)
- //{
- // try
- // {
- // Reports reports = new Reports();
-
- // //鏌ヨ浜岀淮鐮�
- // Dt_FillingOrder FillingOrder = _FillingOrderRepository.QueryFirst(x => x.BarCode == MaterialCode);
-
- // reports.report.Qty = FillingOrder.BarNum;
- // reports.report.DispatchID = FillingOrder.WorkID + "";
- // reports.barcodeSN[0].Barcode = FillingOrder.BarCode;
- // reports.barcodeSN[0].BatchNum = int.Parse(FillingOrder.batchNum);
- // reports.barcodeSN[0].Id = FillingOrder.BarCodeID;
- // reports.barcodeSN[0].MaterialId = FillingOrder.ArticleNumID;
- // reports.barcodeSN[0].Quantity = (int)FillingOrder.BarNum;
- // reports.barcodeSN[0].DispatchId = FillingOrder.WorkID;
-
- // string mes = AppSettings.Get("MSE");
- // if (!string.IsNullOrEmpty(mes))
- // {
- // HttpHelper.Post($"{mes}/Task/SaveReportRaw/", reports.Serialize());
- // }
- // }
- // catch (Exception ex)
- // {
- // WriteInfo("MES鎶ュ伐閿欒", $"{ex.Message}");
- // }
- //}
}
}
--
Gitblit v1.9.3