From 3a067640b42d5eb3e359e3fae47ef7176f2d9c39 Mon Sep 17 00:00:00 2001 From: zhaoaomin <18366680202@163.com> Date: Fri, 10 Nov 2023 14:44:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=A5=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shangjian/.vs/BL/v17/.suo | Bin 1290240 -> 1298432 bytes shangjian/XGL/Views/LanJu_Operator.xaml.cs | 2 +- .../XGLFinishPro/Views/LanJu_Operator.xaml.cs | 59 ++++++++---------- 3 files changed, 27 insertions(+), 34 deletions(-) diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo index 7c4601c0f1027d7b54ea07fb044e3860e251b809..c1ac16cde2cb54d42a859e274dd8121af9ad89a1 100644 GIT binary patch delta 27563 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 ZqmguN4fr>-le5a#WP3aOg9tZ={{!(Isu%zO delta 17962 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 diff --git a/shangjian/XGL/Views/LanJu_Operator.xaml.cs b/shangjian/XGL/Views/LanJu_Operator.xaml.cs index fc4c886..87ae74b 100644 --- a/shangjian/XGL/Views/LanJu_Operator.xaml.cs +++ b/shangjian/XGL/Views/LanJu_Operator.xaml.cs @@ -491,7 +491,7 @@ namespace XGL.Views } else { - newRfid = "B" + (Convert.ToInt32(dtNewRFID.Rows[0]["rfid"].ToString().TrimStart('B')) + 1).ToString(); + newRfid = "B" + (Convert.ToInt64(dtNewRFID.Rows[0]["rfid"].ToString().TrimStart('B')) + 1).ToString(); } } diff --git a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs index c2065d6..5560c15 100644 --- a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs +++ b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs @@ -23,7 +23,7 @@ namespace XGLFinishPro.Views FormingMachineService formingMachineService = new FormingMachineService(); FinishProdDBService userDbWareHouse = new FinishProdDBService(); public static LanJu_Operator lanJu_Operator; - Frame frame = new Frame() { Content = new Views.LanJu_InOut()}; + Frame frame = new Frame() { Content = new Views.LanJu_InOut() }; string deviceCode = Utils.GetAppSetting("DeviceCode"); Timer timerDeciveState = new Timer(); string _workOrderCode = ""; @@ -36,10 +36,10 @@ namespace XGLFinishPro.Views { InitializeComponent(); WindowChange(WindowID.frame); - + } - + public void WindowChange(WindowID windowID) { @@ -48,7 +48,7 @@ namespace XGLFinishPro.Views List sfcList = null; - private void InOut_Click(object sender, RoutedEventArgs e) + private void InOut_Click(object sender, RoutedEventArgs e) { LanJu_InOut lanJu_InOut = new LanJu_InOut(_workOrderCode, deviceCode); // 在主界面中的某个位置订阅事件 @@ -85,19 +85,19 @@ namespace XGLFinishPro.Views private void Paused_Click(object sender, RoutedEventArgs e) { LanJu_Paused lanJu_Paused = new LanJu_Paused(); - Window1.Content= new Frame + Window1.Content = new Frame { Content = lanJu_Paused }; } - + private void UCOperator_Loaded(object sender, RoutedEventArgs e) { timerDeciveState.Interval = Utils.GetAppSetting("GetDeviceStateInterval") == "" ? 15000 : Convert.ToInt32(Utils.GetAppSetting("GetDeviceStateInterval")); timerDeciveState.Elapsed += TimerDeciveState_Elapsed; timerDeciveState.Start(); - GetWorkOrderInfo(); + GetWorkOrderInfo(); } string isbaiye; string plantime; @@ -176,10 +176,10 @@ namespace XGLFinishPro.Views //modelWareHouse = new List(); - - DataTable dt = userDbWareHouse.GetWetPlanInfo(deviceCode,currShiftDate.ToString());//formingMachineService.GetFormingMachineInfo(deviceCode, currShiftDate.ToString()); + + DataTable dt = userDbWareHouse.GetWetPlanInfo(deviceCode, currShiftDate.ToString());//formingMachineService.GetFormingMachineInfo(deviceCode, currShiftDate.ToString()); if (dt == null) return; - + if (orderList != null) { //使用Dispatcher来在UI线程上更新UI @@ -192,7 +192,7 @@ namespace XGLFinishPro.Views } ), System.Windows.Threading.DispatcherPriority.Render); - } + } } catch (Exception ex) { @@ -274,10 +274,10 @@ namespace XGLFinishPro.Views //modelWareHouse = new List(); - - DataTable dt = userDbWareHouse.GetWetPlanInfo(deviceCode,currShiftDate.ToString()); + + DataTable dt = userDbWareHouse.GetWetPlanInfo(deviceCode, currShiftDate.ToString()); if (dt == null) return; - + this.dgWorkOrderInfo.ItemsSource = null; this.dgWorkOrderInfo.ItemsSource = dt.DefaultView; } @@ -285,8 +285,8 @@ namespace XGLFinishPro.Views { LogHelper.instance.log.Error("操作界面:获取成品工单准备信息时发生异常:" + ex.Message); } - } - + } + private void dgWorkOrderInfo_LoadingRow(object sender, DataGridRowEventArgs e) { @@ -314,7 +314,7 @@ namespace XGLFinishPro.Views PauseOrderWin pauseOrderWin = new PauseOrderWin(); if (pauseOrderWin.ShowDialog() == true) { - + formingMachineService.UpdateWorkOrder(workordercode, "w4", pauseOrderWin.remark, pauseOrderWin.type, deviceCode); GetWorkOrderInfo(); @@ -322,7 +322,7 @@ namespace XGLFinishPro.Views //MessageBoxResult result = MessageBox.Show("你确定要暂停该工单吗?", "温馨提示", MessageBoxButton.YesNo, MessageBoxImage.Information); //if (result == MessageBoxResult.No) // return; - + } private void btnRecover_Click(object sender, RoutedEventArgs e) @@ -346,7 +346,7 @@ namespace XGLFinishPro.Views // return; PauseOrderWin pauseOrderWin = new PauseOrderWin(); if (pauseOrderWin.ShowDialog() == true) - { + { formingMachineService.UpdateWorkOrder(workordercode, "w2", pauseOrderWin.remark, pauseOrderWin.type, deviceCode); GetWorkOrderInfo(); } @@ -424,21 +424,14 @@ namespace XGLFinishPro.Views DataTable dtNewReportCode = formingMachineService.GetReportCode(); if (dtNewReportCode == null || dtNewReportCode.Rows.Count == 0) { - newReportCode = DateTime.Now.ToString("yyyyMMdd") + "0001"; - } - else - { - if (string.IsNullOrEmpty(dtNewReportCode.Rows[0]["report_code"].ToString())) - { - newReportCode = DateTime.Now.ToString("yyyyMMdd") + "0001"; - } - else - { - newReportCode = (Convert.ToInt64(dtNewReportCode.Rows[0]["report_code"].ToString()) + 1).ToString(); - } + newReportCode = (Convert.ToInt64(dtNewReportCode.Rows[0]["report_code"].ToString()) + 1).ToString(); } + ExecReportWorkWin execReport = new ExecReportWorkWin(selectedRow["workorder_code"].ToString(), selectedRow["quantity_split"].ToString()); + + + if (execReport.ShowDialog() == true) { string workTime = execReport._workTime; @@ -479,8 +472,8 @@ namespace XGLFinishPro.Views { } - - + + } private void btnCheckLog_Click(object sender, RoutedEventArgs e)