From b0f4d58240f4cf0ec5b00eac7adabe051a515edf Mon Sep 17 00:00:00 2001
From: zhaojian <qj120227@163.com>
Date: Wed, 15 Nov 2023 18:30:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=89=E6=8B=A9=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E5=8F=B7=E5=92=8C=E6=9C=80=E7=BB=88=E6=8A=A5=E5=B7=A5?=
 =?UTF-8?q?,=E4=BD=86=E6=98=AF=E7=A1=AE=E8=AE=A4=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=B2=A1=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinishProdDBService.cs                    | 11 ++++++-
 shangjian/XGLFinishPro/App.config             |  4 +--
 .../XGLFinishPro/Views/ExecReportWorkWin.xaml | 19 ++++++++---
 .../Views/ExecReportWorkWin.xaml.cs           | 32 ++++++++++++++++++-
 .../XGLFinishPro/Views/LanJu_Operator.xaml    | 11 ++++---
 .../XGLFinishPro/Views/LanJu_Operator.xaml.cs | 10 +++++-
 .../XGLFinishPro/Views/LanJu_User.xaml.cs     |  3 +-
 7 files changed, 76 insertions(+), 14 deletions(-)

diff --git a/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs b/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs
index 01189f0..bd9d67c 100644
--- a/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs
+++ b/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs
@@ -187,7 +187,16 @@ where CONVERT(VARCHAR(10), upload_time , 120)= CONVERT(VARCHAR(10), GetDate() ,
             }
             return null;
         }
