From 9aa1ccbaf232340bcc1196eddb85258e2b16f4e2 Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周五, 06 12月 2024 15:38:29 +0800 Subject: [PATCH] 22 --- CC/iWareCC_ASRS/FormCC.cs | 47 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 41 insertions(+), 6 deletions(-) diff --git a/CC/iWareCC_ASRS/FormCC.cs b/CC/iWareCC_ASRS/FormCC.cs index 2217055..b2ae9ce 100644 --- a/CC/iWareCC_ASRS/FormCC.cs +++ b/CC/iWareCC_ASRS/FormCC.cs @@ -1,4 +1,5 @@ -锘縰sing iWareCC.Common.Helper; +锘縰sing Admin.NET.Application; +using iWareCC.Common.Helper; using iWareCC.DeviceThreadFactory; using iWareCC.Forms; using iWareCC.RgvService; @@ -232,6 +233,7 @@ new Thread(DataProcess_RobotBuffer_FinishTaskForOutbound.Handler).Start(); + new Thread(DataProcess_RobotBuffer_ForceOutbound.Handler).Start(); new Thread(DataProcess_RobotBuffer_FinishTask.Handler).Start(); @@ -258,7 +260,7 @@ new Thread(PushPackageCodeToMes.Handler).Start(); new Thread(PushPaperCutToMes.Handler).Start(); - + new Thread(DataProcess_ValidateQiTao.Handler).Start(); //*/ #endregion @@ -348,14 +350,14 @@ var showNowTime = "(" + DateTimeHelper.ConvertToStringForOnlyShowTime(DateTime.Now) + ")"; //璁剧疆鍫嗗灈鏈轰换鍔′笅鍙戝拰浠诲姟纭绾跨▼娑堟伅 this.lbl_Alert_DataProcess_BZ39_IssueInboundTask.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_BZ39_IssueInboundTask; - this.lbl_Alert_Srm2Release.Text = showNowTime + SystemWarningMsg._lbl_Alert_Srm2Release; + this.lbl_Alert_DataProcess_RobotBuffer_ForceOutbound.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_ForceOutbound; this.lbl_Alert_DataProcess_BZ12.Text = showNowTime + SystemWarningMsg._lbl_alert_DataProcess_BZ12; this.lbl_Alert_Srm4Release.Text = showNowTime + SystemWarningMsg._lbl_Alert_Srm4Release; //璁剧疆鍫嗗灈鏈轰换鍔′笅鍙戝拰浠诲姟瀹屾垚纭绾跨▼娑堟伅 this.lbl_Alter_Srm1ReleaseFinish.Text = showNowTime + SystemWarningMsg._lbl_Alert_Srm1ReleaseFinish; this.lbl_Alert_DataProcess_BZ12_FinishTask.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_BZ12_FinishTask; this.lbl_Alert_DataProcess_BZ21_FinishTask.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_BZ21_FinishTask; - + this.lbl_Alert_PushPaperCutToMes.Text = showNowTime + SystemWarningMsg._lbl_Alert_PushPaperCutToMes; @@ -1531,7 +1533,7 @@ DoCommonCheckedChanged(ref SystemValue.isAllowRuning_SrmTaskThreadService_1_Finish, ckBSrm1FinishedHandle); //鍫嗗灈鏈�2浠诲姟涓嬪彂 - DoCommonCheckedChanged(ref SystemValue.isAllowRuning_SrmTaskThreadService_2, ckBSrm2Release); + DoCommonCheckedChanged(ref SystemValue.isAllowRuning_SrmTaskThreadService_2, ckBDataProcess_RobotBuffer_ForceOutbound); DoCommonCheckedChanged(ref SystemValue.isAllowRuning_SrmTaskThreadService_2_Finish, ckBDataProcess_BZ12_FinishTask); //鍫嗗灈鏈�3浠诲姟涓嬪彂 @@ -3562,7 +3564,40 @@ var packageCode = this.tb_PackageCode.Text.Trim(); var alertMsg = ""; - DataProcess_RobotBuffer_ForceOutbound.Handler(packageCode, ref alertMsg); + CC_DataProcess_RobotBuffer_ForceOutbound.Handler(packageCode, ref alertMsg); + if (!string.IsNullOrEmpty(alertMsg)) + { + MessageBox.Show("閿欒:" + alertMsg); + } + else + { + MessageBox.Show("宸插鐞�"); + } + } + + private void button25_Click(object sender, EventArgs e) + { + var packageCode = this.tb_PackageCode.Text.Trim(); + + var alertMsg = ""; + using (WmsDBModel db = new WmsDBModel()) + { + var upiList = db.mes_batchOrderUPI_new.Where(x => x.PackageCode == packageCode).ToList(); + foreach (var item in upiList) + { + item.AreaCode = (int)AreaCodeEnum.鏃犲尯鍩�; + item.UpiStatus = (int)UpiStatusEnum.鍒濆; + } + + var pList = db.mes_package_gather.Where(x => x.PackageCode == packageCode).ToList(); + foreach (var item in pList) + { + item.AreaCode = (int)AreaCodeEnum.鏃犲尯鍩�; + item.UpiStatus = (int)UpiStatusEnum.鍒濆; + } + + db.SaveChanges(); + } if (!string.IsNullOrEmpty(alertMsg)) { MessageBox.Show("閿欒:" + alertMsg); -- Gitblit v1.9.3