From 752fd1d6f70afc3f58eca4ab2e6b9359ba2a5578 Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周六, 30 11月 2024 17:04:21 +0800
Subject: [PATCH] add
---
CC/iWareSql/DataAccess/TaskHandler.cs | 24 +++++
CC/iWareCC_ASRS/App.config | 2
CC/iWareCC_ASRS/ThreadService/02_BZ39工位（补板后工位）/Inbound/1、DataProcess_BZ39.cs | 22 +----
CC/iWareCC_ASRS/ThreadService/02_BZ39工位（补板后工位）/DataProcess_RobotBuffer_ModeChange.cs | 4
CC/iWareCC_ASRS/ThreadService/01_BZ01工位（清灰，洗板后工位）/DataProcess_BZ01.cs | 2
CC/iWareCC_ASRS/ThreadService/02_BZ39工位（补板后工位）/Inbound/2、DataProcess_RobotBuffer_FinishTask.cs | 28 ++++++
SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs | 46 ++++++-----
CC/iWareCC_ASRS/ThreadService/02_BZ39工位（补板后工位）/Outbound/2、DataProcess_RobotBuffer_IssueOutboundTask.cs | 28 +++---
CC/iWareCC_ASRS/ThreadService/02_BZ39工位（补板后工位）/Outbound/3、DataProcess_RobotBuffer_FinishTaskForOutbound.cs | 22 ++++
SDA/iWareSda/App.config | 4
CC/iWareCC_ASRS/ThreadService/02_BZ39工位（补板后工位）/Outbound/1、DataProcess_RobotBuffer_AutoQiTaoOutbound.cs | 4
11 files changed, 118 insertions(+), 68 deletions(-)
diff --git a/CC/iWareCC_ASRS/App.config b/CC/iWareCC_ASRS/App.config
index 3325369..04c8529 100644
--- a/CC/iWareCC_ASRS/App.config
+++ b/CC/iWareCC_ASRS/App.config
@@ -35,7 +35,7 @@
<add key="IsEnableNewInStorePlace" value="false"/>
</appSettings>
<connectionStrings>
- <add name="WmsDBModel" connectionString="data source=localhost;initial catalog=LA24030_LuLiPackageLine;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/>
+ <add name="WmsDBModel" connectionString="data source=172.17.1.111;initial catalog=LA24030_LuLiPackageLine;persist security info=True;user id=sa;password=admin@123;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/>
</connectionStrings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
diff --git "a/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs" "b/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs"
index e2c6727..20eec66 100644
--- "a/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs"
@@ -37,7 +37,7 @@
SystemWarningMsg._lbl_alert_DataProcess_BZ01 = string.Empty;
try
{
- if (SystemValue.isAllowRuning_DataProcess_BZ01 && SystemValue.isStartedModel)
+ if ( SystemValue.isStartedModel)//SystemValue.isAllowRuning_DataProcess_BZ01 &&
{
if (FormCC.IsAllowRunOutMode == true)
{
diff --git "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_RobotBuffer_ModeChange.cs" "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_RobotBuffer_ModeChange.cs"
index 57420bc..e89e4a8 100644
--- "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_RobotBuffer_ModeChange.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_RobotBuffer_ModeChange.cs"
@@ -33,8 +33,8 @@
Thread.Sleep(2000);//浼戠湢2绉掞紝灏嗕紤鐪犲啓鍒板墠闈紝鏄负浜嗕笅闈㈢殑continue鏂规硶鎵ц鍚庝笉鏄剧ず閿欒淇℃伅鐨勬彁绀猴紒锛侊紒銆怑ditBy shaocx,2022-05-24銆�
SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_ModeChange = string.Empty;
try
- {
- if (SystemValue.isAllowRuning_DataProcess_RobotBuffer_ModeChange && SystemValue.isStartedModel)
+ {//SystemValue.isAllowRuning_DataProcess_RobotBuffer_ModeChange &&
+ if ( SystemValue.isStartedModel)
{
var rgvLocation = StationLocationEnum.BZ39.ToString();
if (FormCC.IsAllowRunOutMode)
diff --git "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/1\343\200\201DataProcess_BZ39.cs" "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/1\343\200\201DataProcess_BZ39.cs"
index 6c3ed53..ebe49de 100644
--- "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/1\343\200\201DataProcess_BZ39.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/1\343\200\201DataProcess_BZ39.cs"
@@ -34,7 +34,7 @@
SystemWarningMsg._lbl_alert_DataProcess_BZ39 = string.Empty;
try
{
- if (SystemValue.isAllowRuning_DataProcess_BZ39 && SystemValue.isStartedModel)
+ if ( SystemValue.isStartedModel)//SystemValue.isAllowRuning_DataProcess_BZ39 &&
{
var rgvLocation = StationLocationEnum.BZ39.ToString();
/*
@@ -55,15 +55,15 @@
using (WmsDBModel wmsDB = new WmsDBModel())
{
//涓嶅啀鎷︽埅
- /*
+
//瑕佹槸鏈夊凡涓嬪彂鐨勪换鍔★紝灏变笉瑕佹墽琛�
- var isValidate = TaskHandler.ValidateIssueTaskForRobotBuffer(wmsDB);
+ var isValidate = TaskHandler.ValidateIssueTaskForRobotBuffer(wmsDB,upiCode);
if (!isValidate)
{
SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()}-鏈夆�樺凡涓嬪彂鈥欑殑浠诲姟锛屼笉鑳藉鐞�,姝ゆ寰幆缁撴潫";
continue;
}
- //*/
+ //
var upiObj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == upiCode).FirstOrDefault();
if (upiObj == null)
{
@@ -112,20 +112,6 @@
using (StationServiceClient client = new StationServiceClient())
{
- //涓嶅啀鎷︽埅
- /*
- //棣栧厛鍏堟竻鐞�
- var res = await client.InboundFinishConfirmAsync((int)EDevice.Station, false, rgvLocation);
- if (!res.result)
- {
- SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()}-涓嬪彂鍏ュ簱浠诲姟 澶辫触,InboundFinishConfirmAsync 杩斿洖:{res.resMsg}";
- continue;
- }
- else
- {
- Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-涓嬪彂鍏ュ簱浠诲姟 鎴愬姛,InboundFinishConfirmAsync锛屽弬鏁�: 绔欑偣{rgvLocation}");
- }
- //*/
var res = await client.WriteInStoreTaskInfoAsync((int)EDevice.Station, rgvLocation, place.PlaceCode,
(short)upiObj.Length,
diff --git "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/2\343\200\201DataProcess_RobotBuffer_FinishTask.cs" "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/2\343\200\201DataProcess_RobotBuffer_FinishTask.cs"
index c61372e..206c13d 100644
--- "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/2\343\200\201DataProcess_RobotBuffer_FinishTask.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/2\343\200\201DataProcess_RobotBuffer_FinishTask.cs"
@@ -34,7 +34,7 @@
SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = string.Empty;
try
{
- if (SystemValue.isAllowRuning_DataProcess_RobotBuffer_FinishTask && SystemValue.isStartedModel)
+ if ( SystemValue.isStartedModel)//SystemValue.isAllowRuning_DataProcess_RobotBuffer_FinishTask &&
{
var rgvLocation = StationLocationEnum.BZ39.ToString();
var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();
@@ -62,11 +62,23 @@
var task = wmsDB.wms_rbline_task.Where(x =>
x.TaskNo == obj.R_Inbound_TaskID.ToString()
&& x.RbTaskType == (int)RbTaskTypeEnum.鍏ュ簱浠诲姟
- && x.TaskStatus == (int)TaskStatusEnum.宸蹭笅鍙�).FirstOrDefault();
+ ).OrderByDescending(x=>x.Id).FirstOrDefault();
if (task == null)
{
SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()},鏍规嵁 R_InboundNumber:{obj.R_InboundNumber}娌℃湁鎵惧埌宸蹭笅鍙戠殑浠诲姟 ";
continue;
+ }
+ else
+ {
+ if (task.TaskStatus == (int)TaskStatusEnum.宸插畬鎴�)
+ {
+ using (StationServiceClient client = new StationServiceClient())
+ {
+ var res = await client.InboundFinishConfirmAsync((int)EDevice.Station, true, rgvLocation);
+
+ }
+ continue;
+ }
}
var upiCode = task.UPI;
@@ -125,6 +137,18 @@
wmsDB.SaveChanges();
}
}
+ else
+ {
+ //涓嶅啀鎷︽埅
+
+ //棣栧厛鍏堟竻鐞�
+ using (StationServiceClient client = new StationServiceClient())
+ {
+ var res = await client.InboundFinishConfirmAsync((int)EDevice.Station, false, rgvLocation);
+
+ }
+
+ }
}
}
catch (Exception ex)
diff --git "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/1\343\200\201DataProcess_RobotBuffer_AutoQiTaoOutbound.cs" "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/1\343\200\201DataProcess_RobotBuffer_AutoQiTaoOutbound.cs"
index d4a4924..c879823 100644
--- "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/1\343\200\201DataProcess_RobotBuffer_AutoQiTaoOutbound.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/1\343\200\201DataProcess_RobotBuffer_AutoQiTaoOutbound.cs"
@@ -26,8 +26,8 @@
Thread.Sleep(2000);//浼戠湢2绉掞紝灏嗕紤鐪犲啓鍒板墠闈紝鏄负浜嗕笅闈㈢殑continue鏂规硶鎵ц鍚庝笉鏄剧ず閿欒淇℃伅鐨勬彁绀猴紒锛侊紒銆怑ditBy shaocx,2022-05-24銆�
SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound = string.Empty;
try
- {
- if (SystemValue.isAllowRuning_DataProcess_RobotBuffer_AutoQiTaoOutbound && SystemValue.isStartedModel)
+ {//SystemValue.isAllowRuning_DataProcess_RobotBuffer_AutoQiTaoOutbound &&
+ if (SystemValue.isStartedModel)
{
using (WmsDBModel wmsDB = new WmsDBModel())
diff --git "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/2\343\200\201DataProcess_RobotBuffer_IssueOutboundTask.cs" "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/2\343\200\201DataProcess_RobotBuffer_IssueOutboundTask.cs"
index 72ebdb7..3810906 100644
--- "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/2\343\200\201DataProcess_RobotBuffer_IssueOutboundTask.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/2\343\200\201DataProcess_RobotBuffer_IssueOutboundTask.cs"
@@ -34,8 +34,8 @@
Thread.Sleep(1000);//浼戠湢2绉掞紝灏嗕紤鐪犲啓鍒板墠闈紝鏄负浜嗕笅闈㈢殑continue鏂规硶鎵ц鍚庝笉鏄剧ず閿欒淇℃伅鐨勬彁绀猴紒锛侊紒銆怑ditBy shaocx,2022-05-24銆�
SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = string.Empty;
try
- {
- if (SystemValue.isAllowRuning_DataProcess_RobotBuffer_IssueOutboundTask && SystemValue.isStartedModel)
+ {//SystemValue.isAllowRuning_DataProcess_RobotBuffer_IssueOutboundTask &&
+ if ( SystemValue.isStartedModel)
{
var rgvLocation = StationLocationEnum.BZ39.ToString();
/*
@@ -46,7 +46,7 @@
using (WmsDBModel wmsDB = new WmsDBModel())
{
//瑕佹槸鏈夊凡涓嬪彂鐨勪换鍔★紝灏变笉瑕佹墽琛�
- var isValidate = TaskHandler.ValidateIssueTaskForRobotBuffer(wmsDB);
+ var isValidate = TaskHandler.ValidateIssueOutTaskForRobotBuffer(wmsDB);
if (!isValidate)
{
SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = $"{rgvLocation.ToString()}-鏈夆�樺凡涓嬪彂鈥欑殑浠诲姟锛屼笉鑳藉鐞�,姝ゆ寰幆缁撴潫";
@@ -98,18 +98,18 @@
using (StationServiceClient client = new StationServiceClient())
{
//棣栧厛瑕佹竻鐞�
- var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, false, rgvLocation);
- if (!res.result)
- {
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = $"{rgvLocation.ToString()}-涓嬪彂鍑哄簱浠诲姟 澶辫触,OutboundFinishConfirmAsync 杩斿洖:{res.resMsg}";
- continue;
- }
- else
- {
- Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-涓嬪彂鍑哄簱浠诲姟 鎴愬姛,OutboundFinishConfirmAsync锛屽弬鏁�: 绔欑偣{rgvLocation}");
- }
+ //var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, false, rgvLocation);
+ //if (!res.result)
+ //{
+ // SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = $"{rgvLocation.ToString()}-涓嬪彂鍑哄簱浠诲姟 澶辫触,OutboundFinishConfirmAsync 杩斿洖:{res.resMsg}";
+ // continue;
+ //}
+ //else
+ //{
+ // Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-涓嬪彂鍑哄簱浠诲姟 鎴愬姛,OutboundFinishConfirmAsync锛屽弬鏁�: 绔欑偣{rgvLocation}");
+ //}
- res = await client.WriteOutStoreTaskInfoAsync((int)EDevice.Station, rgvLocation, doTask.PlaceCode, Convert.ToInt32(doTask.TaskNo));
+ var res = await client.WriteOutStoreTaskInfoAsync((int)EDevice.Station, rgvLocation, doTask.PlaceCode, Convert.ToInt32(doTask.TaskNo));
if (!res.result)
{
SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()}-涓嬪彂鍑哄簱浠诲姟 澶辫触,WriteOutStoreTaskInfoAsync 杩斿洖:{res.resMsg}";
diff --git "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/3\343\200\201DataProcess_RobotBuffer_FinishTaskForOutbound.cs" "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/3\343\200\201DataProcess_RobotBuffer_FinishTaskForOutbound.cs"
index be10ec7..a6fe956 100644
--- "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/3\343\200\201DataProcess_RobotBuffer_FinishTaskForOutbound.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/3\343\200\201DataProcess_RobotBuffer_FinishTaskForOutbound.cs"
@@ -25,8 +25,8 @@
Thread.Sleep(500);//浼戠湢2绉掞紝灏嗕紤鐪犲啓鍒板墠闈紝鏄负浜嗕笅闈㈢殑continue鏂规硶鎵ц鍚庝笉鏄剧ず閿欒淇℃伅鐨勬彁绀猴紒锛侊紒銆怑ditBy shaocx,2022-05-24銆�
SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = string.Empty;
try
- {
- if (SystemValue.isAllowRuning_DataProcess_RobotBuffer_FinishTaskForOutbound && SystemValue.isStartedModel)
+ {//SystemValue.isAllowRuning_DataProcess_RobotBuffer_FinishTaskForOutbound &&
+ if (SystemValue.isStartedModel)
{
var rgvLocation = StationLocationEnum.BZ39.ToString();
var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();
@@ -53,11 +53,23 @@
var task = wmsDB.wms_rbline_task.Where(x =>
x.TaskNo == obj.R_Outbound_TaskID.ToString()
&& x.RbTaskType == (int)RbTaskTypeEnum.鍑哄簱浠诲姟
- && x.TaskStatus == (int)TaskStatusEnum.宸蹭笅鍙�).FirstOrDefault();
+ ).OrderByDescending(x => x.Id).FirstOrDefault();
if (task == null)
{
SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = $"{rgvLocation.ToString()},鏍规嵁 R_OutboundNumber:{obj.R_OutboundNumber}娌℃湁鎵惧埌宸蹭笅鍙戠殑浠诲姟 ";
continue;
+ }
+ else
+ {
+ if (task.TaskStatus == (int)TaskStatusEnum.宸插畬鎴�)
+ {
+ //using (StationServiceClient client = new StationServiceClient())
+ //{
+ // var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, true, rgvLocation);
+ //}
+ continue;
+ }
+
}
var upiCode = task.UPI;
@@ -96,6 +108,10 @@
wmsDB.SaveChanges();
}
}
+ else
+ {
+
+ }
}
}
catch (Exception ex)
diff --git a/CC/iWareSql/DataAccess/TaskHandler.cs b/CC/iWareSql/DataAccess/TaskHandler.cs
index 5ac39ba..55ab793 100644
--- a/CC/iWareSql/DataAccess/TaskHandler.cs
+++ b/CC/iWareSql/DataAccess/TaskHandler.cs
@@ -18,14 +18,14 @@
/// </summary>
/// <param name="wmsDB"></param>
/// <returns></returns>
- public static bool ValidateIssueTaskForRobotBuffer(WmsDBModel.WmsDBModel wmsDB)
+ public static bool ValidateIssueTaskForRobotBuffer(WmsDBModel.WmsDBModel wmsDB,string UPI)
{
var isExist = wmsDB.wms_rbline_task.Where(x => x.TaskStatus == (int)TaskStatusEnum.宸蹭笅鍙�
&& (
x.RbTaskType == (int)RbTaskTypeEnum.鍏ュ簱浠诲姟
||
x.RbTaskType == (int)RbTaskTypeEnum.鍑哄簱浠诲姟
- )
+ )&&x.UPI== UPI
).ToList();
if (isExist?.Count() > 0)
@@ -34,7 +34,27 @@
}
return true;
}
+ /// <summary>
+ /// 楠岃瘉 鏈哄櫒浜虹紦瀛樺矝鏄惁瀛樺湪宸蹭笅鍙戠殑浠诲姟
+ /// </summary>
+ /// <param name="wmsDB"></param>
+ /// <returns></returns>
+ public static bool ValidateIssueOutTaskForRobotBuffer(WmsDBModel.WmsDBModel wmsDB)
+ {
+ var isExist = wmsDB.wms_rbline_task.Where(x => x.TaskStatus == (int)TaskStatusEnum.宸蹭笅鍙�
+ && (
+ x.RbTaskType == (int)RbTaskTypeEnum.鍏ュ簱浠诲姟
+ ||
+ x.RbTaskType == (int)RbTaskTypeEnum.鍑哄簱浠诲姟
+ )
+ ).ToList();
+ if (isExist?.Count() > 0)
+ {
+ return false;
+ }
+ return true;
+ }
/// <summary>
/// 楠岃瘉 鐮佹澘鏄惁鏈夋墽琛屼腑浠诲姟
/// </summary>
diff --git a/SDA/iWareSda/App.config b/SDA/iWareSda/App.config
index 98ac5e6..6cc8c0b 100644
--- a/SDA/iWareSda/App.config
+++ b/SDA/iWareSda/App.config
@@ -4,8 +4,8 @@
<!-- 璇█閰嶇疆 閰嶇疆 0 涓枃 1 鑻辨枃 -->
<add key="LanguageFlg" value="0"/>
<!-- 绔欑偣鐨凱LC 閰嶇疆 -->
- <!--<add key="Station_Address" value="172.17.51.202"/> -->
- <add key="Station_Address" value="192.168.10.100"/>
+ <add key="Station_Address" value="172.17.51.202"/>
+ <!--<add key="Station_Address" value="192.168.10.100"/>-->
<add key="Station_Rack" value="0"/>
<add key="Station_Slot" value="1"/>
<add key="Station_Port" value="102"/>
diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs b/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
index 99a3dab..90dac1a 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
@@ -278,28 +278,32 @@
return false;
}
+ if (value)
+ {
+ b2 = this.plcService.WriteValuePoint(stationObj.W_ReqOut, false, view_stationObj.W_ReqOut);
+ if (!b2.result)
+ {
+ msg = string.Format("鍚慡tation W_ReqOut 鍦板潃{0} 鍐� " + false + "澶辫触,杩斿洖缁撴灉:" + b2.resMsg,
+ stationObj.W_ReqOut);
+ return false;
+ }
+ b2 = this.plcService.WriteValuePoint(stationObj.W_Destination_Out, 0, view_stationObj.W_Destination_Out);
+ if (!b2.result)
+ {
+ msg = string.Format("鍚慡tation W_Destination_Out 鍦板潃{0} 鍐� " + 0 + "澶辫触,杩斿洖缁撴灉:" + b2.resMsg,
+ stationObj.W_Destination_Out);
+ return false;
+ }
+ b2 = this.plcService.WriteValuePoint(stationObj.W_Outbound_TaskID, 0, view_stationObj.W_Outbound_TaskID);
+ if (!b2.result)
+ {
+ msg = string.Format("鍚慡tation W_Outbound_TaskID 鍦板潃{0} 鍐� " + 0 + "澶辫触,杩斿洖缁撴灉:" + b2.resMsg,
+ stationObj.W_Outbound_TaskID);
+ return false;
+ }
+ }
- b2 = this.plcService.WriteValuePoint(stationObj.W_ReqOut, false, view_stationObj.W_ReqOut);
- if (!b2.result)
- {
- msg = string.Format("鍚慡tation W_ReqOut 鍦板潃{0} 鍐� " + false + "澶辫触,杩斿洖缁撴灉:" + b2.resMsg,
- stationObj.W_ReqOut);
- return false;
- }
- b2 = this.plcService.WriteValuePoint(stationObj.W_Destination_Out, 0, view_stationObj.W_Destination_Out);
- if (!b2.result)
- {
- msg = string.Format("鍚慡tation W_Destination_Out 鍦板潃{0} 鍐� " + 0 + "澶辫触,杩斿洖缁撴灉:" + b2.resMsg,
- stationObj.W_Destination_Out);
- return false;
- }
- b2 = this.plcService.WriteValuePoint(stationObj.W_Outbound_TaskID, 0, view_stationObj.W_Outbound_TaskID);
- if (!b2.result)
- {
- msg = string.Format("鍚慡tation W_Outbound_TaskID 鍦板潃{0} 鍐� " + 0 + "澶辫触,杩斿洖缁撴灉:" + b2.resMsg,
- stationObj.W_Outbound_TaskID);
- return false;
- }
+
return true;
--
Gitblit v1.9.3