-
+        public DataTable piciGetCostCenter(string workorder)
+        {
+            string sql = $" SELECT batch_code FROM pro_order_workorder_batch WHERE workorder_id='{workorder}' AND del_flag='0'";
+            DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
+            if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
+            {
+                return dtset.Tables[0];
+            }
+            return null;
+        }
         public DataTable GetFactoryInfo(string sitecode)
         {
             string sql = $"select factory_name from sys_factory where factory_code = '{sitecode}'";
diff --git a/shangjian/XGLFinishPro/App.config b/shangjian/XGLFinishPro/App.config
index ffb6ec7..7044b4b 100644
--- a/shangjian/XGLFinishPro/App.config
+++ b/shangjian/XGLFinishPro/App.config
@@ -10,9 +10,9 @@
 		<!--车间编码-->
 		<add key="SiteCode" value="1000" />
 		<!--设备编码-->
-		<add key="DeviceCode" value="XL04" />
+		<add key="DeviceCode" value="XL01" />
 		<!--上位机类型 0:工单准备，1：成型机\shoupei，2：烘房,3:人员登录-->
-		<add key="ClientMode" value="0" />
+		<add key="ClientMode" value="1" />
 
 		<add key="SerialPort" value="COM5" />
  
diff --git a/shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml b/shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml
index e622052..7bf7994 100644
--- a/shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml
+++ b/shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml
@@ -115,6 +115,7 @@
             <RowDefinition/>
             <RowDefinition/>
             <RowDefinition/>
+            <RowDefinition/>
         </Grid.RowDefinitions>
         <Label Grid.ColumnSpan="2" x:Name="lbTitle" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="24" Content="报工" FontWeight="Bold"></Label>
         <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="1">
@@ -137,12 +138,22 @@
 
         <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Margin="15,0,0,0">
             <Label  Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="24" Content="成本中心："></Label>
-            <ComboBox x:Name="comboBoxCostCenter" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="24" Width="360" Height="50"  Style="{StaticResource ComboBoxStyle}"></ComboBox>
+            <ComboBox x:Name="comboBoxCostCenter" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="24" Width="360" Height="50"  Style="{StaticResource ComboBoxStyle}" SelectionChanged="comboBoxCostCenter_SelectionChanged"></ComboBox>
+        </StackPanel>
+        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" Margin="15,0,0,0">
+            <Label  Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="24" Content="批 次 号： "></Label>
+            <ComboBox x:Name="pici" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="24" Margin="2,0,0,0" Width="360" Height="50"  Style="{StaticResource ComboBoxStyle}"></ComboBox>
+            <Label Content="* 注不选批次号默认为该工单报工" Foreground="Red"  VerticalAlignment="Center"></Label>
         </StackPanel>
-        <Label x:Name="tbMsg" Width="500" Height="60" Grid.Row="4" Grid.ColumnSpan="2" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" VerticalAlignment="Center" FontSize="18" Foreground="Red" FontWeight="Bold"></Label>
 
-        <Button x:Name="btnOK" Grid.Row="5" Grid.Column="0" Width="120" Height="50" Content="确定" Margin="10" Background="#2F82E7" Foreground="White" FontSize="22" FontWeight="Bold" Click="btnOK_Click"/>
-        <Button x:Name="btnCancel"  Grid.Row="5" Grid.Column="1" Width="120" Height="50" Content="取消" Margin="10" FontWeight="Bold" FontSize="22" Click="btnCancel_Click"/>
+        <Label x:Name="tbMsg" Width="500" Height="60" Grid.Row="5" Grid.ColumnSpan="2" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" VerticalAlignment="Center" FontSize="18" Foreground="Red" FontWeight="Bold"></Label>
+        <CheckBox Content="最终报工" Height="auto"  FontSize="10"  Grid.Row="6" IsChecked="False" HorizontalAlignment="Left" VerticalContentAlignment="Center"  Name="xuanze9" >
+            <CheckBox.LayoutTransform >
+                <ScaleTransform ScaleX="2" ScaleY="2" />
+            </CheckBox.LayoutTransform>
+        </CheckBox>
+        <Button x:Name="btnOK" Grid.Row="6" Grid.Column="0" Width="120" Height="43" Content="确定" Margin="10" Background="#2F82E7" Foreground="White" FontSize="22" FontWeight="Bold" Click="btnOK_Click"/>
+        <Button x:Name="btnCancel"  Grid.Row="6" Grid.Column="1" Width="120" Height="43" Content="取消" Margin="10" FontWeight="Bold" FontSize="22" Click="btnCancel_Click"/>
 
 
     </Grid>
diff --git a/shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml.cs b/shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml.cs
index 15e413b..c1d66c0 100644
--- a/shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml.cs
+++ b/shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml.cs
@@ -14,6 +14,7 @@ using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
+using Xceed.Wpf.DataGrid;
 using XGL.Data;
 using XGL.Dats.DBServiceFinishProd;
 
@@ -30,14 +31,16 @@ namespace XGLFinishPro.Views
         public string _useMan = "";
         public string _costCenter = "";
         public string _workQuntity = "";
+        public string workOrdercode = "";
         public ExecReportWorkWin()
         {
             InitializeComponent();
         }
 
-        public ExecReportWorkWin(string workOrder, string quantity)
+        public ExecReportWorkWin(string workOrder, string quantity,string workOrdercode)
         {
             InitializeComponent();
+            this.workOrdercode = workOrdercode;
             this.lbCurrOrderNo.Content = workOrder;
             this.txtQuantity.Text = quantity;
         }
@@ -117,6 +120,7 @@ namespace XGLFinishPro.Views
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
             InitComBoboxData();
+            piciInitComBoboxData();
         }
 
         private void txtQuantity_TextChanged(object sender, TextChangedEventArgs e)
@@ -183,6 +187,32 @@ namespace XGLFinishPro.Views
             comboBoxCostCenter.DisplayMemberPath = "factory_name";
             comboBoxCostCenter.SelectedIndex = 0;
         }
