From 5a3f34856055ffbbbe9c2519a52b8be50c6f4562 Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周一, 25 11月 2024 13:59:28 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
CC/iWareCC_ASRS/FormCC.cs | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/CC/iWareCC_ASRS/FormCC.cs b/CC/iWareCC_ASRS/FormCC.cs
index c1cd1ad..2eba145 100644
--- a/CC/iWareCC_ASRS/FormCC.cs
+++ b/CC/iWareCC_ASRS/FormCC.cs
@@ -5,6 +5,7 @@
using iWareCC.SrmService;
using iWareCC.StationService;
using iWareCC.ThreadService;
+using iWareCC.ThreadService._03_BZ12_鏈哄櫒浜虹爜鍖呭伐浣峗;
using iWareCC.WCF;
using iWareCommon.Common.Globle;
using iWareCommon.Utils;
@@ -36,6 +37,11 @@
/// 鍏ㄥ眬鈥旀槸鍚﹀彲浠ヨ繍琛屾墽琛屽嚭搴撴ā寮�
/// </summary>
public static bool IsAllowRunOutMode = false;
+
+ /// <summary>
+ /// 褰撳墠涓嬪彂鍑哄簱浠诲姟鐨勫寘鍙�
+ /// </summary>
+ public static string currHandlerPackageCodeForIssueOutboundTask = "";
/// <summary>
/// 1鍙峰爢鍨涙満鍏ュ簱鍙ｆ壂鐮佸己鍒堕獙璇侀�氳繃
@@ -233,11 +239,12 @@
new Thread(DataProcess_BZ39.Handler).Start();
-
+ new Thread(DataProcess_BZ12.Hander).Start();
+ new Thread(DataProcess_BZ12_FinishTask.Handler).Start();
new Thread(DeleteData).Start();
- //new Thread(LineInSacnResult.HandlerLineInSacnResult).Start();
+ new Thread(PrintHandler.Handler).Start();
@@ -1539,6 +1546,8 @@
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DataProcess_RobotBuffer_ModeChange, ck_DataProcess_RobotBuffer_ModeChange);
+ DoCommonCheckedChanged(ref SystemValue.isAllowRuning_PrintHandler, ck_PrintHandler);
+
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DataProcess_RobotBuffer_FinishTaskForOutbound, checkBox_DataProcess_RobotBuffer_FinishTaskForOutbound);
@@ -1831,6 +1840,7 @@
}
this.lbl_RobotMode.Text = "缂撳瓨宀涙満鍣ㄤ汉妯″紡:" + (IsAllowRunOutMode ? "鍑哄簱妯″紡" : "鍏ュ簱妯″紡");
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask.Text = "褰撳墠涓嬪彂鍑哄簱浠诲姟鐨勫寘鍙�:" + currHandlerPackageCodeForIssueOutboundTask;
}
}
@@ -3535,5 +3545,22 @@
{
}
+
+ private void button24_Click(object sender, EventArgs e)
+ {
+ //寮哄埗璇ュ寘鍙峰嚭搴�
+ var packageCode = this.tb_PackageCode.Text.Trim();
+
+ var alertMsg = "";
+ DataProcess_RobotBuffer_ForceOutbound.Handler(packageCode, ref alertMsg);
+ if (!string.IsNullOrEmpty(alertMsg))
+ {
+ MessageBox.Show("閿欒:" + alertMsg);
+ }
+ else
+ {
+ MessageBox.Show("宸插鐞�");
+ }
+ }
}
}
--
Gitblit v1.9.3