+         private void piciInitComBoboxData()
+        {
+            DataTable dt = userDbWareHouse.piciGetCostCenter(this.workOrdercode);
+            if (dt == null)
+            {
+                CustomMessageBox.Show("没有找到批次号，请联系管理员！", CustomMessageBoxIcon.Warning);
+                return;
+            }
+            List<string> strings =new List<string>();
+            foreach (System.Data.DataRow row in dt.Rows)
+            {
+                strings.Add(row[0].ToString());
+            }
+
+            List<CostCenter> listCostCenter = Utils.ToDataList<CostCenter>(dt);
+            //comboDryRoomInfo.SelectedValuePath = "quipName";
+            //comboDryRoomInfo.DisplayMemberPath = "quipCode";
+            //comboDryRoomInfo.ItemsSource = listEquip;
+            //绑定
+            pici.ItemsSource = strings;
+        }
+
+        private void comboBoxCostCenter_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+
+        }
     }
     public class CostCenter
     { 
diff --git a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml
index 01147b8..4966312 100644
--- a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml
+++ b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml
@@ -436,10 +436,11 @@
                 <DataGridTextColumn Width="250" Header="工单/SFC" Binding="{Binding workorder_id}" Visibility="Collapsed"/>
                 <DataGridTextColumn Width="300" Header="工单/SFC" Binding="{Binding workorder_code}" />
                 <!--<DataGridTextColumn Width="120" Header="RFID" Binding="{Binding rfid}"/>-->
-                <DataGridTextColumn Width="400" Header="产品名称" Binding="{Binding product_name}" />
-                <DataGridTextColumn Width="250" Header="产品型号" Binding="{Binding product_code}" />
+                <DataGridTextColumn Width="480" Header="产品名称" Binding="{Binding product_name}" />
+                <DataGridTextColumn Width="380" Header="批次号" Binding="{Binding batch_code}" />
+               
                 <DataGridTextColumn Width="100" Header="数量" Binding="{Binding quantity_split}" />
-                <DataGridTextColumn Width="250" Header="计划时间" Binding="{Binding plan_time, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" />
+                
                 <DataGridTextColumn Width="60" Header="状态"   Binding="{Binding status,Converter={StaticResource MyConverter}}" >
                     <!--<DataGridTextColumn.ElementStyle>
                         <Style TargetType="TextBlock">
@@ -450,8 +451,10 @@
                 <!--<DataGridTextColumn Width="140" Header="工单完成数" Binding="{Binding attr1}" />
                 <DataGridTextColumn Width="180" Header="当前机台完成数" Binding="{Binding totalCount}" />-->
                 <DataGridTextColumn Width="180" Header="班次" Binding="{Binding shift_desc}" />
-                <DataGridTextColumn Width="180" Header="批次号" Binding="{Binding batch_code}" />
+                <DataGridTextColumn Width="250" Header="产品编码" Binding="{Binding product_code}" />
                 <DataGridTextColumn Width="180" Header="批次数量" Binding="{Binding batch_quantity}" />
+                <DataGridTextColumn Width="180" Header="工单code" Visibility="Hidden" Binding="{Binding workorder_id}" />
+                <DataGridTextColumn Width="250" Header="计划时间" Binding="{Binding plan_time, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" />
                 <!--<DataGridTextColumn Width="340" Header="流转码" Binding="{Binding work_batch_code}" />-->
                 <!--<DataGridTextColumn Width="60" Header="出入" Binding="{Binding taskcode,Converter={StaticResource TaskCodeConverter}}"/>-->
 
diff --git a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs
index f11eb60..2988be3 100644
--- a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs
+++ b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs
@@ -460,7 +460,7 @@ namespace XGLFinishPro.Views
                 }
                    
 
-                ExecReportWorkWin execReport = new ExecReportWorkWin(selectedRow["workorder_code"].ToString(), selectedRow["quantity_split"].ToString());
+                ExecReportWorkWin execReport = new ExecReportWorkWin(selectedRow["workorder_code"].ToString(),  selectedRow["quantity_split"].ToString(), selectedRow["workorder_id"].ToString());
 
                 if (execReport.ShowDialog() == true)
                 {
@@ -592,6 +592,14 @@ namespace XGLFinishPro.Views
 
             return true;
         }
+
+        private void DatePicker_SelectedDateChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (sender is DatePicker datePicker)
+            {
+                DateTime selectedDate = datePicker.SelectedDate ?? DateTime.MinValue;
+            }
+        }
     }
     public class ReportWork
     {
diff --git a/shangjian/XGLFinishPro/Views/LanJu_User.xaml.cs b/shangjian/XGLFinishPro/Views/LanJu_User.xaml.cs
index cc63165..fad38fa 100644
--- a/shangjian/XGLFinishPro/Views/LanJu_User.xaml.cs
+++ b/shangjian/XGLFinishPro/Views/LanJu_User.xaml.cs
@@ -88,7 +88,8 @@ namespace XGLFinishPro.Views
                     if (isSucc)
                     {
                         CustomMessageBox.Show("打卡成功，祝您工作愉快！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
-          
+                        txtOnWorkUserID.Text = "";
+                        txtOnWorkUserID.Focus();
                         Now_Click(null, null);
                     }
                     else {